Merge pull request #497 from meshtastic/revert-490-master

Revert "Move pb2 Files to Own Folder"

Author: thebentern

bin/regen-protobufs.sh

@@ -7,18 +7,13 @@
 ./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
 
 # workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
-mv ./meshtastic/*_pb2.py ./meshtastic/PbDefinitions
 
 if [[ $OSTYPE == 'darwin'* ]]; then
-	sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/PbDefinitions/*.py
+	sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
 	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
-	# change from meshtastic to meshtastic.PbDefinitions
-	sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
+	sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
 else
-	sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/PbDefinitions/*.py
+	sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
 	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
-	# change from meshtastic to meshtastic.PbDefinitions
-	sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
-fi
+	sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
+fi