Merge branch 'MK3_sm_MeatPack' into sm_gcode_meatpacking

scottmudge · May 21, 2021 · d74e562 · d74e562
2 parents a81ad68 + 5d35d76
commit d74e562
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git 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/cmdqueue.h b/Firmware/cmdqueue.h
@@ -84,7 +84,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)); };

diff --git 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
@@ -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 → Firmware/meatpack.h b/Firmware/MeatPack.h → 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,