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 internal property read methods protected

pull/46/head
Simon Stürz 2022-01-28 10:14:03 +01:00 committed by Michael Zanetti
parent 9fcfa037e3
commit 1e34b07cf4
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,6 +933,11 @@ def writeTcpHeaderFile():
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
writeLine(headerFile)
# Protected members
writeLine(headerFile, 'protected:')
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
writeLine(headerFile)
# Private members
writeLine(headerFile, 'private:')
writeLine(headerFile, ' quint16 m_slaveId = 1;')
@ -944,8 +949,7 @@ def writeTcpHeaderFile():
writeLine(headerFile)
writeLine(headerFile, ' void verifyInitFinished();')
writeLine(headerFile)
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
writeLine(headerFile)
# End of class
writeLine(headerFile)
@ -995,7 +999,7 @@ def writeTcpSourceFile():
# Write block update method
writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks'])
# Write property read method implementations
# Write internal protected property read method implementations
writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))
@ -1085,6 +1089,11 @@ def writeRtuHeaderFile():
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
writeLine(headerFile)
# Protected members
writeLine(headerFile, 'protected:')
writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers'])
writeLine(headerFile)
# Private members
writeLine(headerFile, 'private:')
writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;')
@ -1098,8 +1107,6 @@ def writeRtuHeaderFile():
writeLine(headerFile)
writeLine(headerFile, ' void verifyInitFinished();')
writeLine(headerFile)
writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers'])
writeLine(headerFile)
# End of class
writeLine(headerFile)
@ -1161,7 +1168,7 @@ def writeRtuSourceFile():
# Write block update method
writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks'])
# Write property read method implementations
# Write internal protected property read method implementations
writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))