Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OTA and Debug improvements (#445)

Browse Source 
* Use esp_crt_bundle for HTTPS requests

* Remove Solo1 support

* Improve Nuki device config read functions

* Webserial

* OTA Improvements

* WebCfg fixes

* Debug improvements
This commit is contained in:
iranl
2024-08-11 11:20:51 +02:00
committed by GitHub
parent 9d55c2173d
commit 063fbab6b2
11 changed files with 317 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/beta.yml vendored
View File

@@ -52,13 +52,12 @@ jobs:
python3 resources/config_version.py beta python3 resources/config_version.py beta
- name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }} - name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }}
run: | run: |
ORIGBOARD="${BOARD}"
if [ "$BUILD" = "debug" ]; then if [ "$BUILD" = "debug" ]; then
BOARD="${BOARD}_dbg" BOARD="${BOARD}_dbg"
fi fi
echo "::group::Building with PlatformIO" echo "::group::Building with PlatformIO"
if [ "$BUILD" = "release" ]; then make updater_${ORIGBOARD}
make updater_${BOARD}
fi
make $BOARD make $BOARD
echo "::endgroup::" echo "::endgroup::"
- name: Add flash script - name: Add flash script
@@ -118,24 +117,39 @@ jobs:
with: with:
path: release path: release
pattern: '*-release-assets' pattern: '*-release-assets'
- name: Download debug assets
uses: actions/download-artifact@v4
with:
path: debug
pattern: '*-debug-assets'
- name: Copy binaries to ota/beta - name: Copy binaries to ota/beta
env: env:
Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }} Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
run: | run: |
mkdir -p ota/beta/ mkdir -p ota/beta/
mkdir -p ota/debug/beta/
mkdir -p ota/master/
mkdir -p ota/debug/master/
mkdir -p webflash/
mkdir -p resources/ mkdir -p resources/
mkdir -p src/ mkdir -p src/
cp -vf release/*/nuki_hub_*.bin ota/beta/ cp -vf release/*/nuki_hub_*.bin ota/beta/
cp -vf debug/*/nuki_hub_*.bin ota/debug/beta/
cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/resources/ota_manifest.py resources/ota_manifest.py
cp -vf master/src/Config.h src/Config.h cp -vf master/src/Config.h src/Config.h
python3 resources/ota_manifest.py beta $Version python3 resources/ota_manifest.py beta $Version
find * -not -path "ota*" -not -path "webflash*" -delete find * -not -path "ota*" -not -path "webflash*" -delete
rm -rf .github .gitignore .gitmodules rm -rf .github .gitignore .gitmodules
touch ota/beta/empty
touch ota/master/empty
touch ota/debug/beta/empty
touch ota/debug/master/empty
touch webflash/empty
- name: Commit binaries to binary - name: Commit binaries to binary
uses: stefanzweifel/git-auto-commit-action@v5 uses: stefanzweifel/git-auto-commit-action@v5
with: with:
commit_message: "Update binaries" commit_message: "Update binaries"
file_pattern: 'ota/* ota/master/* ota/beta/* webflash/*' file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
branch: binary branch: binary
skip_dirty_check: true skip_dirty_check: true
skip_fetch: true skip_fetch: true

5
.github/workflows/build.yml vendored
View File

@@ -57,13 +57,12 @@ jobs:
sed -i "s/unknownbuildnr/$Version/g" src/Config.h sed -i "s/unknownbuildnr/$Version/g" src/Config.h
- name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }} - name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }}
run: | run: |
ORIGBOARD="${BOARD}"
if [ "$BUILD" = "debug" ]; then if [ "$BUILD" = "debug" ]; then
BOARD="${BOARD}_dbg" BOARD="${BOARD}_dbg"
fi fi
echo "::group::Building with PlatformIO" echo "::group::Building with PlatformIO"
if [ "$BUILD" = "release" ]; then make updater_${ORIGBOARD}
make updater_${BOARD}
fi
make $BOARD make $BOARD
echo "::endgroup::" echo "::endgroup::"
- name: Add flash script - name: Add flash script

34
.github/workflows/nightly.yml vendored
View File

@@ -12,19 +12,20 @@ jobs:
name: Count commits in last 24h name: Count commits in last 24h
if: github.repository == 'technyon/nuki_hub' if: github.repository == 'technyon/nuki_hub'
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs:
has-commits: ${{ steps.commits.outputs.NEW_COMMIT_COUNT }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: recursive submodules: recursive
- name: Get new commits - name: Get new commits
run: echo "NEW_COMMIT_COUNT=$(git log --oneline --since '24 hours ago' | wc -l)" >> $GITHUB_ENV id: commits
- name: Check if commits larger than 0 run: echo "NEW_COMMIT_COUNT=$(git log --oneline --since '24 hours ago' | wc -l)" >> $GITHUB_OUTPUT
if: ${{ env.NEW_COMMIT_COUNT < 1 }}
run: exit 1
build: build:
name: Build ${{ matrix.board }} (${{ matrix.build }}) name: Build ${{ matrix.board }} (${{ matrix.build }})
needs: check-commits needs: check-commits
if: needs.check-commits.outputs.has-commits > 0
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false fail-fast: false
@@ -69,13 +70,12 @@ jobs:
python3 resources/config_version.py master python3 resources/config_version.py master
- name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }} - name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }}
run: | run: |
ORIGBOARD="${BOARD}"
if [ "$BUILD" = "debug" ]; then if [ "$BUILD" = "debug" ]; then
BOARD="${BOARD}_dbg" BOARD="${BOARD}_dbg"
fi fi
echo "::group::Building with PlatformIO" echo "::group::Building with PlatformIO"
if [ "$BUILD" = "release" ]; then make updater_${ORIGBOARD}
make updater_${BOARD}
fi
make $BOARD make $BOARD
echo "::endgroup::" echo "::endgroup::"
- name: Add flash script - name: Add flash script
@@ -109,7 +109,8 @@ jobs:
path: ${{ matrix.build }}/${{ env.VARIANT }} path: ${{ matrix.build }}/${{ env.VARIANT }}
ota-nightly: ota-nightly:
name: Create nightly from latest master name: Create nightly from latest master
needs: build needs: [check-commits, build]
if: needs.check-commits.outputs.has-commits > 0
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Git Checkout - name: Git Checkout
@@ -135,26 +136,39 @@ jobs:
with: with:
path: release path: release
pattern: '*-release-assets' pattern: '*-release-assets'
- name: Download debug assets
uses: actions/download-artifact@v4
with:
path: debug
pattern: '*-debug-assets'
- name: Copy binaries to ota/master - name: Copy binaries to ota/master
env: env:
Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }} Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
run: | run: |
mkdir -p ota/master/
mkdir -p ota/beta/ mkdir -p ota/beta/
mkdir -p ota/debug/beta/
mkdir -p ota/master/
mkdir -p ota/debug/master/
mkdir -p webflash/
mkdir -p resources/ mkdir -p resources/
mkdir -p src/ mkdir -p src/
cp -vf release/*/nuki_hub_*.bin ota/master/ cp -vf release/*/nuki_hub_*.bin ota/master/
cp -vf debug/*/nuki_hub_*.bin ota/debug/master/
cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/resources/ota_manifest.py resources/ota_manifest.py
cp -vf master/src/Config.h src/Config.h cp -vf master/src/Config.h src/Config.h
python3 resources/ota_manifest.py master $Version python3 resources/ota_manifest.py master $Version
find * -not -path "ota*" -not -path "webflash*" -delete find * -not -path "ota*" -not -path "webflash*" -delete
rm -rf .github .gitignore .gitmodules rm -rf .github .gitignore .gitmodules
touch ota/beta/empty touch ota/beta/empty
touch ota/master/empty
touch ota/debug/beta/empty
touch ota/debug/master/empty
touch webflash/empty
- name: Commit binaries to binary - name: Commit binaries to binary
uses: stefanzweifel/git-auto-commit-action@v5 uses: stefanzweifel/git-auto-commit-action@v5
with: with:
commit_message: "Update binaries" commit_message: "Update binaries"
file_pattern: 'ota/* ota/master/* ota/beta/* webflash/*' file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
branch: binary branch: binary
skip_dirty_check: true skip_dirty_check: true
skip_fetch: true skip_fetch: true

