some cleanup

bigtreetech · Sep 5, 2023 · fc5af27 · fc5af27
1 parent 792a114
commit fc5af27
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 78 deletions.
diff --git a/Copy to SD Card root directory to update/config.ini b/Copy to SD Card root directory to update/config.ini
@@ -65,9 +65,6 @@
 #   SET_PROGRESS_MANUALLY (in Configuration_adv.h)
 #   M73_REPORT (in Configuration_adv.h)
 #
-# Options to support ADVANCED_OK with host:
-#   ADVANCED_OK (in Configuration_adv.h)
-#
 # Options to support M600 with host & (Un)Load menu:
 #   Options to support dialog with host (as pre requisite)
 #   NOZZLE_PARK_FEATURE (in Configuration.h)
@@ -110,41 +107,6 @@
 #   Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
 serial_port:P1:6 P2:0 P3:0 P4:0
 
-#### TX Slots
-# Used/effective only in case "advanced_ok" is also enabled.
-# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
-#
-# NOTES:
-#   - It requires "advanced_ok" to be enabled.
-#   - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
-#     case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
-#     following key requirements:
-#     - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
-#     - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
-#       To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
-#       you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
-#       be enough, but more is better/safer.
-#   - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
-#     buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
-#     static ADVANCED_OK feature allowed by this setting.
-#
-#   Value range: [min: 2, max: 16]
-tx_slots:2
-
-#### Advanced OK
-# If enabled:
-# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
-#   the available G-code TX slots indication provided by the mainboard to schedule the transmission
-#   of multiple G-codes, if any, for a maximum of the given indication.
-# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
-#   support the transmission of G-codes according to the configured "tx_slots" setting.
-# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
-#
-# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
-#
-#   Options: [disable: 0, enable: 1]
-advanced_ok:0
-
 #### Emulated M600
 # The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
 # otherwise provided by Marlin firmware.
@@ -685,7 +647,7 @@ probing_z_raise:20.0
 #### Z Steppers Auto-Alignment (ABL)
 # It allows to align multiple Z stepper motors using a bed probe by probing one position per stepper.
 # Enable this setting to show an icon in ABL menu allowing to run G34 command (it requires
-# "Z_STEPPER_AUTO_ALIGN" enabled in Configuration_adv.h in Marlin firmware).
+# Z_STEPPER_AUTO_ALIGN enabled in Configuration_adv.h in Marlin firmware).
 #
 # NOTE: Only for Marlin printers with one stepper driver per Z stepper motor and no Z timing belt.
 #
@@ -834,7 +796,7 @@ btt_mini_ups:0
 #
 # NOTE: Error messages from printer will always play the error sound.
 #
-# Settings:
+# Parameters:
 #   touch_sound:  Enable/disable this to control touch feedback sound.
 #   toast_sound:  Enable/disable this to control all toast notification sounds.
 #   alert_sound:  Enable/disable this to control all popup and alert sounds

diff --git a/Copy to SD Card root directory to update/config_rrf.ini b/Copy to SD Card root directory to update/config_rrf.ini
@@ -73,41 +73,6 @@
 #   Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
 serial_port:P1:5 P2:0 P3:0 P4:0
 
-#### TX Slots
-# Used/effective only in case "advanced_ok" is also enabled.
-# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
-#
-# NOTES:
-#   - It requires "advanced_ok" to be enabled.
-#   - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
-#     case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
-#     following key requirements:
-#     - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
-#     - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
-#       To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
-#       you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
-#       be enough, but more is better/safer.
-#   - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
-#     buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
-#     static ADVANCED_OK feature allowed by this setting.
-#
-#   Value range: [min: 2, max: 16]
-tx_slots:2
-
-#### Advanced OK
-# If enabled:
-# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
-#   the available G-code TX slots indication provided by the mainboard to schedule the transmission
-#   of multiple G-codes, if any, for a maximum of the given indication.
-# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
-#   support the transmission of G-codes according to the configured "tx_slots" setting.
-# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
-#
-# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
-#
-#   Options: [disable: 0, enable: 1]
-advanced_ok:0
-
 #### Emulated M600
 # The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
 # otherwise provided by Marlin firmware.
@@ -648,7 +613,7 @@ probing_z_raise:20.0
 #### Z Steppers Auto-Alignment (ABL)
 # It allows to align multiple Z stepper motors using a bed probe by probing one position per stepper.
 # Enable this setting to show an icon in ABL menu allowing to run G34 command (it requires
-# "Z_STEPPER_AUTO_ALIGN" enabled in Configuration_adv.h in Marlin firmware).
+# Z_STEPPER_AUTO_ALIGN enabled in Configuration_adv.h in Marlin firmware).
 #
 # NOTE: Only for Marlin printers with one stepper driver per Z stepper motor and no Z timing belt.
 #
@@ -695,7 +660,7 @@ preheat_temp_6:T250 B90
 #
 # NOTE: Error messages from printer will always play the error sound.
 #
