Merge branch 'udp' into dev

This commit is contained in:
Kevin Hester 2020-12-10 14:05:13 +08:00
commit 9ab02119f5
2 changed files with 5 additions and 10 deletions

View File

@ -3,15 +3,10 @@ Import("projenv")
import configparser import configparser
prefsLoc = projenv["PROJECT_DIR"] + "/version.properties" prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
print(f"Preferences in {prefsLoc}") config = configparser.RawConfigParser()
try: config.read(prefsLoc)
config = configparser.RawConfigParser() version = dict(config.items('VERSION'))
config.read(prefsLoc) verStr = "{}.{}.{}".format(version["major"], version["minor"], version["build"])
version = dict(config.items('VERSION'))
verStr = "{}.{}.{}".format(version["major"], version["minor"], version["build"])
except:
print("Can't read preferences, using 0.0.0")
verStr = "0.0.0"
print(f"Using meshtastic platform-custom.py, firmare version {verStr}") print(f"Using meshtastic platform-custom.py, firmare version {verStr}")

View File

@ -1,6 +1,6 @@
set -e set -e
source bin/version.sh VERSION=`bin/buildinfo.py`
esptool.py --baud 921600 write_flash 0x10000 release/latest/bins/firmware-tbeam-US-$VERSION.bin esptool.py --baud 921600 write_flash 0x10000 release/latest/bins/firmware-tbeam-US-$VERSION.bin