🐛 Fix Anycubic / Trigorilla pins, etc. (MarlinFirmware#24971)

adequator · Nov 12, 2022 · 7395569 · 7395569
1 parent e1423a8
commit 7395569
Show file tree

Hide file tree

Showing 9 changed files with 606 additions and 540 deletions.
diff --git a/Marlin/src/feature/powerloss.h b/Marlin/src/feature/powerloss.h
@@ -153,6 +153,9 @@ class PrintJobRecovery {
  static void prepare();
 
  static void setup() {
+ #if PIN_EXISTS(OUTAGECON)
+ OUT_WRITE(OUTAGECON_PIN, HIGH);
+ #endif
  #if PIN_EXISTS(POWER_LOSS)
  #if ENABLED(POWER_LOSS_PULLUP)
  SET_INPUT_PULLUP(POWER_LOSS_PIN);

diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
@@ -313,9 +313,16 @@ void GcodeSuite::M43() {
 
  // 'P' Get the range of pins to test or watch
  uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
- last_pin = parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
+ last_pin = parser.seenval('L') ? PARSED_PIN_INDEX('L', 0) : parser.seenval('P') ? first_pin : (NUMBER_PINS_TOTAL) - 1;
 
- if (first_pin > last_pin) return;
+ NOMORE(first_pin, (NUMBER_PINS_TOTAL) - 1);
+ NOMORE(last_pin, (NUMBER_PINS_TOTAL) - 1);
+
+ if (first_pin > last_pin) {
+ const uint8_t f = first_pin;
+ first_pin = last_pin;
+ last_pin = f;
+ }
 
  // 'I' to ignore protected pins
  const bool ignore_protection = parser.boolval('I');

diff --git a/Marlin/src/gcode/feature/advance/M900.cpp b/Marlin/src/gcode/feature/advance/M900.cpp
@@ -50,6 +50,7 @@ void GcodeSuite::M900() {
 
  #if EXTRUDERS < 2
  constexpr uint8_t tool_index = 0;
+ UNUSED(tool_index);
  #else
  const uint8_t tool_index = parser.intval('T', active_extruder);
  if (tool_index >= EXTRUDERS) {