-# Settings:
+# Parameters:
 #   touch_sound:  Enable/disable this to control touch feedback sound.
 #   toast_sound:  Enable/disable this to control all toast notification sounds.
 #   alert_sound:  Enable/disable this to control all popup and alert sounds

diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h
@@ -62,7 +62,7 @@
  *
  *   Value range: [min: 2, max: 16]
  */
-#define TX_SLOTS 1  // Default: 1
+#define TX_SLOTS 2  // Default: 1
 
 /**
  * Advanced OK

diff --git a/TFT/src/User/config.ini b/TFT/src/User/config.ini
@@ -65,6 +65,9 @@
 #   SET_PROGRESS_MANUALLY (in Configuration_adv.h)
 #   M73_REPORT (in Configuration_adv.h)
 #
+# Options to support ADVANCED_OK with host:
+#   ADVANCED_OK (in Configuration_adv.h)
+#
 # Options to support M600 with host & (Un)Load menu:
 #   Options to support dialog with host (as pre requisite)
 #   NOZZLE_PARK_FEATURE (in Configuration.h)
@@ -107,6 +110,41 @@
 #   Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
 serial_port:P1:6 P2:0 P3:0 P4:0
 
+#### TX Slots
+# Used/effective only in case "advanced_ok" is also enabled.
+# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
+#
+# NOTES:
+#   - It requires "advanced_ok" to be enabled.
+#   - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
+#     case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
+#     following key requirements:
+#     - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
+#     - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
+#       To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
+#       you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
+#       be enough, but more is better/safer.
+#   - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
+#     buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
+#     static ADVANCED_OK feature allowed by this setting.
+#
+#   Value range: [min: 2, max: 16]
+tx_slots:2
+
+#### Advanced OK
+# If enabled:
+# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
+#   the available G-code TX slots indication provided by the mainboard to schedule the transmission
+#   of multiple G-codes, if any, for a maximum of the given indication.
+# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
+#   support the transmission of G-codes according to the configured "tx_slots" setting.
+# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
+#
+# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
+#
+#   Options: [disable: 0, enable: 1]
+advanced_ok:0
+
 #### Emulated M600
 # The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
 # otherwise provided by Marlin firmware.

diff --git a/TFT/src/User/config_rrf.ini b/TFT/src/User/config_rrf.ini
@@ -73,6 +73,41 @@
 #   Options: [OFF (port disabled): 0, 2400: 1, 9600: 2, 19200: 3, 38400: 4, 57600: 5, 115200: 6, 250000: 7, 500000: 8, 1000000: 9]
 serial_port:P1:5 P2:0 P3:0 P4:0
 
+#### TX Slots
+# Used/effective only in case "advanced_ok" is also enabled.
+# Maximum number of G-code TX slots used by the TFT for the communication with the printer.
+#
+# NOTES:
+#   - It requires "advanced_ok" to be enabled.
+#   - This setting allows a sort of static "ADVANCED_OK" feature implementation on TFT side just in
+#     case "ADVANCED_OK" feature is disabled in Marlin firmware. You have to set it according to the
+#     following key requirements:
+#     - a value not bigger than "BUFSIZE" configured in Configuration_adv.h in Marlin firmware.
+#     - "RX_BUFFER_SIZE" properly configured in Configuration_adv.h in Marlin firmware.
+#       To be safe you need (MAX_CMD_SIZE * BUFSIZE) RX buffer. By default this is 96 * 4 bytes so
+#       you would need to at least set RX_BUFFER_SIZE to 512 bytes, practically half of that will
+#       be enough, but more is better/safer.
+#   - Typically, a value of 2 is enough to keep the printer busy most of the time while preventing
+#     buffer overruns on RX buffer. Thus, 2 is the suggested value in case users want to use the
+#     static ADVANCED_OK feature allowed by this setting.
+#
+#   Value range: [min: 2, max: 16]
+tx_slots:2
+
+#### Advanced OK
+# If enabled:
+# - if "ADVANCED_OK" feature is enabled in Configuration_adv.h in Marlin firmware, the TFT will use
+#   the available G-code TX slots indication provided by the mainboard to schedule the transmission
+#   of multiple G-codes, if any, for a maximum of the given indication.
+# - if "ADVANCED_OK" feature is disabled in Configuration_adv.h in Marlin firmware, the TFT will
+#   support the transmission of G-codes according to the configured "tx_slots" setting.
+# If disabled, the TFT will provide the standard transmission logic based on one G-code per time.
+#
+# NOTE: Disable it in case no ADVANCED_OK feature is requested/needed by the user.
+#
+#   Options: [disable: 0, enable: 1]
+advanced_ok:0
+
 #### Emulated M600
 # The TFT intercepts the M600 G-code (filament change) and emulates the handling logic
 # otherwise provided by Marlin firmware.