Browse Source

🩹 Fix Switching Toolhead compile (#24814)

Adam 1 year ago
parent
commit
6cc11b76fd
No account linked to committer's email address

+ 5
- 6
Marlin/src/module/tool_change.cpp View File

@@ -440,6 +440,11 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
440 440
     }
441 441
   }
442 442
 
443
+
444
+#endif // TOOL_SENSOR
445
+
446
+#if ENABLED(SWITCHING_TOOLHEAD)
447
+
443 448
   inline void switching_toolhead_lock(const bool locked) {
444 449
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
445 450
       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.
452 457
     #endif
453 458
   }
454 459
 
455
-  #include <bitset>
456
-
457 460
   void swt_init() {
458 461
     switching_toolhead_lock(true);
459 462
 
@@ -494,10 +497,6 @@ void fast_line_to_current(const AxisEnum fr_axis) { _line_to_current(fr_axis, 0.
494 497
     #endif // TOOL_SENSOR
495 498
   }
496 499
 
497
-#endif // TOOL_SENSOR
498
-
499
-#if ENABLED(SWITCHING_TOOLHEAD)
500
-
501 500
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
502 501
     if (no_move) return;
503 502
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

@@ -234,7 +234,7 @@
234 234
 #elif ENABLED(FYSETC_MINI_12864_2_1)
235 235
 
236 236
   #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."
238 238
   #endif
239 239
 
240 240
   #if SD_CONNECTION_IS(LCD)

+ 1
- 1
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h View File

@@ -311,7 +311,7 @@
311 311
     #elif ENABLED(FYSETC_MINI_12864_2_1)
312 312
 
313 313
       #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."
315 315
       #endif
316 316
 
317 317
       /**

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c View File

@@ -59,7 +59,7 @@ WEAK const PinMap PinMap_ADC[] = {
59 59
   //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
60 60
   //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
61 61
   //{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
63 63
   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
64 64
   //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
65 65
   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8

Loading…
Cancel
Save