Quellcode durchsuchen

✏️ Fix missing brace (#23337)

Followup to #22916

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Tanguy Pruvot vor 2 Jahren
Ursprung
Commit
da67deb621
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden

+ 9
- 7
Marlin/src/feature/bltouch.cpp Datei anzeigen

@@ -68,13 +68,15 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
68 68
 
69 69
   #else
70 70
 
71
-    if (DEBUGGING(LEVELING)) {
72
-      PGMSTR(mode0, "OD");
73
-      PGMSTR(mode1, "5V");
74
-      DEBUG_ECHOPGM("BLTouch Mode: ");
75
-      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
76
-      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
77
-    }
71
+    #ifdef DEBUG_OUT
72
+      if (DEBUGGING(LEVELING)) {
73
+        PGMSTR(mode0, "OD");
74
+        PGMSTR(mode1, "5V");
75
+        DEBUG_ECHOPGM("BLTouch Mode: ");
76
+        DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
77
+        DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
78
+      }
79
+    #endif
78 80
 
79 81
     const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
80 82
 

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_corners.cpp Datei anzeigen

@@ -292,7 +292,7 @@ static void _lcd_level_bed_corners_get_next_position() {
292 292
     } while (good_points < nr_edge_points); // loop until all points within tolerance
293 293
 
294 294
     #if ENABLED(BLTOUCH)
295
-      if (bltouch.high_speed_mode)
295
+      if (bltouch.high_speed_mode) {
296 296
         // In HIGH SPEED MODE do clearance and stow at the very end
297 297
         do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
298 298
         bltouch.stow();

+ 5
- 3
Marlin/src/lcd/menu/menu_configuration.cpp Datei anzeigen

@@ -53,6 +53,8 @@
53 53
   #include "../../libs/buzzer.h"
54 54
 #endif
55 55
 
56
+#include "../../core/debug_out.h"
57
+
56 58
 #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
57 59
 
58 60
 void menu_advanced_settings();
@@ -219,9 +221,9 @@ void menu_advanced_settings();
219 221
     void bltouch_report() {
220 222
       PGMSTR(mode0, "OD");
221 223
       PGMSTR(mode1, "5V");
222
-      SERIAL_ECHOPGM("BLTouch Mode: ");
223
-      SERIAL_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
224
-      SERIAL_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
224
+      DEBUG_ECHOPGM("BLTouch Mode: ");
225
+      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
226
+      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
225 227
       char mess[21];
226 228
       strcpy_P(mess, PSTR("BLTouch Mode: "));
227 229
       strcpy_P(&mess[15], bltouch.od_5v_mode ? mode1 : mode0);

+ 2
- 2
buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive Datei anzeigen

@@ -10,8 +10,8 @@ restore_configs
10 10
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
11 11
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
12 12
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
13
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING \
14
-           FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
13
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LEVEL_BED_CORNERS LEVEL_CORNERS_USE_PROBE \
14
+           NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
15 15
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
16 16
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
17 17
         X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \

Laden…
Abbrechen
Speichern