Explorar o código

Add thermometer (#3454)

* add thermometer

* .

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
CaCO3 hai 11 meses
pai
achega
b10336b59c

+ 9 - 0
code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -179,6 +179,15 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
             else if (toUpper(splitted[1]) == "ENERGY_GJ") {
                 mqttServer_setMeterType("energy", "GJ", "h", "GJ/h");
             }
+            else if (toUpper(splitted[1]) == "TEMPERATURE_C") {
+                mqttServer_setMeterType("temperature", "°C", "m", "°C/m"); // m = Minutes
+            }
+            else if (toUpper(splitted[1]) == "TEMPERATURE_F") {
+                mqttServer_setMeterType("temperature", "°F", "m", "°F/m"); // m = Minutes
+            }
+            else if (toUpper(splitted[1]) == "TEMPERATURE_K") {
+                mqttServer_setMeterType("temperature", "K", "m", "K/m"); // m = Minutes
+            }
         }
 
         if ((toUpper(_param) == "CLIENTID") && (splitted.size() > 1))

+ 5 - 2
sd-card/html/edit_config_template.html

@@ -1180,13 +1180,16 @@
 					<option value="water_m3">Watermeter (Value: m³, Rate: m³/h)</option>
 					<option value="water_l">Watermeter (Value: l, Rate: l/h)</option>
 					<option value="water_gal">Watermeter (Value: gal, Rate: gal/h)</option>
-					<option value="water_ft3">Watermeter (Value: ft³, Rate: ft³/m)</option>
+					<option value="water_ft3">Watermeter (Value: ft³, Rate: ft³/min)</option>
 					<option value="gas_m3">Gasmeter (Value: m³, Rate: m³/h)</option>
-					<option value="gas_ft3">Gasmeter (Value: ft³, Rate: ft³/m)</option>
+					<option value="gas_ft3">Gasmeter (Value: ft³, Rate: ft³/min)</option>
 					<option value="energy_wh">Energymeter (Value: Wh, Rate: W)</option>
 					<option value="energy_kwh">Energymeter (Value: kWh, Rate: kW)</option>
 					<option value="energy_mwh">Energymeter (Value: MWh, Rate: MW)</option>
 					<option value="energy_gj">Energymeter (Value: GJ, Rate: GJ/h)</option>
+					<option value="temperature_c">Thermometer (Value: °C, Rate: °C/min)</option>
+					<option value="temperature_c">Thermometer (Value: °F, Rate: °F/min)</option>
+					<option value="temperature_c">Thermometer (Value: K, Rate: K/min)</option>
 				</select>
 			</td>
 			<td>$TOOLTIP_MQTT_MeterType</td>