|
@@ -177,6 +177,7 @@ def processMeterData(data):
|
|
|
|
|
|
momUnit = meters_yaml[cNum].get('momUnit', None)
|
|
|
momType = meters_yaml[cNum].get('momType', None)
|
|
|
+ readingType = meters_yaml[cNum].get('readingType', None)
|
|
|
|
|
|
momUnit_conv1 = meters_yaml[cNum].get('momUnit_conv1', None)
|
|
|
momType_conv1 = meters_yaml[cNum].get('momType_conv1', None)
|
|
@@ -380,7 +381,10 @@ def processMeterData(data):
|
|
|
# publish current reading to MQTT
|
|
|
if statTopic:
|
|
|
if MQTTenabled and cReading_formatted is not None:
|
|
|
- mqttc.publish(statTopic + "/reading", str(cReading_formatted), qos=0, retain=False)
|
|
|
+ if readingType is not None:
|
|
|
+ mqttc.publish(statTopic + "/" + readingType, str(cReading_formatted), qos=0, retain=False)
|
|
|
+ else:
|
|
|
+ mqttc.publish(statTopic + "/reading", str(cReading_formatted), qos=0, retain=False)
|
|
|
|
|
|
|
|
|
data_energy[cNum][meters_yaml[cNum].get('influxFieldName_energy', 'energyTotal')] = round(float(cReading), digits)
|