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

Make properties protected instead of private

master
Simon Stürz 2022-01-28 12:18:16 +01:00 committed by Michael Zanetti
parent d22b5b6e91
commit 00915e3dc1
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,22 +991,21 @@ def writeTcpHeaderFile():
writeLine(headerFile, 'protected:') writeLine(headerFile, 'protected:')
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers']) writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
writeLine(headerFile) writeLine(headerFile)
# Private members
writeLine(headerFile, 'private:')
writeLine(headerFile, ' quint16 m_slaveId = 1;')
writeLine(headerFile, ' QVector<QModbusReply *> m_pendingInitReplies;')
writeLine(headerFile)
writePrivatePropertyMembers(headerFile, registerJson['registers']) writePrivatePropertyMembers(headerFile, registerJson['registers'])
if 'blocks' in registerJson: if 'blocks' in registerJson:
for blockDefinition in registerJson['blocks']: for blockDefinition in registerJson['blocks']:
writePrivatePropertyMembers(headerFile, blockDefinition['registers']) writePrivatePropertyMembers(headerFile, blockDefinition['registers'])
writeLine(headerFile) writeLine(headerFile)
# Private members
writeLine(headerFile, 'private:')
writeLine(headerFile, ' quint16 m_slaveId = 1;')
writeLine(headerFile, ' QVector<QModbusReply *> m_pendingInitReplies;')
writeLine(headerFile)
writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile, ' void verifyInitFinished();')
writeLine(headerFile) writeLine(headerFile)
# End of class # End of class
writeLine(headerFile) writeLine(headerFile)
writeLine(headerFile, '};') writeLine(headerFile, '};')
@ -1157,18 +1156,18 @@ def writeRtuHeaderFile():
writeLine(headerFile, 'protected:') writeLine(headerFile, 'protected:')
writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers'])
writeLine(headerFile) writeLine(headerFile)
writePrivatePropertyMembers(headerFile, registerJson['registers'])
if 'blocks' in registerJson:
for blockDefinition in registerJson['blocks']:
writePrivatePropertyMembers(headerFile, blockDefinition['registers'])
writeLine(headerFile)
# Private members # Private members
writeLine(headerFile, 'private:') writeLine(headerFile, 'private:')
writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;') writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;')
writeLine(headerFile, ' quint16 m_slaveId = 1;') writeLine(headerFile, ' quint16 m_slaveId = 1;')
writeLine(headerFile, ' QVector<ModbusRtuReply *> m_pendingInitReplies;') writeLine(headerFile, ' QVector<ModbusRtuReply *> m_pendingInitReplies;')
writeLine(headerFile)
writePrivatePropertyMembers(headerFile, registerJson['registers'])
if 'blocks' in registerJson:
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)