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

Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)

Browse Source 
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
This commit is contained in:
Robert F-C
2013-02-28 02:04:51 +11:00
parent 67710df9f3
commit 1292d735ba
7 changed files with 765 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/Marlin_main.cpp
View File

@@ -124,7 +124,7 @@
// M500 - stores paramters in EEPROM
// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
// M503 - print the current settings (from memory not from eeprom)
// M503 - print the current settings (from memory not from eeprom)
// M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
// M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
// M907 - Set digital trimpot motor current using axis codes.
@@ -853,13 +853,13 @@ void process_commands()
previous_millis_cmd = millis();
if (codenum > 0){
codenum += millis(); // keep track of when we started waiting
while(millis() < codenum && !LCD_CLICKED){
while(millis() < codenum && !lcd_clicked()){
manage_heater();
manage_inactivity();
lcd_update();
}
}else{
while(!LCD_CLICKED){
while(!lcd_clicked()){
manage_heater();
manage_inactivity();
lcd_update();
@@ -1499,13 +1499,13 @@ void process_commands()
{
Config_PrintSettings();
}
break;
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
case 540:
{
if(code_seen('S')) abort_on_endstop_hit = code_value() > 0;
}
break;
break;
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
case 540:
{
if(code_seen('S')) abort_on_endstop_hit = code_value() > 0;
}
break;
#endif
#ifdef FILAMENTCHANGEENABLE
case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
@@ -1592,7 +1592,7 @@ void process_commands()
delay(100);
LCD_ALERTMESSAGEPGM(MSG_FILAMENTCHANGE);
uint8_t cnt=0;
while(!LCD_CLICKED){
while(!lcd_clicked()){
cnt++;
manage_heater();
manage_inactivity();