Revert "General cleanup"

This reverts commit 66d401b.
ahmetcemturan · Jan 23, 2021 · 26991c0 · 26991c0
1 parent 89195d2
commit 26991c0
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/Marlin/src/core/multi_language.cpp b/Marlin/src/core/multi_language.cpp
diff --git a/Marlin/src/feature/spindle_laser.cpp b/Marlin/src/feature/spindle_laser.cpp
@@ -68,7 +68,7 @@ void SpindleLaser::init() {
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
       set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
-    #endif
+    #endif 
   }
   void SpindleLaser::ocr_off() {
     WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH);       // Turn spindle off

diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
@@ -874,7 +874,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
       #if ENABLED(TOUCH_SCREEN_CALIBRATION)
         case 995: M995(); break;                                  // M995: Touch screen calibration for TFT display
       #endif
-
+      
       #if ENABLED(PLATFORM_M997_SUPPORT)
         case 997: M997(); break;                                  // M997: Perform in-application firmware update
       #endif

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -2436,7 +2436,7 @@
  */
 #if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
   #define HAS_BUZZER 1
-  #if NONE(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
+  #if DISABLED(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
     #define USE_BEEPER 1
   #endif
 #endif

diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -350,7 +350,7 @@ void menu_motion() {
   #if ENABLED(ASSISTED_TRAMMING)
     GCODES_ITEM(MSG_ASSISTED_TRAMMING, PSTR("G35"));
   #endif
-
+  
   //
   // Level Bed
   //

diff --git a/Marlin/src/lcd/menu/menu_tmc.cpp b/Marlin/src/lcd/menu/menu_tmc.cpp
@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if HAS_LCD_MENU && HAS_TRINAMIC_CONFIG
+#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
 
 #include "menu.h"
 #include "../../module/stepper/indirection.h"

diff --git a/Marlin/src/lcd/menu/menu_touch_screen.cpp b/Marlin/src/lcd/menu/menu_touch_screen.cpp
@@ -22,15 +22,13 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
+#if ENABLED(TOUCH_SCREEN_CALIBRATION)
 
 #include "menu.h"
 #include "../ultralcd.h"
 
 void touch_screen_calibration() {
-
   ui.touch_calibration();
-
 }
 
 #endif // TOUCH_SCREEN_CALIBRATION
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
@@ -74,7 +74,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   #endif
 #endif
 
-#if EITHER(PCA9632_BUZZER, USE_BEEPER)
+#if ENABLED(PCA9632_BUZZER) || USE_BEEPER
   #include "../libs/buzzer.h" // for BUZZ() macro
   #if ENABLED(PCA9632_BUZZER)
     #include "../feature/leds/pca9632.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -350,7 +350,7 @@ void menu_motion() { @@
       #if ENABLED(ASSISTED_TRAMMING)
         GCODES_ITEM(MSG_ASSISTED_TRAMMING, PSTR("G35"));
       #endif
       //
       // Level Bed
       //
@@ Expand Down @@