ETM-Schurig/powersync-plugins-modbus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #71: modbus-tool: Fix issue #69 : make json without blocks work again

Browse Source
This commit is contained in:
jenkins 2022-06-30 15:05:28 +02:00
commit 9ed1d04fc9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libnymea-modbus/tools/generate-connection.py
View File

@ -197,8 +197,12 @@ def writeTcpSourceFile():
writePropertyGetSetMethodImplementationsTcp(sourceFile, className, blockDefinition['registers']) writePropertyGetSetMethodImplementationsTcp(sourceFile, className, blockDefinition['registers'])
# Write init and update method implementation # Write init and update method implementation
writeInitMethodImplementationTcp(sourceFile, className, registerJson['registers'], registerJson['blocks']) blocks = []
writeUpdateMethod(sourceFile, className, registerJson['registers'], registerJson['blocks']) if 'blocks' in registerJson:
blocks = registerJson['blocks']
writeInitMethodImplementationTcp(sourceFile, className, registerJson['registers'], blocks)
writeUpdateMethod(sourceFile, className, registerJson['registers'], blocks)
# Write update methods # Write update methods
writePropertyUpdateMethodImplementationsTcp(sourceFile, className, registerJson['registers']) writePropertyUpdateMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
@ -427,8 +431,12 @@ def writeRtuSourceFile():
writePropertyGetSetMethodImplementationsRtu(sourceFile, className, blockDefinition['registers']) writePropertyGetSetMethodImplementationsRtu(sourceFile, className, blockDefinition['registers'])
# Write init and update method implementation # Write init and update method implementation
writeInitMethodImplementationRtu(sourceFile, className, registerJson['registers'], registerJson['blocks']) blocks = []
writeUpdateMethod(sourceFile, className, registerJson['registers'], registerJson['blocks']) if 'blocks' in registerJson:
blocks = registerJson['blocks']
writeInitMethodImplementationRtu(sourceFile, className, registerJson['registers'], blocks)
writeUpdateMethod(sourceFile, className, registerJson['registers'], blocks)
# Write update methods # Write update methods
writePropertyUpdateMethodImplementationsRtu(sourceFile, className, registerJson['registers']) writePropertyUpdateMethodImplementationsRtu(sourceFile, className, registerJson['registers'])