bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

General cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2020-08-06 00:49:15 -05:00 committed by Scott Lahteine
parent 4201a48ecf
commit e8dc7cad18
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/inc/Conditionals_post.h
View File

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

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

@ -26,7 +26,7 @@
#include "../../inc/MarlinConfigPre.h"
#if HAS_TRINAMIC_CONFIG && HAS_LCD_MENU
#if HAS_LCD_MENU && HAS_TRINAMIC_CONFIG
#include "menu.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"
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
#if BOTH(HAS_LCD_MENU, TOUCH_SCREEN_CALIBRATION)
#include "menu.h"
#include "../ultralcd.h"
void touch_screen_calibration() {
ui.touch_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
#if ENABLED(PCA9632_BUZZER) || USE_BEEPER
#if EITHER(PCA9632_BUZZER, USE_BEEPER)
#include "../libs/buzzer.h" // for BUZZ() macro
#if ENABLED(PCA9632_BUZZER)
#include "../feature/leds/pca9632.h"