Browse Source

🩹 Remove extra #include, misc. style

Scott Lahteine 2 years ago
parent
commit
58301837e0

+ 1
- 3
Marlin/src/lcd/marlinui.cpp View File

1483
         next_filament_display = ms + 5000UL; // Show status message for 5s
1483
         next_filament_display = ms + 5000UL; // Show status message for 5s
1484
       #endif
1484
       #endif
1485
 
1485
 
1486
-      #if ENABLED(STATUS_MESSAGE_SCROLLING)
1487
-        status_scroll_offset = 0;
1488
-      #endif
1486
+      TERN_(STATUS_MESSAGE_SCROLLING, status_scroll_offset = 0);
1489
     #else // HAS_WIRED_LCD
1487
     #else // HAS_WIRED_LCD
1490
       UNUSED(persist);
1488
       UNUSED(persist);
1491
     #endif
1489
     #endif

+ 0
- 2
Marlin/src/pins/stm32f4/pins_ANET_ET4.h View File

23
 
23
 
24
 #include "env_validate.h"
24
 #include "env_validate.h"
25
 
25
 
26
-#include "env_validate.h"
27
-
28
 #if HOTENDS > 1 || E_STEPPERS > 1
26
 #if HOTENDS > 1 || E_STEPPERS > 1
29
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
27
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
28
 #endif

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h View File

244
 #define PIN_WIRE_SCL            PB6
244
 #define PIN_WIRE_SCL            PB6
245
 
245
 
246
 // Timer Definitions
246
 // Timer Definitions
247
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
247
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
248
 #define TIMER_TONE              TIM7
248
 #define TIMER_TONE              TIM7
249
 #define TIMER_SERVO             TIM5
249
 #define TIMER_SERVO             TIM5
250
 #define TIMER_SERIAL            TIM2
250
 #define TIMER_SERIAL            TIM2

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h View File

244
 #define PIN_WIRE_SCL            PB8
244
 #define PIN_WIRE_SCL            PB8
245
 
245
 
246
 // Timer Definitions
246
 // Timer Definitions
247
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
247
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
248
 #define TIMER_TONE              TIM7
248
 #define TIMER_TONE              TIM7
249
 #define TIMER_SERVO             TIM5
249
 #define TIMER_SERVO             TIM5
250
 #define TIMER_SERIAL            TIM8
250
 #define TIMER_SERIAL            TIM8

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h View File

254
 #endif
254
 #endif
255
 
255
 
256
 // Timer Definitions
256
 // Timer Definitions
257
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
257
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
258
 #define TIMER_TONE              TIM10
258
 #define TIMER_TONE              TIM10
259
 #define TIMER_SERVO             TIM5
259
 #define TIMER_SERVO             TIM5
260
 #define TIMER_SERIAL            TIM7
260
 #define TIMER_SERIAL            TIM7

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h View File

254
 #endif
254
 #endif
255
 
255
 
256
 // Timer Definitions
256
 // Timer Definitions
257
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
257
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
258
 #define TIMER_TONE              TIM2
258
 #define TIMER_TONE              TIM2
259
 #define TIMER_SERVO             TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
259
 #define TIMER_SERVO             TIM5 // Only 1 Servo PIN on SKR-PRO, so use the same timer as defined in PeripheralPins
260
 #define TIMER_SERIAL            TIM7
260
 #define TIMER_SERIAL            TIM7

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h View File

156
 #define NUM_ANALOG_FIRST        108
156
 #define NUM_ANALOG_FIRST        108
157
 
157
 
158
 // Timer Definitions
158
 // Timer Definitions
159
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
159
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
160
 #define TIMER_TONE              TIM2
160
 #define TIMER_TONE              TIM2
161
 #define TIMER_SERVO             TIM5
161
 #define TIMER_SERVO             TIM5
162
 #define TIMER_SERIAL            TIM7
162
 #define TIMER_SERIAL            TIM7

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h View File

298
 #define PIN_WIRE_SCL            PB6
298
 #define PIN_WIRE_SCL            PB6
299
 
299
 
300
 // Timer Definitions
300
 // Timer Definitions
301
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
301
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
302
 #define TIMER_TONE              TIM6
302
 #define TIMER_TONE              TIM6
303
 
303
 
304
 // Do not use basic timer: OC is required
304
 // Do not use basic timer: OC is required

+ 1
- 1
buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h View File

184
 #define PIN_WIRE_SCL            PB6
184
 #define PIN_WIRE_SCL            PB6
185
 
185
 
186
 // Timer Definitions
186
 // Timer Definitions
187
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
187
+// Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
188
 #define TIMER_TONE              TIM6
188
 #define TIMER_TONE              TIM6
189
 
189
 
190
 // Do not use basic timer: OC is required
190
 // Do not use basic timer: OC is required

Loading…
Cancel
Save