From fa8ff6c02dbff213215cbd74dd1f4ebc310e5a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AA=9C=E5=8E=9F=E9=99=BD=E4=B8=80=E9=83=8E?= Date: Thu, 24 Feb 2022 22:16:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?make=20gen-msg=20msg=3Dgeometry=5Fmsgs/msms?= =?UTF-8?q?m/msg/Twist.msg=20=E3=81=A7custom=5Fmsgs/geometry=5Fmsgs/msg/tw?= =?UTF-8?q?ist.hpp=20=E7=94=9F=E6=88=90=E3=81=97=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- embeddedRTPS | 2 +- mros2_header_generator/header_generator.py | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/embeddedRTPS b/embeddedRTPS index 501987d..ad34def 160000 --- a/embeddedRTPS +++ b/embeddedRTPS @@ -1 +1 @@ -Subproject commit 501987d23540b4aeed7cb9703db36e58d976c10b +Subproject commit ad34def0a3c9bf78824da1fd7ccdab80623f2397 diff --git a/mros2_header_generator/header_generator.py b/mros2_header_generator/header_generator.py index 5ee7f38..ca793af 100644 --- a/mros2_header_generator/header_generator.py +++ b/mros2_header_generator/header_generator.py @@ -1,14 +1,13 @@ # generate message type header file for mROS2 import os -import json import sys import re from jinja2 import Environment, FileSystemLoader arg = sys.argv mros2Dir = arg[1] -msgDir = arg[2] +msgFile= arg[2] def toCamelCase(string): return ''.join(x.capitalize() for x in string.split('_')) @@ -19,10 +18,7 @@ def toSnakeCase(string): def main(): from msg_data_generator import msgDataGenerator # load msg settings & prepare information for .tpl file - with open(msgDir + "/" + "msg_settings.json", 'r') as f: - jsonData = json.load(f) - for genMsg in jsonData['pubsubMsgs']: - msgs.append(msgDataGenerator(genMsg.strip())) + msgs.append(msgDataGenerator(msgFile)) # generate header file for mros2 for msg in msgs: @@ -30,10 +26,10 @@ def main(): template = env.get_template('header_template.tpl') datatext = template.render({ "msg": msg }) - msgPkgPath = "../mros2_msgs" + "/" + msg['pkg'] + msgPkgPath = "custom_msgs" + "/" + msg['pkg'] - if not(os.path.isdir("../mros2_msgs")): - os.mkdir("../mros2_msgs") + if not(os.path.isdir("custom_msgs")): + os.mkdir("custom_msgs") if not(os.path.isdir(msgPkgPath)): os.mkdir(msgPkgPath) if not(os.path.isdir(msgPkgPath + "/msg")): @@ -51,10 +47,10 @@ def genDepMsgHeader(genMsg): template = env.get_template('header_template.tpl') datatext = template.render({ "msg": msg }) - msgPkgPath = "../mros2_msgs" + "/" + msg['pkg'] + msgPkgPath = "custom_msgs" + "/" + msg['pkg'] - if not(os.path.isdir("../mros2_msgs")): - os.mkdir("../mros2_msgs") + if not(os.path.isdir("custom_msgs")): + os.mkdir("custom_msgs") if not(os.path.isdir(msgPkgPath)): os.mkdir(msgPkgPath) if not(os.path.isdir(msgPkgPath + "/msg")): From b04ea4ea4e6f882873e32afed17b7dbbe0cd92b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AA=9C=E5=8E=9F=E9=99=BD=E4=B8=80=E9=83=8E?= Date: Thu, 10 Mar 2022 11:57:09 +0900 Subject: [PATCH 2/4] =?UTF-8?q?cntPub=E3=82=92=E3=82=AF=E3=83=AA=E3=82=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mros2_header_generator/header_template.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mros2_header_generator/header_template.tpl b/mros2_header_generator/header_template.tpl index 3f88434..99aa2e1 100644 --- a/mros2_header_generator/header_template.tpl +++ b/mros2_header_generator/header_template.tpl @@ -464,7 +464,9 @@ public: } uint32_t getTotalSize(){ - return cntPub ; + uint32_t tmpCntPub = cntPub; + cntPub = 0; + return tmpCntPub ; } private: From 6a27021053883c161b441bb0dbc24a012be18bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AA=9C=E5=8E=9F=E9=99=BD=E4=B8=80=E9=83=8E?= Date: Thu, 10 Mar 2022 12:04:39 +0900 Subject: [PATCH 3/4] =?UTF-8?q?cntPub=E3=82=92=E3=82=AF=E3=83=AA=E3=82=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- embeddedRTPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embeddedRTPS b/embeddedRTPS index ad34def..501987d 160000 --- a/embeddedRTPS +++ b/embeddedRTPS @@ -1 +1 @@ -Subproject commit ad34def0a3c9bf78824da1fd7ccdab80623f2397 +Subproject commit 501987d23540b4aeed7cb9703db36e58d976c10b From e0fa10459d1bed50f23bd30c84ee06f9b0f2d042 Mon Sep 17 00:00:00 2001 From: takasehideki Date: Thu, 10 Mar 2022 21:51:19 +0900 Subject: [PATCH 4/4] remove `mros2Dir` from arg of python scripts --- mros2_header_generator/header_generator.py | 7 +++---- mros2_header_generator/templates_generator.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mros2_header_generator/header_generator.py b/mros2_header_generator/header_generator.py index ca793af..88f8d59 100644 --- a/mros2_header_generator/header_generator.py +++ b/mros2_header_generator/header_generator.py @@ -6,8 +6,7 @@ from jinja2 import Environment, FileSystemLoader arg = sys.argv -mros2Dir = arg[1] -msgFile= arg[2] +msgFile = arg[1] def toCamelCase(string): return ''.join(x.capitalize() for x in string.split('_')) @@ -22,7 +21,7 @@ def main(): # generate header file for mros2 for msg in msgs: - env = Environment(loader=FileSystemLoader(mros2Dir + '/mros2_header_generator')) + env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator')) template = env.get_template('header_template.tpl') datatext = template.render({ "msg": msg }) @@ -43,7 +42,7 @@ def genDepMsgHeader(genMsg): msgs=[] msgs.append(msgDataGenerator(genMsg.strip())) for msg in msgs: - env = Environment(loader=FileSystemLoader(mros2Dir + '/mros2_header_generator')) + env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator')) template = env.get_template('header_template.tpl') datatext = template.render({ "msg": msg }) diff --git a/mros2_header_generator/templates_generator.py b/mros2_header_generator/templates_generator.py index 517c864..90e9698 100644 --- a/mros2_header_generator/templates_generator.py +++ b/mros2_header_generator/templates_generator.py @@ -4,8 +4,7 @@ from jinja2 import Environment, FileSystemLoader arg = sys.argv -mros2Dir = arg[1] -app = arg[2] +app = arg[1] includeFiles = [] pubMsgTypes = [] @@ -39,13 +38,13 @@ def main(): includeFiles.append(includeFile) - env = Environment(loader=FileSystemLoader(mros2Dir + '/mros2_header_generator')) + env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator')) template = env.get_template('templates.tpl') datatext = template.render({ "includeFiles":includeFiles, "pubMsgTypes":pubMsgTypes, "subMsgTypes":subMsgTypes }) with open(os.path.join(app+"/templates.hpp"), "wb") as f: f.write(datatext.encode('utf-8')) - env = Environment(loader=FileSystemLoader(mros2Dir + '/mros2_header_generator')) + env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator')) template = env.get_template('header_includer.tpl') datatext = template.render({ "app": app }) with open(os.path.join("../header_includer/header_includer.hpp"), "wb") as f: