Skip to content

Commit ca5a6d1

Browse files
DrToxicthinkyhead
authored andcommitted
🎨 Misc. cleanup (MarlinFirmware#25194)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent 1c484c7 commit ca5a6d1

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Marlin/src/HAL/SAMD21/timers.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ const tTimerConfig timer_config[NUM_HARDWARE_TIMERS] = {
4747
{ {.pTcc=TCC0}, TimerType::tcc, TCC0_IRQn, TC_PRIORITY(0) }, // 0 - stepper (assigned priority 2)
4848
{ {.pTcc=TCC1}, TimerType::tcc, TCC1_IRQn, TC_PRIORITY(1) }, // 1 - stepper (needed by 32 bit timers)
4949
{ {.pTcc=TCC2}, TimerType::tcc, TCC2_IRQn, 5 }, // 2 - tone (reserved by framework and fixed assigned priority 5)
50-
{ {.pTc=TC3}, TimerType::tc, TC3_IRQn, TC_PRIORITY(3) }, // 3 - servo (assigned priority 1)
51-
{ {.pTc=TC4}, TimerType::tc, TC4_IRQn, TC_PRIORITY(4) }, // 4 - software serial (no interrupts used)
52-
{ {.pTc=TC5}, TimerType::tc, TC5_IRQn, TC_PRIORITY(5) },
53-
{ {.pTc=TC6}, TimerType::tc, TC6_IRQn, TC_PRIORITY(6) },
54-
{ {.pTc=TC7}, TimerType::tc, TC7_IRQn, TC_PRIORITY(7) },
50+
{ {.pTc=TC3}, TimerType::tc, TC3_IRQn, TC_PRIORITY(3) }, // 3 - servo (assigned priority 1)
51+
{ {.pTc=TC4}, TimerType::tc, TC4_IRQn, TC_PRIORITY(4) }, // 4 - software serial (no interrupts used)
52+
{ {.pTc=TC5}, TimerType::tc, TC5_IRQn, TC_PRIORITY(5) },
53+
{ {.pTc=TC6}, TimerType::tc, TC6_IRQn, TC_PRIORITY(6) },
54+
{ {.pTc=TC7}, TimerType::tc, TC7_IRQn, TC_PRIORITY(7) },
5555
{ {.pRtc=RTC}, TimerType::rtc, RTC_IRQn, TC_PRIORITY(8) } // 8 - temperature (assigned priority 6)
5656
};
5757

Marlin/src/feature/pause.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
211211
while (wait_for_user) {
212212
impatient_beep(max_beep_count);
213213
#if BOTH(FILAMENT_CHANGE_RESUME_ON_INSERT, FILAMENT_RUNOUT_SENSOR)
214-
#if ENABLED(MULTI_FILAMENT_SENSOR)
214+
#if MULTI_FILAMENT_SENSOR
215215
#define _CASE_INSERTED(N) case N-1: if (READ(FIL_RUNOUT##N##_PIN) != FIL_RUNOUT##N##_STATE) wait_for_user = false; break;
216216
switch (active_extruder) {
217217
REPEAT_1(NUM_RUNOUT_SENSORS, _CASE_INSERTED)

Marlin/src/pins/stm32f1/pins_CREALITY_V427.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
//
3434
#define X_STEP_PIN PB9
3535
#define X_DIR_PIN PC2
36-
#define Y_STEP_PIN PB7
3736

37+
#define Y_STEP_PIN PB7
3838
#define Y_DIR_PIN PB8
39+
3940
#define Z_STEP_PIN PB5
4041
#define Z_DIR_PIN PB6
4142

buildroot/share/PlatformIO/scripts/preflight-checks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,5 @@ def rm_ofile(subdir, name):
132132
if 'FILAMENT_RUNOUT_SCRIPT' in env['MARLIN_FEATURES'] and "%c" not in env['MARLIN_FEATURES']['FILAMENT_RUNOUT_SCRIPT']:
133133
err = "ERROR: FILAMENT_RUNOUT_SCRIPT needs a %c parameter when NUM_RUNOUT_SENSORS is > 1"
134134
raise SystemExit(err)
135-
135+
136136
sanity_check_target()

0 commit comments

Comments
 (0)