From af519626aa34de828beccac4e395300567de3b32 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 26 Apr 2021 14:21:33 +0200 Subject: [PATCH] Define MSG_FS_V_04_OR_NEWER and MSG_FS_V_03_OR_OLDER c=14 --- Firmware/Marlin_main.cpp | 4 ++-- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_nl.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 683e6ffc8..ab69e3297 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9750,7 +9750,7 @@ static uint16_t nFSCheckCount=0; if( minVolt >= IRsensor_Ldiode_TRESHOLD && minVolt <= IRsensor_Lmax_TRESHOLD && maxVolt >= IRsensor_Hmin_TRESHOLD && maxVolt <= IRsensor_Hopen_TRESHOLD ){ - manage_inactivity_IR_ANALOG_Check(nFSCheckCount, ClFsensorPCB::_Old, ClFsensorPCB::_Rev04, _i("FS v0.4 or newer") ); ////c=18 + manage_inactivity_IR_ANALOG_Check(nFSCheckCount, ClFsensorPCB::_Old, ClFsensorPCB::_Rev04, _i("FS v0.4 or newer") ); ////MSG_FS_V_04_OR_NEWER c=18 } //! If and only if minVolt is in range <0.0, 0.3> and maxVolt is in range <4.6, 5.0V>, I'm considering a situation with the old fsensor //! Note, we are not relying on one voltage here - getting just +5V can mean an old fsensor or a broken new sensor - that's why @@ -9758,7 +9758,7 @@ static uint16_t nFSCheckCount=0; else if( minVolt < IRsensor_Ldiode_TRESHOLD && maxVolt > IRsensor_Hopen_TRESHOLD && maxVolt <= IRsensor_VMax_TRESHOLD ){ - manage_inactivity_IR_ANALOG_Check(nFSCheckCount, ClFsensorPCB::_Rev04, oFsensorPCB=ClFsensorPCB::_Old, _i("FS v0.3 or older")); ////c=18 + manage_inactivity_IR_ANALOG_Check(nFSCheckCount, ClFsensorPCB::_Rev04, oFsensorPCB=ClFsensorPCB::_Old, _i("FS v0.3 or older")); ////MSG_FS_V_03_OR_OLDER c=18 } #endif // IR_SENSOR_ANALOG if (fsensor_check_autoload()) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 783d7ab81..cfce1bb7b 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,7 +1,7 @@ #MSG_IR_03_OR_OLDER c=18 " 0.3 or older" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" #MSG_IR_04_OR_NEWER c=18 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3bb01aae3..4f4ae098f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 nebo starsi" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 nebo starsi" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 nebo novejsi" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 a novejsi" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index d59a18a58..4980e3113 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 oder aelter" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 oder aelter" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 oder neuer" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 oder neuer" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f27d4ce01..a85e45c1f 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 o mayor" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 o mayor" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 o mas nueva" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 o mas nueva" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 808d67436..d8f665295 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 ou +ancien" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS v0.3 ou +ancien" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 ou +recent" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS v0.4 ou +recent" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 34c8740a6..30f2d5b75 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 o inferiore" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 o inferiore" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 o superiore" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 o superiore" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index b35219837..0a253b363 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 of ouder" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 of ouder" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 of nieuwer" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 of nieuwer" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index d60dc85a7..10a8cb69e 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -2,7 +2,7 @@ " 0.3 or older" " 0.3 lub starszy" -# c=18 +#MSG_FS_V_03_OR_OLDER c=18 "FS v0.3 or older" "FS 0.3 lub starszy" @@ -10,7 +10,7 @@ " 0.4 or newer" " 0.4 lub nowszy" -# c=18 +#MSG_FS_V_04_OR_NEWER c=18 "FS v0.4 or newer" "FS 0.4 lub nowszy"