Merge branch 'MarlinFirmware:bugfix-2.1.x' into mecha-octopus-bf2.1.x

Djonker83 · Jul 17, 2023 · cdf105f · cdf105f
2 parents bf78251 + 244de24
commit cdf105f
Show file tree

Hide file tree

Showing 212 changed files with 23,210 additions and 4,467 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -3303,6 +3303,15 @@
    */
   #define TFT_FONT  NOTOSANS
 
+  /**
+   * TFT Theme for Color_UI. Choose one of the following or add a new one to 'Marlin/src/lcd/tft/themes' directory
+   *
+   * BLUE_MARLIN  - Default theme with 'midnight blue' background
+   * BLACK_MARLIN - Theme with 'black' background
+   * ANET_BLACK   - Theme used for Anet ET4/5
+   */
+  #define TFT_THEME BLACK_MARLIN
+
   //#define TFT_SHARED_IO   // I/O is shared between TFT display and other devices. Disable async data transfer.
 #endif
 

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

diff --git a/Marlin/src/HAL/LPC1768/HAL_SPI.cpp b/Marlin/src/HAL/LPC1768/HAL_SPI.cpp
@@ -318,7 +318,7 @@ void SPIClass::dmaSend(void *buf, uint16_t length, bool minc) {
   // Enable DMA
   GPDMA_ChannelCmd(0, ENABLE);
 
-  /*
+  /**
    * Observed behaviour on normal data transfer completion (SKR 1.3 board / LPC1768 MCU)
    *   GPDMA_STAT_INTTC flag is SET
    *   GPDMA_STAT_INTERR flag is NOT SET

diff --git a/Marlin/src/HAL/SAMD21/fastio.h b/Marlin/src/HAL/SAMD21/fastio.h
@@ -129,7 +129,7 @@
  * Added as necessary or if I feel like it- not a comprehensive list!
  */
 
-/*
+/**
  * Some of these share the same source and so can't be used in the same time
  */
 #define PWM_PIN(P)        (WITHIN(P, 2, 13) || WITHIN(P, 22, 23) || WITHIN(P, 44, 45) || P == 48)

diff --git a/Marlin/src/HAL/SAMD51/fastio.h b/Marlin/src/HAL/SAMD51/fastio.h
@@ -130,7 +130,7 @@
 
 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
 
-  /*
+  /**
    * Adafruit Grand Central M4 has a lot of PWMs the availables are listed here.
    * Some of these share the same source and so can't be used in the same time
    */
@@ -176,7 +176,7 @@
 
   #define digitalPinToAnalogInput(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
 
-  /*
+  /**
    * pins
    */
 

diff --git a/Marlin/src/HAL/SAMD51/spi_pins.h b/Marlin/src/HAL/SAMD51/spi_pins.h
@@ -27,7 +27,7 @@
 
 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
 
- /*
+ /**
   * AGCM4 Default SPI Pins
   *
   *         SS    SCK   MISO   MOSI

diff --git a/Marlin/src/HAL/STM32F1/SPI.h b/Marlin/src/HAL/STM32F1/SPI.h
@@ -58,7 +58,7 @@
 #define SPI_CLOCK_DIV128 SPI_BAUD_PCLK_DIV_128
 #define SPI_CLOCK_DIV256 SPI_BAUD_PCLK_DIV_256
 
-/*
+/**
  * Roger Clark. 20150106
  * Commented out redundant AVR defined
  *
@@ -153,7 +153,7 @@ class SPISettings {
   friend class SPIClass;
 };
 
-/*
+/**
  * Kept for compat.
  */
 static const uint8_t ff = 0xFF;
@@ -233,7 +233,7 @@ class SPIClass {
   void onReceive(void(*)());
   void onTransmit(void(*)());
 
-  /*
+  /**
    * I/O
    */
 
@@ -314,7 +314,7 @@ class SPIClass {
   uint8_t dmaSendRepeat(uint16_t length);
 
   uint8_t dmaSendAsync(const void * transmitBuf, uint16_t length, bool minc = 1);
-  /*
+  /**
    * Pin accessors
    */
 
@@ -398,7 +398,7 @@ class SPIClass {
 
   void updateSettings();
 
-  /*
+  /**
    * Functions added for DMA transfers with Callback.
    * Experimental.
    */

diff --git a/Marlin/src/feature/leds/leds.cpp b/Marlin/src/feature/leds/leds.cpp
@@ -105,7 +105,7 @@ void LEDLights::setup() {
     PCA9632_set_led_color(curColor);      // blackout
     delay(200);
 
-    /*
+    /**
      * LED Pin Counter steps -> events
      * | 0-100 | 100-200 | 200-300 | 300-400 |
      *  fade in   steady |           fade out

diff --git a/Marlin/src/feature/leds/pca9533.cpp b/Marlin/src/feature/leds/pca9533.cpp
@@ -1,4 +1,4 @@
-/*
+/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *

diff --git a/Marlin/src/feature/leds/pca9533.h b/Marlin/src/feature/leds/pca9533.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-/*
+/**
  * Driver for the PCA9533 LED controller found on the MightyBoard
  * used by FlashForge Creator Pro, MakerBot, etc.
  * Written 2020 APR 01 by grauerfuchs

diff --git a/Marlin/src/feature/meatpack.h b/Marlin/src/feature/meatpack.h
@@ -20,7 +20,7 @@
  *
  */
 
-/*
+/**
  * MeatPack G-code Compression
  *
  * Algorithm & Implementation: Scott Mudge - [email protected]

diff --git a/Marlin/src/feature/runout.cpp b/Marlin/src/feature/runout.cpp
@@ -101,15 +101,16 @@ void event_filament_runout(const uint8_t extruder) {
 
   const bool run_runout_script = !runout.host_handling;
 
-  const bool park_or_pause = (false
-    #ifdef FILAMENT_RUNOUT_SCRIPT
-      || strstr(FILAMENT_RUNOUT_SCRIPT, "M600")
-      || strstr(FILAMENT_RUNOUT_SCRIPT, "M125")
-      || TERN0(ADVANCED_PAUSE_FEATURE, strstr(FILAMENT_RUNOUT_SCRIPT, "M25"))
-    #endif
-  );
-
   #if ENABLED(HOST_ACTION_COMMANDS)
+
+    const bool park_or_pause = (false
+      #ifdef FILAMENT_RUNOUT_SCRIPT
+        || strstr(FILAMENT_RUNOUT_SCRIPT, "M600")
+        || strstr(FILAMENT_RUNOUT_SCRIPT, "M125")
+        || TERN0(ADVANCED_PAUSE_FEATURE, strstr(FILAMENT_RUNOUT_SCRIPT, "M25"))
+      #endif
+    );
+
     if (run_runout_script && park_or_pause) {
       hostui.paused(false);
     }
@@ -127,6 +128,7 @@ void event_filament_runout(const uint8_t extruder) {
     SERIAL_ECHOPGM(" " ACTION_REASON_ON_FILAMENT_RUNOUT " ");
     SERIAL_CHAR(tool);
     SERIAL_EOL();
+
   #endif // HOST_ACTION_COMMANDS
 
   #ifdef FILAMENT_RUNOUT_SCRIPT

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -1781,12 +1781,19 @@
 #elif ANY(TFT_1024x600_LTDC, TFT_1024x600_SIM)
   #define HAS_UI_1024x600 1
 #endif
-#if ANY(HAS_UI_320x240, HAS_UI_480x320, HAS_UI_480x272)
+
+#if ANY(HAS_UI_320x240, HAS_UI_480x272)
   #if ENABLED(TFT_COLOR_UI_PORTRAIT)
     #define LCD_HEIGHT TERN(TOUCH_SCREEN, 8, 9) // Fewer lines with touch buttons onscreen
   #else
     #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
   #endif
+#elif HAS_UI_480x320
+  #if ENABLED(TFT_COLOR_UI_PORTRAIT)
+    #define LCD_HEIGHT TERN(TOUCH_SCREEN, 9, 10) // Fewer lines with touch buttons onscreen
+  #else
+    #define LCD_HEIGHT TERN(TOUCH_SCREEN, 6, 7) // Fewer lines with touch buttons onscreen
+  #endif
 #elif HAS_UI_1024x600
   #define LCD_HEIGHT TERN(TOUCH_SCREEN, 12, 13) // Fewer lines with touch buttons onscreen
 #endif

diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
@@ -833,7 +833,7 @@
   #define HAS_MEDIA_SUBCALLS 1
 #endif
 
-#if ANY(SHOW_PROGRESS_PERCENT, SHOW_ELAPSED_TIME, SHOW_REMAINING_TIME, SHOW_INTERACTION_TIME)
+#if ANY(SHOW_PROGRESS_PERCENT, SHOW_ELAPSED_TIME, SHOW_REMAINING_TIME, SHOW_INTERACTION_TIME) && !HAS_GRAPHICAL_TFT
   #define HAS_EXTRA_PROGRESS 1
 #endif
 

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 "2023-07-16"
+  #define STRING_DISTRIBUTION_DATE "2023-07-17"
 #endif
 
 /**

diff --git a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@@ -25,17 +25,17 @@
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
   // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
 
-/*
-  Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
-  Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
-  Capital A Height: 7, '1' Height: 7
-  Calculated Max Values w= 7 h=10 x= 5 y= 5 dx= 7 dy= 0 ascent= 8 len=10
-  Font Bounding box     w=12 h=15 x= 0 y=-2
-  Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
-  Pure Font   ascent = 7 descent=-2
-  X Font      ascent = 8 descent=-2
-  Max Font    ascent = 8 descent=-2
-*/
+/**
+ * Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
+ * Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
+ * Capital A Height: 7, '1' Height: 7
+ * Calculated Max Values w= 7 h=10 x= 5 y= 5 dx= 7 dy= 0 ascent= 8 len=10
+ * Font Bounding box     w=12 h=15 x= 0 y=-2
+ * Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
+ * Pure Font   ascent = 7 descent=-2
+ * X Font      ascent = 8 descent=-2
+ * Max Font    ascent = 8 descent=-2
+ */
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1324] U8G_FONT_SECTION("ISO10646_1_5x7") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x07,0x02,0x25,0x03,0xBB,0x01,0x7F,0xFE,0x08,0xFE,0x08,
   0xFE,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xF0,0xC8,0x88,0x88,0x98,0x78,0x10,0x05,
@@ -123,17 +123,17 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[1324] U8G_FONT_SECTION("ISO10646_1_5x7")
 #else
   // extended (original) font (symbols 1 - 255)
 
-/*
-  Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
-  Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
-  Capital A Height: 7, '1' Height: 7
-  Calculated Max Values w= 7 h=10 x= 5 y= 7 dx= 7 dy= 0 ascent=10 len=10
-  Font Bounding box     w=12 h=15 x= 0 y=-2
-  Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
-  Pure Font   ascent = 7 descent=-2
-  X Font      ascent = 8 descent=-2
-  Max Font    ascent =10 descent=-2
-*/
+/**
+ * Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
+ * Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
+ * Capital A Height: 7, '1' Height: 7
+ * Calculated Max Values w= 7 h=10 x= 5 y= 7 dx= 7 dy= 0 ascent=10 len=10
+ * Font Bounding box     w=12 h=15 x= 0 y=-2
+ * Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
+ * Pure Font   ascent = 7 descent=-2
+ * X Font      ascent = 8 descent=-2
+ * Max Font    ascent =10 descent=-2
+ */
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[2647] U8G_FONT_SECTION("ISO10646_1_5x7") = {
   0x00,0x0C,0x0F,0x00,0xFE,0x07,0x02,0x25,0x03,0xBB,0x01,0xFF,0xFE,0x0A,0xFE,0x08,
   0xFE,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xF0,0xC8,0x88,0x88,0x98,0x78,0x10,0x05,

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
@@ -1,4 +1,4 @@
-/*
+/**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *

diff --git a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -59,7 +59,7 @@ uint32_t SPIFlashStorage::m_startAddress;
       while (index < inputLength && index - count < max && input[index] == pixel)
         index++;
       if (index - count == 1) {
-        /*
+        /**
          * Failed to "replicate" the current pixel. See how many to copy.
          * Avoid a replicate run of only 2-pixels after a literal run. There
          * is no gain in this, and there is a risK of loss if the run after
@@ -68,7 +68,7 @@ uint32_t SPIFlashStorage::m_startAddress;
          */
         while (index < inputLength && index - count < max && (input[index] != input[index - 1] || (index > 1 && input[index] != input[index - 2])))
           index++;
-        /*
+        /**
          * Check why this run stopped. If it found two identical pixels, reset
          * the index so we can add a run. Do this twice: the previous run
          * tried to detect a replicate run of at least 3 pixels. So we may be

diff --git a/Marlin/src/lcd/tft/canvas.h b/Marlin/src/lcd/tft/canvas.h
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-#include "tft_color.h"
 #include "tft_string.h"
 #include "tft_image.h"
 #include "tft.h"

diff --git a/...d/tft/fontdata/Helvetica/helvetica_14.cpp → ...d/tft/fontdata/Helvetica/Helvetica_14.cpp b/...d/tft/fontdata/Helvetica/helvetica_14.cpp → ...d/tft/fontdata/Helvetica/Helvetica_14.cpp
@@ -20,26 +20,23 @@
  *
  */
 
-/*
-  Fontname: Helvetica
-  Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
-  Capital A Height: 14, '1' Height: 13
-  Calculated Max Values w=16 h=18 x= 2 y=12 dx=18 dy= 0 ascent=16 len=36
-  Font Bounding box     w=18 h=19 x= 0 y=-4
-  Calculated Min Values           x= 0 y=-4 dx= 0 dy= 0
-  Pure Font   ascent =14 descent=-4
-  X Font      ascent =14 descent=-4
-  Max Font    ascent =16 descent=-4
-*/
+/**
+ * Fontname: Helvetica
+ * Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
+ * Capital A Height: 14, '1' Height: 13
+ * Calculated Max Values w=16 h=18 x= 2 y=12 dx=18 dy= 0 ascent=16 len=36
+ * Font Bounding box     w=18 h=19 x= 0 y=-4
+ * Calculated Min Values           x= 0 y=-4 dx= 0 dy= 0
+ * Pure Font   ascent =14 descent=-4
+ * X Font      ascent =14 descent=-4
+ * Max Font    ascent =16 descent=-4
+ */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../fontdata.h"
 
-#define HELVETICA 123
 #if HAS_GRAPHICAL_TFT && TFT_FONT == HELVETICA
 
-#include <stdint.h>
-
-// Helvetica Symbols, capital 'A' heigth: 14px
+// Helvetica Symbols, capital 'A' height: 14px
 extern const uint8_t Helvetica_Symbols_14[43] = {
   129,14,8,0,9,0,16,252, // unifont_t
   // 0x08 - LCD_STR_THERMOMETER a.k.a 0x1f321  🌡
@@ -48,7 +45,7 @@ extern const uint8_t Helvetica_Symbols_14[43] = {
   5,5,5,7,1,8,112,216,136,216,112,
 };
 
-// Helvetica, capital 'A' heigth: 14px
+// Helvetica, capital 'A' height: 14px
 extern const uint8_t Helvetica_14[4831] = {
   129,14,32,0,255,0,16,252, // unifont_t
   // 0x0020 " "