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

Merge remote-tracking branch 'MarlinFirmware/Development' into Development

Browse Source
This commit is contained in:
Chris Roadfeldt
2015-03-31 03:07:57 -05:00
parent 17707e7479 21ab44cfa7
commit 45ece5afb1
30 changed files with 3039 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/ultralcd_implementation_hitachi_HD44780.h
View File

@@ -193,10 +193,10 @@
#include "utf_mapper.h"
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
static uint16_t progressBarTick = 0;
#if PROGRESS_MSG_EXPIRE > 0
static uint16_t messageTick = 0;
static uint16_t expireStatusMillis = 0;
#endif
#define LCD_STR_PROGRESS "\x03\x04\x05"
#endif
@@ -214,7 +214,7 @@
#define LCD_STR_ARROW_RIGHT ">" /* from the default character set */
static void lcd_set_custom_characters(
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
bool progress_bar_set=true
#endif
) {
@@ -299,7 +299,7 @@ static void lcd_set_custom_characters(
B00000
}; //thanks Sonny Mounicou
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
static bool char_mode = false;
byte progress[3][8] = { {
B00000,
@@ -360,7 +360,7 @@ static void lcd_set_custom_characters(
}
static void lcd_implementation_init(
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
bool progress_bar_set=true
#endif
) {
@@ -390,7 +390,7 @@ static void lcd_implementation_init(
#endif
lcd_set_custom_characters(
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
progress_bar_set
#endif
);
@@ -583,7 +583,7 @@ static void lcd_implementation_status_screen()
// Status message line at the bottom
lcd.setCursor(0, LCD_HEIGHT - 1);
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#ifdef LCD_PROGRESS_BAR
if (card.isFileOpen()) {
uint16_t mil = millis(), diff = mil - progressBarTick;