Merge branch 'master' into update-tasks

.github/workflows/build.yml

@@ -33,6 +33,11 @@ jobs:
         run: pip install --upgrade platformio
       - name: Install ESPTool
         run: pip install --upgrade esptool
+      - name: Add version info
+        env:
+          Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
+        run: |
+          sed -i "s/unknownbuildnr/$Version (release)/g" src/Config.h
       - name: Build PlatformIO Project esp32dev
         run: |
           pio run --environment esp32dev
@@ -96,6 +101,11 @@ jobs:
         with:
           name: esp32solo1-assets
           path: release/esp32solo1
+      - name: Add version info
+        env:
+          Version: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
+        run: |
+          sed -i "s/$Version (release)/$Version (debug)/g" src/Config.h
       - name: Build PlatformIO Project esp32dev_dbg
         run: |
           pio run --environment esp32dev_dbg

README.md

@@ -10,7 +10,7 @@ It exposes the lock state (and much more) through MQTT and allows executing comm
 
 ***Nuki Hub does not integrate with the Nuki mobile app, it can't register itself as a bridge in the official Nuki mobile app.***
 
-Feel free to join us on Discord: https://discord.gg/24HxpGBJ
+Feel free to join us on Discord: https://discord.gg/9nPq85bP4p
 
 ## Supported devices
 
@@ -116,6 +116,7 @@ In a browser navigate to the IP address assigned to the ESP32.
 - MQTT SSL Client Key: Optionally set to the Client SSL key of the MQTT broker, see the "[MQTT Encryption](#mqtt-encryption-optional-wi-fi-and-lan8720-only)" section of this README.
 - Network hardware: "Wi-Fi only" by default, set to one of the specified ethernet modules if available, see the "Supported Ethernet devices" and "[Connecting via Ethernet](#connecting-via-ethernet-optional)" section of this README.
 - Disable fallback to Wi-Fi / Wi-Fi config portal: By default the Nuki Hub will fallback to Wi-Fi and open the Wi-Fi configuration portal when the network connection fails. Enable this setting to disable this fallback.
+- Connect to AP with the best signal in an environment with multiple APs with the same SSID: Enable to perform a scan for the Access Point with the best signal strenght for the specified SSID in a multi AP/Mesh environment.
 - RSSI Publish interval: Set to a positive integer to set the amount of seconds between updates to the maintenance/wifiRssi MQTT topic with the current Wi-Fi RSSI, set to -1 to disable, default 60. 
 - Network Timeout until restart: Set to a positive integer to restart the Nuki Hub after the set amount of seconds has passed without an active connection to the MQTT broker, set to -1 to disable, default 60.
 - Restart on disconnect: Enable to restart the Nuki Hub after 60 seconds without a connection to a network.

lib/WiFiManager/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 idf_component_register(
                        SRCS "WiFiManager.cpp"
                        INCLUDE_DIRS "."
-                       REQUIRES arduino
+                       PRIV_REQUIRES arduino
 )
 
 project(WiFiManager)

lib/WiFiManager/README.md

@@ -5,7 +5,8 @@ Espressif ESPx WiFi Connection manager with fallback web configuration portal
 
 :warning: This Documentation is out of date, see notes below
 
-![Release](https://img.shields.io/github/v/release/tzapu/WiFiManager?include_prereleases)
+<a name="release"></a>
+[![Release](https://img.shields.io/github/v/release/tzapu/WiFiManager?include_prereleases)](#release)
 
 [![Build CI Status](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml/badge.svg)](https://github.com/tzapu/WiFiManager/actions/workflows/compile_library.yml)
 
@@ -20,6 +21,7 @@ Espressif ESPx WiFi Connection manager with fallback web configuration portal
 [![ESP32](https://img.shields.io/badge/ESP-32-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32)
 [![ESP32](https://img.shields.io/badge/ESP-32S2-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32-s2)
 [![ESP32](https://img.shields.io/badge/ESP-32C3-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32-c3)
+[![ESP32](https://img.shields.io/badge/ESP-32S3-000000.svg?longCache=true&style=flat&colorA=CC101F)](https://www.espressif.com/en/products/socs/esp32-S3)
 
 Member to Member Support / Chat
 
@@ -28,15 +30,10 @@ Member to Member Support / Chat
 [![Discord](https://img.shields.io/badge/Discord-WiFiManager-%237289da.svg?logo=discord)](https://discord.gg/nS5WGkaQH5)
 The configuration portal is of the captive variety, so on various devices it will present the configuration dialogue as soon as you connect to the created access point.
 
-**This works with the ESP8266 Arduino platform**
-
-[https://github.com/esp8266/Arduino](https://github.com/esp8266/Arduino)
-
-**This works with the ESP32 Arduino platform** 
-
-[https://github.com/espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
+Works with the [ESP8266 Arduino](https://github.com/esp8266/Arduino) and [ESP32 Arduino](https://github.com/espressif/arduino-esp32) platforms.
 
 ### Known Issues
+
 * Documentation needs to be updated, see [https://github.com/tzapu/WiFiManager/issues/500](https://github.com/tzapu/WiFiManager/issues/500)
 -------