⛙ Merge w/Marlin

Author: classicrocker883

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 "2026-02-19"
+//#define STRING_DISTRIBUTION_DATE "2026-02-22"
 
 #define STRING_DISTRIBUTION_DATE __DATE__
 #define STRING_DISTRIBUTION_TIME __TIME__

Marlin/src/HAL/HC32/sdio.cpp

@@ -109,7 +109,7 @@ bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
   WITH_RETRY(SDIO_READ_RETRIES, {
     en_result_t rc = SDCARD_ReadBlocks(handle, block, 1, dst, SDIO_READ_TIMEOUT);
     if (rc == Ok) return true;
-    printf("SDIO_ReadBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
+    printf("SDIO_ReadBlock error (rc=%u; ErrorCode=%" PRIu32 ")\n", rc, handle->u32ErrorCode);
   })
 
   return false;
@@ -122,7 +122,7 @@ bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
   WITH_RETRY(SDIO_WRITE_RETRIES, {
     en_result_t rc = SDCARD_WriteBlocks(handle, block, 1, (uint8_t *)src, SDIO_WRITE_TIMEOUT);
     if (rc == Ok) return true;
-    printf("SDIO_WriteBlock error (rc=%u; ErrorCode=%lu)\n", rc, handle->u32ErrorCode);
+    printf("SDIO_WriteBlock error (rc=%u; ErrorCode=%" PRIu32 ")\n", rc, handle->u32ErrorCode);
   })
 
   return false;

Marlin/src/HAL/RP2040/pinsDebug.h

@@ -137,7 +137,7 @@ int8_t digital_pin_to_analog_pin(pin_t pin) {
 }
 
 bool isAnalogPin(const pin_t pin) {
-  return digital_pin_to_analog_pin(pin) != -1;
+  return digital_pin_to_analog_pin(pin) >= 0;
 }
 
 #define digitalRead_mod(A) extDigitalRead(A)  // must use Arduino pin numbers when doing reads

Marlin/src/HAL/SAMD21/pinsDebug.h

@@ -50,7 +50,7 @@
 #define getPinByIndex(x) pin_array[x].pin
 #define getPinIsDigitalByIndex(x) pin_array[x].is_digital
 #define isValidPin(P) (P >= 0 && P < pin_t(NUMBER_PINS_TOTAL))
-#define isAnalogPin(P) (digitalPinToAnalogIndex(P) != -1)
+#define isAnalogPin(P) (digitalPinToAnalogIndex(P) >= 0)
 #define pwm_status(P) digitalPinHasPWM(P)
 #define MULTI_NAME_PAD 27 // space needed to be pretty if not first name assigned to a pin
 

Marlin/src/HAL/STM32/sd/usb_host.cpp

@@ -88,9 +88,9 @@ void USBHost::setUsbTaskState(uint8_t state) {
     capacity = info.capacity.block_nbr / 2000;
     block_size = info.capacity.block_size;
     block_count = info.capacity.block_nbr;
-    //SERIAL_ECHOLNPGM("info.capacity.block_nbr : %ld\n", info.capacity.block_nbr);
-    //SERIAL_ECHOLNPGM("info.capacity.block_size: %d\n", info.capacity.block_size);
-    //SERIAL_ECHOLNPGM("capacity                : %d MB\n", capacity);
+    //SERIAL_ECHOLNPGM("info.capacity.block_nbr : ", info.capacity.block_nbr);
+    //SERIAL_ECHOLNPGM("info.capacity.block_size: ", info.capacity.block_size);
+    //SERIAL_ECHOLNPGM("capacity                : ", capacity, "MB");
   }
 };
 

Marlin/src/MarlinCore.cpp

@@ -720,7 +720,7 @@ void Marlin::manage_inactivity(const bool no_stepper_sleep/*=false*/) {
       motion.position.e += EXTRUDER_RUNOUT_EXTRUDE;
       motion.goto_current_position(MMM_TO_MMS(EXTRUDER_RUNOUT_SPEED));
       motion.position.e = olde;
-      planner.set_e_position_mm(olde);
+      motion.sync_plan_position_e();
       planner.synchronize();
 
       if (e_off) stepper.DISABLE_EXTRUDER(e_stepper);

Marlin/src/core/macros.h

@@ -299,6 +299,7 @@
 // Array shorthand
 #define COUNT(a)            (sizeof(a)/sizeof(*a))
 #define ZERO(a)             memset((void*)a,0,sizeof(a))
+#define OBJZERO(a)          memset(&a,0,sizeof(a))
 #define COPY(a,b) do{ \
     static_assert(sizeof(a[0]) == sizeof(b[0]), "COPY: '" STRINGIFY(a) "' and '" STRINGIFY(b) "' types (sizes) don't match!"); \
     memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \

Marlin/src/feature/pause.cpp

@@ -740,7 +740,8 @@ void resume_print(
 
   // Now all extrusion positions are resumed and ready to be confirmed
   // Set extruder to saved position
-  planner.set_e_position_mm((motion.destination.e = motion.position.e = resume_position.e));
+  motion.destination.e = motion.position.e = resume_position.e;
+  motion.sync_plan_position_e();
 
   ui.pause_show_message(PAUSE_MESSAGE_STATUS);
   #if ENABLED(SOVOL_SV06_RTS)

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2026-02-19"
+  #define STRING_DISTRIBUTION_DATE "2026-02-22"
 #endif
 
 /**

Marlin/src/lcd/HD44780/marlinui_HD44780.cpp

@@ -1078,7 +1078,7 @@ void MarlinUI::draw_status_screen() {
               #if ENABLED(LCD_SHOW_E_TOTAL)
                 char tmp[20];
                 const uint8_t escale = motion.e_move_accumulator >= 100000.0f ? 10 : 1; // After 100m switch to cm
-                sprintf_P(tmp, PSTR("E %ld%cm       "), uint32_t(_MAX(motion.e_move_accumulator, 0.0f)) / escale, escale == 10 ? 'c' : 'm'); // 1234567mm
+                sprintf_P(tmp, PSTR("E %" PRIu32 "%cm       "), uint32_t(_MAX(motion.e_move_accumulator, 0.0f)) / escale, escale == 10 ? 'c' : 'm'); // 1234567mm
                 lcd_put_u8str(tmp);
               #endif
             }