Merge branch 'bugfix-JyersUI' of https://github.com/LMoesman/Marlin i…

…nto E3-RRF * 'bugfix-JyersUI' of https://github.com/LMoesman/Marlin: (78 commits) Update Config Versions 🍻 Preliminary fix for Max31865 SPI (MarlinFirmware#22682) 🐛 Fix JyersUI scrolling filename, etc. (MarlinFirmware#23082) 🐛 Fix DGUS Reloaded status message (MarlinFirmware#23090) [cron] Bump distribution date (2021-11-07) [cron] Bump distribution date (2021-11-06) Updated Workflow for Maple Env v2.0.1 Re-add Beeper Mute Put back support for other UIs [cron] Bump distribution date (2021-11-05) 🍻 Get/clear reset source earlier 🐛 Prevent AVR watchdogpile (MarlinFirmware#23075) 🐛 Fix TFT backlight [STM32] (MarlinFirmware#23062) 🐛 Fix Octopus-Pro Max31865 / SPI (MarlinFirmware#23072) 🔨 Fix IntelliSense / PIO conflicts (MarlinFirmware#23058) 📌 'STOP' auto-assign, some Chitu V9 pins (MarlinFirmware#22889) [cron] Bump distribution date (2021-11-04) 🔨 Script 'mfprep' finds pending commits 🔨 Update git helper scripts ...
LMoesman3004 · Nov 7, 2021 · c608108 · c608108
2 parents 11b20f1 + 633e79f
commit c608108
Show file tree

Hide file tree

Showing 309 changed files with 6,314 additions and 2,940 deletions.
diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml
@@ -46,7 +46,7 @@ jobs:
         sed -i "s/#define MOTHERBOARD.*/#define MOTHERBOARD BOARD_CREALITY_$BOARD/g" Marlin/Configuration.h
         pio run
         mkdir temp
-        mv .pio/build/STM32F103RET6_creality/*.bin temp/build.bin
+        mv .pio/build/STM32F103RET6_creality_maple/*.bin temp/build.bin
       env:
         BOARD: ${{ matrix.board }}
         VERSION: ${{ env.RELEASE_VERSION }}
@@ -109,7 +109,7 @@ jobs:
         sed -i "s/[^ ]*#define BLTOUCH_HS_MODE/$TEMP#define BLTOUCH_HS_MODE/g" Marlin/Configuration_adv.h
         pio run
         mkdir temp
-        mv .pio/build/STM32F103RET6_creality/*.bin temp/build.bin
+        mv .pio/build/STM32F103RET6_creality_maple/*.bin temp/build.bin
       env:
         BOARD: ${{ matrix.board }}
         GRID: ${{ matrix.grid }}
@@ -170,7 +170,7 @@ jobs:
         sed -i "s/#define GRID_MAX_POINTS_X.*/#define GRID_MAX_POINTS_X $GRID/g" Marlin/Configuration.h
         pio run
         mkdir temp
-        mv .pio/build/STM32F103RET6_creality/*.bin temp/build.bin
+        mv .pio/build/STM32F103RET6_creality_maple/*.bin temp/build.bin
       env:
         BOARD: ${{ matrix.board }}
         GRID: ${{ matrix.grid }}
@@ -234,7 +234,7 @@ jobs:
         sed -i "s/[^ ]*#define BLTOUCH_HS_MODE/$TEMP#define BLTOUCH_HS_MODE/g" Marlin/Configuration_adv.h
         pio run
         mkdir temp
-        mv .pio/build/STM32F103RET6_creality/*.bin temp/build.bin
+        mv .pio/build/STM32F103RET6_creality_maple/*.bin temp/build.bin
       env:
         BOARD: ${{ matrix.board }}
         GRID: ${{ matrix.grid }}
@@ -295,7 +295,7 @@ jobs:
         sed -i "s/#define GRID_MAX_POINTS_X.*/#define GRID_MAX_POINTS_X $GRID/g" Marlin/Configuration.h
         pio run
         mkdir temp
