Skip to content

Commit db38655

Browse files
committed
🎨 Misc. cleanup
1 parent 51c1645 commit db38655

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

Marlin/src/feature/bltouch.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ bool BLTouch::od_5v_mode; // Initialized by settings.load, 0 = Open Drai
3838
#include "../module/servo.h"
3939
#include "../module/probe.h"
4040

41-
void stop();
42-
4341
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
4442
#include "../core/debug_out.h"
4543

Marlin/src/feature/pause.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,7 @@ bool pause_print(const_float_t retract, const xyz_pos_t &park_point, const bool
472472
if (unload_length)
473473
unload_filament(unload_length, show_lcd, PAUSE_MODE_CHANGE_FILAMENT);
474474

475-
#if ENABLED(DUAL_X_CARRIAGE)
476-
set_duplication_enabled(saved_ext_dup_mode, saved_ext);
477-
#endif
475+
TERN_(DUAL_X_CARRIAGE, set_duplication_enabled(saved_ext_dup_mode, saved_ext));
478476

479477
// Disable the Extruder for manual change
480478
disable_active_extruder();
@@ -580,9 +578,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
580578
}
581579
idle_no_sleep();
582580
}
583-
#if ENABLED(DUAL_X_CARRIAGE)
584-
set_duplication_enabled(saved_ext_dup_mode, saved_ext);
585-
#endif
581+
TERN_(DUAL_X_CARRIAGE, set_duplication_enabled(saved_ext_dup_mode, saved_ext));
586582
}
587583

588584
/**

buildroot/share/scripts/upload.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,7 @@ def _RollbackUpload(FirmwareFile):
189189
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
190190
'BOARD_CREALITY_V24S1']
191191
# "upload_random_name": generate a random 8.3 firmware filename to upload
192-
upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
193-
'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
194-
'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
192+
upload_random_filename = upload_delete_old_bins and not marlin_long_filename_host_support
195193

196194
try:
197195

0 commit comments

Comments
 (0)