0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu

Browse source 
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
This commit is contained in:
daid 2013-02-13 08:56:00 -08:00
parent fa5c45f515 a0d4e8e78e
commit 5e2abfcdcd
2 changed files with 1462 additions and 1454 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2898
Marlin/language.h
View file

File diff suppressed because it is too large Load diff

18
Marlin/ultralcd.cpp
View file

@ -199,9 +199,15 @@ static void lcd_main_menu()
MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop); MENU_ITEM(function, MSG_STOP_PRINT, lcd_sdcard_stop);
}else{ }else{
MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu); MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
#if SDCARDDETECT < 1
MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user
#endif
} }
}else{ }else{
MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu); MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
#if SDCARDDETECT < 1
MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
#endif
} }
#endif #endif
END_MENU(); END_MENU();
@ -516,9 +522,9 @@ static void lcd_control_motion_menu()
MENU_ITEM_EDIT(float52, MSG_YSTEPS, &axis_steps_per_unit[Y_AXIS], 5, 9999); MENU_ITEM_EDIT(float52, MSG_YSTEPS, &axis_steps_per_unit[Y_AXIS], 5, 9999);
MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999); MENU_ITEM_EDIT(float51, MSG_ZSTEPS, &axis_steps_per_unit[Z_AXIS], 5, 9999);
MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999); MENU_ITEM_EDIT(float51, MSG_ESTEPS, &axis_steps_per_unit[E_AXIS], 5, 9999);
#ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit); MENU_ITEM_EDIT(bool, "Endstop abort", &abort_on_endstop_hit);
#endif #endif
END_MENU(); END_MENU();
} }
@ -889,10 +895,10 @@ char *ftostr31(const float &x)
char *ftostr32(const float &x) char *ftostr32(const float &x)
{ {
long xx=x*100; long xx=x*100;
if (xx >= 0) if (xx >= 0)
conv[0]=(xx/10000)%10+'0'; conv[0]=(xx/10000)%10+'0';
else else
conv[0]='-'; conv[0]='-';
xx=abs(xx); xx=abs(xx);
conv[1]=(xx/1000)%10+'0'; conv[1]=(xx/1000)%10+'0';