From 3ae84f28cd41b88cee460a9e016615a389a751b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 4 Apr 2022 15:00:18 +0200 Subject: [PATCH] Fix modbus connection header file --- modbus/tools/generate-connection.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modbus/tools/generate-connection.py b/modbus/tools/generate-connection.py index c5d7742..dd971bc 100644 --- a/modbus/tools/generate-connection.py +++ b/modbus/tools/generate-connection.py @@ -313,6 +313,15 @@ def writeRtuHeaderFile(): writeLine(headerFile) + writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) + if 'blocks' in registerJson: + for blockDefinition in registerJson['blocks']: + writeInternalPropertyReadMethodDeclarationsRtu(headerFile, blockDefinition['registers']) + + writeLine(headerFile) + writeInternalBlockReadMethodDeclarationsRtu(headerFile, registerJson['blocks']) + + # Write registers value changed signals writeLine(headerFile, 'signals:') writeLine(headerFile, ' void initializationFinished();') @@ -327,14 +336,6 @@ def writeRtuHeaderFile(): # Protected members writeLine(headerFile, 'protected:') - writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) - if 'blocks' in registerJson: - for blockDefinition in registerJson['blocks']: - writeInternalPropertyReadMethodDeclarationsRtu(headerFile, blockDefinition['registers']) - - writeLine(headerFile) - writeInternalBlockReadMethodDeclarationsRtu(headerFile, registerJson['blocks']) - writeProtectedPropertyMembers(headerFile, registerJson['registers']) if 'blocks' in registerJson: @@ -378,6 +379,7 @@ def writeRtuSourceFile(): writeLine(sourceFile, '#include "%s"' % headerFileName) writeLine(sourceFile, '#include "loggingcategories.h"') + writeLine(sourceFile, '#include "math.h"') writeLine(sourceFile) writeLine(sourceFile, 'NYMEA_LOGGING_CATEGORY(dc%s, "%s")' % (className, className)) writeLine(sourceFile)