Add advanced misc fans menu (DWIN) + G-Codes

.github/workflows/bump-date.yml

@@ -18,12 +18,12 @@ jobs:
 
     steps:
 
-    - name: Check out 2024-December
+    - name: Check out 2025-January
       uses: actions/[email protected]
       with:
-        ref: 2024-December
+        ref: 2025-January
 
-    - name: Bump Date (2024-December)
+    - name: Bump Date (2025-January)
       run: |
         if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
           shopt -s globstar && \

.github/workflows/check-pr.yml

@@ -3,34 +3,35 @@
 # Close PRs directed at release branches
 #
 
-name: PR Bad Target
+name: Bad PR Target
 
 on:
   pull_request_target:
     types: [opened]
     branches:
     - 2024-*
-    - HC32-*
 
 jobs:
   bad_target:
-    name: PR Bad Target
-    if: github.repository == 'classicrocker883/MRiscoCProUI'
+    name: Bad PR Target
+    if: github.repository == 'classicrocker883/MRiscoCProUI' && github.event.pull_request.base.ref != '2025-January'
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: superbrothers/[email protected]
-      with:
-        comment: >
-          Thanks for your contribution!  
+      - uses: superbrothers/[email protected]
+        with:
+          comment: |
+            Thanks for your contribution!
 
