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

Fix compilation errors. Followup to #12439 (#12481)

Browse source
This commit is contained in:
Marcio Teixeira 2018-11-19 23:02:13 -07:00 committed by Scott Lahteine
parent 90a58488b5
commit 50ee747787
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -134,7 +134,6 @@ namespace ExtUI {
// The ms count is // The ms count is
return (uint32_t)(currTime / (F_CPU / 8000)); return (uint32_t)(currTime / (F_CPU / 8000));
} }
#endif // __SAM3X8E__ #endif // __SAM3X8E__
void delay_us(unsigned long us) { void delay_us(unsigned long us) {

2
Marlin/src/lcd/extensible_ui/ui_api.h
View file

@ -179,7 +179,7 @@ namespace ExtUI {
#ifdef __SAM3X8E__ #ifdef __SAM3X8E__
uint32_t safe_millis(); uint32_t safe_millis();
#else #else
#define safe_millis() millis() // TODO: Implement for AVR FORCE_INLINE uint32_t safe_millis() { return millis(); } // TODO: Implement for AVR
#endif #endif
void delay_us(unsigned long us); void delay_us(unsigned long us);

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

@ -29,12 +29,31 @@
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#include "../sd/cardreader.h" #include "../sd/cardreader.h"
#endif #endif
#if ENABLED(EXTENSIBLE_UI) #if ENABLED(EXTENSIBLE_UI)
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u) #define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
#endif #endif
#endif #endif
#if HAS_SPI_LCD
#if ENABLED(STATUS_MESSAGE_SCROLLING)
uint8_t MarlinUI::status_scroll_offset; // = 0
#if LONG_FILENAME_LENGTH > CHARSIZE * 2 * (LCD_WIDTH)
#define MAX_MESSAGE_LENGTH LONG_FILENAME_LENGTH
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
#endif
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif
#elif ENABLED(EXTENSIBLE_UI)
#define MAX_MESSAGE_LENGTH 63
#endif
#ifdef MAX_MESSAGE_LENGTH
uint8_t MarlinUI::status_message_level; // = 0
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
#endif
#if HAS_SPI_LCD #if HAS_SPI_LCD
#if HAS_GRAPHICAL_LCD #if HAS_GRAPHICAL_LCD
@ -75,24 +94,6 @@
uint8_t lcd_sd_status; uint8_t lcd_sd_status;
#endif #endif
#if ENABLED(STATUS_MESSAGE_SCROLLING)
uint8_t MarlinUI::status_scroll_offset; // = 0
#if LONG_FILENAME_LENGTH > CHARSIZE * 2 * (LCD_WIDTH)
#define MAX_MESSAGE_LENGTH LONG_FILENAME_LENGTH
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
#endif
#elif ENABLED(EXTENSIBLE_UI)
#define MAX_MESSAGE_LENGTH 63
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif
#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
uint8_t MarlinUI::status_message_level; // = 0
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
#endif
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS #if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
bool MarlinUI::defer_return_to_status; bool MarlinUI::defer_return_to_status;
#endif #endif