From 4ae2a76492b176c831647e29cc6150e7d8c0605a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 5 Jan 2024 12:34:50 -0600 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8E=A8=20Clean=20up=20ws?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 1 - Marlin/src/gcode/feature/ft_motion/M493.cpp | 2 +- docs/BinaryFileTransferProtocol.md | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 248841d748d0..3208364c3c2e 100644 --- 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 * Requires fans with tachometer pins diff --git a/Marlin/src/gcode/feature/ft_motion/M493.cpp b/Marlin/src/gcode/feature/ft_motion/M493.cpp index d374ca58c9f5..a72a35d5bf36 100644 --- 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 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/docs/BinaryFileTransferProtocol.md b/docs/BinaryFileTransferProtocol.md index 46c1bf9718cf..6d52671789f7 100644 --- 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. From 2a8c00bdeb5268b11a3bbddfc8797a3f09a92947 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sat, 6 Jan 2024 00:21:22 +0000 Subject: [PATCH 2/2] [cron] Bump distribution date (2024-01-06) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 25d9a5b78236..baa1539a5b09 100644 --- 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/inc/Version.h b/Marlin/src/inc/Version.h index a9ad73b331fe..892d02c74514 100644 --- 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 /**