github-mirrors/pyPLC
1
0
Fork 0
mirror of https://github.com/uhi22/pyPLC.git synced 2024-11-20 01:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #34 from jsphuebner/mqtt_backend

Browse source 
Mqtt backend topic changes
This commit is contained in:
Uwe Hennig 2024-11-19 22:54:29 +01:00 committed by GitHub
commit 5c91017cfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fsmEvse.py
View file

@ -30,6 +30,7 @@ class fsmEvse():
self.hardwareInterface.displayState(s) self.hardwareInterface.displayState(s)
def publishSoCs(self, current_soc: int, full_soc: int = -1, energy_capacity: int = -1, energy_request: int = -1, evccid: str = "", origin: str = ""): def publishSoCs(self, current_soc: int, full_soc: int = -1, energy_capacity: int = -1, energy_request: int = -1, evccid: str = "", origin: str = ""):
self.hardwareInterface.displaySoc(current_soc)
if self.callbackSoCStatus is not None: if self.callbackSoCStatus is not None:
self.callbackSoCStatus(current_soc, full_soc, energy_capacity, energy_request, self.evccid, origin) self.callbackSoCStatus(current_soc, full_soc, energy_capacity, energy_request, self.evccid, origin)
@ -329,11 +330,11 @@ class fsmEvse():
strEVTargetCurrentMultiplier = jsondict["EVTargetCurrent.Multiplier"] strEVTargetCurrentMultiplier = jsondict["EVTargetCurrent.Multiplier"]
iTarget = combineValueAndMultiplier(strEVTargetCurrentValue, strEVTargetCurrentMultiplier) iTarget = combineValueAndMultiplier(strEVTargetCurrentValue, strEVTargetCurrentMultiplier)
self.addToTrace("EV wants EVTargetVoltage " + str(uTarget) + " and EVTargetCurrent " + str(iTarget)) self.addToTrace("EV wants EVTargetVoltage " + str(uTarget) + " and EVTargetCurrent " + str(iTarget))
self.hardwareInterface.setPowerSupplyVoltageAndCurrent(uTarget, iTarget)
current_soc = int(jsondict.get("DC_EVStatus.EVRESSSOC", -1)) current_soc = int(jsondict.get("DC_EVStatus.EVRESSSOC", -1))
full_soc = int(jsondict.get("FullSOC", -1)) full_soc = int(jsondict.get("FullSOC", -1))
energy_capacity = int(jsondict.get("EVEnergyCapacity.Value", -1)) energy_capacity = int(jsondict.get("EVEnergyCapacity.Value", -1))
energy_request = int(jsondict.get("EVEnergyRequest.Value", -1)) energy_request = int(jsondict.get("EVEnergyRequest.Value", -1))
self.hardwareInterface.setPowerSupplyVoltageAndCurrent(uTarget, iTarget)
self.publishSoCs(current_soc, full_soc, energy_capacity, energy_request, origin="CurrentDemandReq") self.publishSoCs(current_soc, full_soc, energy_capacity, energy_request, origin="CurrentDemandReq")
@ -346,7 +347,7 @@ class fsmEvse():
strPresentVoltage = str(self.hardwareInterface.getInletVoltage()) #str(self.simulatedPresentVoltage) strPresentVoltage = str(self.hardwareInterface.getInletVoltage()) #str(self.simulatedPresentVoltage)
self.callbackShowStatus(strPresentVoltage, "EVSEPresentVoltage") self.callbackShowStatus(strPresentVoltage, "EVSEPresentVoltage")
strEVSEPresentCurrent = str(self.hardwareInterface.getAccuMaxCurrent()) #"1" # Just as a dummy current strEVSEPresentCurrent = str(self.hardwareInterface.getAccuMaxCurrent()) #"1" # Just as a dummy current
if (self.blChargeStopTrigger == 1): if (self.blChargeStopTrigger == 1 or self.hardwareInterface.stopRequest()):
# User pressed the STOP button on the charger. Send EVSE_Shutdown. # User pressed the STOP button on the charger. Send EVSE_Shutdown.
self.addToTrace("User pressed the STOP button on the charger. Sending EVSE_Shutdown.") self.addToTrace("User pressed the STOP button on the charger. Sending EVSE_Shutdown.")
strEVSEStatus = "2" # 2=EVSE_Shutdown, means the user stopped the session on the charger. strEVSEStatus = "2" # 2=EVSE_Shutdown, means the user stopped the session on the charger.

52
hardwareInterface.py
View file

