Rename flowratemeter

arendst · Apr 27, 2022 · b1933f7 · b1933f7
1 parent ff3adb9
commit b1933f7
Show file tree

Hide file tree

Showing 35 changed files with 161 additions and 185 deletions.
diff --git a/BUILDS.md b/BUILDS.md
@@ -216,7 +216,7 @@ Note: `minimal` variant is not listed as it shouldn't be used outside of the [up
 | USE_HRE               | - | - / x | - | x | - | - |
 | USE_A4988_STEPPER     | - | - / - | - | - | - | - |
 | USE_NEOPOOL           | - | - / - | - | - | - | - |
-| USE_FLOWMETER         | - | - / - | - | - | - | - |
+| USE_FLOWRATEMETER     | - | - / - | - | - | - | - |
 |                       |   |       |   |   |   |   |
 | Feature or Sensor     | l | t     | k | s | i | d | Remarks
 | USE_DISPLAY           | - | - / - | - | - | - | x |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
 - Command ``EnergyExportActive<phase>`` to (p)reset energy export active for supported devices. Currently ADE7880 only (#13515)
 - Sonoff SPM delayed SetPowerOnState (#13447)
 - Command ``SetOption139 0/1`` to switch between pressure unit "mmHg" (0) or "inHg" (1) when ``SO24 1`` (#15350)
-- Support for flow meter
+- Support for flowrate meters like YF-DN50 and similary
 
 ### Changed
 

diff --git a/tasmota/berry/include/be_gpio_defines.h b/tasmota/berry/include/be_gpio_defines.h
@@ -73,7 +73,7 @@ const be_const_member_t lv_gpio_constants[] = {
     { "ETH_PHY_POWER", (int32_t) GPIO_ETH_PHY_POWER },
     { "EXS_ENABLE", (int32_t) GPIO_EXS_ENABLE },
     { "FALLING", FALLING },
-    { "FLOWMETER_SIGNAL", (int32_t) GPIO_FLOWMETER_IN },
+    { "FLOWRATEMETER_SIGNAL", (int32_t) GPIO_FLOWRATEMETER_IN },
     { "FTC532", (int32_t) GPIO_FTC532 },
     { "GPS_RX", (int32_t) GPIO_GPS_RX },
     { "GPS_TX", (int32_t) GPIO_GPS_TX },

diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Wagwoord geverifieer"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Fout"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowmeter"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Грешка"             // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Übereinstimmung"               // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Fehler"                      // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Durchflussmesser"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX"
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter"
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Clave Correcta"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Mot-de-passe vérifié" // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Erreur"             // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
@@ -1056,9 +1056,8 @@
 #define D_FP_PASSVERIFY "Jelszó ellenőrizve"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Hiba"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
@@ -1056,9 +1056,8 @@
 #define D_FP_PASSVERIFY          "Password verificata"            // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR        "Errore"                         // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"             // Machine names

diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Wachtwoord herkend"   // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Fout"               // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Zweryfikowano poprawnie"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Błąd"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Senha verificada"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Erro"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names

diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
@@ -866,7 +866,7 @@
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
 #define D_SENSOR_CM11_TX       "CM110x TX" 
 #define D_SENSOR_CM11_RX       "CM110x RX"
-#define D_SENSOR_FLOWMETER     "Flowmeter" 
+#define D_SENSOR_FLOWRATEMETER "Flowrate"
 
 // Units
 #define D_UNIT_AMPERE "A"
@@ -1057,9 +1057,8 @@
 #define D_FP_PASSVERIFY "Password verified"    // 0x21 Verify the fingerprint passed
 #define D_FP_UNKNOWNERROR "Error"              // Any other error
 
-// xsns_96_flowmeter.ino
-#define D_FLOWMETER_NAME "Flowmeter"
-#define D_FLOWMETER_RATE "Rate"
+// xsns_96_flowratemeter.ino
+#define D_FLOWRATEMETER_NAME "Flowrate"
 
 // xsns_83_neopool.ino
 #define D_NEOPOOL_MACH_NONE               "NeoPool"           // Machine names