pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-30 11:23:53 +00:00
Code Issues 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
commit fe95247d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/device-install.sh
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}

2
bin/device-update.sh
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

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 2 major = 2
minor = 0 minor = 0
build = 6 build = 7