Skip to content

Commit df8ea85

Browse files
rc14193rc14193
committed
change to PbDefinitions for clearer naming
1 parent 10c2e75 commit df8ea85

32 files changed

Lines changed: 46 additions & 46 deletions

‎bin/regen-protobufs.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
88

99
# workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
10-
mv ./meshtastic/*_pb2.py ./meshtastic/pbDefinitions
10+
mv ./meshtastic/*_pb2.py ./meshtastic/PbDefinitions
1111

1212
if [[ $OSTYPE == 'darwin'* ]]; then
13-
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/pbDefinitions/*.py
13+
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/PbDefinitions/*.py
1414
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
15-
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
16-
# change from meshtastic to meshtastic.pbDefinitions
17-
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
15+
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
16+
# change from meshtastic to meshtastic.PbDefinitions
17+
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
1818
else
19-
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/pbDefinitions/*.py
19+
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/PbDefinitions/*.py
2020
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
21-
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
22-
# change from meshtastic to meshtastic.pbDefinitions
23-
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
21+
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
22+
# change from meshtastic to meshtastic.PbDefinitions
23+
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
2424
fi

meshtastic/pbDefinitions/__init__.py renamed to meshtastic/PbDefinitions/__init__.py

File renamed without changes.

meshtastic/pbDefinitions/admin_pb2.py renamed to meshtastic/PbDefinitions/admin_pb2.py

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

meshtastic/pbDefinitions/apponly_pb2.py renamed to meshtastic/PbDefinitions/apponly_pb2.py

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

meshtastic/pbDefinitions/atak_pb2.py renamed to meshtastic/PbDefinitions/atak_pb2.py

File renamed without changes.

meshtastic/pbDefinitions/cannedmessages_pb2.py renamed to meshtastic/PbDefinitions/cannedmessages_pb2.py

File renamed without changes.

meshtastic/pbDefinitions/channel_pb2.py renamed to meshtastic/PbDefinitions/channel_pb2.py

File renamed without changes.

meshtastic/pbDefinitions/clientonly_pb2.py renamed to meshtastic/PbDefinitions/clientonly_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

meshtastic/pbDefinitions/config_pb2.py renamed to meshtastic/PbDefinitions/config_pb2.py

File renamed without changes.

meshtastic/pbDefinitions/connection_status_pb2.py renamed to meshtastic/PbDefinitions/connection_status_pb2.py

File renamed without changes.

0 commit comments

Comments
 (0)