From e1d3593dbceca21ede514d018729a41d0e58c6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 3 Jun 2022 09:28:18 +0200 Subject: [PATCH] Update protocol parsing logic and warn on invalid protocol --- libnymea-modbus/tools/generate-connection.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/libnymea-modbus/tools/generate-connection.py b/libnymea-modbus/tools/generate-connection.py index 0fc7c07..e385892 100644 --- a/libnymea-modbus/tools/generate-connection.py +++ b/libnymea-modbus/tools/generate-connection.py @@ -533,19 +533,11 @@ if 'blocks' in registerJson: validateBlocks(registerJson['blocks']) # Create classes depending on the protocol -writeTcp = True -writeRtu = False - -if protocol == 'TCP': - writeTcp = True - writeRtu = False -elif protocol == 'RTU': - writeTcp = False - writeRtu = True -else: - # Any other value generates both classes - writeTcp = True - writeRtu = True +writeTcp = protocol in ["TCP", "BOTH"] +writeRtu = protocol in ["RTU", "BOTH"] +if not writeTcp and not writeRtu: + logger.warning('Invalid protocol definition. Please use TCP, RTU or BOTH.') + exit(1) headerFiles = [] sourceFiles = []