Squashed commit of the following:

commit 8298a47 Author: thinkyhead <[email protected]> Date: Tue Nov 15 00:24:38 2022 +0000 [cron] Bump distribution date (2022-11-15) commit 00156a3 Author: ellensp <[email protected]> Date: Mon Nov 14 21:35:24 2022 +1300 🩹 Fix 2 thermocouples (MarlinFirmware#24982) Followup to MarlinFirmware#24898 commit d62fbfb Author: Scott Lahteine <[email protected]> Date: Mon Nov 14 02:26:31 2022 -0600 🐛 Fix M808 starting count Reported by adcurtin on Discord commit 14966c0 Author: thinkyhead <[email protected]> Date: Mon Nov 14 06:23:44 2022 +0000 [cron] Bump distribution date (2022-11-14) commit e283f15 Author: Justin Hartmann <[email protected]> Date: Mon Nov 14 00:50:02 2022 -0500 🩹 Fix Overlord compile (MarlinFirmware#24947) commit 16faa29 Author: Pascal de Bruijn <[email protected]> Date: Mon Nov 14 05:59:25 2022 +0100 🚸 M306: Indicate MPC Autotune (MarlinFirmware#24949) commit abc9316 Author: ellensp <[email protected]> Date: Mon Nov 14 17:45:28 2022 +1300 🩹 Allow max endstops MKS Monster 8 V2 (MarlinFirmware#24944) commit dbd5dc4 Author: thinkyhead <[email protected]> Date: Sun Nov 13 00:23:31 2022 +0000 [cron] Bump distribution date (2022-11-13) commit 7395569 Author: Scott Lahteine <[email protected]> Date: Fri Nov 11 20:35:07 2022 -0600 🐛 Fix Anycubic / Trigorilla pins, etc. (MarlinFirmware#24971) commit e1423a8 Author: thinkyhead <[email protected]> Date: Sat Nov 12 00:40:15 2022 +0000 [cron] Bump distribution date (2022-11-12) commit d123ea7 Author: Scott Lahteine <[email protected]> Date: Fri Nov 11 16:09:26 2022 -0600 🎨 Prefer axis element over index commit 4d913fb Author: thinkyhead <[email protected]> Date: Thu Nov 10 06:06:37 2022 +0000 [cron] Bump distribution date (2022-11-10) commit 3985d26 Author: Scott Lahteine <[email protected]> Date: Wed Nov 9 20:54:17 2022 -0600 🐛 Fix recalculate_max_e_jerk
FB-G6 · Nov 15, 2022 · e55db2c · e55db2c
1 parent c47971d
commit e55db2c
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 20 deletions.
diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2022-11-13"
+//#define STRING_DISTRIBUTION_DATE "2022-11-15"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
@@ -30,18 +30,6 @@
 
 #include "leds.h"
 
-#if ENABLED(BLINKM)
-  #include "blinkm.h"
-#endif
-
-#if ENABLED(PCA9632)
-  #include "pca9632.h"
-#endif
-
-#if ENABLED(PCA9533)
-  #include "pca9533.h"
-#endif
-
 #if EITHER(CASE_LIGHT_USE_RGB_LED, CASE_LIGHT_USE_NEOPIXEL)
   #include "../../feature/caselight.h"
 #endif

diff --git a/Marlin/src/feature/leds/leds.h b/Marlin/src/feature/leds/leds.h
@@ -40,6 +40,18 @@
   #undef _NEOPIXEL_INCLUDE_
 #endif
 
+#if ENABLED(BLINKM)
+  #include "blinkm.h"
+#endif
+
+#if ENABLED(PCA9533)
+  #include "pca9533.h"
+#endif
+
+#if ENABLED(PCA9632)
+  #include "pca9632.h"
+#endif
+
 /**
  * LEDcolor type for use with leds.set_color
  */

diff --git a/Marlin/src/feature/repeat.cpp b/Marlin/src/feature/repeat.cpp
@@ -42,7 +42,7 @@ void Repeat::add_marker(const uint32_t sdpos, const uint16_t count) {
     SERIAL_ECHO_MSG("!Too many markers.");
   else {
     marker[index].sdpos = sdpos;
-    marker[index].counter = count ?: -1;
+    marker[index].counter = count ? count - 1 : -1;
     index++;
     DEBUG_ECHOLNPGM("Add Marker ", index, " at ", sdpos, " (", count, ")");
   }

diff --git a/Marlin/src/gcode/temp/M306.cpp b/Marlin/src/gcode/temp/M306.cpp
@@ -25,6 +25,7 @@
 #if ENABLED(MPCTEMP)
 
 #include "../gcode.h"
+#include "../../lcd/marlinui.h"
 #include "../../module/temperature.h"
 
 /**
@@ -42,7 +43,12 @@
  */
 
 void GcodeSuite::M306() {
-  if (parser.seen_test('T')) { thermalManager.MPC_autotune(); return; }
+  if (parser.seen_test('T')) {
+    LCD_MESSAGE(MSG_MPC_AUTOTUNE);
+    thermalManager.MPC_autotune();
+    ui.reset_status();
+    return;
+  }
 
   if (parser.seen("ACFPRH")) {
     const heater_id_t hid = (heater_id_t)parser.intval('E', 0);

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,11 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
+<<<<<<< HEAD
   #define STRING_DISTRIBUTION_DATE "2022-11-13"
+=======
+  #define STRING_DISTRIBUTION_DATE "2022-11-15"
+>>>>>>> 8298a477e1f1fa6188788448eec3f349c1ba93de
 #endif
 
 /**

diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
@@ -3076,8 +3076,13 @@ void Temperature::disable_all_heaters() {
       // Needed to return the correct temp when this is called between readings
       static raw_adc_t max_tc_temp_previous[MAX_TC_COUNT] = { 0 };
       #define THERMO_TEMP(I) max_tc_temp_previous[I]
-      #define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
-      #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #if MAX_TC_COUNT > 2
+        #define THERMO_SEL(A,B,C) (hindex > 1 ? (C) : hindex == 1 ? (B) : (A))
+        #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; case 2: WRITE(TEMP_2_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #elif MAX_TC_COUNT > 1
+        #define THERMO_SEL(A,B,C) ( hindex == 1 ? (B) : (A))
+        #define MAXTC_CS_WRITE(V) do{ switch (hindex) { case 1: WRITE(TEMP_1_CS_PIN, V); break; default: WRITE(TEMP_0_CS_PIN, V); } }while(0)
+      #endif
     #else
       // When we have only 1 max tc, THERMO_SEL will pick the appropriate sensor
       // variable, and MAXTC_*() macros will be hardcoded to the correct CS pin.

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V1.h
@@ -26,7 +26,9 @@
 //
 // Limit Switches
 //
+#define X_MIN_PIN                           PA14
 #define X_MAX_PIN                           PA13
+#define Y_MIN_PIN                           PA15
 #define Y_MAX_PIN                           PC5
 
 //

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -23,6 +23,12 @@
 
 #define BOARD_INFO_NAME "MKS Monster8 V2"
 
+//
+// Limit Switches
+//
+#define X_STOP_PIN                          PA14
+#define Y_STOP_PIN                          PA15
+
 //
 // Steppers
 //
@@ -52,6 +58,6 @@
   #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
 #endif
 
-#define NEOPIXEL_PIN                         PC5
+#define NEOPIXEL_PIN                       PC5
 
 #include "pins_MKS_MONSTER8_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -64,8 +64,6 @@
 #define E4_DIAG_PIN                         -1    // Driver7 diag signal is not connected
 
 // Limit Switches for endstops
-#define X_MIN_PIN                           PA14
-#define Y_MIN_PIN                           PA15
 #define Z_MIN_PIN                           PB13
 #define Z_MAX_PIN                           PB12