zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

General cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-08-06 00:49:15 -05:00
parent 41718cf55f
commit a9912681b4
8 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Marlin/src/core/multi_language.cpp
View file

2
Marlin/src/feature/spindle_laser.cpp
View file

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

2
Marlin/src/gcode/gcode.cpp
View file

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

2
Marlin/src/inc/Conditionals_post.h
View file

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

2
Marlin/src/lcd/menu/menu_motion.cpp
View file

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

2
Marlin/src/lcd/menu/menu_tmc.cpp
View file

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU #if HAS_LCD_MENU && HAS_TRINAMIC_CONFIG
#include "menu.h" #include "menu.h"
#include "../../module/stepper/indirection.h" #include "../../module/stepper/indirection.h"

4
Marlin/src/lcd/menu/menu_touch_screen.cpp
View file

@ -22,13 +22,15 @@
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(TOUCH_SCREEN_CALIBRATION) #if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
#include "menu.h" #include "menu.h"
#include "../ultralcd.h" #include "../ultralcd.h"
void touch_screen_calibration() { void touch_screen_calibration() {
ui.touch_calibration(); ui.touch_calibration();
} }
#endif // TOUCH_SCREEN_CALIBRATION #endif // TOUCH_SCREEN_CALIBRATION

2
Marlin/src/lcd/ultralcd.cpp
View file

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