diff --git a/Marlin/src/HAL/HAL_LPC1768/include/Wire.h b/Marlin/src/HAL/HAL_LPC1768/include/Wire.h index 5c4b0b9518..b833d699e4 100644 --- a/Marlin/src/HAL/HAL_LPC1768/include/Wire.h +++ b/Marlin/src/HAL/HAL_LPC1768/include/Wire.h @@ -49,7 +49,7 @@ class TwoWire { uint8_t requestFrom(uint8_t, uint8_t); uint8_t requestFrom(int, int); - + virtual size_t write(uint8_t); virtual size_t write(const uint8_t *, size_t); virtual int available(void); diff --git a/Marlin/src/HAL/HAL_LPC1768/persistent_store_impl.cpp b/Marlin/src/HAL/HAL_LPC1768/persistent_store_impl.cpp index f2f33ba9f1..ef8e1aa29f 100644 --- a/Marlin/src/HAL/HAL_LPC1768/persistent_store_impl.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/persistent_store_impl.cpp @@ -107,7 +107,7 @@ bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { SERIAL_PROTOCOLPAIR(" write_data(", pos); // This extra chit-chat goes away soon. But it is helpful SERIAL_PROTOCOLPAIR(",", (int)value); // right now to see errors that are happening in the SERIAL_PROTOCOLPAIR(",", (int)size); // read_data() and write_data() functions - SERIAL_PROTOCOL("...)\n"); + SERIAL_PROTOCOLLNPGM("...)"); SERIAL_PROTOCOLLNPAIR(" f_lseek()=", (int)s); return s; } @@ -117,7 +117,7 @@ bool write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) { SERIAL_PROTOCOLPAIR(" write_data(", pos); // This extra chit-chat goes away soon. But it is helpful SERIAL_PROTOCOLPAIR(",", (int)value); // right now to see errors that are happening in the SERIAL_PROTOCOLPAIR(",", size); // read_data() and write_data() functions - SERIAL_PROTOCOLLN("...)"); + SERIAL_PROTOCOLLNPGM("...)"); SERIAL_PROTOCOLLNPAIR(" f_write()=", (int)s); SERIAL_PROTOCOLPAIR(" size=", size); SERIAL_PROTOCOLLNPAIR("\n bytes_written=", bytes_written); @@ -136,7 +136,7 @@ bool read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc, const boo SERIAL_PROTOCOLPAIR(" read_data(", pos); // This extra chit-chat goes away soon. But it is helpful SERIAL_PROTOCOLPAIR(",", (int)value); // right now to see errors that are happening in the SERIAL_PROTOCOLPAIR(",", size); // read_data() and write_data() functions - SERIAL_PROTOCOLLN("...)"); + SERIAL_PROTOCOLLNPGM("...)"); SERIAL_PROTOCOLLNPAIR(" f_lseek()=", (int)s); return true; } @@ -153,7 +153,7 @@ bool read_data(int &pos, uint8_t* value, uint16_t size, uint16_t *crc, const boo SERIAL_PROTOCOLPAIR(" read_data(", pos); // This extra chit-chat goes away soon. But it is helpful SERIAL_PROTOCOLPAIR(",", (int)value); // right now to see errors that are happening in the SERIAL_PROTOCOLPAIR(",", size); // read_data() and write_data() functions - SERIAL_PROTOCOLLN("...)"); + SERIAL_PROTOCOLLNPGM("...)"); SERIAL_PROTOCOLLNPAIR(" f_write()=", (int)s); SERIAL_PROTOCOLPAIR(" size=", size); SERIAL_PROTOCOLLNPAIR("\n bytes_read=", bytes_read); diff --git a/Marlin/src/HAL/HAL_STM32F7/HAL_STM32F7.h b/Marlin/src/HAL/HAL_STM32F7/HAL_STM32F7.h index f2196a6740..03ab69a1ed 100644 --- a/Marlin/src/HAL/HAL_STM32F7/HAL_STM32F7.h +++ b/Marlin/src/HAL/HAL_STM32F7/HAL_STM32F7.h @@ -98,7 +98,7 @@ #define NUM_SERIAL 1 #endif -#define _BV(bit) (1 << (bit)) +#define _BV(b) (1UL << (b)) /** * TODO: review this to return 1 for pins that are not analog input diff --git a/Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h b/Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h index ed74161e01..e22acc6670 100644 --- a/Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h +++ b/Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h @@ -29,7 +29,7 @@ #ifndef _FASTIO_STM32F7_H #define _FASTIO_STM32F7_H -#define _BV(bit) (1 << (bit)) +#define _BV(b) (1UL << (b)) #define READ(IO) digitalRead(IO) #define WRITE(IO, v) digitalWrite(IO,v) diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h index 2c62467232..945233a457 100644 --- a/Marlin/src/core/macros.h +++ b/Marlin/src/core/macros.h @@ -95,9 +95,8 @@ #define STRINGIFY(M) STRINGIFY_(M) // Macros for bit masks -#ifndef _BV - #define _BV(n) (1<<(n)) -#endif +#undef _BV // Marlin needs 32-bit unsigned! +#define _BV(b) (1UL << (b)) #define TEST(n,b) (((n)&_BV(b))!=0) #define SBI(n,b) (n |= _BV(b)) #define CBI(n,b) (n &= ~_BV(b)) diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp index b951962e6e..531dcadbfd 100644 --- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp +++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp @@ -1095,7 +1095,7 @@ SERIAL_PROTOCOLLNPAIR("UBL object count: ", (int)ubl_cnt); #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) - SERIAL_PROTOCOL("planner.z_fade_height : "); + SERIAL_PROTOCOLPGM("planner.z_fade_height : "); SERIAL_PROTOCOL_F(planner.z_fade_height, 4); SERIAL_EOL(); #endif diff --git a/Marlin/src/feature/dac/stepper_dac.cpp b/Marlin/src/feature/dac/stepper_dac.cpp index 33be396d2f..458eb61f1a 100644 --- a/Marlin/src/feature/dac/stepper_dac.cpp +++ b/Marlin/src/feature/dac/stepper_dac.cpp @@ -114,7 +114,7 @@ void dac_print_values() { SERIAL_ECHOPAIR(" (", dac_amps(Z_AXIS)); SERIAL_ECHOPAIR(") E:", dac_perc(E_AXIS)); SERIAL_ECHOPAIR(" (", dac_amps(E_AXIS)); - SERIAL_ECHOLN(")"); + SERIAL_ECHOLNPGM(")"); } void dac_commit_eeprom() { diff --git a/Marlin/src/gcode/config/M301.cpp b/Marlin/src/gcode/config/M301.cpp index 4df4a2c0e5..9d876224fc 100644 --- a/Marlin/src/gcode/config/M301.cpp +++ b/Marlin/src/gcode/config/M301.cpp @@ -71,7 +71,7 @@ void GcodeSuite::M301() { } else { SERIAL_ERROR_START(); - SERIAL_ERRORLN(MSG_INVALID_EXTRUDER); + SERIAL_ERRORLNPGM(MSG_INVALID_EXTRUDER); } } diff --git a/Marlin/src/gcode/feature/caselight/M355.cpp b/Marlin/src/gcode/feature/caselight/M355.cpp index 0e61ff5e0d..f22936d13c 100644 --- a/Marlin/src/gcode/feature/caselight/M355.cpp +++ b/Marlin/src/gcode/feature/caselight/M355.cpp @@ -56,10 +56,10 @@ void GcodeSuite::M355() { // always report case light status SERIAL_ECHO_START(); if (!case_light_on) { - SERIAL_ECHOLN("Case light: off"); + SERIAL_ECHOLNPGM("Case light: off"); } else { - if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on"); + if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLNPGM("Case light: on"); else SERIAL_ECHOLNPAIR("Case light: ", case_light_brightness); } #else diff --git a/Marlin/src/gcode/feature/i2c/M260_M261.cpp b/Marlin/src/gcode/feature/i2c/M260_M261.cpp index fdfa5804d6..918e764c40 100644 --- a/Marlin/src/gcode/feature/i2c/M260_M261.cpp +++ b/Marlin/src/gcode/feature/i2c/M260_M261.cpp @@ -73,7 +73,7 @@ void GcodeSuite::M261() { } else { SERIAL_ERROR_START(); - SERIAL_ERRORLN("Bad i2c request"); + SERIAL_ERRORLNPGM("Bad i2c request"); } } diff --git a/Marlin/src/gcode/host/M118.cpp b/Marlin/src/gcode/host/M118.cpp index 63e195ae63..aadf2d06c5 100644 --- a/Marlin/src/gcode/host/M118.cpp +++ b/Marlin/src/gcode/host/M118.cpp @@ -29,7 +29,7 @@ * E1 Have the host 'echo:' the text */ void GcodeSuite::M118() { - if (parser.boolval('E')) SERIAL_ECHO_START(); - if (parser.boolval('A')) SERIAL_ECHOPGM("// "); + if (parser.seenval('E') && parser.value_bool()) SERIAL_ECHO_START(); + if (parser.seenval('A') && parser.value_bool()) SERIAL_ECHOPGM("// "); SERIAL_ECHOLN(parser.string_arg); } diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp index a3543670f9..067950e478 100644 --- a/Marlin/src/gcode/parser.cpp +++ b/Marlin/src/gcode/parser.cpp @@ -60,7 +60,7 @@ int GCodeParser::codenum; #if ENABLED(FASTER_GCODE_PARSER) // Optimized Parameters - byte GCodeParser::codebits[4]; // found bits + uint32_t GCodeParser::codebits; // found bits uint8_t GCodeParser::param[26]; // parameter offsets from command_ptr #else char *GCodeParser::command_args; // start of parameters @@ -83,7 +83,7 @@ void GCodeParser::reset() { subcode = 0; // No command sub-code #endif #if ENABLED(FASTER_GCODE_PARSER) - ZERO(codebits); // No codes yet + codebits = 0; // No codes yet //ZERO(param); // No parameters (should be safe to comment out this line) #endif } @@ -196,14 +196,7 @@ void GCodeParser::parse(char *p) { while (*p == ' ') p++; // Skip spaces between parameters & values - const bool has_num = NUMERIC(p[0]) // [0-9] - || (p[0] == '.' && NUMERIC(p[1])) // .[0-9] - || ( - (p[0] == '-' || p[0] == '+') && ( // [-+] - NUMERIC(p[1]) // [0-9] - || (p[1] == '.' && NUMERIC(p[2])) // .[0-9] - ) - ); + const bool has_num = valid_float(p); #if ENABLED(DEBUG_GCODE_PARSER) if (debug) { @@ -225,13 +218,7 @@ void GCodeParser::parse(char *p) { #endif #if ENABLED(FASTER_GCODE_PARSER) - { - set(code, has_num ? p : NULL // Set parameter exists and pointer (NULL for no number) - #if ENABLED(DEBUG_GCODE_PARSER) - , debug - #endif - ); - } + set(code, has_num ? p : NULL); // Set parameter exists and pointer (NULL for no number) #endif } else if (!string_arg) { // Not A-Z? First time, keep as the string_arg diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h index 922e5829e9..8d5582a4e4 100644 --- a/Marlin/src/gcode/parser.h +++ b/Marlin/src/gcode/parser.h @@ -51,7 +51,7 @@ private: static char *value_ptr; // Set by seen, used to fetch the value #if ENABLED(FASTER_GCODE_PARSER) - static byte codebits[4]; // Parameters pre-scanned + static uint32_t codebits; // Parameters pre-scanned static uint8_t param[26]; // For A-Z, offsets into command args #else static char *command_args; // Args start here, for slow scan @@ -88,30 +88,34 @@ public: // Reset is done before parsing static void reset(); - // Index so that 'X' falls on index 24 - #define PARAM_IND(N) ((N) >> 3) - #define PARAM_BIT(N) ((N) & 0x7) - #define LETTER_OFF(N) ((N) - 'A') - #define LETTER_IND(N) PARAM_IND(LETTER_OFF(N)) - #define LETTER_BIT(N) PARAM_BIT(LETTER_OFF(N)) + #define LETTER_BIT(N) ((N) - 'A') #if ENABLED(FASTER_GCODE_PARSER) + FORCE_INLINE static bool valid_signless(const char * const p) { + return NUMERIC(p[0]) || (p[0] == '.' && NUMERIC(p[1])); // .?[0-9] + } + + FORCE_INLINE static bool valid_float(const char * const p) { + return valid_signless(p) || ((p[0] == '-' || p[0] == '+') && valid_signless(&p[1])); // [-+]?.?[0-9] + } + + FORCE_INLINE static bool valid_int(const char * const p) { + return NUMERIC(p[0]) || ((p[0] == '-' || p[0] == '+') && NUMERIC(p[1])); // [-+]?[0-9] + } + // Set the flag and pointer for a parameter - static void set(const char c, char * const ptr - #if ENABLED(DEBUG_GCODE_PARSER) - , const bool debug=false - #endif - ) { - const uint8_t ind = LETTER_OFF(c); + static void set(const char c, char * const ptr) { + const uint8_t ind = LETTER_BIT(c); if (ind >= COUNT(param)) return; // Only A-Z - SBI(codebits[PARAM_IND(ind)], PARAM_BIT(ind)); // parameter exists + SBI(codebits, ind); // parameter exists param[ind] = ptr ? ptr - command_ptr : 0; // parameter offset or 0 #if ENABLED(DEBUG_GCODE_PARSER) - if (debug) { - SERIAL_ECHOPAIR("Set bit ", (int)PARAM_BIT(ind)); - SERIAL_ECHOPAIR(" of index ", (int)PARAM_IND(ind)); - SERIAL_ECHOLNPAIR(" | param = ", (int)param[ind]); + if (codenum == 800) { + SERIAL_ECHOPAIR("Set bit ", (int)ind); + SERIAL_ECHOPAIR(" of codebits (", hex_address((void*)(codebits >> 16))); + print_hex_word((uint16_t)(codebits & 0xFFFF)); + SERIAL_ECHOLNPAIR(") | param = ", (int)param[ind]); } #endif } @@ -119,25 +123,28 @@ public: // Code seen bit was set. If not found, value_ptr is unchanged. // This allows "if (seen('A')||seen('B'))" to use the last-found value. static bool seen(const char c) { - const uint8_t ind = LETTER_OFF(c); + const uint8_t ind = LETTER_BIT(c); if (ind >= COUNT(param)) return false; // Only A-Z - const bool b = TEST(codebits[PARAM_IND(ind)], PARAM_BIT(ind)); - if (b) value_ptr = param[ind] ? command_ptr + param[ind] : (char*)NULL; + const bool b = TEST(codebits, ind); + if (b) { + char * const ptr = command_ptr + param[ind]; + value_ptr = param[ind] && valid_float(ptr) ? ptr : (char*)NULL; + } return b; } - static bool seen_any() { return codebits[3] || codebits[2] || codebits[1] || codebits[0]; } + static bool seen_any() { return !!codebits; } - #define SEEN_TEST(L) TEST(codebits[LETTER_IND(L)], LETTER_BIT(L)) + #define SEEN_TEST(L) TEST(codebits, LETTER_BIT(L)) #else // !FASTER_GCODE_PARSER // Code is found in the string. If not found, value_ptr is unchanged. // This allows "if (seen('A')||seen('B'))" to use the last-found value. static bool seen(const char c) { - char *p = strchr(command_args, c); + const char *p = strchr(command_args, c); const bool b = !!p; - if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL; + if (b) value_ptr = valid_float(&p[1]) ? &p[1] : (char*)NULL; return b; } @@ -201,7 +208,7 @@ public: inline static uint8_t value_byte() { return (uint8_t)constrain(value_long(), 0, 255); } // Bool is true with no value or non-zero - inline static bool value_bool() { return !has_value() || value_byte(); } + inline static bool value_bool() { return !has_value() || !!value_byte(); } // Units modes: Inches, Fahrenheit, Kelvin @@ -298,16 +305,15 @@ public: void unknown_command_error(); // Provide simple value accessors with default option - FORCE_INLINE static float floatval(const char c, const float dval=0.0) { return seenval(c) ? value_float() : dval; } - FORCE_INLINE static bool boolval(const char c) { return seenval(c) ? value_bool() : seen(c); } - FORCE_INLINE static uint8_t byteval(const char c, const uint8_t dval=0) { return seenval(c) ? value_byte() : dval; } - FORCE_INLINE static int16_t intval(const char c, const int16_t dval=0) { return seenval(c) ? value_int() : dval; } - FORCE_INLINE static uint16_t ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort() : dval; } - FORCE_INLINE static int32_t longval(const char c, const int32_t dval=0) { return seenval(c) ? value_long() : dval; } - FORCE_INLINE static uint32_t ulongval(const char c, const uint32_t dval=0) { return seenval(c) ? value_ulong() : dval; } - FORCE_INLINE static float linearval(const char c, const float dval=0.0) { return seenval(c) ? value_linear_units() : dval; } - FORCE_INLINE static float celsiusval(const char c, const float dval=0.0) { return seenval(c) ? value_celsius() : dval; } - FORCE_INLINE static const char* strval(const char c) { return seenval(c) ? value_ptr : NULL; } + FORCE_INLINE static float floatval(const char c, const float dval=0.0) { return seenval(c) ? value_float() : dval; } + FORCE_INLINE static bool boolval(const char c) { return seenval(c) ? value_bool() : seen(c); } + FORCE_INLINE static uint8_t byteval(const char c, const uint8_t dval=0) { return seenval(c) ? value_byte() : dval; } + FORCE_INLINE static int16_t intval(const char c, const int16_t dval=0) { return seenval(c) ? value_int() : dval; } + FORCE_INLINE static uint16_t ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort() : dval; } + FORCE_INLINE static int32_t longval(const char c, const int32_t dval=0) { return seenval(c) ? value_long() : dval; } + FORCE_INLINE static uint32_t ulongval(const char c, const uint32_t dval=0) { return seenval(c) ? value_ulong() : dval; } + FORCE_INLINE static float linearval(const char c, const float dval=0.0) { return seenval(c) ? value_linear_units() : dval; } + FORCE_INLINE static float celsiusval(const char c, const float dval=0.0) { return seenval(c) ? value_celsius() : dval; } }; diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index a27cf80563..6208275f51 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -1502,7 +1502,7 @@ void MarlinSettings::postprocess() { HAL::PersistentStore::access_finish(); if (status) - SERIAL_PROTOCOL("?Unable to save mesh data.\n"); + SERIAL_PROTOCOLPGM("?Unable to save mesh data.\n"); // Write crc to MAT along with other data, or just tack on to the beginning or end @@ -1540,7 +1540,7 @@ void MarlinSettings::postprocess() { HAL::PersistentStore::access_finish(); if (status) - SERIAL_PROTOCOL("?Unable to load mesh data.\n"); + SERIAL_PROTOCOLPGM("?Unable to load mesh data.\n"); #if ENABLED(EEPROM_CHITCHAT) else diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index a80626764d..224fbcfced 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -266,11 +266,11 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS], #endif if (!WITHIN(hotend, _BOT_HOTEND, _TOP_HOTEND)) { - SERIAL_ECHOLN(MSG_PID_BAD_EXTRUDER_NUM); + SERIAL_ECHOLNPGM(MSG_PID_BAD_EXTRUDER_NUM); return; } - SERIAL_ECHOLN(MSG_PID_AUTOTUNE_START); + SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_START); disable_all_heaters(); // switch off all heaters. diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index 0d1e00c2cb..83cff7a641 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -123,7 +123,7 @@ inline void invalid_extruder_error(const uint8_t e) { SERIAL_CHAR('T'); SERIAL_ECHO_F(e, DEC); SERIAL_CHAR(' '); - SERIAL_ECHOLN(MSG_INVALID_EXTRUDER); + SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER); } /** diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 0269ee15a4..b78ffead5b 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -364,7 +364,7 @@ void CardReader::openFile(char* name, const bool read, const bool subcall/*=fals if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) { SERIAL_ERROR_START(); SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); - SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); + SERIAL_ERRORLN((int)SD_PROCEDURE_DEPTH); kill(PSTR(MSG_KILLED)); return; }