-          Unfortunately, we can only accept **PR**s targeting the **default** branch.  
-          Anything Marlin specific, or `HC32-*` branches should be submitted [here](https://github.com/MarlinFirmware/Marlin/issues/new/choose).  
-          To fix this:  
-          1. Rebase your branch onto `default`.
-          2. Submit a new **PR** targeting the most recent.
+            Unfortunately, we can only accept **PR**s targeting the **default** branch.
 
-          Please redo this **PR** starting with the most recent branch and be careful to target it when resubmitting the **PR**.  
+            Anything Marlin specific, or `HC32-*` branches should be submitted [here](https://github.com/MarlinFirmware/Marlin/issues/new/choose).
 
-          See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
+            To fix this:
+              1. Rebase your branch onto `default`.
+              2. Submit a new **PR** targeting the most recent.
+
+            Please redo this **PR** starting with the most recent branch and be careful to target it when resubmitting the **PR**.
+
+            See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/ci-build-tests.yml

@@ -8,7 +8,7 @@ name: CI - Build Tests
 on:
   pull_request:
     branches:
-    - 2024-December
+    - 2025-January
     paths-ignore:
     - configurations/**
     - display assets/**
@@ -22,7 +22,7 @@ on:
     - '**/*.md'
   push:
     branches:
-    - 2024-December
+    - 2025-January
     paths-ignore:
     - configurations/**
     - display assets/**

.github/workflows/ci-unit-tests.yml

@@ -8,7 +8,7 @@ name: CI - Unit Tests
 on:
   pull_request:
     branches:
-    - 2024-December
+    - 2025-January
     paths-ignore:
     - configurations/**
     - display assets/**
@@ -22,7 +22,7 @@ on:
     - '**/*.md'
   push:
     branches:
-    - 2024-December
+    - 2025-January
     paths-ignore:
     - configurations/**
     - display assets/**

.github/workflows/ci-validate-boards.yml

@@ -9,13 +9,13 @@ name: CI - Validate boards.h
 on:
   pull_request:
     branches:
-    - 2024-December
+    - 2025-January
     #- bugfix-2.1.x
     paths:
     - 'Marlin/src/core/boards.h'
   push:
     branches:
-    - 2024-December
+    - 2025-January
     #- bugfix-2.1.x
     paths:
     - 'Marlin/src/core/boards.h'

.github/workflows/ci-validate-pins.yml

@@ -8,14 +8,14 @@ name: CI - Validate Pins Files
 on:
   pull_request:
     branches:
-    - 2024-December
+    - 2025-January
     # Cannot be enabled on 2.1.x until it contains the unit test framework
     #- 2.1.x
     paths:
     - 'Marlin/src/pins/*/**'
   push:
     branches:
-    - 2024-December
+    - 2025-January
     # Cannot be enabled on 2.1.x until it contains the unit test framework
     #- 2.1.x
     paths:

Marlin/Configuration.h

@@ -607,6 +607,10 @@
   #define MAX31865_SENSOR_OHMS_2      100
   #define MAX31865_CALIBRATION_OHMS_2 430
 #endif
+#if TEMP_SENSOR_IS_MAX_TC(BED)
+  #define MAX31865_SENSOR_OHMS_BED      100
+  #define MAX31865_CALIBRATION_OHMS_BED 430
+#endif
 
 #if HAS_E_TEMP_SENSOR
   #define TEMP_RESIDENCY_TIME         10  // (seconds) Time to wait for hotend to "settle" in M109
@@ -2124,6 +2128,12 @@
 #define AUTO_BED_LEVELING_UBL
 //#define MESH_BED_LEVELING
 
+/**
+ * Commands to execute at the start of G29 probing,
+ * after switching to the PROBING_TOOL.
+ */
+//#define EVENT_GCODE_BEFORE_G29 "M300 P440 S200"
+
 /**
  * Commands to execute at the end of G29 probing.
  * Useful to retract or move the Z probe out of the way.

Marlin/Configuration_adv.h

@@ -180,9 +180,10 @@
  * Thermocouple Options — for MAX6675 (-2), MAX31855 (-3), and MAX31865 (-5).
  */
 //#define TEMP_SENSOR_FORCE_HW_SPI                // Ignore SCK/MOSI/MISO pins; use CS and the default SPI bus.
-//#define MAX31865_SENSOR_WIRES_0 2               // (2-4) Number of wires for the probe connected to a MAX31865 board.
-//#define MAX31865_SENSOR_WIRES_1 2
-//#define MAX31865_SENSOR_WIRES_2 2
+//#define MAX31865_SENSOR_WIRES_0   2             // (2-4) Number of wires for the probe connected to a MAX31865 board.
+//#define MAX31865_SENSOR_WIRES_1   2
+//#define MAX31865_SENSOR_WIRES_2   2
+//#define MAX31865_SENSOR_WIRES_BED 2
 
 //#define MAX31865_50HZ_FILTER                    // Use a 50Hz filter instead of the default 60Hz.
 //#define MAX31865_USE_READ_ERROR_DETECTION       // Treat value spikes (20°C delta in under 1s) as read errors.
@@ -194,6 +195,7 @@
 //#define MAX31865_WIRE_OHMS_0              0.95f // For 2-wire, set the wire resistances for more accurate readings.
 //#define MAX31865_WIRE_OHMS_1              0.0f
 //#define MAX31865_WIRE_OHMS_2              0.0f
+//#define MAX31865_WIRE_OHMS_BED            0.0f
 
 /**
  * Hephestos 2 24V heated bed upgrade kit.
@@ -587,7 +589,8 @@
   //#define CONTROLLER_FAN2_PIN -1          // Set a custom pin for second controller fan
   //#define CONTROLLER_FAN_USE_Z_ONLY       // With this option only the Z axis is considered
   //#define CONTROLLER_FAN_IGNORE_Z         // Ignore Z stepper. Useful when stepper timeout is disabled.
-  #define CONTROLLERFAN_SPEED_MIN         0 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
+  #define CONTROLLERFAN_SPEED_MIN        40 // (0-255) Minimum speed. (If set below this value the fan is turned off.)
+  #define CONTROLLERFAN_SPEED_MAX       127 // (0-255) Maximum speed. (Use only for a specific hardware build, or with non default PWM Scale, needs testing with other builds)
   #define CONTROLLERFAN_SPEED_ACTIVE    255 // (0-255) Active speed, used when any motor is enabled
   #define CONTROLLERFAN_SPEED_IDLE        0 // (0-255) Idle speed, used when motors are disabled
   #define CONTROLLERFAN_IDLE_TIME        60 // (seconds) Extra time to keep the fan running after disabling motors
@@ -616,6 +619,10 @@
 //#define FAN_KICKSTART_POWER 180  // 64-255
 //#define FAN_KICKSTART_LINEAR     // Set kickstart time linearly based on the speed, e.g., for 20% (51) it will be FAN_KICKSTART_TIME * 0.2.
                                    // Useful for quick speed up to low speed. Kickstart power must be set to 255.
+//#define FAN_KICKSTART_EDITABLE            // Enable M711 configurable settings
+#if ENABLED(FAN_KICKSTART_EDITABLE)
+  #define FAN_KICKSTART_MENU                // Enable the Fan Kickstart submenu
+#endif
 
 // Some coolers may require a non-zero "off" state.
 //#define FAN_OFF_PWM  1
@@ -682,18 +689,22 @@
 #endif
 
 /**
- * Extruder cooling fans
+ * Cooling fans
  *
- * Extruder auto fans automatically turn on when their extruders'
- * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
+ * Fans automatically turn on when their extruders'
+ * temperatures go above threshold.
  *
  * Your board's pins file specifies the recommended pins. Override those here
  * or set to -1 to disable completely.
  *
  * Multiple extruders can be assigned to the same pin in which case
  * the fan will turn on when any selected extruder is above the threshold.
+ *
+ * EXAMPLE: When 'EXTRUDER_AUTO_FAN_TEMPERATURE' >= 50
+ *          Fan spins at full speed:
+ *          'EXTRUDER_AUTO_FAN_SPEED' 255 == full speed
  */
-#define E0_AUTO_FAN_PIN -1  // Ender3V2 Configs
+#define E0_AUTO_FAN_PIN -1//PC0  // Ender3V2 Configs
 #define E1_AUTO_FAN_PIN -1
 #define E2_AUTO_FAN_PIN -1
 #define E3_AUTO_FAN_PIN -1
@@ -705,12 +716,20 @@
 #define COOLER_AUTO_FAN_PIN -1
 
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
-#define EXTRUDER_AUTO_FAN_SPEED 255   // 255 == full speed
+#define EXTRUDER_AUTO_FAN_SPEED 255
 #define CHAMBER_AUTO_FAN_TEMPERATURE 30
 #define CHAMBER_AUTO_FAN_SPEED 255
 #define COOLER_AUTO_FAN_TEMPERATURE 18
 #define COOLER_AUTO_FAN_SPEED 255
 
+/**
+ * Allow Auto Cooling Fans to be editable
+ */
+//#define AUTO_FAN_EDITABLE                 // Enable M712 configurable settings
+#if ENABLED(AUTO_FAN_EDITABLE)
+  #define AUTO_FAN_MENU                     // Enable the Editable Auto Fans submenu
+#endif
+
 /**
  * Hotend Cooling Fans tachometers
  *
@@ -2052,17 +2071,17 @@
   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
   //#define STATUS_HEAT_POWER         // Show heater output power as a vertical bar
 
-  // Frivolous Game Options
-  //#define MARLIN_BRICKOUT
-  //#define MARLIN_INVADERS
-  //#define MARLIN_SNAKE
-  //#define GAMES_EASTER_EGG          // Add extra blank lines above the "Games" sub-menu
-
 #endif // HAS_MARLINUI_U8GLIB
 
 #if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
   #define MENU_HOLLOW_FRAME           // Enable to save many cycles by drawing a hollow frame on Menu Screens
   //#define OVERLAY_GFX_REVERSE       // Swap the CW/CCW indicators in the graphics overlay
+
+  // Frivolous Game Options
+  //#define MARLIN_BRICKOUT
+  //#define MARLIN_INVADERS
+  //#define MARLIN_SNAKE
+  //#define GAMES_EASTER_EGG          // Add extra blank lines above the "Games" sub-menu
 #endif
 
 //

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "2.1.3f-12"
+#define SHORT_BUILD_VERSION "2.1.3g-1"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2025-01-01"
+//#define STRING_DISTRIBUTION_DATE "2025-01-11"
 
 #define STRING_DISTRIBUTION_DATE __DATE__
 #define STRING_DISTRIBUTION_TIME __TIME__