ソースを参照

🩹 Fix Switching Toolhead compile (#24814)

Adam 1年前
コミット
6cc11b76fd
コミッターのメールアドレスに関連付けられたアカウントが存在しません

+ 5
- 6
Marlin/src/module/tool_change.cpp ファイルの表示

440
     }
440
     }
441
   }
441
   }
442
 
442
 
443
+
444
+#endif // TOOL_SENSOR
445
+
446
+#if ENABLED(SWITCHING_TOOLHEAD)
447
+
443
   inline void switching_toolhead_lock(const bool locked) {
448
   inline void switching_toolhead_lock(const bool locked) {
444
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
449
     #ifdef SWITCHING_TOOLHEAD_SERVO_ANGLES
445
       const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
450
       const uint16_t swt_angles[2] = SWITCHING_TOOLHEAD_SERVO_ANGLES;
452
     #endif
457
     #endif
453
   }
458
   }
454
 
459
 
455
-  #include <bitset>
456
-
457
   void swt_init() {
460
   void swt_init() {
458
     switching_toolhead_lock(true);
461
     switching_toolhead_lock(true);
459
 
462
 
494
     #endif // TOOL_SENSOR
497
     #endif // TOOL_SENSOR
495
   }
498
   }
496
 
499
 
497
-#endif // TOOL_SENSOR
498
-
499
-#if ENABLED(SWITCHING_TOOLHEAD)
500
-
501
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
500
   inline void switching_toolhead_tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
502
     if (no_move) return;
501
     if (no_move) return;
503
 
502
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h ファイルの表示

234
 #elif ENABLED(FYSETC_MINI_12864_2_1)
234
 #elif ENABLED(FYSETC_MINI_12864_2_1)
235
 
235
 
236
   #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
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
   #endif
238
   #endif
239
 
239
 
240
   #if SD_CONNECTION_IS(LCD)
240
   #if SD_CONNECTION_IS(LCD)

+ 1
- 1
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h ファイルの表示

311
     #elif ENABLED(FYSETC_MINI_12864_2_1)
311
     #elif ENABLED(FYSETC_MINI_12864_2_1)
312
 
312
 
313
       #ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
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
       #endif
315
       #endif
316
 
316
 
317
       /**
317
       /**

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c ファイルの表示

59
   //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
59
   //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
60
   //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
60
   //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
61
   //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
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
   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
63
   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
64
   //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
64
   //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
65
   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
65
   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8

読み込み中…
キャンセル
保存