Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin…

… into bugfix-2.1.x
fnsign · Jul 24, 2024 · eeac33d · eeac33d
2 parents 6627a00 + acc8bf1
commit eeac33d
Show file tree

Hide file tree

Showing 37 changed files with 288 additions and 180 deletions.
diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml
@@ -125,7 +125,7 @@ jobs:
         - REMRAM_V1
 
         # STM32H7
-        - BTT_SKR_SE_BX
+        - BIGTREE_SKR_SE_BX
         - STM32H743VI_btt
 
         # STM32F1 (Maple)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -2690,7 +2690,7 @@
  *
  * Use CRC checks and retries on the SD communication.
  */
-//#define SD_CHECK_AND_RETRY
+#define SD_CHECK_AND_RETRY
 
 /**
  * LCD Menu Items

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -3545,7 +3545,7 @@
   //#define PHOTOGRAPH_PIN 23
 
   // Canon Hack Development Kit
-  // https://web.archive.org/web/20200920094805/https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
+  // https://web.archive.org/web/20200920094805/captain-slow.dk/2014/03/09/3d-printing-timelapses/
   //#define CHDK_PIN        4
 
   // Optional second move with delay to trigger the camera shutter

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 "2024-07-23"
+//#define STRING_DISTRIBUTION_DATE "2024-07-24"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h
@@ -26,7 +26,7 @@
  *
  *   Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
- *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
+ *            Logical pins 46-47 aren't supported by Teensyduino, but are supported below as E2 and E3
  */
 
 #include "../fastio.h"

