Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-07 03:56:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add GJ (gigajoule) as an energy meter unit (#2114)

Browse Source 
Some district heating meters are displaying their values in GJ and Home
Assistant is also capable of accepting heating values in this format.
This commit is contained in:
Attila Darazs
2023-03-04 18:31:32 +01:00
committed by GitHub
parent 827423023c
commit 4dc4752823
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
View File

@@ -156,6 +156,9 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
else if (toUpper(splitted[1]) == "ENERGY_MWH") { else if (toUpper(splitted[1]) == "ENERGY_MWH") {
mqttServer_setMeterType("energy", "MWh", "h", "MW"); mqttServer_setMeterType("energy", "MWh", "h", "MW");
} }
else if (toUpper(splitted[1]) == "ENERGY_GJ") {
mqttServer_setMeterType("energy", "GJ", "h", "GJ/h");
}
} }
if ((toUpper(splitted[0]) == "CLIENTID") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "CLIENTID") && (splitted.size() > 1))

1
sd-card/html/edit_config_param.html
View File

@@ -654,6 +654,7 @@ textarea {
<option value="energy_wh">Energymeter (Value: Wh, Rate: W)</option> <option value="energy_wh">Energymeter (Value: Wh, Rate: W)</option>
<option value="energy_kwh">Energymeter (Value: kWh, Rate: kW)</option> <option value="energy_kwh">Energymeter (Value: kWh, Rate: kW)</option>
<option value="energy_mwh">Energymeter (Value: MWh, Rate: MW)</option> <option value="energy_mwh">Energymeter (Value: MWh, Rate: MW)</option>
<option value="energy_gj">Energymeter (Value: GJ, Rate: GJ/h)</option>
</select> </select>
</td> </td>
<td>$TOOLTIP_MQTT_MeterType</td> <td>$TOOLTIP_MQTT_MeterType</td>