From ce8fb560998e01f212436620698f0ec771ee6177 Mon Sep 17 00:00:00 2001 From: Scott Mudge Date: Wed, 20 Jan 2021 18:33:13 -0500 Subject: [PATCH 1/4] - remove volatile from lookup table. --- Firmware/cmdqueue.cpp | 2 +- Firmware/meatpack.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 2058d7f968..dd431ea263 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -1,7 +1,7 @@ #include "cmdqueue.h" #include "cardreader.h" #include "ultralcd.h" -#include "MeatPack.h" +#include "meatpack.h" extern bool Stopped; diff --git a/Firmware/meatpack.cpp b/Firmware/meatpack.cpp index acc64b3d31..f1d2e002b8 100644 --- a/Firmware/meatpack.cpp +++ b/Firmware/meatpack.cpp @@ -5,7 +5,7 @@ * Date: Dec. 2020 */ -#include "MeatPack.h" +#include "meatpack.h" #ifdef ENABLE_MEATPACK @@ -80,7 +80,7 @@ uint8_t mp_char_out_count = 0; // Stores number of characters to be read out #ifdef USE_LOOKUP_TABLE // The 15 most-common characters used in G-code, ~90-95% of all g-code uses these characters // NOT storing this with PROGMEM, given how frequently this table will be accessed. -volatile uint8_t MeatPackLookupTbl[16] = { +uint8_t MeatPackLookupTbl[16] = { '0', // 0000 '1', // 0001 '2', // 0010 From 820d67b125a73e54b04fc69a50bb599217b81449 Mon Sep 17 00:00:00 2001 From: Scott Mudge Date: Sat, 23 Jan 2021 03:21:03 -0500 Subject: [PATCH 2/4] Fixed filename case sensitivity... issue with Windows being case insensitive. --- Firmware/{MeatPack.h => meatpack.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Firmware/{MeatPack.h => meatpack.h} (100%) diff --git a/Firmware/MeatPack.h b/Firmware/meatpack.h similarity index 100% rename from Firmware/MeatPack.h rename to Firmware/meatpack.h From 5f69ec5bc6c952e9615473d1822ee04369c85e94 Mon Sep 17 00:00:00 2001 From: Scott Mudge Date: Mon, 25 Jan 2021 12:00:06 -0500 Subject: [PATCH 3/4] Remove unused toggle command. --- Firmware/meatpack.cpp | 6 ------ Firmware/meatpack.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Firmware/meatpack.cpp b/Firmware/meatpack.cpp index f1d2e002b8..a0a0a6c571 100644 --- a/Firmware/meatpack.cpp +++ b/Firmware/meatpack.cpp @@ -298,12 +298,6 @@ void FORCE_INLINE mp_handle_cmd(const MeatPack_Command c) { #ifdef MP_DEBUG SERIAL_ECHOLNPGM("[MPDBG] DISBL REC"); #endif - } break; - case MPCommand_TogglePacking: { - mp_config ^= MPConfig_Active; -#ifdef MP_DEBUG - SERIAL_ECHOLNPGM("[MPDBG] TGL REC"); -#endif } break; case MPCommand_ResetAll: { mp_reset_state(); diff --git a/Firmware/meatpack.h b/Firmware/meatpack.h index 003b82d057..4c949abf29 100644 --- a/Firmware/meatpack.h +++ b/Firmware/meatpack.h @@ -47,7 +47,7 @@ // some non-0xFF character. enum MeatPack_Command { MPCommand_None = 0U, - MPCommand_TogglePacking = 253U, + // MPCommand_TogglePacking = 253U, -- Unused, byte 253 can be re-used later. MPCommand_EnablePacking = 251U, MPCommand_DisablePacking = 250U, MPCommand_ResetAll = 249U, From 5d35d76a1b0cd31a366468e5de2cb071674c0718 Mon Sep 17 00:00:00 2001 From: Scott Mudge Date: Tue, 26 Jan 2021 13:06:19 -0500 Subject: [PATCH 4/4] * Fix strtod() -> strtod_noE() after merge. --- Firmware/cmdqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index d41add5604..b89db11c77 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -85,7 +85,7 @@ extern "C" { // Return True if a character was found static inline bool code_seen(char code) { return (strchr_pointer = strchr(CMDBUFFER_CURRENT_STRING, code)) != NULL; } static inline bool code_seen_P(const char *code_PROGMEM) { return (strchr_pointer = strstr_P(CMDBUFFER_CURRENT_STRING, code_PROGMEM)) != NULL; } -static inline float code_value() { return strtod(strchr_pointer+1, NULL);} +static inline float code_value() { return strtod_noE(strchr_pointer+1, NULL);} static inline long code_value_long() { return strtol(strchr_pointer+1, NULL, 10); } static inline int16_t code_value_short() { return int16_t(strtol(strchr_pointer+1, NULL, 10)); }; static inline uint8_t code_value_uint8() { return uint8_t(strtol(strchr_pointer+1, NULL, 10)); };