ETM-Schurig
/
nymea-plugins-modbus
mirror of https://github.com/nymea/nymea-plugins-modbus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make block definition optional for register json file

pull/46/head
Simon Stürz 2022-01-28 10:19:17 +01:00 committed by Michael Zanetti
parent 1e34b07cf4
commit 4e9f98ddee
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modbus/tools/generate-connection.py
View File

@ -914,7 +914,8 @@ def writeTcpHeaderFile():
writePropertyGetSetMethodDeclarationsTcp(headerFile, registerJson['registers']) writePropertyGetSetMethodDeclarationsTcp(headerFile, registerJson['registers'])
# Write block get/set method declarations # Write block get/set method declarations
writeBlocksUpdateMethodDeclarations(headerFile, registerJson['blocks']) if 'blocks' in registerJson:
writeBlocksUpdateMethodDeclarations(headerFile, registerJson['blocks'])
# Write init and update method declarations # Write init and update method declarations
writeLine(headerFile, ' virtual void initialize();') writeLine(headerFile, ' virtual void initialize();')
@ -929,8 +930,10 @@ def writeTcpHeaderFile():
writeLine(headerFile, ' void initializationFinished();') writeLine(headerFile, ' void initializationFinished();')
writeLine(headerFile) writeLine(headerFile)
writePropertyChangedSignals(headerFile, registerJson['registers']) writePropertyChangedSignals(headerFile, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePropertyChangedSignals(headerFile, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
writeLine(headerFile) writeLine(headerFile)
# Protected members # Protected members
@ -944,8 +947,10 @@ def writeTcpHeaderFile():
writeLine(headerFile, ' QVector<QModbusReply *> m_pendingInitReplies;') writeLine(headerFile, ' QVector<QModbusReply *> m_pendingInitReplies;')
writeLine(headerFile) writeLine(headerFile)
writePrivatePropertyMembers(headerFile, registerJson['registers']) writePrivatePropertyMembers(headerFile, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePrivatePropertyMembers(headerFile, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePrivatePropertyMembers(headerFile, blockDefinition['registers'])
writeLine(headerFile) writeLine(headerFile)
writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile, ' void verifyInitFinished();')
writeLine(headerFile) writeLine(headerFile)
@ -986,8 +991,9 @@ def writeTcpSourceFile():
writePropertyGetSetMethodImplementationsTcp(sourceFile, className, registerJson['registers']) writePropertyGetSetMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
# Block property get methods # Block property get methods
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePropertyGetSetMethodImplementationsTcp(sourceFile, className, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePropertyGetSetMethodImplementationsTcp(sourceFile, className, blockDefinition['registers'])
# Write init and update method implementation # Write init and update method implementation
writeInitializeMethod(sourceFile, className, registerJson['registers']) writeInitializeMethod(sourceFile, className, registerJson['registers'])
@ -996,8 +1002,9 @@ def writeTcpSourceFile():
# Write update methods # Write update methods
writePropertyUpdateMethodImplementationsTcp(sourceFile, className, registerJson['registers']) writePropertyUpdateMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
# Write block update method # Write block update method
writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks']) if 'blocks' in registerJson:
writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks'])
# Write internal protected property read method implementations # Write internal protected property read method implementations
writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers']) writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
@ -1018,8 +1025,9 @@ def writeTcpSourceFile():
writeLine(sourceFile, ' debug.nospace().noquote() << "%s(" << %s->hostAddress().toString() << ":" << %s->port() << ")" << "\\n";' % (className, debugObjectParamName, debugObjectParamName)) writeLine(sourceFile, ' debug.nospace().noquote() << "%s(" << %s->hostAddress().toString() << ":" << %s->port() << ")" << "\\n";' % (className, debugObjectParamName, debugObjectParamName))
writeRegistersDebugLine(sourceFile, debugObjectParamName, registerJson['registers']) writeRegistersDebugLine(sourceFile, debugObjectParamName, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writeRegistersDebugLine(sourceFile, debugObjectParamName, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writeRegistersDebugLine(sourceFile, debugObjectParamName, blockDefinition['registers'])
writeLine(sourceFile, ' return debug.quote().space();') writeLine(sourceFile, ' return debug.quote().space();')
writeLine(sourceFile, '}') writeLine(sourceFile, '}')
@ -1070,7 +1078,8 @@ def writeRtuHeaderFile():
writePropertyGetSetMethodDeclarationsRtu(headerFile, registerJson['registers']) writePropertyGetSetMethodDeclarationsRtu(headerFile, registerJson['registers'])
# Write block get/set method declarations # Write block get/set method declarations
writeBlocksUpdateMethodDeclarations(headerFile, registerJson['blocks']) if 'blocks' in registerJson:
writeBlocksUpdateMethodDeclarations(headerFile, registerJson['blocks'])
writePropertyUpdateMethodDeclarations(headerFile, registerJson['registers']) writePropertyUpdateMethodDeclarations(headerFile, registerJson['registers'])
writeLine(headerFile) writeLine(headerFile)
@ -1085,8 +1094,9 @@ def writeRtuHeaderFile():
writeLine(headerFile, ' void initializationFinished();') writeLine(headerFile, ' void initializationFinished();')
writeLine(headerFile) writeLine(headerFile)
writePropertyChangedSignals(headerFile, registerJson['registers']) writePropertyChangedSignals(headerFile, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePropertyChangedSignals(headerFile, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
writeLine(headerFile) writeLine(headerFile)
# Protected members # Protected members
@ -1101,8 +1111,9 @@ def writeRtuHeaderFile():
writeLine(headerFile, ' QVector<ModbusRtuReply *> m_pendingInitReplies;') writeLine(headerFile, ' QVector<ModbusRtuReply *> m_pendingInitReplies;')
writeLine(headerFile) writeLine(headerFile)
writePrivatePropertyMembers(headerFile, registerJson['registers']) writePrivatePropertyMembers(headerFile, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePrivatePropertyMembers(headerFile, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePrivatePropertyMembers(headerFile, blockDefinition['registers'])
writeLine(headerFile) writeLine(headerFile)
writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile, ' void verifyInitFinished();')
@ -1155,8 +1166,9 @@ def writeRtuSourceFile():
writePropertyGetSetMethodImplementationsRtu(sourceFile, className, registerJson['registers']) writePropertyGetSetMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
# Block property get methods # Block property get methods
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writePropertyGetSetMethodImplementationsRtu(sourceFile, className, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writePropertyGetSetMethodImplementationsRtu(sourceFile, className, blockDefinition['registers'])
# Write init and update method implementation # Write init and update method implementation
writeInitializeMethod(sourceFile, className, registerJson['registers']) writeInitializeMethod(sourceFile, className, registerJson['registers'])
@ -1166,7 +1178,8 @@ def writeRtuSourceFile():
writePropertyUpdateMethodImplementationsRtu(sourceFile, className, registerJson['registers']) writePropertyUpdateMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
# Write block update method # Write block update method
writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks']) if 'blocks' in registerJson:
writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks'])
# Write internal protected property read method implementations # Write internal protected property read method implementations
writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers']) writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
@ -1187,8 +1200,9 @@ def writeRtuSourceFile():
writeLine(sourceFile, ' debug.nospace().noquote() << "%s(" << %s->modbusRtuMaster()->modbusUuid().toString() << ", " << %s->modbusRtuMaster()->serialPort() << ", slave ID:" << %s->slaveId() << ")" << "\\n";' % (className, debugObjectParamName, debugObjectParamName, debugObjectParamName)) writeLine(sourceFile, ' debug.nospace().noquote() << "%s(" << %s->modbusRtuMaster()->modbusUuid().toString() << ", " << %s->modbusRtuMaster()->serialPort() << ", slave ID:" << %s->slaveId() << ")" << "\\n";' % (className, debugObjectParamName, debugObjectParamName, debugObjectParamName))
writeRegistersDebugLine(sourceFile, debugObjectParamName, registerJson['registers']) writeRegistersDebugLine(sourceFile, debugObjectParamName, registerJson['registers'])
for blockDefinition in registerJson['blocks']: if 'blocks' in registerJson:
writeRegistersDebugLine(sourceFile, debugObjectParamName, blockDefinition['registers']) for blockDefinition in registerJson['blocks']:
writeRegistersDebugLine(sourceFile, debugObjectParamName, blockDefinition['registers'])
writeLine(sourceFile, ' return debug.quote().space();') writeLine(sourceFile, ' return debug.quote().space();')
writeLine(sourceFile, '}') writeLine(sourceFile, '}')
@ -1234,7 +1248,8 @@ protocol = 'TCP'
if 'protocol' in registerJson: if 'protocol' in registerJson:
protocol = registerJson['protocol'] protocol = registerJson['protocol']
validateBlocks(registerJson['blocks']) if 'blocks' in registerJson:
validateBlocks(registerJson['blocks'])
if protocol == 'TCP': if protocol == 'TCP':
writeTcpHeaderFile() writeTcpHeaderFile()