From 2fe21f43e9087660a8a34f1864652dbd83a87fea Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Thu, 8 Mar 2018 16:01:39 -0700 Subject: [PATCH] Fixes to CLCD and ST7920 UIs. - Fixed compile error with ST7920 UI. - Corrected landscape oriented screens on CLCD. - Added configuration type for demo CLCD. --- Marlin/AO_FT810_Pins.h | 4 ++-- Marlin/AO_FT810_UI_Screens.h | 23 +++++++++--------- Marlin/Conditionals_LulzBot.h | 38 ++++++++++++++++++++++++++---- Marlin/status_screen_lite_ST7920.h | 2 +- 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/Marlin/AO_FT810_Pins.h b/Marlin/AO_FT810_Pins.h index d21642892..d24469e93 100644 --- a/Marlin/AO_FT810_Pins.h +++ b/Marlin/AO_FT810_Pins.h @@ -30,7 +30,7 @@ #define CLCD_MOD_RESET 93 // PB2 J20 Pin-8 #endif -#if defined(LULZBOT_Gladiola_Mini_CLCD) // MINI RAMBO P1 HEADER +5V Pin-10 GND Pin-9 +#if LULZBOT_MOTHERBOARD == BOARD_MINIRAMBO // MINI RAMBO P1 HEADER +5V Pin-10 GND Pin-9 #define CLCD_BB_SPI_SCLK 71 // PG3 P1 Pin-8 #define CLCD_BB_SPI_MOSI 85 // PH7 P1 Pin-7 #define CLCD_BB_SPI_CS 70 // PG4 P1 Pin-6 @@ -41,7 +41,7 @@ #define CLCD_AUX_2 84 // PH2 P1 Pin-1 #endif -#if defined(LULZBOT_Hibiscus_Mini2_CLCD) // EINSY P1 HEADER +5V Pin-1 GND Pin-2 +#if LULZBOT_MOTHERBOARD == BOARD_EINSYRAMBO // EINSY P1 HEADER +5V Pin-1 GND Pin-2 #define CLCD_BB_SPI_SCLK 71 // PG3 P1 Pin-3 #define CLCD_BB_SPI_MOSI 85 // PH7 P1 Pin-4 #define CLCD_BB_SPI_CS 70 // PG4 P1 Pin-5 diff --git a/Marlin/AO_FT810_UI_Screens.h b/Marlin/AO_FT810_UI_Screens.h index f82aa1f22..a5ffac53b 100644 --- a/Marlin/AO_FT810_UI_Screens.h +++ b/Marlin/AO_FT810_UI_Screens.h @@ -897,9 +897,9 @@ void StatusScreen::static_interaction_buttons() { CLCD::CommandFifo cmd; #if defined(LCD_PORTRAIT) - BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(3,9), BTN_SIZE(2,1), F("MENU"), MENU_BTN_STYLE); + BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(3,9), BTN_SIZE(2,1), F("MENU"), MENU_BTN_STYLE); #else - BTN_TAG(4) THEME(back_btn) BTN( BTN_POS(4,7), BTN_SIZE(1,2), F("MENU"), MENU_BTN_STYLE); + BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(4,7), BTN_SIZE(1,2), F("MENU"), MENU_BTN_STYLE); #endif } @@ -1064,17 +1064,16 @@ void MenuScreen::onRefresh() { #else BTN_TAG(2) BTN_ENABLED(1) BTN( BTN_POS(1,1), BTN_SIZE(1,1), F("Auto Home"), MENU_BTN_STYLE); BTN_TAG(3) BTN_ENABLED(1) BTN( BTN_POS(1,2), BTN_SIZE(1,1), F("Move Axis"), MENU_BTN_STYLE); - BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(1,3), BTN_SIZE(1,1), F("Disable Steppers"), MENU_BTN_STYLE); - BTN_TAG(6) BTN_ENABLED(0) BTN( BTN_POS(1,4), BTN_SIZE(2,1), F("Change Filament"), MENU_BTN_STYLE); + BTN_TAG(6) BTN_ENABLED(0) BTN( BTN_POS(1,3), BTN_SIZE(1,1), F("Change Filament"), MENU_BTN_STYLE); + BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(1,4), BTN_SIZE(1,1), F("Disable Steppers"), MENU_BTN_STYLE); BTN_TAG(5) BTN_ENABLED(1) BTN( BTN_POS(2,1), BTN_SIZE(1,1), F("Temperature"), MENU_BTN_STYLE); BTN_TAG(7) BTN_ENABLED(1) BTN( BTN_POS(2,2), BTN_SIZE(1,1), F("Advanced Settings"), MENU_BTN_STYLE); BTN_TAG(8) BTN_ENABLED(1) BTN( BTN_POS(2,3), BTN_SIZE(1,1), F("About Firmware"), MENU_BTN_STYLE); #endif - #define MARGIN_T 15 - #if defined(LCD_PORTRAIT) + #define MARGIN_T 15 BTN_TAG(1) THEME(back_btn) BTN( BTN_POS(1,7), BTN_SIZE(2,1), F("Back"), MENU_BTN_STYLE); #else BTN_TAG(1) THEME(back_btn) BTN( BTN_POS(2,4), BTN_SIZE(1,1), F("Back"), MENU_BTN_STYLE); @@ -1138,13 +1137,13 @@ void AdvancedSettingsScreen::onRefresh() { BTN_TAG(2) BTN_ENABLED(1) BTN( BTN_POS(1,6), BTN_SIZE(2,1), F("Save As Default"), MENU_BTN_STYLE); BTN_TAG(1) THEME(back_btn) BTN( BTN_POS(1,7), BTN_SIZE(2,1), F("Back"), MENU_BTN_STYLE); #else - BTN_TAG(3) BTN_ENABLED(1) BTN( BTN_POS(1,1), BTN_SIZE(1,1), F("Z Offset "), MENU_BTN_STYLE); - BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(1,2), BTN_SIZE(1,1), F("Steps/mm"), MENU_BTN_STYLE); + BTN_TAG(4) BTN_ENABLED(1) BTN( BTN_POS(1,1), BTN_SIZE(1,1), F("Z Offset "), MENU_BTN_STYLE); + BTN_TAG(5) BTN_ENABLED(1) BTN( BTN_POS(1,2), BTN_SIZE(1,1), F("Steps/mm"), MENU_BTN_STYLE); - BTN_TAG(5) BTN_ENABLED(0) BTN( BTN_POS(2,1), BTN_SIZE(1,1), F("Velocity "), MENU_BTN_STYLE); - BTN_TAG(6) BTN_ENABLED(0) BTN( BTN_POS(2,2), BTN_SIZE(1,1), F("Acceleration"), MENU_BTN_STYLE); - BTN_TAG(7) BTN_ENABLED(0) BTN( BTN_POS(2,3), BTN_SIZE(1,1), F("Jerk"), MENU_BTN_STYLE); - BTN_TAG(8) BTN_ENABLED(1) BTN( BTN_POS(1,3), BTN_SIZE(1,1), F("Restore Failsafe"), MENU_BTN_STYLE); + BTN_TAG(6) BTN_ENABLED(0) BTN( BTN_POS(2,1), BTN_SIZE(1,1), F("Velocity "), MENU_BTN_STYLE); + BTN_TAG(7) BTN_ENABLED(0) BTN( BTN_POS(2,2), BTN_SIZE(1,1), F("Acceleration"), MENU_BTN_STYLE); + BTN_TAG(8) BTN_ENABLED(0) BTN( BTN_POS(2,3), BTN_SIZE(1,1), F("Jerk"), MENU_BTN_STYLE); + BTN_TAG(10) BTN_ENABLED(1) BTN( BTN_POS(1,3), BTN_SIZE(1,1), F("Restore Failsafe"), MENU_BTN_STYLE); BTN_TAG(2) BTN_ENABLED(1) BTN( BTN_POS(1,4), BTN_SIZE(1,1), F("Save"), MENU_BTN_STYLE); BTN_TAG(1) THEME(back_btn) BTN( BTN_POS(2,4), BTN_SIZE(1,1), F("Back"), MENU_BTN_STYLE); diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index a24f57c3a..e1ef581c4 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -23,7 +23,8 @@ !defined(LULZBOT_Hibiscus_Mini2) && \ !defined(LULZBOT_Hibiscus_Mini2_CLCD) && \ !defined(LULZBOT_Quiver_TAZ7) && \ - !defined(LULZBOT_Quiver_TAZ7_CLCD) \ + !defined(LULZBOT_Quiver_TAZ7_CLCD) && \ + !defined(LULZBOT_Prototype_DemoCLCD) \ ) || ( \ !defined(TOOLHEAD_Gladiola_SingleExtruder) && \ !defined(TOOLHEAD_Albatross_Flexystruder) && \ @@ -131,6 +132,7 @@ #define LULZBOT_USE_EINSY_RETRO #define LULZBOT_USE_TOUCH_UI #define LULZBOT_USE_HIGH_RES + #define LULZBOT_USE_PORTRAIT_UI #define LULZBOT_TWO_PIECE_BED #define LULZBOT_USE_AUTOLEVELING #define LULZBOT_SENSORLESS_HOMING @@ -170,6 +172,7 @@ #define LULZBOT_TWO_PIECE_BED #define LULZBOT_USE_TOUCH_UI #define LULZBOT_USE_HIGH_RES + #define LULZBOT_USE_PORTRAIT_UI #define LULZBOT_USE_AUTOLEVELING #define LULZBOT_USE_MIN_ENDSTOPS #define LULZBOT_USE_MAX_ENDSTOPS @@ -181,6 +184,28 @@ #define LULZBOT_USE_EXPERIMENTAL_FEATURES #endif +#if defined(LULZBOT_Prototype_DemoCLCD) + #define LULZBOT_CUSTOM_MACHINE_NAME "LulzBot TAZ" + #define LULZBOT_LCD_MACHINE_NAME "TAZ" + #define LULZBOT_IS_MINI + #define LULZBOT_MINI_BED + #define LULZBOT_USE_EINSYRAMBO + #define LULZBOT_USE_EINSY_RETRO + #define LULZBOT_USE_TOUCH_UI + #define LULZBOT_USE_HIGH_RES + #define LULZBOT_USE_PORTRAIT_UI + #define LULZBOT_TWO_PIECE_BED + #define LULZBOT_USE_AUTOLEVELING + #define LULZBOT_SENSORLESS_HOMING + #define LULZBOT_USE_TMC_STEALTHCHOP_Z + #define LULZBOT_USE_Z_BELT + #define LULZBOT_BAUDRATE 250000 + #define LULZBOT_PRINTCOUNTER + #define LULZBOT_USE_32_MICROSTEPS_ON_Z + #define LULZBOT_UUID "e5502411-d46d-421d-ba3a-a20126d7930f" + #define LULZBOT_USE_EXPERIMENTAL_FEATURES +#endif + /****************************** DEBUGGING OPTIONS *******************************/ //#define LULZBOT_TMC_SHOW_CURRENT_ADJUSTMENTS @@ -1752,15 +1777,18 @@ #if defined(LULZBOT_USE_TOUCH_UI) extern void lcd_update(); extern void lcd_buttons_update(); - //#define LCD_IS_FT800 - #define LCD_IS_FT810 #if defined(LULZBOT_USE_HIGH_RES) #define LCD_800x480 #else #define LCD_480x272 #endif - #define LCD_PORTRAIT - #define LCD_UPSIDE_DOWN + #if defined(LULZBOT_USE_PORTRAIT_UI) + #define LCD_PORTRAIT + #define LCD_UPSIDE_DOWN + #define LCD_IS_FT810 + #else + #define LCD_IS_FT800 + #endif #define UI_FRAMEWORK_DEBUG #define LULZBOT_SDSUPPORT #define LULZBOT_DISABLE_SD_DETECT_INVERTED diff --git a/Marlin/status_screen_lite_ST7920.h b/Marlin/status_screen_lite_ST7920.h index 64c8544d9..3b5d28e85 100644 --- a/Marlin/status_screen_lite_ST7920.h +++ b/Marlin/status_screen_lite_ST7920.h @@ -831,7 +831,7 @@ void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) { void ST7920_Lite_Status_Screen::update_progress(const bool forceUpdate) { #if DISABLED(LCD_SET_PROGRESS_MANUALLY) - const uint8_t progress_bar_percent; + uint8_t progress_bar_percent; #endif // Set current percentage from SD when actively printing