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

Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.

Browse Source
This commit is contained in:
daid303 2012-12-21 16:14:47 +01:00
parent b69cb9fbd9
commit 01aac2a142
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Marlin_main.cpp
View File

@ -859,6 +859,7 @@ void process_commands()
lcd_update(); lcd_update();
} }
} }
LCD_MESSAGEPGM(MSG_RESUMING);
} }
break; break;
#endif #endif

1
Marlin/language.h
View File

@ -102,6 +102,7 @@
#define MSG_NO_CARD "No Card" #define MSG_NO_CARD "No Card"
#define MSG_DWELL "Sleep..." #define MSG_DWELL "Sleep..."
#define MSG_USERWAIT "Wait for user..." #define MSG_USERWAIT "Wait for user..."
#define MSG_RESUMING "Resuming print"
#define MSG_NO_MOVE "No move." #define MSG_NO_MOVE "No move."
#define MSG_KILLED "KILLED. " #define MSG_KILLED "KILLED. "
#define MSG_STOPPED "STOPPED. " #define MSG_STOPPED "STOPPED. "

7
Marlin/ultralcd.cpp
View File

@ -137,8 +137,7 @@ static void lcd_status_screen()
currentMenu = lcd_main_menu; currentMenu = lcd_main_menu;
lcd_quick_feedback(); lcd_quick_feedback();
} }
if (abs(encoderPosition / 2) > 1) feedmultiply += int(encoderPosition);
feedmultiply += encoderPosition / 2;
encoderPosition = 0; encoderPosition = 0;
if (feedmultiply < 10) if (feedmultiply < 10)
feedmultiply = 10; feedmultiply = 10;
@ -381,9 +380,9 @@ static void lcd_move_menu_axis()
MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu); MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
MENU_ITEM(submenu, "Move X", lcd_move_x); MENU_ITEM(submenu, "Move X", lcd_move_x);
MENU_ITEM(submenu, "Move Y", lcd_move_y); MENU_ITEM(submenu, "Move Y", lcd_move_y);
MENU_ITEM(submenu, "Move Z", lcd_move_z);
if (move_menu_scale < 10.0) if (move_menu_scale < 10.0)
{ {
MENU_ITEM(submenu, "Move Z", lcd_move_z);
MENU_ITEM(submenu, "Extruder", lcd_move_e); MENU_ITEM(submenu, "Extruder", lcd_move_e);
} }
END_MENU(); END_MENU();
@ -698,6 +697,8 @@ void lcd_init()
WRITE(SDCARDDETECT, HIGH); WRITE(SDCARDDETECT, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED; lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > -1) #endif//(SDCARDDETECT > -1)
lcd_buttons_update();
encoderDiff = 0;
} }
void lcd_update() void lcd_update()

3
Marlin/ultralcd.h
View File

@ -62,9 +62,6 @@
#define LCD_MESSAGEPGM(x) #define LCD_MESSAGEPGM(x)
#define LCD_ALERTMESSAGEPGM(x) #define LCD_ALERTMESSAGEPGM(x)
#define CLICKED false
#define BLOCK ;
#endif #endif
char *itostr2(const uint8_t &x); char *itostr2(const uint8_t &x);

2
Marlin/ultralcd_implementation_hitachi_HD44780.h
View File

@ -363,7 +363,7 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
#define lcd_implementation_drawmenu_setting_edit_bool(row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(row, pstr, ' ', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF)) #define lcd_implementation_drawmenu_setting_edit_bool(row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(row, pstr, ' ', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
void lcd_implementation_drawedit(const char* pstr, char* value) void lcd_implementation_drawedit(const char* pstr, char* value)
{ {
lcd.setCursor(0, 1); lcd.setCursor(1, 1);
lcd_printPGM(pstr); lcd_printPGM(pstr);
lcd.print(':'); lcd.print(':');
lcd.setCursor(19 - strlen(value), 1); lcd.setCursor(19 - strlen(value), 1);