@ -7,6 +7,7 @@
# python -m serial.tools.list_ports # python -m serial.tools.list_ports
import serial # the pyserial import serial # the pyserial
from pyPlcModes import *
from serial.tools.list_ports import comports from serial.tools.list_ports import comports
from time import sleep, time from time import sleep, time
from configmodule import getConfigValue, getConfigValueBool from configmodule import getConfigValue, getConfigValueBool
@ -93,6 +94,10 @@ class hardwareInterface():
if (getConfigValue("digital_output_device")=="mqtt"): if (getConfigValue("digital_output_device")=="mqtt"):
self.mqttclient.publish(getConfigValue("mqtt_topic") + "/fsm_state", state) self.mqttclient.publish(getConfigValue("mqtt_topic") + "/fsm_state", state)
def displaySoc(self, soc):
if getConfigValue("charge_parameter_backend") == "mqtt":
self.mqttclient.publish(getConfigValue("mqtt_topic") + "/soc", str(soc))
def setStateB(self): def setStateB(self):
self.addToTrace("Setting CP line into state B.") self.addToTrace("Setting CP line into state B.")
if (getConfigValue("digital_output_device")=="beaglebone"): if (getConfigValue("digital_output_device")=="beaglebone"):
@ -190,8 +195,8 @@ class hardwareInterface():
self.homeplughandler.sendSpecialMessageToControlThePowerSupply(targetVoltage, targetCurrent) self.homeplughandler.sendSpecialMessageToControlThePowerSupply(targetVoltage, targetCurrent)
#here we can publish the voltage and current requests received from the PEV side #here we can publish the voltage and current requests received from the PEV side
if getConfigValue("charge_parameter_backend") == "mqtt": if getConfigValue("charge_parameter_backend") == "mqtt":
self.mqttclient.publish(getConfigValue("mqtt_topic") + "/pev_voltage", str(targetVoltage)) self.mqttclient.publish(getConfigValue("mqtt_topic") + "/target_voltage", str(targetVoltage))
self.mqttclient.publish(getConfigValue("mqtt_topic") + "/pev_current", str(targetVoltage)) self.mqttclient.publish(getConfigValue("mqtt_topic") + "/target_current", str(targetCurrent))
def getInletVoltage(self): def getInletVoltage(self):
# uncomment this line, to take the simulated inlet voltage instead of the really measured # uncomment this line, to take the simulated inlet voltage instead of the really measured
@ -246,6 +251,9 @@ class hardwareInterface():
self.callbackShowStatus(format(self.simulatedSoc,".1f"), "soc") self.callbackShowStatus(format(self.simulatedSoc,".1f"), "soc")
return self.simulatedSoc return self.simulatedSoc
def stopRequest(self):
return not self.enabled
def isUserAuthenticated(self): def isUserAuthenticated(self):
# If the user needs to authorize, fill this function in a way that it returns False as long as # If the user needs to authorize, fill this function in a way that it returns False as long as
# we shall wait for the users authorization, and returns True if the authentication was successfull. # we shall wait for the users authorization, and returns True if the authentication was successfull.
@ -272,20 +280,22 @@ class hardwareInterface():
GPIO.setup(PinCp, GPIO.OUT) #output for CP GPIO.setup(PinCp, GPIO.OUT) #output for CP
if (getConfigValue("digital_output_device") == "mqtt"): if (getConfigValue("digital_output_device") == "mqtt"):
self.mqttclient = mqtt.Client() self.mqttclient = mqtt.Client(client_id="pyplc")
self.mqttclient.on_connect = self.mqtt_on_connect self.mqttclient.on_connect = self.mqtt_on_connect
self.mqttclient.on_message = self.mqtt_on_message self.mqttclient.on_message = self.mqtt_on_message
self.mqttclient.connect(getConfigValue("mqtt_broker"), 1883, 60) self.mqttclient.connect(getConfigValue("mqtt_broker"), 1883, 60)
def __init__(self, callbackAddToTrace=None, callbackShowStatus=None, homeplughandler=None): def __init__(self, callbackAddToTrace=None, callbackShowStatus=None, homeplughandler=None, mode=C_EVSE_MODE):
self.callbackAddToTrace = callbackAddToTrace self.callbackAddToTrace = callbackAddToTrace
self.callbackShowStatus = callbackShowStatus self.callbackShowStatus = callbackShowStatus
self.homeplughandler = homeplughandler self.homeplughandler = homeplughandler
self.mode = mode
self.loopcounter = 0 self.loopcounter = 0
self.outvalue = 0 self.outvalue = 0
self.simulatedSoc = 20.0 # percent self.simulatedSoc = 20.0 # percent
self.demoAuthenticationCounter = 0 self.demoAuthenticationCounter = 0
self.enabled = True #Charging enabled
self.inletVoltage = 0.0 # volts self.inletVoltage = 0.0 # volts
self.accuVoltage = 0.0 self.accuVoltage = 0.0
@ -527,25 +537,41 @@ class hardwareInterface():
# Subscribing in on_connect() means that if we lose the connection and # Subscribing in on_connect() means that if we lose the connection and
# reconnect then subscriptions will be renewed. # reconnect then subscriptions will be renewed.
client.subscribe(getConfigValue("mqtt_topic") + "/#") if self.mode == C_EVSE_MODE:
client.subscribe(getConfigValue("mqtt_topic") + "/charger_max_voltage") #todo
client.subscribe(getConfigValue("mqtt_topic") + "/charger_max_current") #todo
client.subscribe(getConfigValue("mqtt_topic") + "/charger_voltage")
client.subscribe(getConfigValue("mqtt_topic") + "/charger_current")
client.subscribe(getConfigValue("mqtt_topic") + "/enabled")
elif self.mode == C_EVSE_MODE:
client.subscribe(getConfigValue("mqtt_topic") + "/battery_voltage")
client.subscribe(getConfigValue("mqtt_topic") + "/target_voltage")
client.subscribe(getConfigValue("mqtt_topic") + "/target_current")
client.subscribe(getConfigValue("mqtt_topic") + "/soc")
client.subscribe(getConfigValue("mqtt_topic") + "/inlet_voltage")
def mqtt_on_message(self, client, userdata, msg): def mqtt_on_message(self, client, userdata, msg):
if msg.topic == getConfigValue("mqtt_topic") + "/battery_voltage": baseTopic = getConfigValue("mqtt_topic")
if msg.topic == (f"{baseTopic}/battery_voltage"):
self.accuVoltage = float(msg.payload) self.accuVoltage = float(msg.payload)
self.addToTrace("MQTT: Set battery voltage to %f V" % self.accuVoltage) self.addToTrace("MQTT: Set battery voltage to %f V" % self.accuVoltage)
elif msg.topic == getConfigValue("mqtt_topic") + "/target_voltage": elif msg.topic == (f"{baseTopic}/target_voltage"):
self.accuMaxVoltage = float(msg.payload) self.accuMaxVoltage = float(msg.payload)
self.addToTrace("MQTT: Set target voltage to %f V" % self.accuMaxVoltage) self.addToTrace("MQTT: Set target voltage to %f V" % self.accuMaxVoltage)
elif msg.topic == getConfigValue("mqtt_topic") + "/target_current": elif msg.topic == (f"{baseTopic}/target_current") or msg.topic == (f"{baseTopic}/charger_current"):
self.accuMaxCurrent = float(msg.payload) self.accuMaxCurrent = float(msg.payload)
self.addToTrace("MQTT: Set current request to %f A" % self.accuMaxCurrent) self.addToTrace("MQTT: Set current request to %s A" % self.accuMaxCurrent)
elif msg.topic == getConfigValue("mqtt_topic") + "/soc": elif msg.topic == (f"{baseTopic}/soc"):
self.simulatedSoc = float(msg.payload) self.simulatedSoc = float(msg.payload)
self.soc_percent = self.simulatedSoc self.soc_percent = self.simulatedSoc
self.addToTrace("MQTT: Set SoC to %f %%" % self.simulatedSoc) self.addToTrace("MQTT: Set SoC to %f %%" % self.simulatedSoc)
elif msg.topic == getConfigValue("mqtt_topic") + "/inlet_voltage": elif msg.topic == (f"{baseTopic}/inlet_voltage") or msg.topic == (f"{baseTopic}/charger_voltage"):
self.inletVoltage = float(msg.payload) self.inletVoltage = float(msg.payload) #in EVSE mode this is present charger voltage
self.addToTrace("MQTT: Set inlet voltage to %f V" % self.inletVoltage) self.addToTrace("MQTT: Set present voltage to %f V" % self.inletVoltage)
elif msg.topic == (f"{baseTopic}/enabled"):
self.enabled = bool(int(msg.payload))
self.addToTrace("MQTT: Setting enable flag to %d" % self.enabled)
def myPrintfunction(s): def myPrintfunction(s):
print("myprint " + s) print("myprint " + s)