🚸 Match M920 indexing to M919

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
+//#define SHORT_BUILD_VERSION "2.1.3-beta3"
 
 /**
  * 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-06-23"
+//#define STRING_DISTRIBUTION_DATE "2025-06-25"
 
 /**
  * The protocol for communication to the host. Protocol indicates communication

Marlin/src/gcode/feature/trinamic/M920.cpp

@@ -40,44 +40,44 @@
  * M920: Set Homing Current for one or more axes
  *
  * Parameters:
- *   X[current]  - Homing Current to use for X axis stepper(s)
- *   Y[current]  - Homing Current to use for Y axis stepper(s)
- *   Z[current]  - Homing Current to use for Z axis stepper(s)
- *   A[current]  - Homing Current to use for A axis stepper(s)
- *   B[current]  - Homing Current to use for B axis stepper(s)
- *   C[current]  - Homing Current to use for C axis stepper(s)
- *   U[current]  - Homing Current to use for U axis stepper(s)
- *   V[current]  - Homing Current to use for V axis stepper(s)
- *   W[current]  - Homing Current to use for W axis stepper(s)
+ *   X<current>  - Homing Current to use for X axis stepper(s)
+ *   Y<current>  - Homing Current to use for Y axis stepper(s)
+ *   Z<current>  - Homing Current to use for Z axis stepper(s)
+ *   A<current>  - Homing Current to use for A axis stepper(s)
+ *   B<current>  - Homing Current to use for B axis stepper(s)
+ *   C<current>  - Homing Current to use for C axis stepper(s)
+ *   U<current>  - Homing Current to use for U axis stepper(s)
+ *   V<current>  - Homing Current to use for V axis stepper(s)
+ *   W<current>  - Homing Current to use for W axis stepper(s)
  *
  *   I<index>    - For multi-stepper axes, the zero-based index of the stepper to modify in each axis.
  *                 If omitted all steppers of each axis will be set to the given axis current.
  */
 void GcodeSuite::M920() {
   bool report = true;
-  const uint8_t index = parser.byteval(I_PARAM);
+  const int8_t index = parser.intval(I_PARAM, -1);
   LOOP_NUM_AXES(i) if (parser.seen(AXIS_CHAR(i))) {
     const int16_t value = parser.value_int();
     report = false;
     switch (i) {
       #if X_HAS_HOME_CURRENT
         case X_AXIS:
-          if (index < 1) homing_current_mA.X = value;
-          TERN_(X2_HAS_HOME_CURRENT, if (!index || index == 1) homing_current_mA.X2 = value);
+          if (index <= 0) homing_current_mA.X = value;
+          TERN_(X2_HAS_HOME_CURRENT, if (index < 0 || index == 1) homing_current_mA.X2 = value);
           break;
       #endif
       #if Y_HAS_HOME_CURRENT
         case Y_AXIS:
-          if (index < 1) homing_current_mA.Y = value;
-          TERN_(Y2_HAS_HOME_CURRENT, if (!index || index == 1) homing_current_mA.Y2 = value);
+          if (index <= 0) homing_current_mA.Y = value;
+          TERN_(Y2_HAS_HOME_CURRENT, if (index < 0 || index == 1) homing_current_mA.Y2 = value);
           break;
       #endif
       #if Z_HAS_HOME_CURRENT
         case Z_AXIS:
-          if (index < 1) homing_current_mA.Z = value;
-          TERN_(Z2_HAS_HOME_CURRENT, if (!index || index == 1) homing_current_mA.Z2 = value);
-          TERN_(Z3_HAS_HOME_CURRENT, if (!index || index == 2) homing_current_mA.Z3 = value);
-          TERN_(Z4_HAS_HOME_CURRENT, if (!index || index == 3) homing_current_mA.Z4 = value);
+          if (index <= 0) homing_current_mA.Z = value;
+          TERN_(Z2_HAS_HOME_CURRENT, if (index < 0 || index == 1) homing_current_mA.Z2 = value);
+          TERN_(Z3_HAS_HOME_CURRENT, if (index < 0 || index == 2) homing_current_mA.Z3 = value);
+          TERN_(Z4_HAS_HOME_CURRENT, if (index < 0 || index == 3) homing_current_mA.Z4 = value);
           break;
       #endif
       OPTCODE(I_HAS_HOME_CURRENT, case I_AXIS: homing_current_mA.I = value; break)
@@ -97,7 +97,7 @@ void GcodeSuite::M920_report(const bool forReplay/*=true*/) {
 
   report_heading(forReplay, F(STR_HOMING_CURRENT));
 
-  auto say_M920 = [](const bool forReplay, int16_t index=-1) {
+  auto say_M920 = [](const bool forReplay, int8_t index=-1) {
     report_echo_start(forReplay);
     SERIAL_ECHOPGM("  M920");
     if (index >= 0) SERIAL_ECHOPGM(" " I_PARAM_STR, index);
@@ -113,6 +113,7 @@ void GcodeSuite::M920_report(const bool forReplay/*=true*/) {
     TERN_(Y_SENSORLESS, SERIAL_ECHOPGM_P(SP_Y_STR, homing_current_mA.Y));
     TERN_(Z_SENSORLESS, SERIAL_ECHOPGM_P(SP_Z_STR, homing_current_mA.Z));
     #if X2_SENSORLESS || Y2_SENSORLESS || Z2_SENSORLESS || Z3_SENSORLESS || Z4_SENSORLESS
+      SERIAL_EOL();
       say_M920(forReplay);
     #endif
     TERN_(I_SENSORLESS, SERIAL_ECHOPGM_P(SP_I_STR, homing_current_mA.I));

Marlin/src/inc/Version.h

@@ -25,7 +25,7 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "bugfix-2.1.x"
+  #define SHORT_BUILD_VERSION "2.1.3-beta3"
 #endif
 
 /**
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2025-06-23"
+  #define STRING_DISTRIBUTION_DATE "2025-06-25"
 #endif
 
 /**

Marlin/src/lcd/e3v2/README.md

@@ -1,6 +1,6 @@
 # DWIN for Creality Ender-3 v2
 
-Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/2.1.3-b3/config/examples/Creality/Ender-3%20V2).
 
 ## Easy Install
 

README.md

@@ -67,20 +67,24 @@ Please test this firmware and let us know if it misbehaves in any way. Volunteer
 
 ---
 
-## Marlin 2.1 Bugfix Branch
+## Marlin 2.1.3 Beta 3
 
 __Not for production use. Use with caution!__
 
-Marlin 2.1 continues to support both 32-bit ARM and 8-bit AVR boards while adding support for up to 9 coordinated axes and to up to 8 extruders.
+This branch is for testing and bug fixes for Marlin 2.1.3. We'll use this time to collect bug reports and patch as many issues as we can. This should help the release version of 2.1.3 to be as robust as we can make it. Are you ready to do some testing?
 
-This branch is for patches to the latest 2.1.x release version. Periodically this branch will form the basis for the next minor 2.1.x release.
+## Configuration Migration
 
-Download earlier versions of Marlin on the [Releases page](//github.com/MarlinFirmware/Marlin/releases).
+There are a lot of configuration changes in Marlin 2.1.3. We're working on automated tools to migrate configurations, so if you want to help us test those get in touch on the [Marlin Discord](//discord.com/servers/marlin-firmware-461605380783472640). If you need help migrating your configurations to Marlin 2.1.3, we'll have a dedicated channel for this purpose. Post your configurations there and we'll send back updated configurations. We can also send a built `firmware.bin` file if you need it.
 
 ## Example Configurations
 
 Before you can build Marlin for your machine you'll need a configuration for your specific hardware. Upon request, your vendor will be happy to provide you with the complete source code and configurations for your machine, but you'll need to get updated configuration files if you want to install a newer version of Marlin. Fortunately, Marlin users have contributed dozens of tested configurations to get you started. Visit the [MarlinFirmware/Configurations](//github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware.
 
+## Marlin Builds
+
+We now publish builds for all our posted example configurations. See the [MarlinBuilds](//github.com/MarlinFirmware/MarlinBuilds) repository for details. This is a new process so bear with us while we work out all the best variants. If you like the way an example configuration works but think it could be better, please submit your suggested improvements in a **Pull Request**.
+
 ## Building Marlin 2.1
 
 To build and upload Marlin you will use one of these tools:

config/README.md

@@ -2,7 +2,7 @@
 
 Marlin configurations for specific machines are now maintained in their own repository at:
 
-## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x
+## https://github.com/MarlinFirmware/Configurations/tree/2.1.3-b3
 
 Configuration files for use with the nightly `bugfix-2.1.x` branch can be downloaded from: