forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8526 from thinkyhead/bf1_lcd_init_charset

Browse Source 
[1.1.x] Fix up LCD init / charset
master
Scott Lahteine 7 years ago committed by GitHub
parent e2568d7589 99b71c1dde
commit 3958ff8627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 135 additions and 109 deletions
Show Stats Download Patch File Download Diff File

7
Marlin/Marlin_main.cpp
Unescape View File

@ -8414,7 +8414,7 @@ inline void gcode_M18_M84() {
} }
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) // Only needed with an LCD #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) // Only needed with an LCD
ubl_lcd_map_control = defer_return_to_status = false; ubl.lcd_map_control = defer_return_to_status = false;
#endif #endif
} }
} }
@ -13483,7 +13483,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
disable_e_steppers(); disable_e_steppers();
#endif #endif
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) // Only needed with an LCD #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD) // Only needed with an LCD
ubl_lcd_map_control = defer_return_to_status = false; ubl.lcd_map_control = defer_return_to_status = false;
#endif #endif
} }
@ -13904,9 +13904,6 @@ void setup() {
#if ENABLED(SHOW_BOOTSCREEN) #if ENABLED(SHOW_BOOTSCREEN)
lcd_bootscreen(); lcd_bootscreen();
#if DISABLED(DOGLCD) && ENABLED(ULTRA_LCD) && DISABLED(SDSUPPORT)
lcd_init();
#endif
#endif #endif
#if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1 #if ENABLED(MIXING_EXTRUDER) && MIXING_VIRTUAL_TOOLS > 1

10
Marlin/stepper.cpp
Unescape View File

@ -54,6 +54,10 @@
#include "cardreader.h" #include "cardreader.h"
#include "speed_lookuptable.h" #include "speed_lookuptable.h"
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
#include "ubl.h"
#endif
#if HAS_DIGIPOTSS #if HAS_DIGIPOTSS
#include <SPI.h> #include <SPI.h>
#endif #endif
@ -62,10 +66,6 @@ Stepper stepper; // Singleton
// public: // public:
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
extern bool ubl_lcd_map_control;
#endif
block_t* Stepper::current_block = NULL; // A pointer to the block currently being traced block_t* Stepper::current_block = NULL; // A pointer to the block currently being traced
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
@ -1224,7 +1224,7 @@ void Stepper::finish_and_disable() {
void Stepper::quick_stop() { void Stepper::quick_stop() {
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL) #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTIPANEL)
if (!ubl_lcd_map_control) if (!ubl.lcd_map_control)
cleaning_buffer_counter = 5000; cleaning_buffer_counter = 5000;
#else #else
cleaning_buffer_counter = 5000; cleaning_buffer_counter = 5000;

4
Marlin/ubl.cpp
Unescape View File

@ -73,6 +73,10 @@
bool unified_bed_leveling::g26_debug_flag = false, bool unified_bed_leveling::g26_debug_flag = false,
unified_bed_leveling::has_control_of_lcd_panel = false; unified_bed_leveling::has_control_of_lcd_panel = false;
#if ENABLED(ULTIPANEL)
bool unified_bed_leveling::lcd_map_control = false;
#endif
volatile int unified_bed_leveling::encoder_diff; volatile int unified_bed_leveling::encoder_diff;
unified_bed_leveling::unified_bed_leveling() { unified_bed_leveling::unified_bed_leveling() {

10
Marlin/ubl.h
Unescape View File

@ -46,9 +46,9 @@
// ubl.cpp // ubl.cpp
void bit_clear(uint16_t bits[16], const uint8_t x, const uint8_t y); void bit_clear(uint16_t bits[16], const uint8_t x, const uint8_t y);
void bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y); void bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y);
bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y); bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y);
// ubl_motion.cpp // ubl_motion.cpp
@ -191,6 +191,10 @@ bool is_bit_set(uint16_t bits[16], const uint8_t x, const uint8_t y);
static bool g26_debug_flag, has_control_of_lcd_panel; static bool g26_debug_flag, has_control_of_lcd_panel;
#if ENABLED(ULTIPANEL)
static bool lcd_map_control;
#endif
static volatile int encoder_diff; // Volatile because it's changed at interrupt time. static volatile int encoder_diff; // Volatile because it's changed at interrupt time.
unified_bed_leveling(); unified_bed_leveling();

4
Marlin/ubl_G29.cpp
Unescape View File

@ -1526,7 +1526,7 @@
idle(); idle();
} while (!ubl_lcd_clicked()); } while (!ubl_lcd_clicked());
if (!ubl_lcd_map_control) lcd_return_to_status(); if (!lcd_map_control) lcd_return_to_status();
// The technique used here generates a race condition for the encoder click. // The technique used here generates a race condition for the encoder click.
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune) or here. // It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune) or here.
@ -1571,7 +1571,7 @@
LCD_MESSAGEPGM(MSG_UBL_DONE_EDITING_MESH); LCD_MESSAGEPGM(MSG_UBL_DONE_EDITING_MESH);
SERIAL_ECHOLNPGM("Done Editing Mesh"); SERIAL_ECHOLNPGM("Done Editing Mesh");
if (ubl_lcd_map_control) if (lcd_map_control)
lcd_goto_screen(_lcd_ubl_output_map_lcd); lcd_goto_screen(_lcd_ubl_output_map_lcd);
else else
lcd_return_to_status(); lcd_return_to_status();

