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

Toggle FSENSOR and FSENSOR_AUTOLOAD

This commit is contained in:
leptun 2019-08-19 11:58:16 +03:00
parent 6e9c44af2d
commit 0d22f8039e
10 changed files with 53 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/messages.c
View File

@ -40,9 +40,8 @@ const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1 const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
const char MSG_FSENS_AUTOLOAD_NA[] PROGMEM_I1 = ISTR("F. autoload [N/A]"); ////c=17 r=1 const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=17 r=1
const char MSG_FSENSOR_OFF[] PROGMEM_I1 = ISTR("Fil. sensor [off]"); //// const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////
const char MSG_FSENSOR_ON[] PROGMEM_I1 = ISTR("Fil. sensor [on]"); ////
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); //// const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////

5
Firmware/messages.h
View File

@ -41,9 +41,8 @@ extern const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[];
extern const char MSG_FINISHING_MOVEMENTS[]; extern const char MSG_FINISHING_MOVEMENTS[];
extern const char MSG_FOLLOW_CALIBRATION_FLOW[]; extern const char MSG_FOLLOW_CALIBRATION_FLOW[];
extern const char MSG_FOLLOW_Z_CALIBRATION_FLOW[]; extern const char MSG_FOLLOW_Z_CALIBRATION_FLOW[];
extern const char MSG_FSENS_AUTOLOAD_NA[]; extern const char MSG_FSENSOR_AUTOLOAD[];
extern const char MSG_FSENSOR_OFF[]; extern const char MSG_FSENSOR[];
extern const char MSG_FSENSOR_ON[];
extern const char MSG_HEATING[]; extern const char MSG_HEATING[];
extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HEATING_COMPLETE[];
extern const char MSG_HOMEYZ[]; extern const char MSG_HOMEYZ[];

18
Firmware/ultralcd.cpp
View File

@ -5056,29 +5056,29 @@ do\
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);/*////MSG_FSENSOR_NA*/\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_NA), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA*/\
MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_fsensor_fail);\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), NULL, lcd_fsensor_fail);\
}\ }\
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_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set);\
if (mmu_enabled == false)\ if (mmu_enabled == false)\
{\ {\
MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_filament_autoload_info);\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), NULL, lcd_filament_autoload_info);\
}\ }\
}\ }\
}\ }\
else\ else\
{\ {\
/* Filament sensor turned on, working, no problems*/\ /* Filament sensor turned on, working, no problems*/\
MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set);\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_ON), lcd_fsensor_state_set);\
if (mmu_enabled == false)\ if (mmu_enabled == false)\
{\ {\
if (fsensor_autoload_enabled)\ if (fsensor_autoload_enabled)\
MENU_ITEM_FUNCTION_P(_i("F. autoload [on]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_ON), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\
else\ else\
MENU_ITEM_FUNCTION_P(_i("F. autoload [off]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_OFF), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\
/*if (fsensor_oq_meassure_enabled)*/\ /*if (fsensor_oq_meassure_enabled)*/\
/*MENU_ITEM_FUNCTION_P(_i("F. OQ meass. [on]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_ON c=17 r=1*/\ /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass. [on]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_ON c=17 r=1*/\
/*else*/\ /*else*/\
@ -6865,10 +6865,10 @@ static void lcd_tune_menu()
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
if (FSensorStateMenu == 0) { if (FSensorStateMenu == 0) {
MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set); MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_OFF), lcd_fsensor_state_set);
} }
else { else {
MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set); MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR), _T(MSG_ON), lcd_fsensor_state_set);
} }
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR

20
lang/lang_en.txt
View File

@ -202,14 +202,8 @@
# #
"Fail stats MMU" "Fail stats MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
# #
"Fail stats" "Fail stats"
@ -223,14 +217,8 @@
#MSG_FANS_CHECK #MSG_FANS_CHECK
"Fans check" "Fans check"
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_cz.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"Selhani MMU" "Selhani MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"F. autozav. [zap]" "F. autozav."
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"F. autozav. [N/A]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"F. autozav. [vyp]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Kontr. vent." "Kontr. vent."
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Fil. senzor [zap]" "Fil. senzor"
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Fil. senzor [N/A]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Fil. senzor [vyp]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_de.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"MMU-Fehler" "MMU-Fehler"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"F.Autoladen [an]" "F. autoladen"
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"F. Autoload [nv]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"F. Autoload [aus]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Luefter Chk." "Luefter Chk."
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Fil. Sensor [an]" "\x00"
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Fil. Sensor [nv]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Fil. Sensor [aus]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_es.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"Estadistica de fallos MMU" "Estadistica de fallos MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"Autocarg.Fil[act]" "Autocarg.fil."
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"Autocarg.Fil[N/D]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"Autocarg.Fil[ina]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Comprob.vent" "Comprob.vent"
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Sensor Fil. [act]" "Sensor Fil."
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Sensor Fil. [N/D]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Sensor Fil. [ina]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_fr.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"Stat. echecs MMU" "Stat. echecs MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"ChargAuto f. [on]" "Charg.auto.F."
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"AutoCharg F [N/A]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"AutoCharg F [off]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Verif ventilo" "Verif ventilo"
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Capteur Fil. [on]" "Capteur Fil."
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Capteur Fil. [N/A]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Capteur Fil.[off]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_it.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"Statistiche fallimenti MMU" "Statistiche fallimenti MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"Autocar.filam[on]" "Autocar.filam"
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"Autocar.fil.[N/A]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"Autocar.fil.[off]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Control.vent" "Control.vent"
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Sensor filam.[On]" "Sensor filam."
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Sensor filam[N/A]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Sensor filam[off]"
# #
"Filam. runouts" "Filam. runouts"

28
lang/lang_en_pl.txt
View File

@ -270,17 +270,9 @@
"Fail stats MMU" "Fail stats MMU"
"Bledy MMU" "Bledy MMU"
#MSG_FSENS_AUTOLOAD_ON c=17 r=1 #MSG_FSENSOR_AUTOLOAD
"F. autoload [on]" "F. autoload"
"Autolad. fil [wl]" "Autolad. fil."
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
"F. autoload [N/A]"
"Autolad.fil.[N/D]"
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
"F. autoload [off]"
"Autolad.fil.[wyl]"
# #
"Fail stats" "Fail stats"
@ -298,17 +290,9 @@
"Fans check" "Fans check"
"Sprawd.went." "Sprawd.went."
#MSG_FSENSOR_ON #MSG_FSENSOR
"Fil. sensor [on]" "Fil. sensor"
"Czuj. filam. [wl]" "Czuj. filam."
#MSG_FSENSOR_NA
"Fil. sensor [N/A]"
"Czuj. filam.[N/D]"
#MSG_FSENSOR_OFF
"Fil. sensor [off]"
"Czuj. filam.[wyl]"
# #
"Filam. runouts" "Filam. runouts"