sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-0.12' of https://github.com/s-allius/tsun-gen3-proxy into titan-scan

Browse Source
This commit is contained in:
Stefan Allius
2024-10-16 23:33:06 +02:00
parent 010ae2b2c7 6122f40718
commit 6b488e5269
4 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/gen3/talent.py
View File

@@ -135,6 +135,8 @@ class Talent(Message):
self.modbus_polling = inv['modbus_polling'] self.modbus_polling = inv['modbus_polling']
logger.debug(f'SerialNo {serial_no} allowed! area:{self.sug_area}') # noqa: E501 logger.debug(f'SerialNo {serial_no} allowed! area:{self.sug_area}') # noqa: E501
self.db.set_pv_module_details(inv) self.db.set_pv_module_details(inv)
if self.mb:
self.mb.set_node_id(self.node_id)
else: else:
self.node_id = '' self.node_id = ''
self.sug_area = '' self.sug_area = ''
@@ -590,8 +592,7 @@ class Talent(Message):
return return
for key, update, _ in self.mb.recv_resp(self.db, data[ for key, update, _ in self.mb.recv_resp(self.db, data[
hdr_len:], hdr_len:]):
self.node_id):
if update: if update:
self._set_mqtt_timestamp(key, self._utc()) self._set_mqtt_timestamp(key, self._utc())
self.new_data[key] = True self.new_data[key] = True

5
app/src/gen3plus/solarman_v5.py
View File

@@ -225,6 +225,8 @@ class SolarmanV5(Message):
self.sug_area = inv['suggested_area'] self.sug_area = inv['suggested_area']
self.modbus_polling = inv['modbus_polling'] self.modbus_polling = inv['modbus_polling']
self.sensor_list = inv['sensor_list'] self.sensor_list = inv['sensor_list']
if self.mb:
self.mb.set_node_id(self.node_id)
def __set_serial_no(self, snr: int): def __set_serial_no(self, snr: int):
'''check the serial number and configure the inverter connection''' '''check the serial number and configure the inverter connection'''
@@ -690,8 +692,7 @@ class SolarmanV5(Message):
f'(reg: 0x{self.mb.last_reg:04x}):', f'(reg: 0x{self.mb.last_reg:04x}):',
data[14:], modbus_msg_len) data[14:], modbus_msg_len)
for key, update, _ in self.mb.recv_resp(self.db, data[14:], for key, update, _ in self.mb.recv_resp(self.db, data[14:]):
self.node_id):
self.modbus_elms += 1 self.modbus_elms += 1
if update: if update:
if key == 'inverter': if key == 'inverter':

7
app/src/modbus.py
View File

@@ -117,6 +117,9 @@ class Modbus():
while not self.que.empty(): while not self.que.empty():
self.que.get_nowait() self.que.get_nowait()
def set_node_id(self, node_id: str):
self.node_id = node_id
def build_msg(self, addr: int, func: int, reg: int, val: int, def build_msg(self, addr: int, func: int, reg: int, val: int,
log_lvl=logging.DEBUG) -> None: log_lvl=logging.DEBUG) -> None:
"""Build MODBUS RTU request frame and add it to the tx queue """Build MODBUS RTU request frame and add it to the tx queue
@@ -160,14 +163,13 @@ class Modbus():
return True return True
def recv_resp(self, info_db, buf: bytes, node_id: str) -> \ def recv_resp(self, info_db, buf: bytes) -> \
Generator[tuple[str, bool, int | float | str], None, None]: Generator[tuple[str, bool, int | float | str], None, None]:
"""Generator which check and parse a received MODBUS response. """Generator which check and parse a received MODBUS response.
Keyword arguments: Keyword arguments:
info_db: database for info lockups info_db: database for info lockups
buf: received Modbus RTU response frame buf: received Modbus RTU response frame
node_id: string for logging which identifies the slave
Returns on error and set Self.err to: Returns on error and set Self.err to:
1: CRC error 1: CRC error
@@ -177,7 +179,6 @@ class Modbus():
5: No MODBUS request pending 5: No MODBUS request pending
""" """
# logging.info(f'recv_resp: first byte modbus:{buf[0]} len:{len(buf)}') # logging.info(f'recv_resp: first byte modbus:{buf[0]} len:{len(buf)}')
self.node_id = node_id
fcode = buf[1] fcode = buf[1]
data_available = self.last_addr == self.INV_ADDR and \ data_available = self.last_addr == self.INV_ADDR and \

35
app/tests/test_modbus.py
View File