25
Marlin/ultralcd.cpp
Unescape View File

@ -50,7 +50,6 @@
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
#include "ubl.h" #include "ubl.h"
bool ubl_lcd_map_control = false;
#elif HAS_ABL #elif HAS_ABL
#include "planner.h" #include "planner.h"
#elif ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING) #elif ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
@ -514,20 +513,22 @@ uint16_t max_display_update_time = 0;
if (screen == lcd_status_screen) { if (screen == lcd_status_screen) {
defer_return_to_status = false; defer_return_to_status = false;
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
ubl_lcd_map_control = false; ubl.lcd_map_control = false;
#endif #endif
screen_history_depth = 0; screen_history_depth = 0;
} }
lcd_implementation_clear(); lcd_implementation_clear();
// Re-initialize custom characters that may be re-used // Re-initialize custom characters that may be re-used
#if DISABLED(DOGLCD) && ENABLED(AUTO_BED_LEVELING_UBL) #if DISABLED(DOGLCD) && ENABLED(AUTO_BED_LEVELING_UBL)
if (!ubl_lcd_map_control) lcd_set_custom_characters( if (!ubl.lcd_map_control) {
lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
screen == lcd_status_screen screen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU
#endif #endif
); );
}
#elif ENABLED(LCD_PROGRESS_BAR) #elif ENABLED(LCD_PROGRESS_BAR)
lcd_set_custom_characters(screen == lcd_status_screen); lcd_set_custom_characters(screen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU);
#endif #endif
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
screen_changed = true; screen_changed = true;
@ -669,7 +670,7 @@ void lcd_status_screen() {
#endif #endif
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
false CHARSET_MENU
#endif #endif
); );
lcd_goto_screen(lcd_main_menu); lcd_goto_screen(lcd_main_menu);
@ -850,7 +851,7 @@ void kill_screen(const char* lcd_msg) {
static int8_t bar_percent = 0; static int8_t bar_percent = 0;
if (lcd_clicked) { if (lcd_clicked) {
lcd_goto_previous_menu(); lcd_goto_previous_menu();
lcd_set_custom_characters(false); lcd_set_custom_characters(CHARSET_MENU);
return; return;
} }
bar_percent += (int8_t)encoderPosition; bar_percent += (int8_t)encoderPosition;
@ -2356,7 +2357,7 @@ void kill_screen(const char* lcd_msg) {
void _lcd_ubl_map_homing() { void _lcd_ubl_map_homing() {
defer_return_to_status = true; defer_return_to_status = true;
ubl_lcd_map_control = true; // Return to the map screen ubl.lcd_map_control = true; // Return to the map screen
if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT < 3 ? 0 : (LCD_HEIGHT > 4 ? 2 : 1), PSTR(MSG_LEVEL_BED_HOMING)); if (lcdDrawUpdate) lcd_implementation_drawmenu_static(LCD_HEIGHT < 3 ? 0 : (LCD_HEIGHT > 4 ? 2 : 1), PSTR(MSG_LEVEL_BED_HOMING));
lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW; lcdDrawUpdate = LCDVIEW_CALL_NO_REDRAW;
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
@ -4469,11 +4470,7 @@ void kill_screen(const char* lcd_msg) {
void lcd_init() { void lcd_init() {
lcd_implementation_init( lcd_implementation_init();
#if ENABLED(LCD_PROGRESS_BAR)
true
#endif
);
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#if BUTTON_EXISTS(EN1) #if BUTTON_EXISTS(EN1)
@ -4642,7 +4639,7 @@ void lcd_update() {
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
currentScreen == lcd_status_screen currentScreen == lcd_status_screen ? CHARSET_INFO : CHARSET_MENU
#endif #endif
); );
} }

1
Marlin/ultralcd.h
Unescape View File

@ -193,7 +193,6 @@
void lcd_reset_status(); void lcd_reset_status();
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
extern bool ubl_lcd_map_control;
void lcd_mesh_edit_setup(float initial); void lcd_mesh_edit_setup(float initial);
float lcd_mesh_edit(); float lcd_mesh_edit();
void lcd_z_offset_edit_setup(float); void lcd_z_offset_edit_setup(float);

151
Marlin/ultralcd_impl_HD44780.h
Unescape View File

@ -218,11 +218,57 @@ static void createChar_P(const char c, const byte * const ptr) {
lcd.createChar(c, temp); lcd.createChar(c, temp);
} }
#define CHARSET_MENU 0
#define CHARSET_INFO 1
#define CHARSET_BOOT 2
static void lcd_set_custom_characters( static void lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN)
const bool info_screen_charset = true const uint8_t screen_charset=CHARSET_INFO
#endif #endif
) { ) {
// CHARSET_BOOT
#if ENABLED(SHOW_BOOTSCREEN)
const static PROGMEM byte corner[4][8] = { {
B00000,
B00000,
B00000,
B00000,
B00001,
B00010,
B00100,
B00100
}, {
B00000,
B00000,
B00000,
B11100,
B11100,
B01100,
B00100,
B00100
}, {
B00100,
B00010,
B00001,
B00000,
B00000,
B00000,
B00000,
B00000
}, {
B00100,
B01000,
B10000,
B00000,
B00000,
B00000,
B00000,
B00000
} };
#endif // SHOW_BOOTSCREEN
// CHARSET_INFO
const static PROGMEM byte bedTemp[8] = { const static PROGMEM byte bedTemp[8] = {
B00000, B00000,
B11111, B11111,
@ -290,6 +336,8 @@ static void lcd_set_custom_characters(
}; };
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// CHARSET_MENU
const static PROGMEM byte refresh[8] = { const static PROGMEM byte refresh[8] = {
B00000, B00000,
B00110, B00110,
@ -312,6 +360,8 @@ static void lcd_set_custom_characters(
}; };
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
// CHARSET_INFO
const static PROGMEM byte progress[3][8] = { { const static PROGMEM byte progress[3][8] = { {
B00000, B00000,
B10000, B10000,
@ -340,9 +390,31 @@ static void lcd_set_custom_characters(
B10101, B10101,
B00000 B00000
} }; } };
#endif
#endif // LCD_PROGRESS_BAR
#endif // SDSUPPORT
#if ENABLED(SHOW_BOOTSCREEN) || ENABLED(LCD_PROGRESS_BAR)
static uint8_t char_mode = 0;
#define CHAR_COND (screen_charset != char_mode)
#else
#define CHAR_COND true
#endif #endif
if (CHAR_COND) {
#if ENABLED(SHOW_BOOTSCREEN) || ENABLED(LCD_PROGRESS_BAR)
char_mode = screen_charset;
#if ENABLED(SHOW_BOOTSCREEN)
// Set boot screen corner characters
if (screen_charset == CHARSET_BOOT) {
for (uint8_t i = 4; i--;)
createChar_P(i, corner[i]);
}
else
#endif
#endif
{ // Info Screen uses 5 special characters
createChar_P(LCD_BEDTEMP_CHAR, bedTemp); createChar_P(LCD_BEDTEMP_CHAR, bedTemp);
createChar_P(LCD_DEGREE_CHAR, degree); createChar_P(LCD_DEGREE_CHAR, degree);
createChar_P(LCD_STR_THERMOMETER[0], thermometer); createChar_P(LCD_STR_THERMOMETER[0], thermometer);
@ -351,32 +423,28 @@ static void lcd_set_custom_characters(
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
static bool char_mode = false; if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen
if (info_screen_charset != char_mode) { for (int16_t i = 3; i--;)
char_mode = info_screen_charset; createChar_P(LCD_STR_PROGRESS[i], progress[i]);
if (info_screen_charset) { // Progress bar characters for info screen
for (int16_t i = 3; i--;) createChar_P(LCD_STR_PROGRESS[i], progress[i]);
} }
else { // Custom characters for submenus else
#endif
{ // SD Card sub-menu special characters
createChar_P(LCD_UPLEVEL_CHAR, uplevel); createChar_P(LCD_UPLEVEL_CHAR, uplevel);
createChar_P(LCD_STR_REFRESH[0], refresh); createChar_P(LCD_STR_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder); createChar_P(LCD_STR_FOLDER[0], folder);
} }
}
#else
createChar_P(LCD_UPLEVEL_CHAR, uplevel);
createChar_P(LCD_STR_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder);
#endif
#else #else
// With no SD support, only need the uplevel character
createChar_P(LCD_UPLEVEL_CHAR, uplevel); createChar_P(LCD_UPLEVEL_CHAR, uplevel);
#endif #endif
}
}
} }
static void lcd_implementation_init( static void lcd_implementation_init(
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
const bool info_screen_charset = true const uint8_t screen_charset=CHARSET_INFO
#endif #endif
) { ) {
@ -406,7 +474,7 @@ static void lcd_implementation_init(
lcd_set_custom_characters( lcd_set_custom_characters(
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
info_screen_charset screen_charset
#endif #endif
); );
@ -458,46 +526,7 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
} }
void lcd_bootscreen() { void lcd_bootscreen() {
const static PROGMEM byte corner[4][8] = { { lcd_set_custom_characters(CHARSET_BOOT);
B00000,
B00000,
B00000,
B00000,
B00001,
B00010,
B00100,
B00100
}, {
B00000,
B00000,
B00000,
B11100,
B11100,
B01100,
B00100,
B00100
}, {
B00100,
B00010,
B00001,
B00000,
B00000,
B00000,
B00000,
B00000
}, {
B00100,
B01000,
B10000,
B00000,
B00000,
B00000,
B00000,
B00000
} };
for (uint8_t i = 0; i < 4; i++)
createChar_P(i, corner[i]);
lcd.clear(); lcd.clear();
#define LCD_EXTRA_SPACE (LCD_WIDTH-8) #define LCD_EXTRA_SPACE (LCD_WIDTH-8)
@ -568,11 +597,7 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
safe_delay(100); safe_delay(100);
lcd_set_custom_characters( lcd_set_custom_characters();
#if ENABLED(LCD_PROGRESS_BAR)
false
#endif
);
} }
#endif // SHOW_BOOTSCREEN #endif // SHOW_BOOTSCREEN

Write Preview
Loading…
Cancel
Save