From bea1611e5fa6ea8a430415d43633f0619efdc89d Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 25 Mar 2022 22:22:20 -0700 Subject: [PATCH 1/3] updating proto submodule to latest --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index 1fca6b8e5..b682faf1c 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 1fca6b8e50fcf84a6a34a5605c9e8c5fea96123d +Subproject commit b682faf1c987039ba0b055b1522d4147649cb544 From 15db9f056f74debe3d220eeec31e1a298d5562cf Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 25 Mar 2022 22:30:41 -0700 Subject: [PATCH 2/3] updating proto submodule to latest --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index b682faf1c..1542d4736 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit b682faf1c987039ba0b055b1522d4147649cb544 +Subproject commit 1542d47362f3980c77ceb43ed6e3796ad7c61c46 From 34dc5b92a5c68e67c0f969eb8538d51f60c33fdc Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 25 Mar 2022 23:06:54 -0700 Subject: [PATCH 3/3] Update protos regen scripts --- bin/regen-protos.bat | 2 +- bin/regen-protos.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/regen-protos.bat b/bin/regen-protos.bat index a386433e1..39e1f3507 100644 --- a/bin/regen-protos.bat +++ b/bin/regen-protos.bat @@ -1 +1 @@ -cd proto && ..\nanopb-0.4.4\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\proto *.proto +cd proto && ..\nanopb-0.4.5\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\proto *.proto diff --git a/bin/regen-protos.sh b/bin/regen-protos.sh index 6cb6c2aaa..9f3e33127 100755 --- a/bin/regen-protos.sh +++ b/bin/regen-protos.sh @@ -2,13 +2,13 @@ set -e -echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.4 to be located in the" +echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.5 to be located in the" echo "meshtastic-device root directory if the following step fails, you should download the correct" -echo "prebuilt binaries for your computer into nanopb-0.4.4" +echo "prebuilt binaries for your computer into nanopb-0.4.5" # the nanopb tool seems to require that the .options file be in the current directory! cd proto -../nanopb-0.4.4/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../proto *.proto +../nanopb-0.4.5/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../proto *.proto #echo "Regenerating protobuf documentation - if you see an error message" #echo "you can ignore it unless doing a new protobuf release to github."