Separate line numbers for limit pos and home pos.

Author: ashelly

gcode.c

@@ -401,7 +401,7 @@ uint8_t gc_execute_line(char *line)
   // Check for valid line number N value.
   if (bit_istrue(value_words,bit(WORD_N))) {
     // Line number value cannot be less than zero (done) or greater than max line number.
-    if (gc_block.values.n > MAX_LINE_NUMBER) { FAIL(STATUS_GCODE_INVALID_LINE_NUMBER); } // [Exceeds max line number]
+    if (gc_block.values.n > LINENUMBER_MAX) { FAIL(STATUS_GCODE_INVALID_LINE_NUMBER); } // [Exceeds max line number]
   }
   // bit_false(value_words,bit(WORD_N)); // NOTE: Single-meaning value word. Set at end of error-checking.
 

limits.c

@@ -28,7 +28,8 @@
 #include "limits.h"
 #include "report.h"
 
-#define HOMING_CYCLE_LINE_NUMBER MAX_LINE_NUMBER
+#define HOMING_ZERO_LINE_NUMBER (LINENUMBER_SPECIAL|0)
+#define HOMING_FINISHED_LINE_NUMBER (LINENUMBER_SPECIAL|1)
 
 #define HOMING_AXIS_SEARCH_SCALAR  1.1  // Axis search distance multiplier. Must be > 1.
 
@@ -193,7 +194,7 @@ void limits_go_home(uint8_t cycle_mask)
   } while (n_cycle-- > 0);
 
   //force report of known position for compare to zero.
-  linenumber_insert(HOMING_CYCLE_LINE_NUMBER);
+  linenumber_insert(HOMING_ZERO_LINE_NUMBER);
   request_report_status(1);
   protocol_execute_runtime();
 
@@ -223,7 +224,7 @@ void limits_go_home(uint8_t cycle_mask)
   plan_sync_position(); // Sync planner position to current machine position for pull-off move.
 
   #ifdef USE_LINE_NUMBERS
-    plan_buffer_line(target, min_seek_rate, false, HOMING_CYCLE_LINE_NUMBER); // Bypass mc_line(). Directly plan motion.
+    plan_buffer_line(target, min_seek_rate, false, HOMING_FINISHED_LINE_NUMBER); // Bypass mc_line(). Directly plan motion.
   #else
     plan_buffer_line(target, min_seek_rate, false); // Bypass mc_line(). Directly plan motion.
   #endif

sim/simulator.c

@@ -71,7 +71,7 @@ void init_simulator(float time_multiplier) {
 #ifdef ENABLE_SOFTWARE_DEBOUNCE
   wdt_vect = interrupt_WDT_vect;
 #endif
-  pc_vect = interrupt_LIMIT_INT_vect;
+  //  pc_vect = interrupt_LIMIT_INT_vect;
 
 
   io_sim_init(port_monitors);

system.h

@@ -116,8 +116,9 @@ void system_execute_startup(char *line);
 
 // But We don't need such a big value, and we do need the high bit free 
 //#define MAX_LINE_NUMBER 9999999 
-#define MAX_LINE_NUMBER        0x7FFF 
 #define LINENUMBER_EMPTY_BLOCK 0x8000 //the other bit, used as a flag
+#define LINENUMBER_SPECIAL      0x4000
+#define LINENUMBER_MAX         (LINENUMBER_SPECIAL-1)
 typedef uint16_t linenumber_t;  //resize back to int32 for bigger numbers