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

…leo_1S_S6_btt_mini
JaxTheWolf · Jan 6, 2024 · 63cc738 · 63cc738
2 parents 261a77a + 2a8c00b
commit 63cc738
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -3885,7 +3885,6 @@
 //#define M114_REALTIME       // Real current position based on forward kinematics
 //#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.
 
-
 /**
  * Auto-report fan speed with M123 S<seconds>
  * Requires fans with tachometer pins

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

diff --git a/Marlin/src/gcode/feature/ft_motion/M493.cpp b/Marlin/src/gcode/feature/ft_motion/M493.cpp
@@ -129,7 +129,7 @@ void GcodeSuite::M493_report(const bool forReplay/*=true*/) {
  * M493: Set Fixed-time Motion Control parameters
  *
  *    S<mode> Set the motion / shaping mode. Shaping requires an X axis, at the minimum.
- *      
+ *
  *       0: Standard Motion
  *       1: Fixed-Time Motion
  *      10: ZV    : Zero Vibration

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-01-05"
+  #define STRING_DISTRIBUTION_DATE "2024-01-06"
 #endif
 
 /**

diff --git a/docs/BinaryFileTransferProtocol.md b/docs/BinaryFileTransferProtocol.md
@@ -1,5 +1,5 @@
 # Marlin Binary File Transfer (BFT)
-Marlin is capable of transferring binary data to the internal storage (SD card) via serial when built with `BINARY_FILE_TRANSFER` enabled. The following is a description of the binary protocol that must be used to conduct transfers once the printer is in binary mode after running `M28 B1`. 
+Marlin is capable of transferring binary data to the internal storage (SD card) via serial when built with `BINARY_FILE_TRANSFER` enabled. The following is a description of the binary protocol that must be used to conduct transfers once the printer is in binary mode after running `M28 B1`.
 
 ## Data Endianness
 All data structures are **little-endian**! This means that when constructing the packets with multi-byte values, the lower bits are packed first. For example, each packet should start with a 16-bit start token with the value of `0xB5AD`. The data itself should start with a value of `0xAD` followed by `0xB5` etc.