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

Update debug printes and make read methods public

master
Simon Stürz 2022-03-23 17:00:48 +01:00
parent 45de9c1e5b
commit 6e6261b839
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modbus/tools/connectiontool/modbustcp.py
View File

@ -215,9 +215,9 @@ def writeInternalBlockReadMethodDeclarationsTcp(fileDescriptor, blockDefinitions
writeLine(fileDescriptor, ' /* Read block from start addess %s with size of %s registers containing following %s properties:' % (blockStartAddress, blockSize, registerCount))
for i, registerDefinition in enumerate(blockRegisters):
if 'unit' in registerDefinition and registerDefinition['unit'] != '':
writeLine(fileDescriptor, ' - %s [%s] - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['unit'], registerDefinition['address'], registerDefinition['size']))
writeLine(fileDescriptor, ' - %s [%s] - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['unit'], registerDefinition['address'], registerDefinition['size']))
else:
writeLine(fileDescriptor, ' -- %s - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['address'], registerDefinition['size']))
writeLine(fileDescriptor, ' - %s - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['address'], registerDefinition['size']))
writeLine(fileDescriptor, ' */ ' )
writeLine(fileDescriptor, ' QModbusReply *readBlock%s();' % (blockName[0].upper() + blockName[1:]))
writeLine(fileDescriptor)

7
modbus/tools/connectiontool/toolcommon.py
View File

@ -417,10 +417,10 @@ def writeBlocksUpdateMethodDeclarations(fileDescriptor, blockDefinitions):
if 'unit' in registerDefinition and registerDefinition['unit'] != '':
writeLine(fileDescriptor, ' - %s [%s] - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['unit'], registerDefinition['address'], registerDefinition['size']))
else:
writeLine(fileDescriptor, ' -- %s - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['address'], registerDefinition['size']))
writeLine(fileDescriptor, ' - %s - Address: %s, Size: %s' % (registerDefinition['description'], registerDefinition['address'], registerDefinition['size']))
writeLine(fileDescriptor, ' */ ' )
writeLine(fileDescriptor, ' void update%sBlock();' % (blockName[0].upper() + blockName[1:]))
writeLine(fileDescriptor)
writeLine(fileDescriptor)
def writeRegistersDebugLine(fileDescriptor, debugObjectParamName, registerDefinitions):
@ -444,7 +444,8 @@ def writeUpdateMethod(fileDescriptor, className, registerDefinitions, blockDefin
# Add the update block methods
for blockDefinition in blockDefinitions:
blockName = blockDefinition['id']
writeLine(fileDescriptor, ' update%sBlock();' % (blockName[0].upper() + blockName[1:]))
if 'readSchedule' in blockDefinition and blockDefinition['readSchedule'] == 'update':
writeLine(fileDescriptor, ' update%sBlock();' % (blockName[0].upper() + blockName[1:]))
writeLine(fileDescriptor, '}')
writeLine(fileDescriptor)

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

@ -91,6 +91,16 @@ def writeTcpHeaderFile():
writeLine(headerFile)
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
if 'blocks' in registerJson:
for blockDefinition in registerJson['blocks']:
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, blockDefinition['registers'])
writeLine(headerFile)
writeInternalBlockReadMethodDeclarationsTcp(headerFile, registerJson['blocks'])
writeLine(headerFile)
# Write registers value changed signals
writeLine(headerFile, 'signals:')
writeLine(headerFile, ' void initializationFinished();')
@ -106,14 +116,6 @@ def writeTcpHeaderFile():
# Protected members
writeLine(headerFile, 'protected:')
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
if 'blocks' in registerJson:
for blockDefinition in registerJson['blocks']:
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, blockDefinition['registers'])
writeLine(headerFile)
writeInternalBlockReadMethodDeclarationsTcp(headerFile, registerJson['blocks'])
writeLine(headerFile)
writeProtectedPropertyMembers(headerFile, registerJson['registers'])