Skip to content

Commit d6ff8f0

Browse files
aamottthinkyhead
authored andcommittedDec 16, 2022
🩹 Fix Switching Toolhead compile (MarlinFirmware#24814)
1 parent 8b37b60 commit d6ff8f0

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed
 

‎Marlin/src/module/tool_change.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,11 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
440440
}
441441
}
442442

443+
444+
#endif // TOOL_SENSOR
445+
446+
#if ENABLED(SWITCHING_TOOLHEAD)
447+
443448
inline void switching_toolhead_lock(const bool locked) {
444449
#ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
445450
const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
@@ -452,8 +457,6 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
452457
#endif
453458
}
454459

455-
#include <bitset>
456-
457460
void swt_init() {
458461
switching_toolhead_lock(true);
459462

@@ -494,10 +497,6 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
494497
#endif // TOOL_SENSOR
495498
}
496499

497-
#endif // TOOL_SENSOR
498-
499-
#if ENABLED(SWITCHING_TOOLHEAD)
500-
501500
inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
502501
if (no_move) return;
503502

‎Marlin/src/pins/stm32f1/pins_CREALITY_V4.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
#elif ENABLED(FYSETC_MINI_12864_2_1)
235235

236236
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
237-
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
237+
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_CREALITY_V4.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
238238
#endif
239239

240240
#if SD_CONNECTION_IS(LCD)

‎Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
#elif ENABLED(FYSETC_MINI_12864_2_1)
312312

313313
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
314-
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning"
314+
#error "CAUTION! FYSETC_MINI_12864_2_1 and clones require wiring modifications. See 'pins_BTT_SKR_MINI_E3_V3_0.h' for details. Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning."
315315
#endif
316316

317317
/**

‎buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ WEAK const PinMap PinMap_ADC[] = {
5959
//{PA_5, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
6060
//{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
6161
//{PA_6, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
62-
//{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
62+
//{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
6363
//{PA_7, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
6464
//{PB_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
6565
//{PB_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8

0 commit comments

Comments
 (0)
Please sign in to comment.