diff --git a/.travis/push.sh b/.travis/push.sh index 754ab2c..0961043 100755 --- a/.travis/push.sh +++ b/.travis/push.sh @@ -24,13 +24,23 @@ generate_website_index() { if [ -z "$TS" ]; then TS=`date`; fi echo "
  • $i ($TS)
  • \n" >> download.html; done - echo "" >> download.html + echo " +
    +

    Last two letters of version number indicate SPIFFS file system version. If the first (upper-case) + letter has changed, then this version is incompabible with prevision versions and you have to flash + the full image. If the second (lower-case) letter has changed, then this version has some changes + (e.g. internal web page layout, LCD/TFT display layout) in the file system which you will not get with + a code-only (OTA or flashing update.bin) update, but it should not break anything.

    " >> download.html git add download.html git commit --amend --message "Travis build: $TRAVIS_BUILD_NUMBER" } commit_website_files() { BRANCH=$TRAVIS_BRANCH - VERSION=`cat RX_FSK/version.h | tail -1 | egrep -o '".*"' | sed 's/"//g' | sed 's/ /_/g'` + VERSION=`cat RX_FSK/version.h | grep version_id | egrep -o '".*"' | sed 's/"//g' | sed 's/ /_/g'` + FSMAJOR=`cat RX_FSK/version.h | grep SPIFFS_MAJOR | perl -e '$_=<>;print /=(.*);/?chr($1+64):""'` + FSMINOR=`cat RX_FSK/version.h | grep SPIFFS_MINOR | perl -e '$_=<>;print /=(.*);/?$1:""'` + VERSION=$VERSRION-$FSMAJOR$MSMINOR + MYPATH=$PWD echo "On branch $BRANCH" echo "Version $VERSION" diff --git a/RX_FSK/version.h b/RX_FSK/version.h index 96c51eb..3d53906 100644 --- a/RX_FSK/version.h +++ b/RX_FSK/version.h @@ -1,2 +1,4 @@ const char *version_name = "rdzTTGOsonde"; const char *version_id = "devel20191102"; +const int SPIFFS_MAJOR=2; +const int SPIFFS_MINOR=1;