bdring
diff --git a/‎Grbl_Esp32/Custom/atari_1020.cpp‎
Lines changed: 4 additions & 12 deletions b/‎Grbl_Esp32/Custom/atari_1020.cpp‎
Lines changed: 4 additions & 12 deletions
diff --git a/‎Grbl_Esp32/Custom/polar_coaster.cpp‎
Lines changed: 3 additions & 13 deletions b/‎Grbl_Esp32/Custom/polar_coaster.cpp‎
Lines changed: 3 additions & 13 deletions
diff --git a/‎Grbl_Esp32/src/Config.h‎
Lines changed: 75 additions & 103 deletions b/‎Grbl_Esp32/src/Config.h‎
Lines changed: 75 additions & 103 deletions
diff --git a/‎Grbl_Esp32/src/CoolantControl.cpp‎
Lines changed: 13 additions & 0 deletions b/‎Grbl_Esp32/src/CoolantControl.cpp‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎Grbl_Esp32/src/Eeprom.cpp‎
Lines changed: 23 additions & 1 deletion b/‎Grbl_Esp32/src/Eeprom.cpp‎
Lines changed: 23 additions & 1 deletion
diff --git a/‎Grbl_Esp32/src/Eeprom.h‎
Lines changed: 32 additions & 0 deletions b/‎Grbl_Esp32/src/Eeprom.h‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎Grbl_Esp32/src/GCode.cpp‎
Lines changed: 8 additions & 22 deletions b/‎Grbl_Esp32/src/GCode.cpp‎
Lines changed: 8 additions & 22 deletions
diff --git a/‎Grbl_Esp32/src/GCode.h‎
Lines changed: 1 addition & 10 deletions b/‎Grbl_Esp32/src/GCode.h‎
Lines changed: 1 addition & 10 deletions
diff --git a/‎Grbl_Esp32/src/Grbl.cpp‎
Lines changed: 14 additions & 10 deletions b/‎Grbl_Esp32/src/Grbl.cpp‎
Lines changed: 14 additions & 10 deletions
diff --git a/‎Grbl_Esp32/src/Grbl.h‎
Lines changed: 4 additions & 7 deletions b/‎Grbl_Esp32/src/Grbl.h‎
Lines changed: 4 additions & 7 deletions
@@ -179,7 +179,7 @@ void atari_home_task(void* pvParameters) {
 void calc_solenoid(float penZ) {
     bool        isPenUp;
     static bool previousPenState = false;
-    uint32_t    solenoid_pen_pulse_len;                    // duty cycle of solenoid
+    uint32_t    solenoid_pen_pulse_len;                     // duty cycle of solenoid
     isPenUp = ((penZ > 0) || (sys.state == State::Alarm));  // is pen above Z0 or is there an alarm
     // if the state has not change, we only count down to the pull time
     if (previousPenState == isPenUp) {
@@ -247,33 +247,25 @@ void atari_next_pen() {
 void user_defined_macro(uint8_t index) {
     char gcode_line[20];
     switch (index) {
-#ifdef MACRO_BUTTON_0_PIN
-        case CONTROL_PIN_INDEX_MACRO_0:
+        case 0:
             grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Pen switch");
             WebUI::inputBuffer.push("$H\r");
             break;
-#endif
-#ifdef MACRO_BUTTON_1_PIN
-        case CONTROL_PIN_INDEX_MACRO_1:
+        case 1:
             grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Color switch");
             atari_next_pen();
             sprintf(gcode_line, "G90G0X%3.2f\r", ATARI_PAPER_WIDTH);  // alway return to right side to reduce home travel stalls
             WebUI::inputBuffer.push(gcode_line);
             break;
-#endif
-#ifdef MACRO_BUTTON_2_PIN
-        case CONTROL_PIN_INDEX_MACRO_2:
-            // feed out some paper and reset the Y 0
+        case 2:
             grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Paper switch");
             WebUI::inputBuffer.push("G0Y-25\r");
             WebUI::inputBuffer.push("G4P0.1\r");  // sync...forces wait for planner to clear
             sys_position[Y_AXIS] = 0.0;           // reset the Y position
             gc_sync_position();
             plan_sync_position();
             break;
-#endif
         default:
-            grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Unknown Switch %d", index);
             break;
     }
 }
 
@@ -223,25 +223,15 @@ float abs_angle(float ang) {
 // Polar coaster has macro buttons, this handles those button pushes.
 void user_defined_macro(uint8_t index) {
     switch (index) {
-#ifdef MACRO_BUTTON_0_PIN
-        case CONTROL_PIN_INDEX_MACRO_0:
+        case 0:
             WebUI::inputBuffer.push("$H\r");  // home machine
             break;
-#endif
-#ifdef MACRO_BUTTON_1_PIN
-        case CONTROL_PIN_INDEX_MACRO_1:
+        case 1:
             WebUI::inputBuffer.push("[ESP220]/1.nc\r");  // run SD card file 1.nc
             break;
-#endif
-#ifdef MACRO_BUTTON_2_PIN
-        case CONTROL_PIN_INDEX_MACRO_2:
+        case 2:
             WebUI::inputBuffer.push("[ESP220]/2.nc\r");  // run SD card file 2.nc
             break;
-#endif
-#ifdef MACRO_BUTTON_3_PIN
-        case CONTROL_PIN_INDEX_MACRO_3:
-            break;
-#endif
         default:
             break;
     }
 
@@ -24,12 +24,25 @@
 #include "Grbl.h"
 
 void coolant_init() {
+    static bool init_message = true;  // used to show messages only once.
+
 #ifdef COOLANT_FLOOD_PIN
     pinMode(COOLANT_FLOOD_PIN, OUTPUT);
 #endif
 #ifdef COOLANT_MIST_PIN
     pinMode(COOLANT_MIST_PIN, OUTPUT);
 #endif
+
+    if (init_message) {
+#ifdef COOLANT_FLOOD_PIN
+        grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", pinName(COOLANT_FLOOD_PIN).c_str());
+#endif
+#ifdef COOLANT_MIST_PIN
+        grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", pinName(COOLANT_MIST_PIN).c_str());
+#endif
+        init_message = false;
+    }
+
     coolant_stop();
 }
 
 
@@ -1,5 +1,5 @@
 /*
-  Eeprom.cpp - Header for system level commands and real-time processes
+  Eeprom.cpp - Coordinate data stored in EEPROM
   Part of Grbl
   Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
 
@@ -57,3 +57,25 @@ int memcpy_from_eeprom_with_checksum(char* destination, unsigned int source, uns
     }
     return (checksum == EEPROM.read(source));
 }
+
+// Read selected coordinate data from EEPROM. Updates pointed coord_data value.
+// This is now a compatibility routine that is used to propagate coordinate data
+// in the old EEPROM format to the new tagged NVS format.
+bool old_settings_read_coord_data(uint8_t coord_select, float* coord_data) {
+    uint32_t addr = coord_select * (sizeof(float) * N_AXIS + 1) + EEPROM_ADDR_PARAMETERS;
+    if (!(memcpy_from_eeprom_with_old_checksum((char*)coord_data, addr, sizeof(float) * N_AXIS)) &&
+        !(memcpy_from_eeprom_with_checksum((char*)coord_data, addr, sizeof(float) * MAX_N_AXIS))) {
+        // Reset with default zero vector
+        clear_vector_float(coord_data);
+        // The old code used to rewrite the zeroed data but now that is done
+        // elsewhere, in a different format.
+        return false;
+    }
+    return true;
+}
+
+// Allow iteration over CoordIndex values
+CoordIndex& operator ++ (CoordIndex& i) {
+    i = static_cast<CoordIndex>(static_cast<uint8_t>(i) + 1);
+    return i;
+}
@@ -22,8 +22,40 @@
 
 #include "Grbl.h"
 
+// Define EEPROM memory address location values for saved coordinate data.
+const int EEPROM_SIZE            = 1024U;
+const int EEPROM_ADDR_PARAMETERS = 512U;
+
 //unsigned char eeprom_get_char(unsigned int addr);
 //void eeprom_put_char(unsigned int addr, unsigned char new_value);
 void memcpy_to_eeprom_with_checksum(unsigned int destination, const char* source, unsigned int size);
 int  memcpy_from_eeprom_with_checksum(char* destination, unsigned int source, unsigned int size);
 int  memcpy_from_eeprom_with_old_checksum(char* destination, unsigned int source, unsigned int size);
+
+// Reads selected coordinate data from EEPROM
+bool old_settings_read_coord_data(uint8_t coord_select, float* coord_data);
+
+// Various places in the code access saved coordinate system data
+// by a small integer index according to the values below.
+enum CoordIndex : uint8_t{
+    Begin = 0,
+    G54 = Begin,
+    G55,
+    G56,
+    G57,
+    G58,
+    G59,
+    // To support 9 work coordinate systems it would be necessary to define
+    // the following 3 and modify GCode.cpp to support G59.1, G59.2, G59.3
+    // G59_1,
+    // G59_2,
+    // G59_3,
+    NWCSystems,
+    G28 = NWCSystems,
+    G30,
+    // G92_2,
+    // G92_3,
+    End,
+};
+// Allow iteration over CoordIndex values
+CoordIndex& operator ++ (CoordIndex& i);
@@ -873,10 +873,10 @@ Error gc_execute_line(char* line, uint8_t client) {
         }
     }
     // [15. Coordinate system selection ]: *N/A. Error, if cutter radius comp is active.
-    // TODO: An EEPROM read of the coordinate data may require a buffer sync when the cycle
+    // TODO: Reading the coordinate data may require a buffer sync when the cycle
     // is active. The read pauses the processor temporarily and may cause a rare crash. For
     // future versions on processors with enough memory, all coordinate data should be stored
-    // in memory and written to EEPROM only when there is not a cycle active.
+    // in memory and written to non-volatile storage only when there is not a cycle active.
     float block_coord_system[MAX_N_AXIS];
     memcpy(block_coord_system, gc_state.coord_system, sizeof(gc_state.coord_system));
     if (bit_istrue(command_words, bit(ModalGroup::MG12))) {  // Check if called in block
@@ -1002,7 +1002,7 @@ Error gc_execute_line(char* line, uint8_t client) {
                 case NonModal::GoHome0:  // G28
                 case NonModal::GoHome1:  // G30
                     // [G28/30 Errors]: Cutter compensation is enabled.
-                    // Retreive G28/30 go-home position data (in machine coordinates) from EEPROM
+                    // Retreive G28/30 go-home position data (in machine coordinates) from non-volatile storage
                     if (gc_block.non_modal_command == NonModal::GoHome0) {
                         coords[CoordIndex::G28]->get(coord_data);
                     } else {  // == NonModal::GoHome1
@@ -1502,9 +1502,6 @@ Error gc_execute_line(char* line, uint8_t client) {
     if (gc_state.modal.motion != Motion::None) {
         if (axis_command == AxisCommand::MotionMode) {
             GCUpdatePos gc_update_pos = GCUpdatePos::Target;
-#ifdef USE_I2S_STEPS
-            stepper_id_t save_stepper = current_stepper;
-#endif
             if (gc_state.modal.motion == Motion::Linear) {
                 //mc_line(gc_block.values.xyz, pl_data);
                 mc_line_kins(gc_block.values.xyz, pl_data, gc_state.position);
@@ -1527,12 +1524,6 @@ Error gc_execute_line(char* line, uint8_t client) {
                 // upon a successful probing cycle, the machine position and the returned value should be the same.
 #ifndef ALLOW_FEED_OVERRIDE_DURING_PROBE_CYCLES
                 pl_data->motion.noFeedOverride = 1;
-#endif
-#ifdef USE_I2S_STEPS
-                save_stepper = current_stepper;  // remember the stepper
-                if (save_stepper == ST_I2S_STREAM) {
-                    stepper_switch(ST_I2S_STATIC);  // Change the stepper to reduce the delay for accurate probing.
-                }
 #endif
                 gc_update_pos = mc_probe_cycle(gc_block.values.xyz, pl_data, gc_parser_flags);
             }
@@ -1544,11 +1535,6 @@ Error gc_execute_line(char* line, uint8_t client) {
             } else if (gc_update_pos == GCUpdatePos::System) {
                 gc_sync_position();  // gc_state.position[] = sys_position
             }                        // == GCUpdatePos::None
-#ifdef USE_I2S_STEPS
-            if (save_stepper == ST_I2S_STREAM && current_stepper != ST_I2S_STREAM) {
-                stepper_switch(ST_I2S_STREAM);  // Put the stepper back on.
-            }
-#endif
         }
     }
     // [21. Program flow ]:
@@ -1565,8 +1551,8 @@ Error gc_execute_line(char* line, uint8_t client) {
         case ProgramFlow::Paused:
             protocol_buffer_synchronize();  // Sync and finish all remaining buffered motions before moving on.
             if (sys.state != State::CheckMode) {
-                system_set_exec_state_flag(EXEC_FEED_HOLD);  // Use feed hold for program pause.
-                protocol_execute_realtime();                 // Execute suspend.
+                sys_rt_exec_state.bit.feedHold = true;  // Use feed hold for program pause.
+                protocol_execute_realtime();            // Execute suspend.
             }
             break;
         case ProgramFlow::CompletedM2:
@@ -1594,9 +1580,9 @@ Error gc_execute_line(char* line, uint8_t client) {
 #endif
             // gc_state.modal.override = OVERRIDE_DISABLE; // Not supported.
 #ifdef RESTORE_OVERRIDES_AFTER_PROGRAM_END
-            sys.f_override        = DEFAULT_FEED_OVERRIDE;
-            sys.r_override        = DEFAULT_RAPID_OVERRIDE;
-            sys.spindle_speed_ovr = DEFAULT_SPINDLE_SPEED_OVERRIDE;
+            sys.f_override        = FeedOverride::Default;
+            sys.r_override        = RapidOverride::Default;
+            sys.spindle_speed_ovr = SpindleSpeedOverride::Default;
 #endif
             // Execute coordinate change and spindle/coolant stop.
             if (sys.state != State::CheckMode) {
 
@@ -163,15 +163,6 @@ struct CoolantState {
 
 // Modal Group M8: Coolant control
 // Modal Group M9: Override control
-enum class Override : uint8_t {
-#ifdef DEACTIVATE_PARKING_UPON_INIT
-    Disabled      = 0,  // (Default: Must be zero)
-    ParkingMotion = 1,  // M56
-#else
-    ParkingMotion = 0,  // M56 (Default: Must be zero)
-    Disabled      = 1,  // Parking disabled.
-#endif
-};
 
 // Modal Group M10: User I/O control
 enum class IoControl : uint8_t {
@@ -286,7 +277,7 @@ typedef struct {
     float position[MAX_N_AXIS];  // Where the interpreter considers the tool to be at this point in the code
 
     float coord_system[MAX_N_AXIS];  // Current work coordinate system (G54+). Stores offset from absolute machine
-    // position in mm. Loaded from EEPROM when called.
+    // position in mm. Loaded from non-volatile storage when called.
     float coord_offset[MAX_N_AXIS];  // Retains the G92 coordinate offset (work coordinates) relative to
     // machine zero in mm. Non-persistent. Cleared upon reset and boot.
     float tool_length_offset;  // Tracks tool length offset value when enabled.
 
@@ -37,7 +37,7 @@ void grbl_init() {
 #ifdef MACHINE_NAME
     report_machine_type(CLIENT_SERIAL);
 #endif
-    settings_init();  // Load Grbl settings from EEPROM
+    settings_init();  // Load Grbl settings from non-volatile storage
     stepper_init();   // Configure stepper pins and interrupt timers
     init_motors();
     system_ini();  // Configure pinout pins and pin-change interrupt (Renamed due to conflict with esp32 files)
@@ -80,16 +80,20 @@ static void reset_variables() {
     State prior_state = sys.state;
     memset(&sys, 0, sizeof(system_t));  // Clear system struct variable.
     sys.state             = prior_state;
-    sys.f_override        = DEFAULT_FEED_OVERRIDE;              // Set to 100%
-    sys.r_override        = DEFAULT_RAPID_OVERRIDE;             // Set to 100%
-    sys.spindle_speed_ovr = DEFAULT_SPINDLE_SPEED_OVERRIDE;     // Set to 100%
+    sys.f_override        = FeedOverride::Default;              // Set to 100%
+    sys.r_override        = RapidOverride::Default;             // Set to 100%
+    sys.spindle_speed_ovr = SpindleSpeedOverride::Default;      // Set to 100%
     memset(sys_probe_position, 0, sizeof(sys_probe_position));  // Clear probe position.
-    sys_probe_state                = 0;
-    sys_rt_exec_state              = 0;
-    cycle_stop                     = false;
-    sys_rt_exec_motion_override    = 0;
-    sys_rt_exec_accessory_override = 0;
-    system_clear_exec_alarm();
+
+    sys_probe_state                      = Probe::Off;
+    sys_rt_exec_state.value              = 0;
+    sys_rt_exec_accessory_override.value = 0;
+    sys_rt_exec_alarm                    = ExecAlarm::None;
+    cycle_stop                           = false;
+    sys_rt_f_override                    = FeedOverride::Default;
+    sys_rt_r_override                    = RapidOverride::Default;
+    sys_rt_s_override                    = SpindleSpeedOverride::Default;
+
     // Reset Grbl primary systems.
     serial_reset_read_buffer(CLIENT_ALL);  // Clear serial read buffer
     gc_init();                             // Set g-code parser to default state
 
@@ -23,7 +23,7 @@
 // Grbl versioning system
 
 const char* const GRBL_VERSION       = "1.3a";
-const char* const GRBL_VERSION_BUILD = "20201004";
+const char* const GRBL_VERSION_BUILD = "20201022";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>
@@ -41,18 +41,17 @@ const char* const GRBL_VERSION_BUILD = "20201004";
 
 #include "Defaults.h"
 #include "Error.h"
-#include "SettingsStorage.h"
+#include "Eeprom.h"
 #include "WebUI/Authentication.h"
 #include "WebUI/Commands.h"
+#include "Probe.h"
 #include "System.h"
 
 #include "GCode.h"
 #include "Planner.h"
-#include "Eeprom.h"
 #include "CoolantControl.h"
 #include "Limits.h"
 #include "MotionControl.h"
-#include "Probe.h"
 #include "Protocol.h"
 #include "Report.h"
 #include "Serial.h"
@@ -88,9 +87,7 @@ const char* const GRBL_VERSION_BUILD = "20201004";
 #    endif
 #endif
 
-#ifdef USE_I2S_OUT
-#    include "I2SOut.h"
-#endif
+#include "I2SOut.h"
 
 void grbl_init();
 void run_once();