From dca00618086a6254440815e1ca1ea965f272bde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 21 Jun 2022 11:38:20 +0200 Subject: [PATCH] modbus-tool: Fix #69 --- libnymea-modbus/tools/generate-connection.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libnymea-modbus/tools/generate-connection.py b/libnymea-modbus/tools/generate-connection.py index ef71e5a..76805b6 100644 --- a/libnymea-modbus/tools/generate-connection.py +++ b/libnymea-modbus/tools/generate-connection.py @@ -197,8 +197,12 @@ def writeTcpSourceFile(): writePropertyGetSetMethodImplementationsTcp(sourceFile, className, blockDefinition['registers']) # Write init and update method implementation - writeInitMethodImplementationTcp(sourceFile, className, registerJson['registers'], registerJson['blocks']) - writeUpdateMethod(sourceFile, className, registerJson['registers'], registerJson['blocks']) + blocks = [] + if 'blocks' in registerJson: + blocks = registerJson['blocks'] + + writeInitMethodImplementationTcp(sourceFile, className, registerJson['registers'], blocks) + writeUpdateMethod(sourceFile, className, registerJson['registers'], blocks) # Write update methods writePropertyUpdateMethodImplementationsTcp(sourceFile, className, registerJson['registers']) @@ -427,8 +431,12 @@ def writeRtuSourceFile(): writePropertyGetSetMethodImplementationsRtu(sourceFile, className, blockDefinition['registers']) # Write init and update method implementation - writeInitMethodImplementationRtu(sourceFile, className, registerJson['registers'], registerJson['blocks']) - writeUpdateMethod(sourceFile, className, registerJson['registers'], registerJson['blocks']) + blocks = [] + if 'blocks' in registerJson: + blocks = registerJson['blocks'] + + writeInitMethodImplementationRtu(sourceFile, className, registerJson['registers'], blocks) + writeUpdateMethod(sourceFile, className, registerJson['registers'], blocks) # Write update methods writePropertyUpdateMethodImplementationsRtu(sourceFile, className, registerJson['registers'])