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: resolve mixup of PevMode and EvseMode for SeccIp

Browse source
This commit is contained in:
uhi22 2023-05-11 08:18:04 +02:00
parent 9d06934ec7
commit 123ad659cd
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pyPlcIpv6.py
View file

@ -299,6 +299,9 @@ class ipv6handler():
def enterEvseMode(self): def enterEvseMode(self):
self.iAmEvse = 1 # emulating a charging station self.iAmEvse = 1 # emulating a charging station
self.iAmPev = 0 # not emulating a vehicle self.iAmPev = 0 # not emulating a vehicle
# If we are an charger, we need to support the SDP, which requires to know our IPv6 adrress.
self.SeccIp = self.addressManager.getLinkLocalIpv6Address("bytearray")
def enterListenMode(self): def enterListenMode(self):
self.iAmEvse = 0 # not emulating a charging station self.iAmEvse = 0 # not emulating a charging station
self.iAmPev = 0 # not emulating a vehicle self.iAmPev = 0 # not emulating a vehicle
@ -356,8 +359,8 @@ class ipv6handler():
self.evaluateTcpPacket() self.evaluateTcpPacket()
def __init__(self, transmitCallback, addressManager, connMgr, callbackShowStatus): def __init__(self, transmitCallback, addressManager, connMgr, callbackShowStatus):
self.enterEvseMode() self.iAmEvse = 0
#self.enterListenMode() self.iAmPev = 0
self.transmit = transmitCallback self.transmit = transmitCallback
self.addressManager = addressManager self.addressManager = addressManager
self.connMgr = connMgr self.connMgr = connMgr
@ -367,14 +370,12 @@ class ipv6handler():
# self.SeccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x06, 0xaa, 0xaa, 0xff, 0xfe, 0, 0xaa, 0xaa ] # self.SeccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x06, 0xaa, 0xaa, 0xff, 0xfe, 0, 0xaa, 0xaa ]
# fe80::e0ad:99ac:52eb:85d3 is the Win10 laptop # fe80::e0ad:99ac:52eb:85d3 is the Win10 laptop
# self.SeccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0xe0, 0xad, 0x99, 0xac, 0x52, 0xeb, 0x85, 0xd3 ] # self.SeccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0xe0, 0xad, 0x99, 0xac, 0x52, 0xeb, 0x85, 0xd3 ]
# just a default for the chargers IP, will be filled later with the correct value from SDP
self.SeccIp = bytearray(16)
# 16 bytes, a default IPv6 address for the vehicle # 16 bytes, a default IPv6 address for the vehicle
# todo: On EVSE side, extract the vehicles IP address from the SDP communication
# Just a default, will be overwritten later: # Just a default, will be overwritten later:
self.EvccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x06, 0x65, 0x65, 0xff, 0xfe, 0, 0x64, 0xC3 ] self.EvccIp = [ 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x06, 0x65, 0x65, 0xff, 0xfe, 0, 0x64, 0xC3 ]
#self.ownMac = [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 ] # 6 bytes own MAC default. Should be overwritten before use.
self.ownMac = self.addressManager.getLocalMacAddress() self.ownMac = self.addressManager.getLocalMacAddress()
self.faultInjectionSuppressSdpResponse = 0 # can be set to >0 for fault injection. Number of "lost" SDP responses. self.faultInjectionSuppressSdpResponse = 0 # can be set to >0 for fault injection. Number of "lost" SDP responses.
print("pyPlcIpv6 started with ownMac " + prettyMac(self.ownMac)) print("pyPlcIpv6 started with ownMac " + prettyMac(self.ownMac))
if (self.iAmEvse):
# If we are an charger, we need to support the SDP, which requires to know our IPv6 adrress.
self.SeccIp = self.addressManager.getLinkLocalIpv6Address("bytearray")