⛙ Merge w/Marlin

Author: classicrocker883

Marlin/Configuration.h

@@ -507,8 +507,8 @@
  *    10 : 100kΩ RS PRO 198-961
  *    11 : 100kΩ Keenovo AC silicone mats, most Wanhao i3 machines - beta 3950, 1%
  *    12 : 100kΩ Vishay 0603 SMD NTCS0603E3104FXT (#8) - calibrated for Makibox hot bed
- *    13 : 100kΩ Hisense up to 300°C - for "Simple ONE" & "All In ONE" hotend - beta 3950, 1%
- *    14 : 100kΩ  (R25), 4092K (beta25), 4.7kΩ pull-up, bed thermistor as used in Ender-5 S1
+ *    13 : 100kΩ Hisense up to 300°C - for "Simple ONE" & "All In ONE" hotend - R25 = 100 kOhm, beta25 = 4100 K, 4.7kΩ pull-up
+ *    14 : 100kΩ (R25), 4092K (beta25), 4.7kΩ pull-up, bed thermistor (as used in Ender-5 S1)
  *    15 : 100kΩ Calibrated for JGAurora A5 hotend
  *    17 : 100kΩ Dagoma NTC white thermistor
  *    18 : 200kΩ ATC Semitec 204GT-2 Dagoma.Fr - MKS_Base_DKU001327
@@ -3081,6 +3081,18 @@
 //
 //#define FF_INTERFACEBOARD
 
+//
+// MightyBoard LCD and Interface
+//
+//#define MIGHTYBOARD_LCD
+#if ENABLED(MIGHTYBOARD_LCD)
+  //#define MIGHTYBOARD_DEBUG               // Lightweight debug output for buttons and encoder
+  //#define MIGHTYBOARD_DISABLE_ENC_PULLUP  // Enable if the encoder button is unreliable
+  //#define MIGHTYBOARD_BUTTON_PULLUPS      // Enable if other buttons are unreliable
+  //#define MIGHTYBOARD_BACK_STATUS_BUTTONS // Use LEFT/RIGHT buttons for Back / Home.
+                                            // Otherwise they act like encoder down / up.
+#endif
+
 //
 // TFT GLCD Panel with Marlin UI
 // Panel connected to main board by SPI or I2C interface.

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-03-25"
+//#define STRING_DISTRIBUTION_DATE "2026-03-29"
 
 #define STRING_DISTRIBUTION_DATE __DATE__
 #define STRING_DISTRIBUTION_TIME __TIME__

Marlin/src/core/boards.h

@@ -187,6 +187,7 @@
 #define BOARD_MALYAN_M180             1333  // Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
 #define BOARD_PROTONEER_CNC_SHIELD_V3 1334  // Mega controller & Protoneer CNC Shield V3.00
 #define BOARD_WEEDO_62A               1335  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
+#define BOARD_MIGHTYBOARD_REVG        1336  // Makerbot Mightyboard Revision G and H
 
 //
 // ATmega1281, ATmega2561

Marlin/src/feature/leds/pca9632.cpp

@@ -81,7 +81,11 @@
 #define LED_ON    0x01
 #define LED_PWM   0x02
 
-#define PCA9632_ADDRESS 0b01100000
+#ifndef PCA9632_ADDRESS
+  #define PCA9632_ADDRESS 0b01100000
+  #warning "Using default PCA9632_ADDRESS for I2C (0b01100000)."
+#endif
+//static_assert(false, "Using PCA9632 I2C address=" STRINGIFY(PCA9632_ADDRESS));
 
 byte PCA_init = 0;
 
@@ -98,16 +102,16 @@ static void PCA9632_WriteAllRegisters(const byte addr, const byte regadd, const
   #if DISABLED(PCA9632_NO_AUTO_INC)
     uint8_t data[4];
     data[0] = PCA9632_AUTO_IND | regadd;
-    data[1 + (PCA9632_RED >> 1)] = vr;
+    data[1 + (PCA9632_RED >> 1)] = TERN(PCA9632_SWAP_RB, vb, vr);
     data[1 + (PCA9632_GRN >> 1)] = vg;
-    data[1 + (PCA9632_BLU >> 1)] = vb;
+    data[1 + (PCA9632_BLU >> 1)] = TERN(PCA9632_SWAP_RB, vr, vb);
     Wire.beginTransmission(I2C_ADDRESS(addr));
     Wire.write(data, sizeof(data));
     Wire.endTransmission();
   #else
-    PCA9632_WriteRegister(addr, regadd + (PCA9632_RED >> 1), vr);
+    PCA9632_WriteRegister(addr, regadd + (PCA9632_RED >> 1), TERN(PCA9632_SWAP_RB, vb, vr));
     PCA9632_WriteRegister(addr, regadd + (PCA9632_GRN >> 1), vg);
-    PCA9632_WriteRegister(addr, regadd + (PCA9632_BLU >> 1), vb);
+    PCA9632_WriteRegister(addr, regadd + (PCA9632_BLU >> 1), TERN(PCA9632_SWAP_RB, vb, vr));
     #if ENABLED(PCA9632_RGBW)
       PCA9632_WriteRegister(addr, regadd + (PCA9632_WHT >> 1), vw);
     #endif
@@ -132,15 +136,20 @@ void PCA9632_set_led_color(const LED1Color_t &color) {
     PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_MODE2, PCA9632_MODE2_VALUE);
   }
 
-  const byte LEDOUT = (color.r ? LED_PWM << PCA9632_RED : 0)
+  const byte LEDOUT = (TERN(PCA9632_SWAP_RB, color.b, color.r) ? LED_PWM << PCA9632_RED : 0)
                     | (color.g ? LED_PWM << PCA9632_GRN : 0)
-                    | (color.b ? LED_PWM << PCA9632_BLU : 0)
+                    | (TERN(PCA9632_SWAP_RB, color.r, color.b) ? LED_PWM << PCA9632_BLU : 0)
                     | (TERN0(PCA9632_RGBW, color.w ? LED_PWM << PCA9632_WHT : 0));
 
-  PCA9632_WriteAllRegisters(PCA9632_ADDRESS,PCA9632_PWM0, color.r, color.g, color.b
+  PCA9632_WriteAllRegisters(
+    PCA9632_ADDRESS, PCA9632_PWM0,
+    TERN(PCA9632_SWAP_RB, color.b, color.r),
+    color.g,
+    TERN(PCA9632_SWAP_RB, color.r, color.b)
     OPTARG(PCA9632_RGBW, color.w)
   );
   PCA9632_WriteRegister(PCA9632_ADDRESS,PCA9632_LEDOUT, LEDOUT);
+
 }
 
 #if ENABLED(PCA9632_BUZZER)

Marlin/src/gcode/host/M360.cpp

@@ -37,13 +37,11 @@
   #include "../../module/temperature.h"
 #endif
 
-#include <cstddef>
-
 struct ProgStr {
   PGM_P ptr;
   constexpr ProgStr(PGM_P p) : ptr(p) {}
   ProgStr(FSTR_P f) : ptr(FTOP(f)) {}
-  ProgStr(std::nullptr_t) : ptr(nullptr) {}
+  ProgStr(nullptr_t) : ptr(nullptr) {}
 
   constexpr operator PGM_P() const { return ptr; }
   constexpr explicit operator bool() const { return ptr != nullptr; }
@@ -92,13 +90,13 @@ void GcodeSuite::M360() {
   //
   // Axis letters, in PROGMEM
   //
-  #define _DEFINE_A_STR(Q) PGMSTR(Q##_STR, STR_##Q);
+  #define _DEFINE_A_STR(Q) static PGMSTR(Q##_STR, STR_##Q);
   MAIN_AXIS_MAP(_DEFINE_A_STR);
 
   //
   // Homing Directions
   //
-  PGMSTR(H_DIR_STR, "HomeDir");
+  static PGMSTR(H_DIR_STR, "HomeDir");
   #if X_HOME_DIR
     config_line(H_DIR_STR, X_HOME_DIR, X_STR);
   #endif
@@ -128,14 +126,18 @@ void GcodeSuite::M360() {
   #endif
 
   #if ANY(CLASSIC_JERK, HAS_LINEAR_E_JERK)
-    PGMSTR(JERK_STR, "Jerk");
+    static PGMSTR(JERK_STR, "Jerk");
   #endif
 
   //
   // XYZ Axis Jerk
   //
   #if ENABLED(CLASSIC_JERK)
     #define _REPORT_JERK(Q) config_line(Q##_STR, planner.max_jerk.Q, JERK_STR);
+    #define XY_MAP(FUNC) do { \
+      TERN_(HAS_X_AXIS, FUNC(X)) \
+      TERN_(HAS_Y_AXIS, FUNC(Y)) \
+    }while(0)
     if (TERN0(HAS_Y_AXIS, planner.max_jerk.x == planner.max_jerk.y))
       config_line(F("XY"), planner.max_jerk.x, JERK_STR);
     else {
@@ -150,9 +152,9 @@ void GcodeSuite::M360() {
   //
   config_line(F("SupportG10G11"), ENABLED(FWRETRACT));
   #if ENABLED(FWRETRACT)
-    PGMSTR(RET_STR, "Retraction");
-    PGMSTR(UNRET_STR, "RetractionUndo");
-    PGMSTR(SPEED_STR, "Speed");
+    static PGMSTR(RET_STR, "Retraction");
+    static PGMSTR(UNRET_STR, "RetractionUndo");
+    static PGMSTR(SPEED_STR, "Speed");
     // M10 Retract with swap (long) moves
     config_line(F("Length"),     fwretract.settings.retract_length, RET_STR);
     config_line(F("LongLength"), fwretract.settings.swap_retract_length, RET_STR);
@@ -175,22 +177,22 @@ void GcodeSuite::M360() {
   motion.apply_limits(cmax);
   const xyz_pos_t wmin = cmin.asLogical(), wmax = cmax.asLogical();
 
-  PGMSTR(MIN_STR, "Min");
+  static PGMSTR(MIN_STR, "Min");
   #define _REPORT_MIN(Q) config_line(MIN_STR, wmin.Q, Q##_STR);
   MAIN_AXIS_MAP(_REPORT_MIN);
 
-  PGMSTR(MAX_STR, "Max");
+  static PGMSTR(MAX_STR, "Max");
   #define _REPORT_MAX(Q) config_line(MAX_STR, wmax.Q, Q##_STR);
   MAIN_AXIS_MAP(_REPORT_MAX);
 
-  PGMSTR(SIZE_STR, "Size");
+  static PGMSTR(SIZE_STR, "Size");
   #define _REPORT_SIZE(Q) config_line(SIZE_STR, wmax.Q - wmin.Q, Q##_STR);
   MAIN_AXIS_MAP(_REPORT_SIZE);
 
   //
   // Axis Steps per mm
   //
-  PGMSTR(S_MM_STR, "Steps/mm");
+  static PGMSTR(S_MM_STR, "Steps/mm");
   #define _REPORT_S_MM(Q) config_line(S_MM_STR, planner.settings.axis_steps_per_mm[_AXIS(Q)], Q##_STR);
   MAIN_AXIS_MAP(_REPORT_S_MM);
 
@@ -199,11 +201,11 @@ void GcodeSuite::M360() {
   //
   #define _ACCEL(Q,B) _MIN(planner.settings.max_acceleration_mm_per_s2[Q##_AXIS], planner.settings.B)
 
-  PGMSTR(P_ACC_STR, "PrintAccel");
+  static PGMSTR(P_ACC_STR, "PrintAccel");
   #define _REPORT_P_ACC(Q) config_line(P_ACC_STR, _ACCEL(Q, acceleration), Q##_STR);
   MAIN_AXIS_MAP(_REPORT_P_ACC);
 
-  PGMSTR(T_ACC_STR, "TravelAccel");
+  static PGMSTR(T_ACC_STR, "TravelAccel");
   #define _REPORT_T_ACC(Q) config_line(T_ACC_STR, _ACCEL(Q, travel_acceleration), Q##_STR);
   MAIN_AXIS_MAP(_REPORT_T_ACC);
 

Marlin/src/gcode/temp/M303.cpp

@@ -71,19 +71,23 @@ void GcodeSuite::M303() {
       return;
   }
 
-  const bool seenC = parser.seenval('C');
-  const int c = seenC ? parser.value_int() : 5;
+  const int cycles = parser.intval('C', 5);
+  if (cycles < 3) {
+    SERIAL_ECHOLNPGM("?(C)ycles not plausible (>=3).");
+    return;
+  }
+
   const bool seenS = parser.seenval('S');
   const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
-  const bool u = parser.boolval('U');
+  const bool uflag = parser.boolval('U');
 
-  TERN_(DWIN_LCD_PROUI, DWIN_M303(c, hid, temp);)
-  TERN_(EXTENSIBLE_UI, ExtUI::onStartM303(c, hid, temp));
+  TERN_(DWIN_LCD_PROUI, DWIN_M303(cycles, hid, temp);)
+  TERN_(EXTENSIBLE_UI, ExtUI::onStartM303(cycles, hid, temp));
 
   IF_DISABLED(BUSY_WHILE_HEATING, KEEPALIVE_STATE(NOT_BUSY));
 
   LCD_MESSAGE(MSG_PID_AUTOTUNE);
-  thermalManager.PID_autotune(temp, hid, c, u);
+  thermalManager.PID_autotune(temp, hid, cycles, uflag);
   ui.reset_status();
 
   queue.flush_rx();

Marlin/src/inc/Conditionals-2-LCD.h

@@ -316,6 +316,12 @@
   #define IS_RRD_SC 1
   #define U8GLIB_SSD1309
 
+#elif ENABLED(MIGHTYBOARD_LCD)
+
+  #define IS_ULTIPANEL 1
+  #define LCD_WIDTH 20
+  #define LCD_HEIGHT 4
+
 #endif
 
 // ST7920-based graphical displays
@@ -939,6 +945,7 @@
   + ENABLED(CARTESIO_UI) \
   + ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) \
   + ENABLED(FF_INTERFACEBOARD) \
+  + ENABLED(MIGHTYBOARD_LCD) \
   + ENABLED(FYSETC_242_OLED_12864) \
   + ENABLED(G3D_PANEL) \
   + ENABLED(LCD_FOR_MELZI) \

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2026-03-25"
+  #define STRING_DISTRIBUTION_DATE "2026-03-29"
 #endif
 
 /**

Marlin/src/lcd/HD44780/marlinui_HD44780.cpp

@@ -89,6 +89,11 @@
     #endif
   );
 
+#elif ENABLED(MIGHTYBOARD_LCD)
+
+  // 3-wire shift-register LCD for Mightyboard
+  LCD_CLASS lcd;
+
 #elif ENABLED(SR_LCD_3W_NL)
 
   // NewLiquidCrystal was not working

Marlin/src/lcd/HD44780/marlinui_HD44780.h

@@ -89,6 +89,15 @@
   #include <LiquidCrystal_SR.h>
   #define LCD_CLASS LiquidCrystal_SR
 
+#elif ENABLED(MIGHTYBOARD_LCD)
+
+  // 3-wire shift-register LCD for Mightyboard
+  // Optimized in-tree implementation
+  // Pin mapping: SR_STROBE_PIN, SR_DATA_PIN, SR_CLK_PIN
+
+  #include "mighty/mighty_lcd_serial.h"
+  #define LCD_CLASS MightyboardLCDSerial
+
 #elif ENABLED(SR_LCD_3W_NL)
 
   // NewLiquidCrystal didn't work, so this uses