-        mv .pio/build/STM32F103RET6_creality/*.bin temp/build.bin
+        mv .pio/build/STM32F103RET6_creality_maple/*.bin temp/build.bin
       env:
         BOARD: ${{ matrix.board }}
         GRID: ${{ matrix.grid }}

diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@ bdf2u8g
 # OS
 #
 applet/
-*.DS_Store
+.DS_Store
 
 #
 # Misc
@@ -167,7 +167,3 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Simulation / Native
-eeprom.dat
-imgui.ini
diff --git a/Configuration Files/E3V2 Templates/BIGTREE_E3_RRF/Default-NoProbe/Configuration_adv.h b/Configuration Files/E3V2 Templates/BIGTREE_E3_RRF/Default-NoProbe/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/...n Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3-HighSpeed/Configuration.h b/...n Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3-HighSpeed/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/...les/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3-HighSpeed/Configuration_adv.h b/...les/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3-HighSpeed/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/Configuration Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3/Configuration.h b/Configuration Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3/Configuration_adv.h b/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/BLTouch-3x3/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/Default-NoProbe/Configuration.h b/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/Default-NoProbe/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/...ion Files/E3V2 Templates/STM32F103RET6_creality_maple/Default-NoProbe/Configuration_adv.h b/...ion Files/E3V2 Templates/STM32F103RET6_creality_maple/Default-NoProbe/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/...guration Files/E3V2 Templates/STM32F103RET6_creality_maple/ManualMesh-3x3/Configuration.h b/...guration Files/E3V2 Templates/STM32F103RET6_creality_maple/ManualMesh-3x3/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/...tion Files/E3V2 Templates/STM32F103RET6_creality_maple/ManualMesh-3x3/Configuration_adv.h b/...tion Files/E3V2 Templates/STM32F103RET6_creality_maple/ManualMesh-3x3/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/...ation Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-BLTouch-10x10/Configuration.h b/...ation Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-BLTouch-10x10/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/...n Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-BLTouch-10x10/Configuration_adv.h b/...n Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-BLTouch-10x10/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-NoProbe-3x3/Configuration.h b/...uration Files/E3V2 Templates/STM32F103RET6_creality_maple/UBL-NoProbe-3x3/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/Configuration Files/Jyers's Config/Configuration.h b/Configuration Files/Jyers's Config/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================

diff --git a/Configuration Files/Jyers's Config/Configuration_adv.h b/Configuration Files/Jyers's Config/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02000902
+#define CONFIGURATION_ADV_H_VERSION 02000903
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -1220,7 +1220,7 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-#if HAS_LCD_MENU
+#if EITHER(HAS_LCD_MENU, HAS_DWIN_E3V2)
 
   // Add Probe Z Offset calibration to the Z Probe Offsets menu
   #if HAS_BED_PROBE
@@ -1248,7 +1248,7 @@
   //#define TURBO_BACK_MENU_ITEM
 
   // Add a mute option to the LCD menu
-  //#define SOUND_MENU_ITEM
+  #define SOUND_MENU_ITEM
 
   /**
    * LED Control Menu

diff --git a/Images/Advanced Options.jpg b/Images/Advanced Options.jpg
diff --git a/Images/Configuration_adv.jpg b/Images/Configuration_adv.jpg
diff --git a/Images/Configuration_adv2.jpg b/Images/Configuration_adv2.jpg
diff --git a/Images/Display Config.jpg b/Images/Display Config.jpg
diff --git a/Images/ExtUI.jpg b/Images/ExtUI.jpg
diff --git a/Images/Filament Change.jpg b/Images/Filament Change.jpg
diff --git a/Images/Main Menu.jpg b/Images/Main Menu.jpg
diff --git a/Images/Manual Leveling.jpg b/Images/Manual Leveling.jpg
diff --git a/Images/Mesh Leveling.jpg b/Images/Mesh Leveling.jpg
diff --git a/Images/OctoPrint.jpg b/Images/OctoPrint.jpg
diff --git a/Images/OctoPrint_Behavior.jpg b/Images/OctoPrint_Behavior.jpg
diff --git a/Images/Preheat Constants.jpg b/Images/Preheat Constants.jpg
diff --git a/Images/Preheat Menu.jpg b/Images/Preheat Menu.jpg
diff --git a/Images/Preprare Menu.jpg b/Images/Preprare Menu.jpg
diff --git a/Images/UBL Manual Tuning.jpg b/Images/UBL Manual Tuning.jpg
diff --git a/Images/UBL Mesh Viewer 15x15.jpg b/Images/UBL Mesh Viewer 15x15.jpg
diff --git a/Images/UBL Mesh Viewer 3x3.jpg b/Images/UBL Mesh Viewer 3x3.jpg
diff --git a/Images/Z Offset.jpg b/Images/Z Offset.jpg
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -35,7 +35,7 @@
  *
  * Advanced settings can be found in Configuration_adv.h
  */
-#define CONFIGURATION_H_VERSION 02000902
+#define CONFIGURATION_H_VERSION 02000903
 
 //===========================================================================
 //============================= Getting Started =============================
@@ -260,7 +260,6 @@
 
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // (mm) Distance to move beyond the parking point to grab the extruder
-  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
 
   #if ENABLED(PARKING_EXTRUDER)