CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10498 from xC0000005/MalyanLCDFix

Browse Source 
Fix overridden Malyan LCD functions
This commit is contained in:
Scott Lahteine 2018-04-23 17:22:43 -05:00 committed by GitHub
commit 8177c4334e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/ultralcd.h
View File

@ -28,6 +28,13 @@
#if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD) #if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD)
void lcd_init(); void lcd_init();
bool lcd_detected(); bool lcd_detected();
void lcd_update();
void lcd_setalertstatusPGM(const char* message);
#else
inline void lcd_init() {}
inline bool lcd_detected() { return true; }
inline void lcd_update() {}
inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
#endif #endif
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
@ -52,7 +59,6 @@
constexpr bool lcd_wait_for_move = false; constexpr bool lcd_wait_for_move = false;
#endif #endif
void lcd_update();
bool lcd_hasstatus(); bool lcd_hasstatus();
void lcd_setstatus(const char* message, const bool persist=false); void lcd_setstatus(const char* message, const bool persist=false);
void lcd_setstatusPGM(const char* message, const int8_t level=0); void lcd_setstatusPGM(const char* message, const int8_t level=0);
@ -230,20 +236,16 @@
void wait_for_release(); void wait_for_release();
#endif #endif
#else // no LCD #else // MALYAN_LCD or no LCD
constexpr bool lcd_wait_for_move = false; constexpr bool lcd_wait_for_move = false;
inline void lcd_init() {}
inline bool lcd_detected() { return true; }
inline void lcd_update() {}
inline void lcd_refresh() {} inline void lcd_refresh() {}
inline void lcd_buttons_update() {} inline void lcd_buttons_update() {}
inline bool lcd_hasstatus() { return false; } inline bool lcd_hasstatus() { return false; }
inline void lcd_setstatus(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); } inline void lcd_setstatus(const char* const message, const bool persist=false) { UNUSED(message); UNUSED(persist); }
inline void lcd_setstatusPGM(const char* const message, const int8_t level=0) { UNUSED(message); UNUSED(level); } inline void lcd_setstatusPGM(const char* const message, const int8_t level=0) { UNUSED(message); UNUSED(level); }
inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); } inline void lcd_status_printf_P(const uint8_t level, const char * const fmt, ...) { UNUSED(level); UNUSED(fmt); }
inline void lcd_setalertstatusPGM(const char* message) { UNUSED(message); }
inline void lcd_reset_alert_level() {} inline void lcd_reset_alert_level() {}
inline void lcd_reset_status() {} inline void lcd_reset_status() {}

21
platformio.ini
View File

@ -282,3 +282,24 @@ lib_deps = ${common.lib_deps}
lib_ignore = Adafruit NeoPixel lib_ignore = Adafruit NeoPixel
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
monitor_baud = 250000 monitor_baud = 250000
[env:malyanm200]
platform = ststm32
framework = arduino
board = malyanM200
build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
src_filter = ${common.default_src_filter}
#-<frameworks>
lib_ignore =
U8glib
LiquidCrystal_I2C
LiquidCrystal
NewliquidCrystal
LiquidTWI2
Adafruit NeoPixel
TMC2130Stepper
Servo(STM32F1)
TMC26XStepper
U8glib-HAL
TMC2208Stepper
c1921b4