kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2002 from meshtastic/master

Browse Source 
Start new develop cycle
This commit is contained in:
Thomas Göttgens
2022-11-27 15:05:27 +01:00
committed by GitHub
co-authored by GitHub
parent c7681cb24d f1179d31ba
commit fe95247d56
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/device-install.sh
+1 -1
View File
@@ -45,7 +45,7 @@ shift "$((OPTIND-1))"
shift shift
} }
if [ -f "${FILENAME}" ] && [[ "${FILENAME}" != *"update"* ]]; then if [ -f "${FILENAME}" ] && [ "${FILENAME##*"update"*}" == "$FILENAME" ]; then
echo "Trying to flash ${FILENAME}, but first erasing and writing system information" echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
"$PYTHON" -m esptool erase_flash "$PYTHON" -m esptool erase_flash
"$PYTHON" -m esptool write_flash 0x00 ${FILENAME} "$PYTHON" -m esptool write_flash 0x00 ${FILENAME}
bin/device-update.sh
+1 -1
View File
@@ -43,7 +43,7 @@ shift "$((OPTIND-1))"
shift shift
} }
if [ -f "${FILENAME}" ] && [[ $FILENAME == *"update"* ]]; then if [ -f "${FILENAME}" ] && [ "${FILENAME##*"update"*}" != "$FILENAME" ]; then
printf "Trying to flash update ${FILENAME}" printf "Trying to flash update ${FILENAME}"
$PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME} $PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME}
else else
version.properties
+1 -1
View File
@@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 2 major = 2
minor = 0 minor = 0
build = 6 build = 7