20
.github/workflows/release.yml vendored
View File

@@ -51,13 +51,12 @@ jobs:
sed -i "s/unknownbuildnr/$Version/g" src/Config.h sed -i "s/unknownbuildnr/$Version/g" src/Config.h
- name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }} - name: Build ${{ matrix.build }} PlatformIO Project ${{ matrix.board }}
run: | run: |
ORIGBOARD="${BOARD}"
if [ "$BUILD" = "debug" ]; then if [ "$BUILD" = "debug" ]; then
BOARD="${BOARD}_dbg" BOARD="${BOARD}_dbg"
fi fi
echo "::group::Building with PlatformIO" echo "::group::Building with PlatformIO"
if [ "$BUILD" = "release" ]; then make updater_${ORIGBOARD}
make updater_${BOARD}
fi
make $BOARD make $BOARD
echo "::endgroup::" echo "::endgroup::"
- name: Add flash script - name: Add flash script
@@ -181,10 +180,15 @@ jobs:
env: env:
Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }} Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
run: | run: |
mkdir -p ota/ mkdir -p ota/beta/
mkdir -p ota/debug/beta/
mkdir -p ota/master/
mkdir -p ota/debug/master/
mkdir -p webflash/
mkdir -p resources/ mkdir -p resources/
mkdir -p src/ mkdir -p src/
cp -vf release/*/nuki_hub_*.bin ota/ cp -vf release/*/nuki_hub_*.bin ota/
cp -vf debug/*/nuki_hub_*.bin ota/debug/
cp -vf release/*/webflash_nuki_hub_*.bin webflash/ cp -vf release/*/webflash_nuki_hub_*.bin webflash/
cp -vf master/resources/ota_manifest.py resources/ota_manifest.py cp -vf master/resources/ota_manifest.py resources/ota_manifest.py
cp -vf master/src/Config.h src/Config.h cp -vf master/src/Config.h src/Config.h
@@ -192,12 +196,18 @@ jobs:
python3 resources/ota_manifest.py beta none python3 resources/ota_manifest.py beta none
find * -not -path "ota*" -not -path "webflash*" -delete find * -not -path "ota*" -not -path "webflash*" -delete
rm -rf ota/beta/*.bin rm -rf ota/beta/*.bin
rm -rf ota/debug/beta/*.bin
rm -rf .github .gitignore .gitmodules rm -rf .github .gitignore .gitmodules
touch ota/beta/empty
touch ota/master/empty
touch ota/debug/beta/empty
touch ota/debug/master/empty
touch webflash/empty
- name: Commit binaries to binary - name: Commit binaries to binary
uses: stefanzweifel/git-auto-commit-action@v5 uses: stefanzweifel/git-auto-commit-action@v5
with: with:
commit_message: "Update binaries" commit_message: "Update binaries"
file_pattern: 'ota/* ota/master/* webflash/*' file_pattern: 'ota/* ota/debug/* ota/master/* ota/debug/master/* ota/beta/* ota/debug/beta/* webflash/*'
branch: binary branch: binary
skip_dirty_check: true skip_dirty_check: true
skip_fetch: true skip_fetch: true

9
pio_package.py
View File

@@ -26,8 +26,7 @@ def copy_files(source, target, env):
shutil.copy(file, f"{target_dir}/nuki_hub.{file.name}") shutil.copy(file, f"{target_dir}/nuki_hub.{file.name}")
elif "firmware" in file.stem: elif "firmware" in file.stem:
shutil.copy(file, f"{target_dir}/nuki_hub_{board}{file.suffix}") shutil.copy(file, f"{target_dir}/nuki_hub_{board}{file.suffix}")
if env.GetProjectOption("custom_build") == 'release': shutil.copy(f"{project_dir}/updater/release/{board}/updater.bin", f"{target_dir}/nuki_hub_updater_{board}{file.suffix}")
shutil.copy(f"{project_dir}/updater/release/{board}/updater.bin", f"{target_dir}/nuki_hub_updater_{board}{file.suffix}")
else: else:
shutil.copy(file, f"{target_dir}/{file.name}") shutil.copy(file, f"{target_dir}/{file.name}")
@@ -68,8 +67,7 @@ def package_last_files(source, target, env):
shutil.copy(file, f"{target_dir}/{file.name}") shutil.copy(file, f"{target_dir}/{file.name}")
env.AddPostAction("$BUILD_DIR/firmware.bin", copy_files) env.AddPostAction("$BUILD_DIR/firmware.bin", copy_files)
if env.GetProjectOption("custom_build") == 'release': env.AddPostAction("$PROJECT_DIR/updater/release/" + get_board_name(env) + "/updater.bin", copy_files)
env.AddPostAction("$PROJECT_DIR/updater/release/" + get_board_name(env) + "/updater.bin", copy_files)
env.AddPostAction("$BUILD_DIR/firmware.bin", package_last_files) env.AddPostAction("$BUILD_DIR/firmware.bin", package_last_files)
env.AddPostAction("$BUILD_DIR/partitions.bin", copy_files) env.AddPostAction("$BUILD_DIR/partitions.bin", copy_files)
env.AddPostAction("$BUILD_DIR/bootloader.bin", copy_files) env.AddPostAction("$BUILD_DIR/bootloader.bin", copy_files)
@@ -77,5 +75,4 @@ env.AddPostAction("$BUILD_DIR/bootloader.bin", copy_files)
if env.GetProjectOption("custom_build") == 'debug': if env.GetProjectOption("custom_build") == 'debug':
env.AddPostAction("$BUILD_DIR/firmware.elf", copy_files) env.AddPostAction("$BUILD_DIR/firmware.elf", copy_files)
if env.GetProjectOption("custom_build") == 'release': env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", merge_bin)
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", merge_bin)

24
src/Config.h
View File

@@ -16,6 +16,12 @@
#define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32c3.bin" #define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32c3.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32c3.bin" #define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32c3.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32c3.bin" #define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32c3.bin"
#define GITHUB_LATEST_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_esp32c3.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_updater_esp32c3.bin"
#define GITHUB_BETA_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_esp32c3.bin"
#define GITHUB_BETA_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_updater_esp32c3.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_esp32c3.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_updater_esp32c3.bin"
#elif defined(CONFIG_IDF_TARGET_ESP32S3) #elif defined(CONFIG_IDF_TARGET_ESP32S3)
#define GITHUB_LATEST_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32s3.bin" #define GITHUB_LATEST_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32s3.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32s3.bin" #define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32s3.bin"
@@ -23,6 +29,12 @@
#define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32s3.bin" #define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32s3.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32s3.bin" #define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32s3.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32s3.bin" #define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32s3.bin"
#define GITHUB_LATEST_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_esp32s3.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_updater_esp32s3.bin"
#define GITHUB_BETA_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_esp32s3.bin"
#define GITHUB_BETA_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_updater_esp32s3.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_esp32s3.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_updater_esp32s3.bin"
#elif defined(CONFIG_IDF_TARGET_ESP32C6) #elif defined(CONFIG_IDF_TARGET_ESP32C6)
#define GITHUB_LATEST_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32c6.bin" #define GITHUB_LATEST_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32c6.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32c6.bin" #define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32c6.bin"
@@ -30,6 +42,12 @@
#define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32c6.bin" #define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32c6.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32c6.bin" #define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32c6.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32c6.bin" #define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32c6.bin"
#define GITHUB_LATEST_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_esp32c6.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_updater_esp32c6.bin"
#define GITHUB_BETA_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_esp32c6.bin"
#define GITHUB_BETA_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_updater_esp32c6.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_esp32c6.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_updater_esp32c6.bin"
#else #else
#define GITHUB_LATEST_RELEASE_BINARY_URL "https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32.bin" #define GITHUB_LATEST_RELEASE_BINARY_URL "https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_esp32.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32.bin" #define GITHUB_LATEST_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/nuki_hub_updater_esp32.bin"
@@ -37,6 +55,12 @@
#define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32.bin" #define GITHUB_BETA_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/beta/nuki_hub_updater_esp32.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32.bin" #define GITHUB_MASTER_RELEASE_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_esp32.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32.bin" #define GITHUB_MASTER_UPDATER_BINARY_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/master/nuki_hub_updater_esp32.bin"
#define GITHUB_LATEST_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_esp32.bin"
#define GITHUB_LATEST_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/nuki_hub_updater_esp32.bin"
#define GITHUB_BETA_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_esp32.bin"
#define GITHUB_BETA_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/beta/nuki_hub_updater_esp32.bin"
#define GITHUB_MASTER_RELEASE_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_esp32.bin"
#define GITHUB_MASTER_UPDATER_BINARY_URL_DBG (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/debug/master/nuki_hub_updater_esp32.bin"
#endif #endif
#ifndef NUKI_HUB_UPDATER #ifndef NUKI_HUB_UPDATER

90
src/NukiNetwork.cpp
View File

@@ -13,7 +13,6 @@
#ifndef NUKI_HUB_UPDATER #ifndef NUKI_HUB_UPDATER
#include <ArduinoJson.h> #include <ArduinoJson.h>
bool _versionPublished = false;
#endif #endif
NukiNetwork* NukiNetwork::_inst = nullptr; NukiNetwork* NukiNetwork::_inst = nullptr;
@@ -466,16 +465,16 @@ bool NukiNetwork::update()
publishULong(_maintenancePathPrefix, mqtt_topic_uptime, ts / 1000 / 60, true); publishULong(_maintenancePathPrefix, mqtt_topic_uptime, ts / 1000 / 60, true);
publishString(_maintenancePathPrefix, mqtt_topic_mqtt_connection_state, "online", true); publishString(_maintenancePathPrefix, mqtt_topic_mqtt_connection_state, "online", true);
if(_lastMaintenanceTs == 0)
{
publishString(_maintenancePathPrefix, mqtt_topic_restart_reason_fw, getRestartReason().c_str(), true);
publishString(_maintenancePathPrefix, mqtt_topic_restart_reason_esp, getEspRestartReason().c_str(), true);
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_version, NUKI_HUB_VERSION, true);
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_build, NUKI_HUB_BUILD, true);
}
if(_publishDebugInfo) if(_publishDebugInfo)
{ {
publishUInt(_maintenancePathPrefix, mqtt_topic_freeheap, esp_get_free_heap_size(), true); publishUInt(_maintenancePathPrefix, mqtt_topic_freeheap, esp_get_free_heap_size(), true);
publishString(_maintenancePathPrefix, mqtt_topic_restart_reason_fw, getRestartReason().c_str(), true);
publishString(_maintenancePathPrefix, mqtt_topic_restart_reason_esp, getEspRestartReason().c_str(), true);
}
if (!_versionPublished) {
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_version, NUKI_HUB_VERSION, true);
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_build, NUKI_HUB_BUILD, true);
_versionPublished = true;
} }
_lastMaintenanceTs = ts; _lastMaintenanceTs = ts;
} }
@@ -504,13 +503,16 @@ bool NukiNetwork::update()
if (!jsonError) if (!jsonError)
{ {
_latestVersion = doc["release"]["version"]; String currentVersion = NUKI_HUB_VERSION;
if(atof(doc["release"]["version"]) >= atof(currentVersion.c_str())) _latestVersion = doc["release"]["version"];
else if(currentVersion.indexOf("beta") > 0) _latestVersion = doc["beta"]["version"];
else if(currentVersion.indexOf("master") > 0) _latestVersion = doc["master"]["version"];
else _latestVersion = doc["release"]["version"];
publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_latest, _latestVersion, true); publishString(_maintenancePathPrefix, mqtt_topic_info_nuki_hub_latest, _latestVersion, true);
if (_latestVersion != _preferences->getString(preference_latest_version).c_str()) if(strcmp(_latestVersion, _preferences->getString(preference_latest_version).c_str()) != 0) _preferences->putString(preference_latest_version, _latestVersion);
{
_preferences->putString(preference_latest_version, _latestVersion);
}
} }
} }
} }
@@ -923,7 +925,11 @@ void NukiNetwork::publishHASSConfig(char* deviceType, const char* baseTopic, cha
json["avty"]["t"] = availabilityTopic; json["avty"]["t"] = availabilityTopic;
json["pl_lock"] = lockAction; json["pl_lock"] = lockAction;
json["pl_unlk"] = unlockAction; json["pl_unlk"] = unlockAction;
json["pl_open"] = openAction;
uint32_t aclPrefs[17];
_preferences->getBytes(preference_acl, &aclPrefs, sizeof(aclPrefs));
if((int)aclPrefs[2]) json["pl_open"] = openAction;
json["stat_t"] = String("~") + mqtt_topic_lock_ha_state; json["stat_t"] = String("~") + mqtt_topic_lock_ha_state;
json["stat_jammed"] = "jammed"; json["stat_jammed"] = "jammed";
json["stat_locked"] = "locked"; json["stat_locked"] = "locked";
@@ -1199,6 +1205,38 @@ void NukiNetwork::publishHASSConfig(char* deviceType, const char* baseTopic, cha
{ { (char*)"en", (char*)"true" }, { { (char*)"en", (char*)"true" },
{(char*)"ic", (char*)"mdi:counter"}}); {(char*)"ic", (char*)"mdi:counter"}});
// Nuki Hub restart reason
publishHassTopic("sensor",
"nuki_hub_restart_reason",
uidString,
"_nuki_hub_restart_reason",
"Nuki Hub restart reason",
name,
baseTopic,
_lockPath + mqtt_topic_restart_reason_fw,
deviceType,
"",
"",
"diagnostic",
"",
{ { (char*)"en", (char*)"true" }});
// Nuki Hub restart reason ESP
publishHassTopic("sensor",
"nuki_hub_restart_reason_esp",
uidString,
"_nuki_hub_restart_reason_esp",
"Nuki Hub restart reason ESP",
name,
baseTopic,
_lockPath + mqtt_topic_restart_reason_esp,
deviceType,
"",
"",
"diagnostic",
"",
{ { (char*)"en", (char*)"true" }});
if(_preferences->getBool(preference_check_updates)) if(_preferences->getBool(preference_check_updates))
{ {
// NUKI Hub latest // NUKI Hub latest
@@ -1292,7 +1330,7 @@ void NukiNetwork::publishHASSConfig(char* deviceType, const char* baseTopic, cha
publishHassTopic("button", publishHassTopic("button",
"query_lockstate", "query_lockstate",
uidString, uidString,
"_query_lockstate_button", "_query_lockstate",
"Query lock state", "Query lock state",
name, name,
baseTopic, baseTopic,
@@ -1309,7 +1347,7 @@ void NukiNetwork::publishHASSConfig(char* deviceType, const char* baseTopic, cha
publishHassTopic("button", publishHassTopic("button",
"query_config", "query_config",
uidString, uidString,
"_query_config_button", "_query_config",
"Query config", "Query config",
name, name,
baseTopic, baseTopic,
@@ -1326,7 +1364,7 @@ void NukiNetwork::publishHASSConfig(char* deviceType, const char* baseTopic, cha
publishHassTopic("button", publishHassTopic("button",
"query_commandresult", "query_commandresult",
uidString, uidString,
"_query_commandresult_button", "_query_commandresult",
"Query lock state command result", "Query lock state command result",
name, name,
baseTopic, baseTopic,
@@ -1375,7 +1413,7 @@ void NukiNetwork::publishHASSConfigAdditionalLockEntities(char *deviceType, cons
publishHassTopic("button", publishHassTopic("button",
"unlatch", "unlatch",
uidString, uidString,
"_unlatch_button", "_unlatch",
"Open", "Open",
name, name,
baseTopic, baseTopic,
@@ -1399,7 +1437,7 @@ void NukiNetwork::publishHASSConfigAdditionalLockEntities(char *deviceType, cons
publishHassTopic("button", publishHassTopic("button",
"lockngo", "lockngo",
uidString, uidString,
"_lock_n_go_button", "_lockngo",
"Lock 'n' Go", "Lock 'n' Go",
name, name,
baseTopic, baseTopic,
@@ -1423,7 +1461,7 @@ void NukiNetwork::publishHASSConfigAdditionalLockEntities(char *deviceType, cons
publishHassTopic("button", publishHassTopic("button",
"lockngounlatch", "lockngounlatch",
uidString, uidString,
"_lock_n_go_unlatch_button", "_lockngounlatch",
"Lock 'n' Go with unlatch", "Lock 'n' Go with unlatch",
name, name,
baseTopic, baseTopic,
@@ -1445,7 +1483,7 @@ void NukiNetwork::publishHASSConfigAdditionalLockEntities(char *deviceType, cons
publishHassTopic("button", publishHassTopic("button",
"query_battery", "query_battery",
uidString, uidString,
"_query_battery_button", "_query_battery",
"Query battery", "Query battery",
name, name,
baseTopic, baseTopic,
@@ -2444,7 +2482,7 @@ void NukiNetwork::publishHASSConfigAdditionalOpenerEntities(char *deviceType, co
publishHassTopic("button", publishHassTopic("button",
"unlatch", "unlatch",
uidString, uidString,
"_unlatch_button", "_unlatch",
"Open", "Open",
name, name,
baseTopic, baseTopic,
@@ -2505,7 +2543,7 @@ void NukiNetwork::publishHASSConfigAdditionalOpenerEntities(char *deviceType, co
} }
publishHassTopic("binary_sensor", publishHassTopic("binary_sensor",
"ring", "ring_detect",
uidString, uidString,
"_ring_detect", "_ring_detect",
"Ring detect", "Ring detect",
@@ -3346,7 +3384,7 @@ void NukiNetwork::publishHASSConfigKeypad(char *deviceType, const char *baseTopi
publishHassTopic("button", publishHassTopic("button",
"query_keypad", "query_keypad",
uidString, uidString,
"_query_keypad_button", "_query_keypad",
"Query keypad", "Query keypad",
name, name,
baseTopic, baseTopic,
@@ -3487,7 +3525,7 @@ void NukiNetwork::removeHASSConfig(char* uidString)
removeHassTopic((char*)"button", (char*)"lockngounlatch", uidString); removeHassTopic((char*)"button", (char*)"lockngounlatch", uidString);
removeHassTopic((char*)"sensor", (char*)"battery_level", uidString); removeHassTopic((char*)"sensor", (char*)"battery_level", uidString);
removeHassTopic((char*)"binary_sensor", (char*)"door_sensor", uidString); removeHassTopic((char*)"binary_sensor", (char*)"door_sensor", uidString);
removeHassTopic((char*)"binary_sensor", (char*)"ring", uidString); removeHassTopic((char*)"binary_sensor", (char*)"ring_detect", uidString);
removeHassTopic((char*)"sensor", (char*)"sound_level", uidString); removeHassTopic((char*)"sensor", (char*)"sound_level", uidString);
removeHassTopic((char*)"sensor", (char*)"last_action_authorization", uidString); removeHassTopic((char*)"sensor", (char*)"last_action_authorization", uidString);
removeHassTopic((char*)"sensor", (char*)"keypad_status", uidString); removeHassTopic((char*)"sensor", (char*)"keypad_status", uidString);
@@ -3558,6 +3596,8 @@ void NukiNetwork::removeHASSConfig(char* uidString)
removeHassTopic((char*)"sensor", (char*)"uptime", uidString); removeHassTopic((char*)"sensor", (char*)"uptime", uidString);
removeHassTopic((char*)"sensor", (char*)"mqtt_log", uidString); removeHassTopic((char*)"sensor", (char*)"mqtt_log", uidString);
removeHassTopic((char*)"binary_sensor", (char*)"hybrid_connected", uidString); removeHassTopic((char*)"binary_sensor", (char*)"hybrid_connected", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_restart_reason", uidString);
removeHassTopic((char*)"sensor", (char*)"nuki_hub_restart_reason_esp", uidString);
} }
void NukiNetwork::removeHASSConfigTopic(char *deviceType, char *name, char *uidString) void NukiNetwork::removeHASSConfigTopic(char *deviceType, char *name, char *uidString)

24
src/NukiNetworkLock.cpp
View File

@@ -196,8 +196,28 @@ void NukiNetworkLock::onMqttDataReceived(const char* topic, byte* payload, const
else if(comparePrefixedPath(topic, mqtt_topic_update) && strcmp(value, "1") == 0 && _preferences->getBool(preference_update_from_mqtt, false)) else if(comparePrefixedPath(topic, mqtt_topic_update) && strcmp(value, "1") == 0 && _preferences->getBool(preference_update_from_mqtt, false))
{ {
Log->println(F("Update requested via MQTT.")); Log->println(F("Update requested via MQTT."));
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL); String currentVersion = NUKI_HUB_VERSION;
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
if(atof(_preferences->getString(preference_latest_version).c_str()) >= atof(currentVersion.c_str()))
{
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
}
else if(currentVersion.indexOf("beta") > 0)
{
_preferences->putString(preference_ota_updater_url, GITHUB_BETA_RELEASE_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_BETA_UPDATER_BINARY_URL);
}
else if(currentVersion.indexOf("master") > 0)
{
_preferences->putString(preference_ota_updater_url, GITHUB_MASTER_RELEASE_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_MASTER_UPDATER_BINARY_URL);
}
else
{
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
}
delay(200); delay(200);
restartEsp(RestartReason::OTAReboot); restartEsp(RestartReason::OTAReboot);
} }

185
src/WebCfgServer.cpp
View File

@@ -48,8 +48,9 @@ WebCfgServer::WebCfgServer(NukiNetwork* network, EthServer* ethServer, Preferenc
memcpy(&_credPassword, pass, str.length()); memcpy(&_credPassword, pass, str.length());
} }
#ifndef NUKI_HUB_UPDATER
_confirmCode = generateConfirmCode(); _confirmCode = generateConfirmCode();
#ifndef NUKI_HUB_UPDATER
_pinsConfigured = true; _pinsConfigured = true;
if(_nuki != nullptr && !_nuki->isPinSet()) if(_nuki != nullptr && !_nuki->isPinSet())
@@ -312,6 +313,14 @@ void WebCfgServer::initialize()
buildOtaHtml(response, _server.arg("errored") != ""); buildOtaHtml(response, _server.arg("errored") != "");
_server.send(200, "text/html", response); _server.send(200, "text/html", response);
}); });
_server.on("/otadebug", [&]() {
if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) {
return _server.requestAuthentication();
}
String response = "";
buildOtaHtml(response, _server.arg("errored") != "", true);
_server.send(200, "text/html", response);
});
_server.on("/reboottoota", [&]() { _server.on("/reboottoota", [&]() {
if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) { if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) {
return _server.requestAuthentication(); return _server.requestAuthentication();
@@ -327,29 +336,12 @@ void WebCfgServer::initialize()
if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) { if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) {
return _server.requestAuthentication(); return _server.requestAuthentication();
} }
String response = ""; #ifndef NUKI_HUB_UPDATER
String key = _server.argName(0); processUpdate();
if(key == "beta") #else
{ _server.sendHeader("Location", "/");
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest BETA version", 2); _server.send(302, "text/plain", "");
_preferences->putString(preference_ota_updater_url, GITHUB_BETA_UPDATER_BINARY_URL); #endif
_preferences->putString(preference_ota_main_url, GITHUB_BETA_RELEASE_BINARY_URL);
}
else if(key == "master")
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest development version", 2);
_preferences->putString(preference_ota_updater_url, GITHUB_MASTER_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_MASTER_RELEASE_BINARY_URL);
}
else
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest RELEASE version", 2);
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
}
_server.send(200, "text/html", response);
waitAndProcess(true, 1000);
restartEsp(RestartReason::OTAReboot);
}); });
_server.on("/uploadota", HTTP_POST, [&]() { _server.on("/uploadota", HTTP_POST, [&]() {
if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) { if (_hasCredentials && !_server.authenticate(_credUser, _credPassword)) {
@@ -401,7 +393,7 @@ void WebCfgServer::update()
_server.handleClient(); _server.handleClient();
} }
void WebCfgServer::buildOtaHtml(String &response, bool errored) void WebCfgServer::buildOtaHtml(String &response, bool errored, bool debug)
{ {
buildHtmlHeader(response); buildHtmlHeader(response);
@@ -421,20 +413,34 @@ void WebCfgServer::buildOtaHtml(String &response, bool errored)
response.concat("<div id=\"autoupdform\"><h4>Update Nuki Hub</h4>"); response.concat("<div id=\"autoupdform\"><h4>Update Nuki Hub</h4>");
response.concat("Click on the button to reboot and automatically update Nuki Hub and the Nuki Hub updater to the latest versions from GitHub"); response.concat("Click on the button to reboot and automatically update Nuki Hub and the Nuki Hub updater to the latest versions from GitHub");
response.concat("<div style=\"clear: both\"></div>"); response.concat("<div style=\"clear: both\"></div>");
response.concat("<form onsubmit=\"return confirm('Do you really want to update to the latest release?');\" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><br><input type=\"submit\" style=\"background: green\" value=\"Update to latest release\"></form>");
response.concat("<form onsubmit=\"return confirm('Do you really want to update to the latest beta? This version could contain breaking bugs and necessitate downgrading to the latest release version using USB/Serial');\" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><input type=\"hidden\" name=\"beta\" value=\"1\" /><br><input type=\"submit\" style=\"color: black; background: yellow\" value=\"Update to latest beta\"></form>"); String release_type;
response.concat("<form onsubmit=\"return confirm('Do you really want to update to the latest development version? This version could contain breaking bugs and necessitate downgrading to the latest release version using USB/Serial');\" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><input type=\"hidden\" name=\"master\" value=\"1\" /><br><input type=\"submit\" style=\"background: red\" value=\"Update to latest development version\"></form>");
if(debug) release_type = "debug";
else release_type = "release";
#ifndef DEBUG_NUKIHUB
String build_type = "release";
#else
String build_type = "debug";
#endif
response.concat("<form onsubmit=\"if(document.getElementById('currentver') == document.getElementById('latestver') && \"" + release_type + "\" == \"" + build_type + "\") { alert('You are already on this version, build and build type'); return false; } else { return confirm('Do you really want to update to the latest release?'); } \" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><input type=\"hidden\" name=\"release\" value=\"1\" /><input type=\"hidden\" name=\"" + release_type + "\" value=\"1\" /><input type=\"hidden\" name=\"token\" value=\"" + _confirmCode + "\" /><br><input type=\"submit\" style=\"background: green\" value=\"Update to latest release\"></form>");
response.concat("<form onsubmit=\"if(document.getElementById('currentver') == document.getElementById('betaver') && \"" + release_type + "\" == \"" + build_type + "\") { alert('You are already on this version, build and build type'); return false; } else { return confirm('Do you really want to update to the latest beta? This version could contain breaking bugs and necessitate downgrading to the latest release version using USB/Serial'); }\" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><input type=\"hidden\" name=\"beta\" value=\"1\" /><input type=\"hidden\" name=\"" + release_type + "\" value=\"1\" /><input type=\"hidden\" name=\"token\" value=\"" + _confirmCode + "\" /><br><input type=\"submit\" style=\"color: black; background: yellow\" value=\"Update to latest beta\"></form>");
response.concat("<form onsubmit=\"if(document.getElementById('currentver') == document.getElementById('devver') && \"" + release_type + "\" == \"" + build_type + "\") { alert('You are already on this version, build and build type'); return false; } else { return confirm('Do you really want to update to the latest development version? This version could contain breaking bugs and necessitate downgrading to the latest release version using USB/Serial'); }\" action=\"/autoupdate\" method=\"get\" style=\"float: left; margin-right: 10px\"><input type=\"hidden\" name=\"master\" value=\"1\" /><input type=\"hidden\" name=\"" + release_type + "\" value=\"1\" /><input type=\"hidden\" name=\"token\" value=\"" + _confirmCode + "\" /><br><input type=\"submit\" style=\"background: red\" value=\"Update to latest development version\"></form>");
response.concat("<div style=\"clear: both\"></div><br>"); response.concat("<div style=\"clear: both\"></div><br>");
response.concat("<b>Current version: </b>"); response.concat("<b>Current version: </b><span id=\"currentver\">");
response.concat(NUKI_HUB_VERSION); response.concat(NUKI_HUB_VERSION);
response.concat(" ("); response.concat(" (");
response.concat(NUKI_HUB_BUILD); response.concat(NUKI_HUB_BUILD);
response.concat("), "); response.concat(")</span>, ");
response.concat(NUKI_HUB_DATE); response.concat(NUKI_HUB_DATE);
response.concat("<br>"); response.concat("<br>");
#ifndef NUKI_HUB_UPDATER #ifndef NUKI_HUB_UPDATER
bool manifestSuccess = false;
NetworkClientSecure *client = new NetworkClientSecure; NetworkClientSecure *client = new NetworkClientSecure;
if (client) { if (client) {
client->setDefaultCACertBundle(); client->setDefaultCACertBundle();
@@ -454,28 +460,34 @@ void WebCfgServer::buildOtaHtml(String &response, bool errored)
if (!jsonError) if (!jsonError)
{ {
response.concat("<b>Latest release version: </b>"); manifestSuccess = true;
response.concat("<b>Latest release version: </b><span id=\"latestver\">");
response.concat(doc["release"]["fullversion"].as<const char*>()); response.concat(doc["release"]["fullversion"].as<const char*>());
response.concat(" ("); response.concat(" (");
response.concat(doc["release"]["build"].as<const char*>()); response.concat(doc["release"]["build"].as<const char*>());
response.concat("), "); response.concat(")</span>, ");
response.concat(doc["release"]["time"].as<const char*>()); response.concat(doc["release"]["time"].as<const char*>());
response.concat("<br>"); response.concat("<br>");
response.concat("<b>Latest beta version: </b>"); response.concat("<b>Latest beta version: </b><span id=\"betaver\">");
response.concat(doc["beta"]["fullversion"].as<const char*>());
if(doc["beta"]["fullversion"] != "No beta available") if(doc["beta"]["fullversion"] != "No beta available")
{ {
response.concat(doc["beta"]["fullversion"].as<const char*>());
response.concat(" ("); response.concat(" (");
response.concat(doc["beta"]["build"].as<const char*>()); response.concat(doc["beta"]["build"].as<const char*>());
response.concat("), "); response.concat(")</span>, ");
response.concat(doc["beta"]["time"].as<const char*>()); response.concat(doc["beta"]["time"].as<const char*>());
} }
else
{
response.concat(doc["beta"]["fullversion"].as<const char*>());
response.concat("</span>");
}
response.concat("<br>"); response.concat("<br>");
response.concat("<b>Latest development version: </b>"); response.concat("<b>Latest development version: </b><span id=\"devver\">");
response.concat(doc["master"]["fullversion"].as<const char*>()); response.concat(doc["master"]["fullversion"].as<const char*>());
response.concat(" ("); response.concat(" (");
response.concat(doc["master"]["build"].as<const char*>()); response.concat(doc["master"]["build"].as<const char*>());
response.concat("), "); response.concat(")</span>, ");
response.concat(doc["master"]["time"].as<const char*>()); response.concat(doc["master"]["time"].as<const char*>());
response.concat("<br>"); response.concat("<br>");
} }
@@ -485,6 +497,11 @@ void WebCfgServer::buildOtaHtml(String &response, bool errored)
} }
delete client; delete client;
} }
if(!manifestSuccess)
{
response.concat("<span id=\"currentver\" style=\"display: none;\">currentver</span><span id=\"latestver\" style=\"display: none;\">latestver</span><span id=\"devver\" style=\"display: none;\">devver</span><span id=\"betaver\" style=\"display: none;\">betaver</span>");
}
#endif #endif
response.concat("<br></div>"); response.concat("<br></div>");
@@ -665,11 +682,20 @@ void WebCfgServer::handleOtaUpload()
} }
} }
void WebCfgServer::buildConfirmHtml(String &response, const String &message, uint32_t redirectDelay) void WebCfgServer::buildConfirmHtml(String &response, const String &message, uint32_t redirectDelay, bool redirect)
{ {
String delay(redirectDelay); String header;
String header = "<meta http-equiv=\"Refresh\" content=\"" + delay + "; url=/\" />";
if(!redirect)
{
String delay(redirectDelay);
header = "<meta http-equiv=\"Refresh\" content=\"" + delay + "; url=/\" />";
}
else
{
String delay(redirectDelay * 1000);
header = "<script type=\"text/JavaScript\">function Redirect() { window.location.href = \"/\"; } setTimeout(function() { Redirect(); }, " + delay + "); </script>";
}
buildHtmlHeader(response, header); buildHtmlHeader(response, header);
response.concat(message); response.concat(message);
response.concat("</body></html>"); response.concat("</body></html>");
@@ -688,6 +714,12 @@ void WebCfgServer::sendFavicon()
_server.send(200, "image/png", (const char*)favicon_32x32, sizeof(favicon_32x32)); _server.send(200, "image/png", (const char*)favicon_32x32, sizeof(favicon_32x32));
} }
String WebCfgServer::generateConfirmCode()
{
int code = random(1000,9999);
return String(code);
}
#ifndef NUKI_HUB_UPDATER #ifndef NUKI_HUB_UPDATER
void WebCfgServer::sendSettings() void WebCfgServer::sendSettings()
{ {
@@ -2976,6 +3008,72 @@ void WebCfgServer::processUnpair(bool opener)
restartEsp(RestartReason::DeviceUnpaired); restartEsp(RestartReason::DeviceUnpaired);
} }
void WebCfgServer::processUpdate()
{
String response = "";
String key = _server.argName(0);
String key2 = _server.argName(1);
String key3 = _server.argName(2);
String value3 = _server.arg(2);
String key4 = _server.argName(3);
if(key3 != "token" || value3 != _confirmCode)
{
buildConfirmHtml(response, "Confirm code is invalid.", 3, true);
_server.send(200, "text/html", response);
return;
}
if(key == "beta")
{
if(key2 == "debug")
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG BETA version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_BETA_UPDATER_BINARY_URL_DBG);
_preferences->putString(preference_ota_main_url, GITHUB_BETA_RELEASE_BINARY_URL_DBG);
}
else
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest BETA version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_BETA_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_BETA_RELEASE_BINARY_URL);
}
}
else if(key == "master")
{
if(key2 == "debug")
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG DEVELOPMENT version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_MASTER_UPDATER_BINARY_URL_DBG);
_preferences->putString(preference_ota_main_url, GITHUB_MASTER_RELEASE_BINARY_URL_DBG);
}
else
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEVELOPMENT version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_MASTER_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_MASTER_RELEASE_BINARY_URL);
}
}
else
{
if(key2 == "debug")
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest DEBUG RELEASE version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL_DBG);
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_UPDATER_BINARY_URL_DBG);
}
else
{
buildConfirmHtml(response, "Rebooting to update Nuki Hub and Nuki Hub updater<br/>Updating to latest RELEASE version", 2, true);
_preferences->putString(preference_ota_updater_url, GITHUB_LATEST_UPDATER_BINARY_URL);
_preferences->putString(preference_ota_main_url, GITHUB_LATEST_RELEASE_BINARY_URL);
}
}
_server.send(200, "text/html", response);
waitAndProcess(true, 1000);
restartEsp(RestartReason::OTAReboot);
}
void WebCfgServer::processFactoryReset() void WebCfgServer::processFactoryReset()
{ {
bool resetWifi = false; bool resetWifi = false;
@@ -3238,13 +3336,6 @@ void WebCfgServer::printParameter(String& response, const char *description, con
} }
String WebCfgServer::generateConfirmCode()
{
int code = random(1000,9999);
return String(code);
}
const std::vector<std::pair<String, String>> WebCfgServer::getNetworkDetectionOptions() const const std::vector<std::pair<String, String>> WebCfgServer::getNetworkDetectionOptions() const
{ {
std::vector<std::pair<String, String>> options; std::vector<std::pair<String, String>> options;

10
src/WebCfgServer.h
View File

@@ -61,6 +61,7 @@ private:
void buildConfigureWifiHtml(String& response); void buildConfigureWifiHtml(String& response);
void buildInfoHtml(String& response); void buildInfoHtml(String& response);
void processUnpair(bool opener); void processUnpair(bool opener);
void processUpdate();
void processFactoryReset(); void processFactoryReset();
void printInputField(String& response, const char* token, const char* description, const char* value, const size_t& maxLength, const char* id, const bool& isPassword = false, const bool& showLengthRestriction = false); void printInputField(String& response, const char* token, const char* description, const char* value, const size_t& maxLength, const char* id, const bool& isPassword = false, const bool& showLengthRestriction = false);
void printInputField(String& response, const char* token, const char* description, const int value, size_t maxLength, const char* id); void printInputField(String& response, const char* token, const char* description, const int value, size_t maxLength, const char* id);
@@ -76,19 +77,18 @@ private:
String pinStateToString(uint8_t value); String pinStateToString(uint8_t value);
void printParameter(String& response, const char* description, const char* value, const char *link = "", const char *id = ""); void printParameter(String& response, const char* description, const char* value, const char *link = "", const char *id = "");
String generateConfirmCode();
NukiWrapper* _nuki = nullptr; NukiWrapper* _nuki = nullptr;
NukiOpenerWrapper* _nukiOpener = nullptr; NukiOpenerWrapper* _nukiOpener = nullptr;
Gpio* _gpio = nullptr; Gpio* _gpio = nullptr;
bool _pinsConfigured = false; bool _pinsConfigured = false;
bool _brokerConfigured = false; bool _brokerConfigured = false;
String _confirmCode = "----";
#endif #endif
void buildConfirmHtml(String& response, const String &message, uint32_t redirectDelay = 5); String generateConfirmCode();
void buildOtaHtml(String& response, bool errored); String _confirmCode = "----";
void buildConfirmHtml(String& response, const String &message, uint32_t redirectDelay = 5, bool redirect = false);
void buildOtaHtml(String& response, bool errored, bool debug = false);
void buildOtaCompletedHtml(String& response); void buildOtaCompletedHtml(String& response);
void sendCss(); void sendCss();
void sendFavicon(); void sendFavicon();

2
src/networkDevices/WifiDevice.cpp
View File

@@ -78,7 +78,7 @@ void WifiDevice::initialize()
_wm.setEnableConfigPortal(_startAp || !_preferences->getBool(preference_network_wifi_fallback_disabled)); _wm.setEnableConfigPortal(_startAp || !_preferences->getBool(preference_network_wifi_fallback_disabled));
// reduced timeout if ESP is set to restart on disconnect // reduced timeout if ESP is set to restart on disconnect
_wm.setFindBestRSSI(_preferences->getBool(preference_find_best_rssi)); _wm.setFindBestRSSI(_preferences->getBool(preference_find_best_rssi));
_wm.setConnectTimeout(5); _wm.setConnectTimeout(20);
_wm.setConfigPortalTimeout(_restartOnDisconnect ? 60 * 3 : 60 * 30); _wm.setConfigPortalTimeout(_restartOnDisconnect ? 60 * 3 : 60 * 30);
_wm.setShowInfoUpdate(false); _wm.setShowInfoUpdate(false);
_wm.setMenu(wm_menu); _wm.setMenu(wm_menu);