From 4ab433d39136ed8c94a188a6cdec70c24432944a Mon Sep 17 00:00:00 2001 From: Chris Pepper Date: Thu, 28 Feb 2019 01:57:48 +0000 Subject: [PATCH] Fix binary protocol with one serial port (#13270) - The `sdcard.transfer_port` variable is Marlin's internal serial port index, not the physical serial port number. - Added packet number to "ok" response so hosts don't need to wait for the ACK. - Renamed feature to `BINARY_FILE_TRANSFER`, as the speed up is only consequential to the ability to transfer binaries over serial. --- Marlin/Configuration_adv.h | 2 +- Marlin/src/config/default/Configuration_adv.h | 2 +- .../3DFabXYZ/Migbot/Configuration_adv.h | 2 +- .../AlephObjects/TAZ4/Configuration_adv.h | 2 +- .../examples/Anet/A2/Configuration_adv.h | 2 +- .../examples/Anet/A2plus/Configuration_adv.h | 2 +- .../examples/Anet/A6/Configuration_adv.h | 2 +- .../examples/Anet/A8/Configuration_adv.h | 2 +- .../examples/AnyCubic/i3/Configuration_adv.h | 2 +- .../config/examples/ArmEd/Configuration_adv.h | 2 +- .../BIBO/TouchX/cyclops/Configuration_adv.h | 2 +- .../BIBO/TouchX/default/Configuration_adv.h | 2 +- .../examples/BQ/Hephestos/Configuration_adv.h | 2 +- .../BQ/Hephestos_2/Configuration_adv.h | 2 +- .../examples/BQ/WITBOX/Configuration_adv.h | 2 +- .../examples/Cartesio/Configuration_adv.h | 2 +- .../Creality/CR-10/Configuration_adv.h | 2 +- .../Creality/CR-10S/Configuration_adv.h | 2 +- .../Creality/CR-10_5S/Configuration_adv.h | 2 +- .../Creality/CR-10mini/Configuration_adv.h | 2 +- .../Creality/CR-8/Configuration_adv.h | 2 +- .../Creality/Ender-2/Configuration_adv.h | 2 +- .../Creality/Ender-3/Configuration_adv.h | 2 +- .../Creality/Ender-4/Configuration_adv.h | 2 +- .../examples/Einstart-S/Configuration_adv.h | 2 +- .../config/examples/Felix/Configuration_adv.h | 2 +- .../FlashForge/CreatorPro/Configuration_adv.h | 2 +- .../FolgerTech/i3-2020/Configuration_adv.h | 2 +- .../Formbot/Raptor/Configuration_adv.h | 2 +- .../Formbot/T_Rex_2+/Configuration_adv.h | 2 +- .../Formbot/T_Rex_3/Configuration_adv.h | 2 +- .../Geeetech/A10M/Configuration_adv.h | 2 +- .../Geeetech/A20M/Configuration_adv.h | 2 +- .../Geeetech/MeCreator2/Configuration_adv.h | 2 +- .../Prusa i3 Pro C/Configuration_adv.h | 2 +- .../Prusa i3 Pro W/Configuration_adv.h | 2 +- .../Infitary/i3-M508/Configuration_adv.h | 2 +- .../examples/JGAurora/A5/Configuration_adv.h | 2 +- .../examples/MakerParts/Configuration_adv.h | 2 +- .../examples/Malyan/M150/Configuration_adv.h | 2 +- .../examples/Malyan/M200/Configuration_adv.h | 2 +- .../Micromake/C1/enhanced/Configuration_adv.h | 2 +- .../examples/Mks/Robin/Configuration_adv.h | 2 +- .../examples/Mks/Sbase/Configuration_adv.h | 2 +- .../RapideLite/RL200/Configuration_adv.h | 2 +- .../examples/RigidBot/Configuration_adv.h | 2 +- .../config/examples/SCARA/Configuration_adv.h | 2 +- .../examples/Sanguinololu/Configuration_adv.h | 2 +- .../examples/TheBorg/Configuration_adv.h | 2 +- .../examples/TinyBoy2/Configuration_adv.h | 2 +- .../examples/Tronxy/X3A/Configuration_adv.h | 2 +- .../UltiMachine/Archim1/Configuration_adv.h | 2 +- .../UltiMachine/Archim2/Configuration_adv.h | 2 +- .../examples/VORONDesign/Configuration_adv.h | 2 +- .../Velleman/K8200/Configuration_adv.h | 2 +- .../Velleman/K8400/Configuration_adv.h | 2 +- .../WASP/PowerWASP/Configuration_adv.h | 2 +- .../Wanhao/Duplicator 6/Configuration_adv.h | 2 +- .../delta/Anycubic/Kossel/Configuration_adv.h | 2 +- .../FLSUN/auto_calibrate/Configuration_adv.h | 2 +- .../delta/FLSUN/kossel/Configuration_adv.h | 2 +- .../FLSUN/kossel_mini/Configuration_adv.h | 2 +- .../Geeetech/Rostock 301/Configuration_adv.h | 2 +- .../delta/MKS/SBASE/Configuration_adv.h | 2 +- .../Tevo Little Monster/Configuration_adv.h | 2 +- .../delta/generic/Configuration_adv.h | 2 +- .../delta/kossel_mini/Configuration_adv.h | 2 +- .../delta/kossel_xl/Configuration_adv.h | 2 +- .../gCreate/gMax1.5+/Configuration_adv.h | 2 +- .../examples/makibox/Configuration_adv.h | 2 +- .../tvrrug/Round2/Configuration_adv.h | 2 +- .../config/examples/wt150/Configuration_adv.h | 2 +- Marlin/src/gcode/host/M115.cpp | 7 ++ Marlin/src/gcode/queue.cpp | 82 +++++++++---------- .../sdcard/M20-M30_M32-M34_M524_M928.cpp | 2 +- Marlin/src/sd/cardreader.cpp | 2 +- Marlin/src/sd/cardreader.h | 6 +- buildroot/share/tests/megaatmega2560-tests | 2 +- 78 files changed, 124 insertions(+), 121 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index fe4416041a..401505d958 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index fe4416041a..401505d958 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index f213c5af20..bb05cbf4cb 100644 --- a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index f97d556842..513b627b4f 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index 1fbf17ed3d..d88da485ec 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index 1fbf17ed3d..d88da485ec 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 4f7f472e88..d7e8502780 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -834,7 +834,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 3188d99965..7592de0147 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h index e81e26d611..d5cde973b9 100644 --- a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h index 868d703435..2d7b9b6ddd 100644 --- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h +++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h @@ -839,7 +839,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index 2a3b1a4663..5f15b3b3dc 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -834,7 +834,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index 22d604cc4a..c6005be857 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index cfe596906a..0a5f8826c6 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 7b6f5b6788..fad23e893c 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -843,7 +843,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index cfe596906a..0a5f8826c6 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 58f0ab396a..09499f02b4 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index 309c958789..620dd7efa0 100644 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index d158680635..1e3dd0d679 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10_5S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10_5S/Configuration_adv.h index 361964192c..283675127d 100644 --- a/Marlin/src/config/examples/Creality/CR-10_5S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10_5S/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index 4ce9af952a..30a0c11caa 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index dfc0514902..f44cd66ecc 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index d75c739f72..6c80015a79 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index fad2f0de35..fccb793a41 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index cbc08f3adb..435e831e6c 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index f18fd8f917..b007186a09 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 1bd679d637..a694c531db 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h index abbf436662..9f5c2fa111 100644 --- a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -834,7 +834,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 2d3f989faf..0c13a992f9 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 8f2605f721..f7e3367061 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index 32f2e1ab49..244b0ab887 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -839,7 +839,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index 43510ad167..ec9de6e5eb 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -840,7 +840,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h index 5d27a07a9c..87d5de9058 100644 --- a/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h index cb6923e92f..6dbf4dfdef 100644 --- a/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/A20M/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 5fc5250cbc..0fd4dfd99f 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 2a44836d13..f75f6d0d3e 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 2a44836d13..f75f6d0d3e 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 1bd80f0aa9..6a241349d7 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index 142af6511c..3dcb30e54d 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index b24cde0383..7e14bcbaab 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 4f12de8b2d..1308bac15d 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 016e6503c8..9db8a18dfc 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index b7c3c1ce66..70720edef0 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h index 1d18699382..28bf573528 100644 --- a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 65bb5f96c4..915f954c3a 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -836,7 +836,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h index 1efdf8476e..b8678f4c2a 100644 --- a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index 37b841de37..f095f32063 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index da73f77a9e..8ed7481da2 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 4fd4df2fda..6e79599b9e 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 1f265b6f00..1cb1367c84 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 4a32177e17..39c26d6d5a 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index 586d7db26f..b7a7acf5fd 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h index c9583c3af7..bd0197d47e 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 7b80cb29ee..fc0f450120 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h index dd022172cb..18f51b3dbd 100644 --- a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h +++ b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index fe6385b598..3d8f20773c 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -848,7 +848,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 66c2470d69..13a6e1d7eb 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h index f40c1fe589..03bbd1db4f 100644 --- a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index db158e10a6..13f41ecb24 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 318437d717..54a5ec27f2 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 1252aafc31..7573ba6e0f 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 1252aafc31..7573ba6e0f 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 445114e174..bf4cb2fb55 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index 993f9bd5e9..98cafe1e95 100644 --- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h index 08b6a23e3f..9aec36a484 100644 --- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h index f288a397c5..9193fdea6b 100644 --- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 445114e174..bf4cb2fb55 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 5af1ea6487..bb5c2316de 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -836,7 +836,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index e76f8b2f9a..d35891d8da 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -837,7 +837,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 197174ca46..97c79c0aa8 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 018833b4a8..8649933261 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 996e8883b8..c09a4916b0 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -835,7 +835,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index f341bace01..01c98b1ec0 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -836,7 +836,7 @@ #endif // Add an optimized binary file transfer mode, initiated with 'M28 B1' - //#define FAST_FILE_TRANSFER + //#define BINARY_FILE_TRANSFER #endif // SDSUPPORT diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp index e69af6cd93..f0b9ac0ae5 100644 --- a/Marlin/src/gcode/host/M115.cpp +++ b/Marlin/src/gcode/host/M115.cpp @@ -52,6 +52,13 @@ void GcodeSuite::M115() { #endif ); + // BINARY_FILE_TRANSFER (M28 B1) + cap_line(PSTR("BINARY_FILE_TRANSFER") + #if ENABLED(BINARY_FILE_TRANSFER) + , true + #endif + ); + // EEPROM (M500, M501) cap_line(PSTR("EEPROM") #if ENABLED(EEPROM_SETTINGS) diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp index 0b6296ebea..d697baae05 100644 --- a/Marlin/src/gcode/queue.cpp +++ b/Marlin/src/gcode/queue.cpp @@ -282,7 +282,7 @@ void gcode_line_error(PGM_P const err, const int8_t port) { serial_count[port] = 0; } -#if ENABLED(FAST_FILE_TRANSFER) +#if ENABLED(BINARY_FILE_TRANSFER) inline bool serial_data_available(const uint8_t index) { switch (index) { @@ -398,16 +398,12 @@ void gcode_line_error(PGM_P const err, const int8_t port) { stream_state = StreamState::PACKET_RESET; bytes_received = 0; time_stream_start = millis(); - SERIAL_ECHO("echo: Datastream initialized ("); - SERIAL_ECHO(stream_header.filesize); - SERIAL_ECHOLN("Bytes expected)"); - SERIAL_ECHO("so"); // confirm active stream and the maximum block size supported - SERIAL_CHAR(static_cast(buffer_size & 0xFF)); - SERIAL_CHAR(static_cast((buffer_size >> 8) & 0xFF)); - SERIAL_CHAR('\n'); + SERIAL_ECHOPAIR("echo: Datastream initialized (", stream_header.filesize); + SERIAL_ECHOLNPGM(" bytes expected)"); + SERIAL_ECHOLNPAIR("so", buffer_size); // confirm active stream and the maximum block size supported } else { - SERIAL_ECHOLN("echo: Datastream initialization error (invalid token)"); + SERIAL_ECHO_MSG("Datastream init error (invalid token)"); stream_state = StreamState::STREAM_FAILED; } buffer_next_index = 0; @@ -423,7 +419,7 @@ void gcode_line_error(PGM_P const err, const int8_t port) { stream_state = StreamState::PACKET_DATA; } else { - SERIAL_ECHO("echo: Datastream packet out of order"); + SERIAL_ECHO_MSG("Datastream packet out of order"); stream_state = StreamState::PACKET_FLUSHRX; } } @@ -431,61 +427,60 @@ void gcode_line_error(PGM_P const err, const int8_t port) { case StreamState::PACKET_DATA: if (!stream_read(data)) break; - if (buffer_next_index < buffer_size) { + if (buffer_next_index < buffer_size) buffer[buffer_next_index] = data; - } else { - SERIAL_ECHO("echo: Datastream packet data buffer overrun"); + SERIAL_ECHO_MSG("Datastream packet data buffer overrun"); stream_state = StreamState::STREAM_FAILED; break; } packet.checksum = checksum(packet.checksum, data); - packet.bytes_received ++; - buffer_next_index ++; + packet.bytes_received++; + buffer_next_index++; - if (packet.bytes_received == packet.header.size) { + if (packet.bytes_received == packet.header.size) stream_state = StreamState::PACKET_VALIDATE; - } + break; case StreamState::PACKET_VALIDATE: if (packet.header.checksum == packet.checksum) { packet_retries = 0; - packets_received ++; + packets_received++; bytes_received += packet.header.size; - if (packet.header.id == 0) { // id 0 is always the stream descriptor + if (packet.header.id == 0) // id 0 is always the stream descriptor stream_state = StreamState::STREAM_HEADER; // defer packet confirmation to STREAM_HEADER state - } else { if (bytes_received < stream_header.filesize) { - stream_state = StreamState::PACKET_RESET; // reset and receive next packet - SERIAL_ECHOLN("ok"); // transmit confirm packet received and valid token + stream_state = StreamState::PACKET_RESET; // reset and receive next packet + SERIAL_ECHOLNPGM("ok"); // transmit confirm packet received and valid token + SERIAL_ECHOLN(packet.header.id); } - else { + else stream_state = StreamState::STREAM_COMPLETE; // no more data required - } + if (card.write(buffer, buffer_next_index) < 0) { stream_state = StreamState::STREAM_FAILED; - SERIAL_ECHO("echo: IO ERROR"); + SERIAL_ECHO_MSG("SDCard IO Error"); break; }; } } else { - SERIAL_ECHO("echo: Block("); - SERIAL_ECHO(packet.header.id); - SERIAL_ECHOLN(") Corrupt"); + SERIAL_ECHO_START(); + SERIAL_ECHOPAIR("Block(", packet.header.id); + SERIAL_ECHOLNPGM(") Corrupt"); stream_state = StreamState::PACKET_FLUSHRX; } break; case StreamState::PACKET_RESEND: if (packet_retries < MAX_RETRIES) { - packet_retries ++; + packet_retries++; stream_state = StreamState::PACKET_RESET; - SERIAL_ECHO("echo: Resend request "); - SERIAL_ECHOLN(packet_retries); - SERIAL_ECHOLN("rs"); // transmit resend packet token + SERIAL_ECHO_START(); + SERIAL_ECHOLNPAIR("Resend request ", int(packet_retries)); + SERIAL_ECHOLNPAIR("rs", packet.header.id); // transmit resend packet token } else { stream_state = StreamState::STREAM_FAILED; @@ -501,27 +496,28 @@ void gcode_line_error(PGM_P const err, const int8_t port) { packet.timeout = millis() + STREAM_MAX_WAIT; break; case StreamState::PACKET_TIMEOUT: - SERIAL_ECHOLN("echo: Datastream timeout"); + SERIAL_ECHO_START(); + SERIAL_ECHOLNPGM("Datastream timeout"); stream_state = StreamState::PACKET_RESEND; break; case StreamState::STREAM_COMPLETE: stream_state = StreamState::STREAM_RESET; card.flag.binary_mode = false; - card.closefile(); - SERIAL_ECHO("echo: "); + SERIAL_ECHO_START(); SERIAL_ECHO(card.filename); - SERIAL_ECHO(" transfer completed @ "); - SERIAL_ECHO(((bytes_received / (millis() - time_stream_start) * 1000) / 1024 )); - SERIAL_ECHOLN("KiB/s"); - SERIAL_ECHOLN("sc"); // transmit stream complete token + SERIAL_ECHOPAIR(" transfer completed @ ", ((bytes_received / (millis() - time_stream_start) * 1000) / 1024)); + SERIAL_ECHOLNPGM("KiB/s"); + SERIAL_ECHOLNPGM("sc"); // transmit stream complete token + card.closefile(); return; case StreamState::STREAM_FAILED: stream_state = StreamState::STREAM_RESET; card.flag.binary_mode = false; card.closefile(); card.removeFile(card.filename); - SERIAL_ECHOLN("echo: File transfer failed"); - SERIAL_ECHOLN("sf"); // transmit stream failed token + SERIAL_ECHO_START(); + SERIAL_ECHOLNPGM("File transfer failed"); + SERIAL_ECHOLNPGM("sf"); // transmit stream failed token return; } } @@ -536,7 +532,7 @@ void gcode_line_error(PGM_P const err, const int8_t port) { } binaryStream{}; -#endif // FAST_FILE_TRANSFER +#endif // BINARY_FILE_TRANSFER FORCE_INLINE bool is_M29(const char * const cmd) { return cmd[0] == 'M' && cmd[1] == '2' && cmd[2] == '9' && !WITHIN(cmd[3], '0', '9'); @@ -555,7 +551,7 @@ inline void get_serial_commands() { #endif ; - #if ENABLED(FAST_FILE_TRANSFER) + #if ENABLED(BINARY_FILE_TRANSFER) if (card.flag.saving && card.flag.binary_mode) { /** * For binary stream file transfer, use serial_line_buffer as the working diff --git a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp index f8c35166e5..f6725358c4 100644 --- a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp +++ b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp @@ -175,7 +175,7 @@ void GcodeSuite::M27() { */ void GcodeSuite::M28() { - #if ENABLED(FAST_FILE_TRANSFER) + #if ENABLED(BINARY_FILE_TRANSFER) bool binary_mode = false; char *p = parser.string_arg; diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 7ecf4ae269..971f895570 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -51,7 +51,7 @@ card_flags_t CardReader::flag; char CardReader::filename[FILENAME_LENGTH], CardReader::longFilename[LONG_FILENAME_LENGTH]; int8_t CardReader::autostart_index; -#if ENABLED(FAST_FILE_TRANSFER) && NUM_SERIAL > 1 +#if ENABLED(BINARY_FILE_TRANSFER) && NUM_SERIAL > 1 int8_t CardReader::transfer_port; #endif diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h index 958c1ce306..4e86be70f1 100644 --- a/Marlin/src/sd/cardreader.h +++ b/Marlin/src/sd/cardreader.h @@ -42,7 +42,7 @@ typedef struct { detected:1, filenameIsDir:1, abort_sd_printing:1 - #if ENABLED(FAST_FILE_TRANSFER) + #if ENABLED(BINARY_FILE_TRANSFER) , binary_mode:1 #endif ; @@ -145,11 +145,11 @@ public: static char filename[FILENAME_LENGTH], longFilename[LONG_FILENAME_LENGTH]; static int8_t autostart_index; - #if ENABLED(FAST_FILE_TRANSFER) + #if ENABLED(BINARY_FILE_TRANSFER) #if NUM_SERIAL > 1 static int8_t transfer_port; #else - static constexpr int8_t transfer_port = SERIAL_PORT; + static constexpr int8_t transfer_port = 0; #endif #endif diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests index 8a24eb8b67..904864509d 100755 --- a/buildroot/share/tests/megaatmega2560-tests +++ b/buildroot/share/tests/megaatmega2560-tests @@ -36,7 +36,7 @@ opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING \ AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \ FWRETRACT ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \ - POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE FAST_FILE_TRANSFER \ + POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE BINARY_FILE_TRANSFER \ LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST PINS_DEBUGGING \ MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING BACKLASH_COMPENSATION BACKLASH_GCODE opt_set FANMUX0_PIN 53