Explorar el Código

General cleanup

Scott Lahteine hace 4 años
padre
commit
a9912681b4

+ 0
- 0
Marlin/src/core/multi_language.cpp Ver fichero


+ 1
- 1
Marlin/src/feature/spindle_laser.cpp Ver fichero

@@ -68,7 +68,7 @@ void SpindleLaser::init() {
68 68
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
69 69
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
70 70
       set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
71
-    #endif 
71
+    #endif
72 72
   }
73 73
   void SpindleLaser::ocr_off() {
74 74
     WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH);       // Turn spindle off

+ 1
- 1
Marlin/src/gcode/gcode.cpp Ver fichero

@@ -874,7 +874,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
874 874
       #if ENABLED(TOUCH_SCREEN_CALIBRATION)
875 875
         case 995: M995(); break;                                  // M995: Touch screen calibration for TFT display
876 876
       #endif
877
-      
877
+
878 878
       #if ENABLED(PLATFORM_M997_SUPPORT)
879 879
         case 997: M997(); break;                                  // M997: Perform in-application firmware update
880 880
       #endif

+ 1
- 1
Marlin/src/inc/Conditionals_post.h Ver fichero

@@ -2436,7 +2436,7 @@
2436 2436
  */
2437 2437
 #if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
2438 2438
   #define HAS_BUZZER 1
2439
-  #if DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
2439
+  #if NONE(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
2440 2440
     #define USE_BEEPER 1
2441 2441
   #endif
2442 2442
 #endif

+ 1
- 1
Marlin/src/lcd/menu/menu_motion.cpp Ver fichero

@@ -350,7 +350,7 @@ void menu_motion() {
350 350
   #if ENABLED(ASSISTED_TRAMMING)
351 351
     GCODES_ITEM(MSG_ASSISTED_TRAMMING, PSTR("G35"));
352 352
   #endif
353
-  
353
+
354 354
   //
355 355
   // Level Bed
356 356
   //

+ 1
- 1
Marlin/src/lcd/menu/menu_tmc.cpp Ver fichero

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include "../../inc/MarlinConfigPre.h"
28 28
 
29
-#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
29
+#if HAS_LCD_MENU && HAS_TRINAMIC_CONFIG
30 30
 
31 31
 #include "menu.h"
32 32
 #include "../../module/stepper/indirection.h"

+ 3
- 1
Marlin/src/lcd/menu/menu_touch_screen.cpp Ver fichero

@@ -22,13 +22,15 @@
22 22
 
23 23
 #include "../../inc/MarlinConfigPre.h"
24 24
 
25
-#if ENABLED(TOUCH_SCREEN_CALIBRATION)
25
+#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
26 26
 
27 27
 #include "menu.h"
28 28
 #include "../ultralcd.h"
29 29
 
30 30
 void touch_screen_calibration() {
31
+
31 32
   ui.touch_calibration();
33
+
32 34
 }
33 35
 
34 36
 #endif // TOUCH_SCREEN_CALIBRATION

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp Ver fichero

@@ -74,7 +74,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
74 74
   #endif
75 75
 #endif
76 76
 
77
-#if ENABLED(PCA9632_BUZZER) || USE_BEEPER
77
+#if EITHER(PCA9632_BUZZER, USE_BEEPER)
78 78
   #include "../libs/buzzer.h" // for BUZZ() macro
79 79
   #if ENABLED(PCA9632_BUZZER)
80 80
     #include "../feature/leds/pca9632.h"

Loading…
Cancelar
Guardar