@@ -77,9 +77,10 @@ def test_recv_resp_crc_err():
mb.last_fcode = 3 mb.last_fcode = 3
mb.last_reg = 0x300e mb.last_reg = 0x300e
mb.last_len = 2 mb.last_len = 2
mb.set_node_id('test')
# check matching response, but with CRC error # check matching response, but with CRC error
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf3', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf3'):
call += 1 call += 1
assert mb.err == 1 assert mb.err == 1
assert 0 == call assert 0 == call
@@ -97,10 +98,11 @@ def test_recv_resp_invalid_addr():
mb.last_fcode = 3 mb.last_fcode = 3
mb.last_reg = 0x300e mb.last_reg = 0x300e
mb.last_len = 2 mb.last_len = 2
mb.set_node_id('test')
# check not matching response, with wrong server addr # check not matching response, with wrong server addr
call = 0 call = 0
for key, update in mb.recv_resp(mb.db, b'\x02\x03\x04\x01\x2c\x00\x46\x88\xf4', 'test'): for key, update in mb.recv_resp(mb.db, b'\x02\x03\x04\x01\x2c\x00\x46\x88\xf4'):
call += 1 call += 1
assert mb.err == 2 assert mb.err == 2
assert 0 == call assert 0 == call
@@ -120,7 +122,8 @@ def test_recv_recv_fcode():
# check not matching response, with wrong function code # check not matching response, with wrong function code
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'): mb.set_node_id('test')
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
call += 1 call += 1
assert mb.err == 3 assert mb.err == 3
@@ -142,7 +145,8 @@ def test_recv_resp_len():
# check not matching response, with wrong data length # check not matching response, with wrong data length
call = 0 call = 0
for key, update, _ in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'): mb.set_node_id('test')
for key, update, _ in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
call += 1 call += 1
assert mb.err == 4 assert mb.err == 4
@@ -161,7 +165,8 @@ def test_recv_unexpect_resp():
# check unexpected response, which must be dropped # check unexpected response, which must be dropped
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'): mb.set_node_id('test')
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
call += 1 call += 1
assert mb.err == 5 assert mb.err == 5
@@ -177,8 +182,9 @@ def test_parse_resp():
assert mb.req_pend assert mb.req_pend
call = 0 call = 0
mb.set_node_id('test')
exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30] exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8'):
if key == 'grid': if key == 'grid':
assert update == True assert update == True
elif key == 'inverter': elif key == 'inverter':
@@ -226,8 +232,9 @@ def test_queue2():
assert mb.send_calls == 1 assert mb.send_calls == 1
assert mb.pdu == b'\x01\x030\x07\x00\x06{\t' assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
call = 0 call = 0
mb.set_node_id('test')
exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30] exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8'):
if key == 'grid': if key == 'grid':
assert update == True assert update == True
elif key == 'inverter': elif key == 'inverter':
@@ -245,14 +252,14 @@ def test_queue2():
assert mb.send_calls == 2 assert mb.send_calls == 2
assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b' assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b'
for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b'):
pass # call generator mb.recv_resp() pass # call generator mb.recv_resp()
assert mb.que.qsize() == 0 assert mb.que.qsize() == 0
assert mb.send_calls == 3 assert mb.send_calls == 3
assert mb.pdu == b'\x01\x030\x07\x00\x06{\t' assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8'):
call += 1 call += 1
assert 0 == mb.err assert 0 == mb.err
assert 5 == call assert 5 == call
@@ -276,8 +283,9 @@ def test_queue3():
assert mb.recv_responses == 0 assert mb.recv_responses == 0
call = 0 call = 0
mb.set_node_id('test')
exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30] exp_result = ['V0.0.2C', 4.4, 0.7, 0.7, 30]
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8'):
if key == 'grid': if key == 'grid':
assert update == True assert update == True
elif key == 'inverter': elif key == 'inverter':
@@ -296,7 +304,7 @@ def test_queue3():
assert mb.send_calls == 2 assert mb.send_calls == 2
assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b' assert mb.pdu == b'\x01\x06\x20\x08\x00\x04\x02\x0b'
for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x06\x20\x08\x00\x04\x02\x0b'):
pass # no code in loop is OK; calling the generator is the purpose pass # no code in loop is OK; calling the generator is the purpose
assert 0 == mb.err assert 0 == mb.err
assert mb.recv_responses == 2 assert mb.recv_responses == 2
@@ -305,7 +313,7 @@ def test_queue3():
assert mb.send_calls == 3 assert mb.send_calls == 3
assert mb.pdu == b'\x01\x030\x07\x00\x06{\t' assert mb.pdu == b'\x01\x030\x07\x00\x06{\t'
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8', 'test'): for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x0c\x01\x2c\x00\x2c\x00\x2c\x00\x46\x00\x46\x00\x46\x32\xc8'):
call += 1 call += 1
assert 0 == mb.err assert 0 == mb.err
assert mb.recv_responses == 2 assert mb.recv_responses == 2
@@ -373,7 +381,8 @@ def test_recv_unknown_data():
# check matching response, but with CRC error # check matching response, but with CRC error
call = 0 call = 0
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4', 'test'): mb.set_node_id('test')
for key, update, val in mb.recv_resp(mb.db, b'\x01\x03\x04\x01\x2c\x00\x46\xbb\xf4'):
call += 1 call += 1
assert mb.err == 0 assert mb.err == 0
assert 0 == call assert 0 == call