From 154059b8f608db26c9febf4c73010627ccac27a7 Mon Sep 17 00:00:00 2001 From: James Churchill Date: Fri, 1 Jul 2011 05:19:18 +1000 Subject: Add M119 - return status of endstops --- Tonokip_Firmware/Tonokip_Firmware.pde | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde index fc49da1..318ff74 100644 --- a/Tonokip_Firmware/Tonokip_Firmware.pde +++ b/Tonokip_Firmware/Tonokip_Firmware.pde @@ -783,6 +783,32 @@ inline void process_commands() Serial.print("E:"); Serial.println(current_e); break; + case 119: // M119 + #if (X_MIN_PIN > -1) + Serial.print("x_min:"); + Serial.println(digitalRead(X_MIN_PIN)?"H":"L"); + #endif + #if (X_MAX_PIN > -1) + Serial.print("x_max:"); + Serial.println(digitalRead(X_MAX_PIN)?"H":"L"); + #endif + #if (Y_MIN_PIN > -1) + Serial.print("y_min:"); + Serial.println(digitalRead(Y_MIN_PIN)?"H":"L"); + #endif + #if (Y_MAX_PIN > -1) + Serial.print("y_max:"); + Serial.println(digitalRead(Y_MAX_PIN)?"H":"L"); + #endif + #if (Z_MIN_PIN > -1) + Serial.print("z_min:"); + Serial.println(digitalRead(Z_MIN_PIN)?"H":"L"); + #endif + #if (Z_MAX_PIN > -1) + Serial.print("z_max:"); + Serial.println(digitalRead(Z_MAX_PIN)?"H":"L"); + #endif + break; #ifdef RAMP_ACCELERATION case 201: // M201 if(code_seen('X')) x_steps_per_sqr_second = code_value() * x_steps_per_unit; -- cgit v1.2.1 From 9d518424389050394da9d45cbf3bb8f4a6d44e5c Mon Sep 17 00:00:00 2001 From: James Churchill Date: Fri, 1 Jul 2011 05:49:21 +1000 Subject: Make M119 take ENDSTOPS_INVERTING into account. --- Tonokip_Firmware/Tonokip_Firmware.pde | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tonokip_Firmware/Tonokip_Firmware.pde b/Tonokip_Firmware/Tonokip_Firmware.pde index 318ff74..ff1b411 100644 --- a/Tonokip_Firmware/Tonokip_Firmware.pde +++ b/Tonokip_Firmware/Tonokip_Firmware.pde @@ -786,27 +786,27 @@ inline void process_commands() case 119: // M119 #if (X_MIN_PIN > -1) Serial.print("x_min:"); - Serial.println(digitalRead(X_MIN_PIN)?"H":"L"); + Serial.println((digitalRead(X_MIN_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif #if (X_MAX_PIN > -1) Serial.print("x_max:"); - Serial.println(digitalRead(X_MAX_PIN)?"H":"L"); + Serial.println((digitalRead(X_MAX_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif #if (Y_MIN_PIN > -1) Serial.print("y_min:"); - Serial.println(digitalRead(Y_MIN_PIN)?"H":"L"); + Serial.println((digitalRead(Y_MIN_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif #if (Y_MAX_PIN > -1) Serial.print("y_max:"); - Serial.println(digitalRead(Y_MAX_PIN)?"H":"L"); + Serial.println((digitalRead(Y_MAX_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif #if (Z_MIN_PIN > -1) Serial.print("z_min:"); - Serial.println(digitalRead(Z_MIN_PIN)?"H":"L"); + Serial.println((digitalRead(Z_MIN_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif #if (Z_MAX_PIN > -1) Serial.print("z_max:"); - Serial.println(digitalRead(Z_MAX_PIN)?"H":"L"); + Serial.println((digitalRead(Z_MAX_PIN)^ENDSTOPS_INVERTING)?"H":"L"); #endif break; #ifdef RAMP_ACCELERATION -- cgit v1.2.1