Skip to content

Commit 0f34163

Browse files
committed
🚸 Minor M43 improvements
1 parent f5c7b19 commit 0f34163

File tree

2 files changed

+36
-9
lines changed

2 files changed

+36
-9
lines changed

Marlin/src/HAL/AVR/pinsDebug.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,13 @@
6464

6565
#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
6666
#if AVR_ATmega1284_FAMILY
67-
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
68-
#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
67+
#define IS_ANALOG(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
68+
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(IS_ANALOG(P) ? (P) - analogInputToDigitalPin(7) : -1)
6969
#else
70-
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
71-
#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
70+
#define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
71+
#define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
72+
#define IS_ANALOG(P) (_ANALOG1(P) || _ANALOG2(P))
73+
#define DIGITAL_PIN_TO_ANALOG_PIN(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
7274
#endif
7375
#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
7476
#define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin

Marlin/src/gcode/config/M43.cpp

+30-5
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void GcodeSuite::M43() {
305305

306306
// 'P' Get the range of pins to test or watch
307307
uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
308-
last_pin = parser.seenval('L') ? PARSED_PIN_INDEX('L', 0) : parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
308+
last_pin = parser.seenval('L') ? PARSED_PIN_INDEX('L', 0) : (parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1);
309309

310310
NOMORE(first_pin, (NUMBER_PINS_TOTAL) - 1);
311311
NOMORE(last_pin, (NUMBER_PINS_TOTAL) - 1);
@@ -321,15 +321,18 @@ void GcodeSuite::M43() {
321321

322322
// 'W' Watch until click, M108, or reset
323323
if (parser.boolval('W')) {
324-
SERIAL_ECHOLNPGM("Watching pins");
325324
#ifdef ARDUINO_ARCH_SAM
326325
NOLESS(first_pin, 2); // Don't hijack the UART pins
327326
#endif
328-
uint8_t pin_state[last_pin - first_pin + 1];
327+
328+
const uint8_t pin_count = last_pin - first_pin + 1;
329+
uint8_t pin_state[pin_count];
330+
bool can_watch = false;
329331
LOOP_S_LE_N(i, first_pin, last_pin) {
330332
pin_t pin = GET_PIN_MAP_PIN_M43(i);
331333
if (!VALID_PIN(pin)) continue;
332334
if (M43_NEVER_TOUCH(i) || (!ignore_protection && pin_is_protected(pin))) continue;
335+
can_watch = true;
333336
pinMode(pin, INPUT_PULLUP);
334337
delay(1);
335338
/*
@@ -340,11 +343,31 @@ void GcodeSuite::M43() {
340343
pin_state[i - first_pin] = extDigitalRead(pin);
341344
}
342345

346+
const bool multipin = (pin_count > 1);
347+
348+
if (!can_watch) {
349+
SERIAL_ECHOPGM("Specified pin");
350+
SERIAL_ECHOPGM_P(multipin ? PSTR("s are") : PSTR(" is"));
351+
SERIAL_ECHOLNPGM(" protected. Use 'I' to override.");
352+
return;
353+
}
354+
355+
// "Watching pin(s) # - #"
356+
SERIAL_ECHOPGM("Watching pin");
357+
if (multipin) SERIAL_CHAR('s');
358+
SERIAL_CHAR(' '); SERIAL_ECHO(first_pin);
359+
if (multipin) SERIAL_ECHOPGM(" - ", last_pin);
360+
SERIAL_EOL();
361+
343362
#if HAS_RESUME_CONTINUE
344363
KEEPALIVE_STATE(PAUSED_FOR_USER);
345364
wait_for_user = true;
346-
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("M43 Wait Called"), FPSTR(CONTINUE_STR)));
347-
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("M43 Wait Called")));
365+
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("M43 Waiting..."), FPSTR(CONTINUE_STR)));
366+
#if ENABLED(EXTENSIBLE_UI)
367+
ExtUI::onUserConfirmRequired(F("M43 Waiting..."));
368+
#else
369+
LCD_MESSAGE(MSG_USERWAIT);
370+
#endif
348371
#endif
349372

350373
for (;;) {
@@ -372,6 +395,8 @@ void GcodeSuite::M43() {
372395

373396
safe_delay(200);
374397
}
398+
399+
TERN_(HAS_RESUME_CONTINUE, ui.reset_status());
375400
}
376401
else {
377402
// Report current state of selected pin(s)

0 commit comments

Comments
 (0)