josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated branch to use TOGGLE

This commit is contained in:
Alex Voinea 2019-11-19 13:51:10 +02:00
parent 6e2793566c
commit e66574ac5f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/messages.c
View File

@ -128,6 +128,9 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); //// const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); //// const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); //// const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////
//not internationalized messages //not internationalized messages
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////

3
Firmware/messages.h
View File

@ -128,6 +128,9 @@ extern const char MSG_SOUND_BLIND[];
extern const char MSG_MESH[]; extern const char MSG_MESH[];
extern const char MSG_Z_PROBE_NR[]; extern const char MSG_Z_PROBE_NR[];
extern const char MSG_MAGNETS_COMP[]; extern const char MSG_MAGNETS_COMP[];
extern const char MSG_FS_ACTION[];
extern const char MSG_FS_CONTINUE[];
extern const char MSG_FS_PAUSE[];
//not internationalized messages //not internationalized messages
extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_BROWNOUT_RESET[];

8
Firmware/ultralcd.cpp
View File

@ -5726,10 +5726,10 @@ do\
switch(oFsensorActionNA)\ switch(oFsensorActionNA)\
{\ {\
case ClFsensorActionNA::_Continue:\ case ClFsensorActionNA::_Continue:\
MENU_ITEM_FUNCTION_P(_i("FS Action [cont.]"),lcd_fsensor_actionNA_set);\ MENU_ITEM_TOGGLE_P(_T(MSG_FS_ACTION), _T(MSG_FS_CONTINUE), lcd_fsensor_actionNA_set);\
break;\ break;\
case ClFsensorActionNA::_Pause:\ case ClFsensorActionNA::_Pause:\
MENU_ITEM_FUNCTION_P(_i("FS Action [pause]"),lcd_fsensor_actionNA_set);\ MENU_ITEM_TOGGLE_P(_T(MSG_FS_ACTION), _T(MSG_FS_PAUSE), lcd_fsensor_actionNA_set);\
break;\ break;\
default:\ default:\
oFsensorActionNA=ClFsensorActionNA::_Continue;\ oFsensorActionNA=ClFsensorActionNA::_Continue;\
@ -7107,11 +7107,11 @@ static void lcd_tune_menu()
if (FSensorStateMenu == 0) { if (FSensorStateMenu == 0) {
if (fsensor_not_responding && (mmu_enabled == false)) { if (fsensor_not_responding && (mmu_enabled == false)) {
/* Filament sensor not working*/ /* Filament sensor not working*/
MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set); MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set);
} }
else { else {
/* Filament sensor turned off, working, no problems*/ /* Filament sensor turned off, working, no problems*/
MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); MENU_ITEM_TOGGLE_P(_T(MSG_MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set);
} }
} }
else { else {