Add endstop monitor & make pins report pretty
This commit is contained in:
		
							parent
							
								
									3c3fe1a1ba
								
							
						
					
					
						commit
						c7f1f0dae6
					
				| @ -148,6 +148,7 @@ | |||||||
|  *        The '#' is necessary when calling from within sd files, as it stops buffer prereading |  *        The '#' is necessary when calling from within sd files, as it stops buffer prereading | ||||||
|  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT) |  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT) | ||||||
|  * M42  - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. |  * M42  - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. | ||||||
|  |  * M43  - Monitor pins & report changes - report active pins | ||||||
|  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST) |  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST) | ||||||
|  * M75  - Start the print job timer. |  * M75  - Start the print job timer. | ||||||
|  * M76  - Pause the print job timer. |  * M76  - Pause the print job timer. | ||||||
| @ -4675,8 +4676,14 @@ inline void gcode_M42() { | |||||||
|   /**
 |   /**
 | ||||||
|    * M43: Pin report and debug |    * M43: Pin report and debug | ||||||
|    * |    * | ||||||
|  |    *      pin report if just M43 with no codes | ||||||
|    *      P<pin> Will read/watch a single pin |    *      P<pin> Will read/watch a single pin | ||||||
|    *      W      Watch pins for changes until reboot |    *      W      Watch pins for changes until reboot | ||||||
|  |    *      E      toggles endstop monitor | ||||||
|  |    *               reports changes to endstops | ||||||
|  |    *               toggles LED when endstop changes | ||||||
|  |    *               background function (machine continues to operate as normal) | ||||||
|  |    * | ||||||
|    */ |    */ | ||||||
|   inline void gcode_M43() { |   inline void gcode_M43() { | ||||||
|     int first_pin = 0, last_pin = DIO_COUNT - 1; |     int first_pin = 0, last_pin = DIO_COUNT - 1; | ||||||
| @ -4721,9 +4728,16 @@ inline void gcode_M42() { | |||||||
|         safe_delay(500); |         safe_delay(500); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     else // single pins report
 |     if ( !(code_seen('P') || code_seen('W') || code_seen('E')))   // single pins report
 | ||||||
|       for (int8_t pin = first_pin; pin <= last_pin; pin++) |       for (uint8_t pin = first_pin; pin <= last_pin; pin++) | ||||||
|         report_pin_state(pin); |         report_pin_state_extended(pin, code_seen('I') );        // "hidden" option to ignore protected list
 | ||||||
|  |      | ||||||
|  |     if (code_seen('E')) { | ||||||
|  |       endstop_monitor_flag ^= true; | ||||||
|  |       SERIAL_PROTOCOLPGM("endstop monitor "); | ||||||
|  |       SERIAL_PROTOCOL(endstop_monitor_flag ? "en" : "dis"); | ||||||
|  |       SERIAL_PROTOCOLLNPGM("abled"); | ||||||
|  |     }     | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
| #endif // PINS_DEBUGGING
 | #endif // PINS_DEBUGGING
 | ||||||
|  | |||||||
							
								
								
									
										1148
									
								
								Marlin/pinsDebug.h
									
									
									
									
									
								
							
							
						
						
									
										1148
									
								
								Marlin/pinsDebug.h
									
									
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -462,12 +462,12 @@ int Temperature::getHeaterPower(int heater) { | |||||||
|       AUTO_3_IS_0 ? 0 : AUTO_3_IS_1 ? 1 : AUTO_3_IS_2 ? 2 : 3 |       AUTO_3_IS_0 ? 0 : AUTO_3_IS_1 ? 1 : AUTO_3_IS_2 ? 2 : 3 | ||||||
|     }; |     }; | ||||||
|     uint8_t fanState = 0; |     uint8_t fanState = 0; | ||||||
|   | 
 | ||||||
|     HOTEND_LOOP() { |     HOTEND_LOOP() { | ||||||
|       if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE) |       if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE) | ||||||
|         SBI(fanState, fanBit[e]); |         SBI(fanState, fanBit[e]); | ||||||
|     } |     } | ||||||
|   | 
 | ||||||
|     uint8_t fanDone = 0; |     uint8_t fanDone = 0; | ||||||
|     for (uint8_t f = 0; f < COUNT(fanPin); f++) { |     for (uint8_t f = 0; f < COUNT(fanPin); f++) { | ||||||
|       int8_t pin = fanPin[f]; |       int8_t pin = fanPin[f]; | ||||||
| @ -1393,6 +1393,87 @@ void Temperature::set_current_temp_raw() { | |||||||
|   temp_meas_ready = true; |   temp_meas_ready = true; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | #if ENABLED(PINS_DEBUGGING) | ||||||
|  |   /**
 | ||||||
|  |    * monitors endstops & Z probe for changes | ||||||
|  |    * | ||||||
|  |    * If a change is detected then the LED is toggled and | ||||||
|  |    * a message is sent out the serial port | ||||||
|  |    * | ||||||
|  |    * Yes, we could miss a rapid back & forth change but | ||||||
|  |    * that won't matter because this is all manual. | ||||||
|  |    * | ||||||
|  |    */ | ||||||
|  |   void endstop_monitor() { | ||||||
|  |     static uint16_t old_endstop_bits_local = 0; | ||||||
|  |     static uint8_t local_LED_status = 0; | ||||||
|  |     if (endstop_monitor_flag) { | ||||||
|  |       uint16_t current_endstop_bits_local = 0; | ||||||
|  |       #if HAS_X_MIN | ||||||
|  |         if (READ(X_MIN_PIN)) current_endstop_bits_local |= _BV(X_MIN); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(X_MIN)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("X_MIN: ", (current_endstop_bits_local & _BV(X_MIN)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_X_MAX | ||||||
|  |         if (READ(X_MAX_PIN)) current_endstop_bits_local |= _BV(X_MAX); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(X_MAX)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   X_MAX: ", (current_endstop_bits_local & _BV(X_MAX)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Y_MIN | ||||||
|  |         if (READ(Y_MIN_PIN)) current_endstop_bits_local |= _BV(Y_MIN); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Y_MIN)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Y_MIN: ", (current_endstop_bits_local & _BV(Y_MIN)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Y_MAX | ||||||
|  |         if (READ(Y_MAX_PIN)) current_endstop_bits_local |= _BV(Y_MAX); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Y_MAX)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Y_MAX: ", (current_endstop_bits_local & _BV(Y_MAX)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Z_MIN | ||||||
|  |         if (READ(Z_MIN_PIN)) current_endstop_bits_local |= _BV(Z_MIN); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Z_MIN)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Z_MIN: ", (current_endstop_bits_local & _BV(Z_MIN)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Z_MAX | ||||||
|  |         if (READ(Z_MAX_PIN)) current_endstop_bits_local |= _BV(Z_MAX); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Z_MAX)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Z_MAX: ", (current_endstop_bits_local & _BV(Z_MAX)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Z_MIN_PROBE_PIN | ||||||
|  |         if (READ(Z_MIN_PROBE_PIN)) current_endstop_bits_local |= _BV(Z_MIN_PROBE); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Z_MIN_PROBE)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   PROBE: ", (current_endstop_bits_local & _BV(Z_MIN_PROBE)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Z2_MIN | ||||||
|  |         if (READ(Z2_MIN_PIN)) current_endstop_bits_local |= _BV(Z2_MIN); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Z2_MIN)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Z2_MIN: ", (current_endstop_bits_local & _BV(Z2_MIN)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  |       #if HAS_Z2_MAX | ||||||
|  |         if (READ(Z2_MAX_PIN)) current_endstop_bits_local |= _BV(Z2_MAX); | ||||||
|  |         if ((current_endstop_bits_local ^ old_endstop_bits_local) & _BV(Z2_MAX)) { | ||||||
|  |           SERIAL_PROTOCOLPAIR("   Z2_MAX: ", (current_endstop_bits_local & _BV(Z2_MAX)) ? 1 : 0); | ||||||
|  |         } | ||||||
|  |       #endif | ||||||
|  | 
 | ||||||
|  |       if (current_endstop_bits_local != old_endstop_bits_local) { | ||||||
|  |         analogWrite(LED_PIN, local_LED_status );                // toggle LED
 | ||||||
|  |         SERIAL_PROTOCOLPGM("\n\n");                             // make it easy to see the message
 | ||||||
|  |         old_endstop_bits_local = current_endstop_bits_local ;   // get ready for next change
 | ||||||
|  |         local_LED_status  = local_LED_status ? 0 : 255; | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  | #endif // PINS_DEBUGGING
 | ||||||
|  | 
 | ||||||
| /**
 | /**
 | ||||||
|  * Timer 0 is shared with millies so don't change the prescaler. |  * Timer 0 is shared with millies so don't change the prescaler. | ||||||
|  * |  * | ||||||
| @ -1848,4 +1929,12 @@ void Temperature::isr() { | |||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   #endif //BABYSTEPPING
 |   #endif //BABYSTEPPING
 | ||||||
|  |   #if ENABLED(PINS_DEBUGGING) | ||||||
|  |     extern bool endstop_monitor_flag; | ||||||
|  |     // run the endstop monitor at 15Hz
 | ||||||
|  |     static uint8_t endstop_monitor_count = 16;  // offset this check from the others
 | ||||||
|  |     endstop_monitor_count += _BV(1);  //  15 Hz
 | ||||||
|  |     endstop_monitor_count &= 0x7F; | ||||||
|  |     if (endstop_monitor_count == 0) endstop_monitor();  // report changes in endstop status
 | ||||||
|  |   #endif | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user