Skip to content

Commit 558feeb

Browse files
tpruvotthinkyhead
authored andcommitted
✏️ Fix missing brace (MarlinFirmware#23337)
Followup to MarlinFirmware#22916 Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent 122cc9b commit 558feeb

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

Marlin/src/feature/bltouch.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
6868

6969
#else
7070

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
7880

7981
const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
8082

Marlin/src/lcd/menu/menu_bed_corners.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static void _lcd_level_bed_corners_get_next_position() {
292292
} while (good_points < nr_edge_points); // loop until all points within tolerance
293293

294294
#if ENABLED(BLTOUCH)
295-
if (bltouch.high_speed_mode)
295+
if (bltouch.high_speed_mode) {
296296
// In HIGH SPEED MODE do clearance and stow at the very end
297297
do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
298298
bltouch.stow();

Marlin/src/lcd/menu/menu_configuration.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
#include "../../libs/buzzer.h"
5454
#endif
5555

56+
#include "../../core/debug_out.h"
57+
5658
#define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
5759

5860
void menu_advanced_settings();
@@ -219,9 +221,9 @@ void menu_advanced_settings();
219221
void bltouch_report() {
220222
PGMSTR(mode0, "OD");
221223
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") ")");
225227
char mess[21];
226228
strcpy_P(mess, PSTR("BLTouch Mode: "));
227229
strcpy_P(&mess[15], bltouch.od_5v_mode ? mode1 : mode0);

buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ restore_configs
1010
opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
1111
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
1212
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
1515
# Not necessary to enable auto-fan for all extruders to hit problematic code paths
1616
opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
1717
X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \

0 commit comments

Comments
 (0)