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

fix: EvseMode: Find the DIN schema and use the related SchemaID. Should fix issue #9

Browse source
This commit is contained in:
uhi22 2023-06-27 21:22:21 +02:00
parent 12d3d021bf
commit 2b5806bf43
3 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
exiConnector.py
View file

@ -55,6 +55,10 @@ exiHexDemoSupportedApplicationProtocolRequestIoniq="8000dbab9371d3234b71d1b98189
# Command line: # Command line:
# ./OpenV2G.exe DH8000dbab9371d3234b71d1b981899189d191818991d26b9b3a232b30020000040040 # ./OpenV2G.exe DH8000dbab9371d3234b71d1b981899189d191818991d26b9b3a232b30020000040040
# (1b) From the tesla. Source https://github.com/SmartEVSE/SmartEVSE-3/issues/25#issuecomment-1606259381)
exiHexDemoSupportedApplicationProtocolRequestTesla="8000DBAB9371D3234B71D1B981899189D191818991D26B9B3A232B30020000040401B75726E3A7465736C613A64696E3A323031383A4D736744656600001C0100080"
# The BMW iX3 handshake request (one schema, schemaID 0, from https://github.com/SmartEVSE/SmartEVSE-3/issues/25#issuecomment-1606271999)
exiHexDemoSupportedApplicationProtocolRequestBMWiX3="8000DBAB9371D3234B71D1B981899189D191818991D26B9B3A232B30020000000040"
# (2) From OpenV2G main_example.appHandshake() # (2) From OpenV2G main_example.appHandshake()
# 8000ebab9371d34b9b79d189a98989c1d191d191818981d26b9b3a232b30010000040001b75726e3a64696e3a37303132313a323031323a4d73674465660020000100880 # 8000ebab9371d34b9b79d189a98989c1d191d191818981d26b9b3a232b30010000040001b75726e3a64696e3a37303132313a323031323a4d73674465660020000100880

37
fsmEvse.py
View file

@ -51,17 +51,32 @@ class fsmEvse():
self.rxData = [] self.rxData = []
strConverterResult = exiDecode(exidata, "DH") # Decode Handshake-request strConverterResult = exiDecode(exidata, "DH") # Decode Handshake-request
self.addToTrace(strConverterResult) self.addToTrace(strConverterResult)
if (strConverterResult.find("ProtocolNamespace=urn:din")>0): if (strConverterResult.find("supportedAppProtocolReq")>0):
# todo: of course we should care for schemaID and prio also here nDinSchemaID = 255 # invalid default value
self.addToTrace("Detected DIN") try:
# TESTSUITE: When the EVSE received the Handshake, it selects a new test case. y = json.loads(strConverterResult)
testsuite_choose_testcase() nAppProtocol_ArrayLen = int(y["AppProtocol_arrayLen"])
# Eh for encode handshake, SupportedApplicationProtocolResponse self.addToTrace("The car supports " + str(nAppProtocol_ArrayLen) + " schemas.")
msg = addV2GTPHeader(exiEncode("Eh")) for i in range(nAppProtocol_ArrayLen):
self.addToTrace("responding " + prettyHexMessage(msg)) strNameSpace = y["NameSpace_"+str(i)]
self.Tcp.transmit(msg) nSchemaId = int(y["SchemaID_"+str(i)])
self.publishStatus("Schema negotiated") self.addToTrace("The NameSpace " + strNameSpace + " has SchemaID " + str(nSchemaId))
self.enterState(stateWaitForSessionSetupRequest) if (strNameSpace.find(":din:70121:")>0):
nDinSchemaID = nSchemaId
except:
self.addToTrace("ERROR: Could not decode the supportedAppProtocolReq")
if (nDinSchemaID<255):
self.addToTrace("Detected DIN")
# TESTSUITE: When the EVSE received the Handshake, it selects a new test case.
testsuite_choose_testcase()
# Eh for encode handshake, SupportedApplicationProtocolResponse, with SchemaID as parameter
msg = addV2GTPHeader(exiEncode("Eh__"+str(nDinSchemaID)))
self.addToTrace("responding " + prettyHexMessage(msg))
self.Tcp.transmit(msg)
self.publishStatus("Schema negotiated")
self.enterState(stateWaitForSessionSetupRequest)
else:
self.addToTrace("Error: The connected car does not support DIN. At the moment, the pyPLC only supports DIN.")
def stateFunctionWaitForSessionSetupRequest(self): def stateFunctionWaitForSessionSetupRequest(self):
if (len(self.rxData)>0): if (len(self.rxData)>0):

3
fsmPev.py
View file

@ -232,6 +232,9 @@ class fsmPev():
# We just use the initial request message from the Ioniq. It contains one entry: DIN. # We just use the initial request message from the Ioniq. It contains one entry: DIN.
self.addToTrace("Checkpoint400: Sending the initial SupportedApplicationProtocolReq") self.addToTrace("Checkpoint400: Sending the initial SupportedApplicationProtocolReq")
self.Tcp.transmit(addV2GTPHeader(exiHexToByteArray(exiHexDemoSupportedApplicationProtocolRequestIoniq))) self.Tcp.transmit(addV2GTPHeader(exiHexToByteArray(exiHexDemoSupportedApplicationProtocolRequestIoniq)))
# For testing purposes, we can also use the requests from other cars:
#self.Tcp.transmit(addV2GTPHeader(exiHexToByteArray(exiHexDemoSupportedApplicationProtocolRequestTesla)))
#self.Tcp.transmit(addV2GTPHeader(exiHexToByteArray(exiHexDemoSupportedApplicationProtocolRequestBMWiX3)))
self.hardwareInterface.resetSimulation() self.hardwareInterface.resetSimulation()
self.enterState(stateWaitForSupportedApplicationProtocolResponse) self.enterState(stateWaitForSupportedApplicationProtocolResponse)