diff --git a/Marlin/src/feature/binary_stream.h b/Marlin/src/feature/binary_stream.h
@@ -146,9 +146,9 @@ class SDFileTransferProtocol  {
     transfer_timeout = millis() + TIMEOUT;
     switch (static_cast<FileTransfer>(packet_type)) {
       case FileTransfer::QUERY:
-        SERIAL_ECHOPGM("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+        SERIAL_ECHO(F("PFT:version:"), VERSION_MAJOR, C('.'), VERSION_MINOR, C('.'), VERSION_PATCH);
         #if ENABLED(BINARY_STREAM_COMPRESSION)
-          SERIAL_ECHOLNPGM(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
+          SERIAL_ECHOLN(F(":compression:heatshrink,"), HEATSHRINK_STATIC_WINDOW_BITS, C(','), HEATSHRINK_STATIC_LOOKAHEAD_BITS);
         #else
           SERIAL_ECHOLNPGM(":compression:none");
         #endif
@@ -322,7 +322,7 @@ class BinaryStream {
             if (packet.header.checksum == packet.header_checksum) {
               // The SYNC control packet is a special case in that it doesn't require the stream sync to be correct
               if (static_cast<Protocol>(packet.header.protocol()) == Protocol::CONTROL && static_cast<ProtocolControl>(packet.header.type()) == ProtocolControl::SYNC) {
-                  SERIAL_ECHOLNPGM("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
+                  SERIAL_ECHOLN(F("ss"), sync, C(','), buffer_size, C(','), VERSION_MAJOR, C('.'), VERSION_MINOR, C('.'), VERSION_PATCH);
                   stream_state = StreamState::PACKET_RESET;
                   break;
               }

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 "2024-07-23"
+  #define STRING_DISTRIBUTION_DATE "2024-07-24"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/menu/menu_info.cpp b/Marlin/src/lcd/menu/menu_info.cpp
@@ -95,96 +95,114 @@
 //
 // About Printer > Thermistors
 //
-void menu_info_thermistors() {
-  if (ui.use_click()) return ui.go_back();
+#if HAS_TEMP_SENSOR
+  void menu_info_thermistors() {
+    if (ui.use_click()) return ui.go_back();
 
-  START_SCREEN();
+    START_SCREEN();
 
-  #define THERM_ITEMS(LBL,HTR,WAT) \
-    STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT); \
-    PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
-    PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
-    STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \
-
-  #if HAS_EXTRUDERS
-    #define THERMISTOR_ID TEMP_SENSOR_0
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
-  #endif
+    #define THERM_ITEM_NAME(LBL) \
+      STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT);
 
-  #if TEMP_SENSOR_1 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_1
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
-  #endif
+    #define THERM_ITEMS(LBL,HTR,WAT) \
+      THERM_ITEM_NAME(LBL) \
+      PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
+      PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
+      STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \
 
-  #if TEMP_SENSOR_2 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_2
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_0 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_0
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_3 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_3
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_1 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_1
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_4 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_4
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_2 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_2
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_5 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_5
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_3 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_3
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_6 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_6
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_4 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_4
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
+    #endif
 
-  #if TEMP_SENSOR_7 != 0
-    #define THERMISTOR_ID TEMP_SENSOR_7
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
-  #endif
+    #if TEMP_SENSOR_5 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_5
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_HEATED_BED
-    #define THERMISTOR_ID TEMP_SENSOR_BED
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("BED", BED, WATCH_BED);
-  #endif
+    #if TEMP_SENSOR_6 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_6
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_HEATED_CHAMBER
-    #define THERMISTOR_ID TEMP_SENSOR_CHAMBER
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
-  #endif
+    #if TEMP_SENSOR_7 != 0
+      #define THERMISTOR_ID TEMP_SENSOR_7
+      #include "../thermistornames.h"
+      THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
+    #endif
 
-  #if HAS_COOLER
-    #define THERMISTOR_ID TEMP_SENSOR_COOLER
-    #include "../thermistornames.h"
-    #undef THERMISTOR_ID
-    THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
-  #endif
+    #if HAS_HEATED_BED
+      #define THERMISTOR_ID TEMP_SENSOR_BED
+      #include "../thermistornames.h"
+      THERM_ITEMS("BED", BED, WATCH_BED);
+    #endif
 
-  END_SCREEN();
-}
+    #if HAS_HEATED_CHAMBER
+      #define THERMISTOR_ID TEMP_SENSOR_CHAMBER
+      #include "../thermistornames.h"
+      THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
+    #endif
+
+    #if HAS_COOLER
+      #define THERMISTOR_ID TEMP_SENSOR_COOLER
+      #include "../thermistornames.h"
+      THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
+    #endif
+
+    #if TEMP_SENSOR_PROBE != 0
+      #define THERMISTOR_ID TEMP_SENSOR_PROBE
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("PROBE");
+    #endif
+
+    #if TEMP_SENSOR_BOARD != 0
+      #define THERMISTOR_ID TEMP_SENSOR_BOARD
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("BOARD");
+    #endif
+
+    #if TEMP_SENSOR_SOC != 0
+      #define THERMISTOR_ID TEMP_SENSOR_SOC
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("SOC");
+    #endif
+
+    #if TEMP_SENSOR_REDUNDANT != 0
+      #define THERMISTOR_ID TEMP_SENSOR_REDUNDANT
+      #include "../thermistornames.h"
+      THERM_ITEM_NAME("REDUNDANT");
+    #endif
+
+    END_SCREEN();
+  }
+#endif // HAS_TEMP_SENSOR
 
 //
 // About Printer > Board Info
@@ -256,7 +274,7 @@ void menu_info() {
   #else
     SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
     SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
-    #if HAS_EXTRUDERS
+    #if HAS_TEMP_SENSOR
       SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
     #endif
   #endif

diff --git a/Marlin/src/lcd/thermistornames.h b/Marlin/src/lcd/thermistornames.h
@@ -171,4 +171,10 @@
 #elif THERMISTOR_ID == 1000
   #define THERMISTOR_NAME "Custom"
 
+// SOC thermistor`
+#elif THERMISTOR_ID == 100
+  #define THERMISTOR_NAME "SOC"
+
 #endif // THERMISTOR_ID
+
+#undef THERMISTOR_ID
diff --git a/Marlin/src/libs/circularqueue.h b/Marlin/src/libs/circularqueue.h
@@ -51,7 +51,7 @@ class CircularQueue {
      *          of item this queue will handle and N defines the maximum number of
      *          items that can be stored on the queue.
      */
-    CircularQueue<T, N>() {
+    CircularQueue() {
       buffer.size = N;
       buffer.count = buffer.head = buffer.tail = 0;
     }

diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -23,13 +23,13 @@
 
 /**
  * Smoothieware Smoothieboard pin assignments
- * Schematic: http://smoothieware.org/_media///external/http.i.imgur.com.oj4zqs3.png
+ * See https://smoothieware.github.io/Webif-pack/documentation/web/html/smoothieboard.html
  */
 
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "Smoothieboard"
-#define BOARD_WEBSITE_URL "smoothieware.org/smoothieboard"
+#define BOARD_WEBSITE_URL "smoothieware.github.io"
 
 //
 // Servos
@@ -131,12 +131,7 @@
 
   /**
    * The Smoothieboard supports the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with either
-   * a custom cable with breakouts to the pins indicated below or the RRD GLCD Adapter board
-   * found at http://smoothieware.org/rrdglcdadapter
-   *
-   * Other links to information about setting up a display panel with Smoothieboard
-   * http://chibidibidiwah.wdfiles.com/local--files/panel/smoothieboard2sd.jpg
-   * http://smoothieware.org/panel
+   * a custom cable with breakouts to the pins indicated below or the RRD GLCD Adapter board.
    */
   #if IS_RRD_FG_SC
     //  EXP1 Pins

diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
@@ -25,7 +25,7 @@
  * Cheaptronic v2.0 pin assignments
  * Built and sold by Michal Dyntar - RRO
  *          www.reprapobchod.cz (DOES NOT EXIST ANYMORE)
- *          https://web.archive.org/web/20190306201523/http://reprapobchod.cz/
+ *          https://web.archive.org/web/20190306201523/reprapobchod.cz
  * ATmega2560
  */
 

diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_11.h b/Marlin/src/pins/mega/pins_CNCONTROLS_11.h
@@ -24,7 +24,7 @@
 /**
  * CartesioV11 pin assignments
  * Comes with an Arduino Mega, see
- * https://web.archive.org/web/20171024190029/http://mauk.cc/mediawiki/index.php/Electronical_assembly
+ * https://web.archive.org/web/20171024190029/mauk.cc/mediawiki/index.php/Electronical_assembly
  * ATmega2560, ATmega1280
  */
 

diff --git a/Marlin/src/pins/mega/pins_CNCONTROLS_12.h b/Marlin/src/pins/mega/pins_CNCONTROLS_12.h
@@ -24,7 +24,7 @@
 /**
  * CartesioV12 pin assignments
  * Comes with an Arduino Mega, see
- * https://web.archive.org/web/20171024190029/http://mauk.cc/mediawiki/index.php/Electronical_assembly
+ * https://web.archive.org/web/20171024190029/mauk.cc/mediawiki/index.php/Electronical_assembly
  * ATmega2560, ATmega1280
  */
 

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -757,9 +757,9 @@
 #elif MB(BTT_SKR_MINI_E3_V3_0_1)
   #include "stm32f4/pins_BTT_SKR_MINI_E3_V3_0_1.h"  // STM32F4                              env:STM32F401RC_btt env:STM32F401RC_btt_xfer
 #elif MB(BTT_SKR_V2_0_REV_A)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"      // STM32F4                              env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_A.h"      // STM32F4                              env:STM32F407VG_btt env:STM32F407VG_btt_USB env:STM32F407VG_btt_USB_debug
 #elif MB(BTT_SKR_V2_0_REV_B)
-  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"      // STM32F4                              env:BIGTREE_SKR_2 env:BIGTREE_SKR_2_USB env:BIGTREE_SKR_2_USB_debug env:BIGTREE_SKR_2_F429 env:BIGTREE_SKR_2_F429_USB env:BIGTREE_SKR_2_F429_USB_debug
+  #include "stm32f4/pins_BTT_SKR_V2_0_REV_B.h"      // STM32F4                              env:STM32F407VG_btt env:STM32F407VG_btt_USB env:STM32F407VG_btt_USB_debug env:STM32F429VG_btt env:STM32F429VG_btt_USB env:STM32F429VG_btt_USB_debug
 #elif MB(BTT_OCTOPUS_V1_0)
   #include "stm32f4/pins_BTT_OCTOPUS_V1_0.h"        // STM32F4                              env:STM32F446ZE_btt env:STM32F446ZE_btt_usb_flash_drive
 #elif MB(BTT_OCTOPUS_V1_1)
@@ -846,9 +846,9 @@
 #elif MB(NUCLEO_F767ZI)
   #include "stm32f7/pins_NUCLEO_F767ZI.h"           // STM32F7                              env:NUCLEO_F767ZI
 #elif MB(BTT_SKR_SE_BX_V2)
-  #include "stm32h7/pins_BTT_SKR_SE_BX_V2.h"        // STM32H7                              env:BTT_SKR_SE_BX
+  #include "stm32h7/pins_BTT_SKR_SE_BX_V2.h"        // STM32H7                              env:BIGTREE_SKR_SE_BX
 #elif MB(BTT_SKR_SE_BX_V3)
-  #include "stm32h7/pins_BTT_SKR_SE_BX_V3.h"        // STM32H7                              env:BTT_SKR_SE_BX
+  #include "stm32h7/pins_BTT_SKR_SE_BX_V3.h"        // STM32H7                              env:BIGTREE_SKR_SE_BX
 #elif MB(BTT_SKR_V3_0)
   #include "stm32h7/pins_BTT_SKR_V3_0.h"            // STM32H7                              env:STM32H743VI_btt env:STM32H723VG_btt
 #elif MB(BTT_SKR_V3_0_EZ)

diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -23,7 +23,7 @@
 
 /**
  * BAM&DICE Due (Arduino Mega) pin assignments
- * Schematic: http://www.2printbeta.de/download/2PRINTBETA-BAM&DICE-DUE-V1.1-sch.pdf
+ * Schematic: http://www.2printbeta.de/de/download/2PRINTBETA-BAM&DICE-DUE-V1.1-sch.pdf
  * ATmega2560, ATmega1280
  */
 

diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
@@ -23,7 +23,7 @@
 
 /**
  * Velleman K8800 (Vertex)
- * Schematic: https://www.velleman.eu/downloads/files/vertex-delta/schematics/K8800-schematic-V1.4.pdf
+ * Schematic: https://cdn.velleman.eu/downloads/files/vertex-delta/schematics/K8800-schematic-V1.4.pdf
  * ATmega2560, ATmega1280
  */