kiwi/domoticz-ds238-modbus-tcp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added Average() on :

Browse Source 
- Voltage
- Current
- Active Power
- Reactive Power
- Power factor
- Frequency
This commit is contained in:
Xavier Beaudouin
2021-05-10 22:02:17 +02:00
parent f6ceba6605
commit eaf1087a0e
1 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
plugin.py
View File

@ -100,6 +100,19 @@ class Maximum:
class BasePlugin: class BasePlugin:
#enabled = False #enabled = False
def __init__(self): def __init__(self):
# Voltage for last 5 minutes
self.voltage=Average()
# Current for last 5 minutes
self.current=Average()
# Active power for last 5 minutes
self.active_power=Average()
# Reactive power for last 5 minutes
self.reactive_power=Average()
# Power factor for last 5 minutes
self.power_factor=Average()
# Frequency for last 5 minutes
self.frequency=Average()
return return
def onStart(self): def onStart(self):
@ -131,7 +144,7 @@ class BasePlugin:
Domoticz.Debug("Query IP " + self.IPAddress + ":" + str(self.IPPort) +" on device : "+str(self.MBAddr)) Domoticz.Debug("Query IP " + self.IPAddress + ":" + str(self.IPPort) +" on device : "+str(self.MBAddr))
# Create the devices if they does not exists # Create the devices if they does not exists
# TODO: refactor this. # TODO: refactor this.
if 1 not in Devices: if 1 not in Devices:
Domoticz.Device(Name="Total Energy", Unit=1, Type=0xfa, Subtype=0x01, Used=0).Create() Domoticz.Device(Name="Total Energy", Unit=1, Type=0xfa, Subtype=0x01, Used=0).Create()
if 2 not in Devices: if 2 not in Devices:
@ -161,7 +174,7 @@ class BasePlugin:
def onStop(self): def onStop(self):
Domoticz.Log("onStop called") Domoticz.Debugging(0)
def onConnect(self, Connection, Status, Description): def onConnect(self, Connection, Status, Description):
Domoticz.Log("onConnect called") Domoticz.Log("onConnect called")
@ -197,6 +210,7 @@ class BasePlugin:
Devices[9].Update(1, "0") Devices[9].Update(1, "0")
Devices[10].Update(1, "0") Devices[10].Update(1, "0")
# TODO: catch errors
# 3 counters # 3 counters
total_e = "0" total_e = "0"
export_e = "0" export_e = "0"
@ -212,9 +226,6 @@ class BasePlugin:
decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big) decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big)
# Value # Value
value = decoder.decode_32bit_int() value = decoder.decode_32bit_int()
# Scale factor / 100
#value = str ( round (value / 100, 3))
#Domoticz.Debug("Value after conversion : "+str(value))
total_e = str(value) total_e = str(value)
# Export Energy # Export Energy
@ -224,9 +235,6 @@ class BasePlugin:
decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big) decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big)
# Value # Value
value = decoder.decode_32bit_int() value = decoder.decode_32bit_int()
# Scale factor / 100
#value = str ( round (value / 100, 3))
#Domoticz.Debug("Value after conversion : "+str(value))
export_e = str(value) export_e = str(value)
# Import Energy # Import Energy
@ -236,9 +244,6 @@ class BasePlugin:
decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big) decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big)
# Value # Value
value = decoder.decode_32bit_int() value = decoder.decode_32bit_int()
# Scale factor / 100
#value = str ( round (value / 100, 3))
#Domoticz.Debug("Value after conversion : "+str(value))
import_e = str(value) import_e = str(value)
# Voltage # Voltage
@ -249,9 +254,13 @@ class BasePlugin:
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 10 # Scale factor / 10
value = str ( round (value / 10, 3)) value = round (value / 10, 3)
#Domoticz.Debug("Value after conversion : "+str(value)) Domoticz.Debug("Value after conversion : "+str(value))
Devices[4].Update(1, value) Domoticz.Debug("-> Calculating average")
self.voltage.update(value)
value = self.voltage.get()
Domoticz.Debug(" = {}".format(value))
Devices[4].Update(1, str(value))
# Current # Current
data = client.read_holding_registers(0xD, 1) data = client.read_holding_registers(0xD, 1)
@ -261,9 +270,13 @@ class BasePlugin:
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 100 # Scale factor / 100
value = str ( round (value / 100, 3)) value = round (value / 100, 3)
#Domoticz.Debug("Value after conversion : "+str(value)) Domoticz.Debug("Value after conversion : "+str(value))
Devices[5].Update(1, value) Domoticz.Debug("-> Calculating average")
self.current.update(value)
value = self.current.get()
Domoticz.Debug(" = {}".format(value))
Devices[5].Update(1, str(value))
# Active Power # Active Power
data = client.read_holding_registers(0xE, 1) data = client.read_holding_registers(0xE, 1)
@ -272,13 +285,10 @@ class BasePlugin:
decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big) decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big)
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 100
#value = str ( round (value / 100, 3))
Domoticz.Debug("Value after conversion : "+str(value)) Domoticz.Debug("Value after conversion : "+str(value))
Domoticz.Debug("-> Calculating average") Domoticz.Debug("-> Calculating average")
m = Average() self.active_power.update(value)
m.update(value) value = self.active_power.get()
value = m.get()
Domoticz.Debug(" = {}".format(value)) Domoticz.Debug(" = {}".format(value))
Devices[6].Update(1, str(value)) Devices[6].Update(1, str(value))
if value > 0.0: if value > 0.0:
@ -294,9 +304,11 @@ class BasePlugin:
decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big) decoder = BinaryPayloadDecoder.fromRegisters(data, byteorder=Endian.Big, wordorder=Endian.Big)
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 100 Domoticz.Debug("Value after conversion : "+str(value))
#value = str ( round (value / 100, 3)) Domoticz.Debug("-> Calculating average")
#Domoticz.Debug("Value after conversion : "+str(value)) self.reactive_power.update(value)
value = self.reactive_power.get()
Domoticz.Debug(" = {}".format(value))
Devices[7].Update(1, str(value)) Devices[7].Update(1, str(value))
# Power Factor # Power Factor
@ -307,9 +319,13 @@ class BasePlugin:
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 1000 # Scale factor / 1000
value = str ( round (value / 1000, 3)) value = round (value / 1000, 3)
#Domoticz.Debug("Value after conversion : "+str(value)) Domoticz.Debug("Value after conversion : "+str(value))
Devices[8].Update(1, value) Domoticz.Debug("-> Calculating average")
self.power_factor.update(value)
value = self.power_factor.get()
Domoticz.Debug(" = {}".format(value))
Devices[8].Update(1, str(value))
# Frequency # Frequency
data = client.read_holding_registers(0x11, 1) data = client.read_holding_registers(0x11, 1)
@ -319,9 +335,13 @@ class BasePlugin:
# Value # Value
value = decoder.decode_16bit_int() value = decoder.decode_16bit_int()
# Scale factor / 100 # Scale factor / 100
value = str ( round (value / 100, 3)) value = round (value / 100, 3)
#Domoticz.Debug("Value after conversion : "+str(value)) Domoticz.Debug("Value after conversion : "+str(value))
Devices[9].Update(1, value) Domoticz.Debug("-> Calculating average")
self.frequency.update(value)
value = self.frequency.get()
Domoticz.Debug(" = {}".format(value))
Devices[9].Update(1, str(value))
# Do insert data on counters # Do insert data on counters