Squashed commit of the following:

commit 59e1989 Author: thinkyhead <[email protected]> Date: Tue Nov 22 00:24:30 2022 +0000 [cron] Bump distribution date (2022-11-22) commit 3936603 Author: ellensp <[email protected]> Date: Tue Nov 22 12:47:27 2022 +1300 🐛 MKS_MINI_12864 on SKR 1.3 needs FORCE_SOFT_SPI (MarlinFirmware#24850) commit 8542e9a Author: EvilGremlin <[email protected]> Date: Tue Nov 22 02:45:57 2022 +0300 🔧 Check Delta homing direction (MarlinFirmware#24865) commit f497312 Author: phigjm <[email protected]> Date: Tue Nov 22 00:41:14 2022 +0100 🩹 Fix SERVICE_INTERVAL reset (MarlinFirmware#24888) commit e3e0735 Author: Marcio T <[email protected]> Date: Mon Nov 21 16:25:56 2022 -0700 Fix FAST_PWM_FAN / TouchUI with NO_MOTION_BEFORE_HOMING (MarlinFirmware#25005) Fix regressions from MarlinFirmware#20323, MarlinFirmware#23463
FB-G6 · Nov 22, 2022 · 522d3d6 · 522d3d6
1 parent d359df7
commit 522d3d6
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 26 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-15"
+//#define STRING_DISTRIBUTION_DATE "2022-11-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/HAL/AVR/fast_pwm.cpp b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -146,11 +146,11 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
       LIMIT(res_pc_temp, 1U, maxtop);
 
       // Calculate frequencies of test prescaler and resolution values
-      const uint32_t f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
-                     f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
-                     f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
-                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp),
-                     f_pc_diff   = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);
+      const int f_diff = ABS(f - int(f_desired)),
+                f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
+                f_fast_diff = ABS(f_fast_temp - int(f_desired)),
+                f_pc_temp = (F_CPU) / (2 * p * res_pc_temp),
+                f_pc_diff = ABS(f_pc_temp - int(f_desired));
 
       if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
         // Set the Wave Generation Mode to FAST PWM

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -1644,8 +1644,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
  * Delta requirements
  */
 #if ENABLED(DELTA)
-  #if NONE(USE_XMAX_PLUG, USE_YMAX_PLUG, USE_ZMAX_PLUG)
-    #error "You probably want to use Max Endstops for DELTA!"
+  #if ANY(X_HOME_TO_MIN, Y_HOME_TO_MIN, Z_HOME_TO_MIN)
+    #error "DELTA kinematics require homing "XYZ" axes to MAX. Set [XYZ]_HOME_DIR to 1."
   #elif ENABLED(ENABLE_LEVELING_FADE_HEIGHT) && DISABLED(AUTO_BED_LEVELING_BILINEAR) && !UBL_SEGMENTED
     #error "ENABLE_LEVELING_FADE_HEIGHT on DELTA requires AUTO_BED_LEVELING_BILINEAR or AUTO_BED_LEVELING_UBL."
   #elif ENABLED(DELTA_AUTO_CALIBRATION) && !(HAS_BED_PROBE || HAS_MARLINUI_MENU)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2022-11-15"
+  #define STRING_DISTRIBUTION_DATE "2022-11-22"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/extui/ui_api.cpp b/Marlin/src/lcd/extui/ui_api.cpp
@@ -375,9 +375,9 @@ namespace ExtUI {
   bool canMove(const axis_t axis) {
     switch (axis) {
       #if IS_KINEMATIC || ENABLED(NO_MOTION_BEFORE_HOMING)
-        case X: return axis_should_home(X_AXIS);
-        OPTCODE(HAS_Y_AXIS, case Y: return axis_should_home(Y_AXIS))
-        OPTCODE(HAS_Z_AXIS, case Z: return axis_should_home(Z_AXIS))
+        case X: return !axis_should_home(X_AXIS);
+        OPTCODE(HAS_Y_AXIS, case Y: return !axis_should_home(Y_AXIS))
+        OPTCODE(HAS_Z_AXIS, case Z: return !axis_should_home(Z_AXIS))
       #else
         case X: case Y: case Z: return true;
       #endif

diff --git a/Marlin/src/module/printcounter.cpp b/Marlin/src/module/printcounter.cpp
@@ -314,13 +314,13 @@ void PrintCounter::reset() {
   void PrintCounter::resetServiceInterval(const int index) {
     switch (index) {
       #if SERVICE_INTERVAL_1 > 0
-        case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1;
+        case 1: data.nextService1 = SERVICE_INTERVAL_SEC_1; break;
       #endif
       #if SERVICE_INTERVAL_2 > 0
-        case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2;
+        case 2: data.nextService2 = SERVICE_INTERVAL_SEC_2; break;
       #endif
       #if SERVICE_INTERVAL_3 > 0
-        case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3;
+        case 3: data.nextService3 = SERVICE_INTERVAL_SEC_3; break;
       #endif
     }
     saveStats();

diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -423,6 +423,7 @@
         #define DOGLCD_A0            EXP1_07_PIN
         #define DOGLCD_SCK           EXP2_02_PIN
         #define DOGLCD_MOSI          EXP2_06_PIN
+        #define FORCE_SOFT_SPI
 
       #elif ENABLED(ENDER2_STOCKDISPLAY)
 

diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_V2.h
@@ -53,8 +53,8 @@
 //
 //#define WIFI_SERIAL 1// USART1
 #if ENABLED(MKS_WIFI_MODULE)
-  #define WIFI_IO0_PIN PB14	// MKS ESP WIFI IO0 PIN
-  #define WIFI_IO1_PIN PB15	// MKS ESP WIFI IO1 PIN
+  #define WIFI_IO0_PIN PB14   // MKS ESP WIFI IO0 PIN
+  #define WIFI_IO1_PIN PB15   // MKS ESP WIFI IO1 PIN
   #define WIFI_RESET_PIN PD14 // MKS ESP WIFI RESET PIN
 #endif
 

diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
@@ -330,15 +330,15 @@ void CardReader::printListing(SdFile parent,  const char * const prepend, const
       SERIAL_CHAR(' ');
       SERIAL_ECHO(p.fileSize);
       if (includeTime) {
-    		SERIAL_CHAR(' ');
-    		uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
-    		if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
-    			crmodDate = p.creationDate;
-    			crmodTime = p.creationTime;
-    		}
-    		SERIAL_ECHOPGM("0x", hex_word(crmodDate));
-    		print_hex_word(crmodTime);
-    	}
+        SERIAL_CHAR(' ');
+        uint16_t crmodDate = p.lastWriteDate, crmodTime = p.lastWriteTime;
+        if (crmodDate < p.creationDate || (crmodDate == p.creationDate && crmodTime < p.creationTime)) {
+          crmodDate = p.creationDate;
+          crmodTime = p.creationTime;
+        }
+        SERIAL_ECHOPGM("0x", hex_word(crmodDate));
+        print_hex_word(crmodTime);
+      }
       #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
         if (includeLong) {
           SERIAL_CHAR(' ');