From fc6806db16abd8db8a980d4ee812423653ee72ee Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Thu, 23 Jun 2016 16:42:12 -0700 Subject: [PATCH] Namespace STAT_MSG macro --- src/messages.def | 94 ++++++++++++++++++++++++------------------------ src/status.c | 8 ++--- src/status.h | 4 +-- 3 files changed, 54 insertions(+), 52 deletions(-) diff --git a/src/messages.def b/src/messages.def index d152ba0..31f3e4e 100644 --- a/src/messages.def +++ b/src/messages.def @@ -26,60 +26,62 @@ \******************************************************************************/ // OS, communications and low-level status -MSG(OK, "OK") -MSG(EAGAIN, "Run command again") -MSG(NOOP, "No op") -MSG(COMPLETE, "Complete") -MSG(NO_SUCH_DEVICE, "No such device") -MSG(BUFFER_FULL, "Buffer full") -MSG(BUFFER_FULL_FATAL, "Buffer full - fatal") -MSG(EEPROM_DATA_INVALID, "EEPROM data invalid") -MSG(MOTOR_ERROR, "Motor error") -MSG(INTERNAL_ERROR, "Internal error") +STAT_MSG(OK, "OK") +STAT_MSG(EAGAIN, "Run command again") +STAT_MSG(NOOP, "No op") +STAT_MSG(COMPLETE, "Complete") +STAT_MSG(NO_SUCH_DEVICE, "No such device") +STAT_MSG(BUFFER_FULL, "Buffer full") +STAT_MSG(BUFFER_FULL_FATAL, "Buffer full - fatal") +STAT_MSG(EEPROM_DATA_INVALID, "EEPROM data invalid") +STAT_MSG(MOTOR_ERROR, "Motor error") +STAT_MSG(INTERNAL_ERROR, "Internal error") -MSG(PREP_LINE_MOVE_TIME_IS_INFINITE, "Move time is infinite") -MSG(PREP_LINE_MOVE_TIME_IS_NAN, "Move time is NAN") +STAT_MSG(PREP_LINE_MOVE_TIME_IS_INFINITE, "Move time is infinite") +STAT_MSG(PREP_LINE_MOVE_TIME_IS_NAN, "Move time is NAN") // Generic data input errors -MSG(UNRECOGNIZED_NAME, "Unrecognized command or config name") -MSG(INVALID_OR_MALFORMED_COMMAND, "Invalid or malformed command") -MSG(BAD_NUMBER_FORMAT, "Bad number format") -MSG(PARAMETER_IS_READ_ONLY, "Parameter is read-only") -MSG(PARAMETER_CANNOT_BE_READ, "Parameter cannot be read") -MSG(COMMAND_NOT_ACCEPTED, "Command not accepted at this time") -MSG(INPUT_EXCEEDS_MAX_LENGTH, "Input exceeds max length") -MSG(INPUT_LESS_THAN_MIN_VALUE, "Input less than minimum value") -MSG(INPUT_EXCEEDS_MAX_VALUE, "Input exceeds maximum value") -MSG(INPUT_VALUE_RANGE_ERROR, "Input value range error") +STAT_MSG(UNRECOGNIZED_NAME, "Unrecognized command or config name") +STAT_MSG(INVALID_OR_MALFORMED_COMMAND, "Invalid or malformed command") +STAT_MSG(BAD_NUMBER_FORMAT, "Bad number format") +STAT_MSG(PARAMETER_IS_READ_ONLY, "Parameter is read-only") +STAT_MSG(PARAMETER_CANNOT_BE_READ, "Parameter cannot be read") +STAT_MSG(COMMAND_NOT_ACCEPTED, "Command not accepted at this time") +STAT_MSG(INPUT_EXCEEDS_MAX_LENGTH, "Input exceeds max length") +STAT_MSG(INPUT_LESS_THAN_MIN_VALUE, "Input less than minimum value") +STAT_MSG(INPUT_EXCEEDS_MAX_VALUE, "Input exceeds maximum value") +STAT_MSG(INPUT_VALUE_RANGE_ERROR, "Input value range error") // Gcode errors & warnings (Most originate from NIST) -MSG(GCODE_COMMAND_UNSUPPORTED, "Gcode command unsupported") -MSG(MCODE_COMMAND_UNSUPPORTED, "M code unsupported") -MSG(GCODE_AXIS_IS_MISSING, "Axis word missing") -MSG(GCODE_FEEDRATE_NOT_SPECIFIED, "Feedrate not specified") -MSG(ARC_SPECIFICATION_ERROR, "Arc specification error") -MSG(ARC_AXIS_MISSING_FOR_SELECTED_PLANE, "Arc missing axis") -MSG(ARC_RADIUS_OUT_OF_TOLERANCE, "Arc radius arc out of tolerance") -MSG(ARC_ENDPOINT_IS_STARTING_POINT, "Arc endpoint is starting point") +STAT_MSG(GCODE_COMMAND_UNSUPPORTED, "Gcode command unsupported") +STAT_MSG(MCODE_COMMAND_UNSUPPORTED, "M code unsupported") +STAT_MSG(GCODE_AXIS_IS_MISSING, "Axis word missing") +STAT_MSG(GCODE_FEEDRATE_NOT_SPECIFIED, "Feedrate not specified") +STAT_MSG(ARC_SPECIFICATION_ERROR, "Arc specification error") +STAT_MSG(ARC_AXIS_MISSING_FOR_SELECTED_PLANE, "Arc missing axis") +STAT_MSG(ARC_RADIUS_OUT_OF_TOLERANCE, "Arc radius arc out of tolerance") +STAT_MSG(ARC_ENDPOINT_IS_STARTING_POINT, "Arc endpoint is starting point") // Errors and warnings -MSG(MINIMUM_LENGTH_MOVE, "Move less than minimum length") -MSG(MINIMUM_TIME_MOVE, "Move less than minimum time") -MSG(MACHINE_ALARMED, "Machine is alarmed - Command not processed") -MSG(LIMIT_SWITCH_HIT, "Limit switch hit - Shutdown occurred") -MSG(SOFT_LIMIT_EXCEEDED, "Soft limit exceeded") +STAT_MSG(MINIMUM_LENGTH_MOVE, "Move less than minimum length") +STAT_MSG(MINIMUM_TIME_MOVE, "Move less than minimum time") +STAT_MSG(MACHINE_ALARMED, "Machine is alarmed - Command not processed") +STAT_MSG(LIMIT_SWITCH_HIT, "Limit switch hit - Shutdown occurred") +STAT_MSG(SOFT_LIMIT_EXCEEDED, "Soft limit exceeded") // Homing -MSG(HOMING_CYCLE_FAILED, "Homing cycle failed") -MSG(HOMING_ERROR_BAD_OR_NO_AXIS, "Homing Error - Bad or no axis specified") -MSG(HOMING_ERROR_ZERO_SEARCH_VELOCITY, "Homing Error - Search velocity is zero") -MSG(HOMING_ERROR_ZERO_LATCH_VELOCITY, "Homing Error - Latch velocity is zero") -MSG(HOMING_ERROR_TRAVEL_MIN_MAX_IDENTICAL, - "Homing Error - Travel min & max are the same") -MSG(HOMING_ERROR_NEGATIVE_LATCH_BACKOFF, - "Homing Error - Negative latch backoff") -MSG(HOMING_ERROR_SWITCH_MISCONFIGURATION, - "Homing Error - Homing switches misconfigured") +STAT_MSG(HOMING_CYCLE_FAILED, "Homing cycle failed") +STAT_MSG(HOMING_ERROR_BAD_OR_NO_AXIS, "Homing Error - Bad or no axis specified") +STAT_MSG(HOMING_ERROR_ZERO_SEARCH_VELOCITY, + "Homing Error - Search velocity is zero") +STAT_MSG(HOMING_ERROR_ZERO_LATCH_VELOCITY, + "Homing Error - Latch velocity is zero") +STAT_MSG(HOMING_ERROR_TRAVEL_MIN_MAX_IDENTICAL, + "Homing Error - Travel min & max are the same") +STAT_MSG(HOMING_ERROR_NEGATIVE_LATCH_BACKOFF, + "Homing Error - Negative latch backoff") +STAT_MSG(HOMING_ERROR_SWITCH_MISCONFIGURATION, + "Homing Error - Homing switches misconfigured") // Probing -MSG(PROBE_CYCLE_FAILED, "Probe cycle failed") +STAT_MSG(PROBE_CYCLE_FAILED, "Probe cycle failed") diff --git a/src/status.c b/src/status.c index f036473..2f63af4 100644 --- a/src/status.c +++ b/src/status.c @@ -31,14 +31,14 @@ stat_t status_code; // allocate a variable for the ritorno macro -#define MSG(NAME, TEXT) static const char stat_##NAME[] PROGMEM = TEXT; +#define STAT_MSG(NAME, TEXT) static const char stat_##NAME[] PROGMEM = TEXT; #include "messages.def" -#undef MSG +#undef STAT_MSG static const char *const stat_msg[] PROGMEM = { -#define MSG(NAME, TEXT) stat_##NAME, +#define STAT_MSG(NAME, TEXT) stat_##NAME, #include "messages.def" -#undef MSG +#undef STAT_MSG }; diff --git a/src/status.h b/src/status.h index 65350bf..1f80417 100644 --- a/src/status.h +++ b/src/status.h @@ -35,9 +35,9 @@ #define ritorno(a) if ((status_code = a) != STAT_OK) {return status_code;} typedef enum { -#define MSG(NAME, TEXT) STAT_##NAME, +#define STAT_MSG(NAME, TEXT) STAT_##NAME, #include "messages.def" -#undef MSG +#undef STAT_MSG STAT_MAX_VALUE = 255 // Do not exceed 255 } stat_t; -- 2.27.0