diff --git a/README.md b/README.md index b36d4f5..ae4e861 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Feel free to join us on Discord: https://discord.gg/9nPq85bP4p ## Supported devices Supported ESP32 devices: -- Nuki Hub is compiled against all ESP32 models with Wi-Fi and Bluetooh Low Energy (BLE) which are supported by ESP-IDF 5.5.1 and Arduino Core 3.3.1. +- Nuki Hub is compiled against all ESP32 models with Wi-Fi and Bluetooh Low Energy (BLE) which are supported by ESP-IDF 5.5.1 and Arduino Core 3.3.2. - Tested stable builds are provided for the ESP32, ESP32-S3, ESP32-C3, ESP32-C5, ESP32-C6, ESP32-P4 with the ESP32-C6 module and ESP32-H2. - Untested builds are provided for the ESP32-Solo1 and ESP32-P4 with the ESP32-C5 module (as the developers don't own these devices). @@ -188,7 +188,7 @@ When pairing is successful, the web interface should show "Paired: Yes".
## Hybrid mode -Hybrid mode allows you to use the official Nuki MQTT implemenation on a Nuki Lock 3.0 Pro, Nuki Lock 4.0, Nuki Lock 4.0 Pro, Nuki Lock 5.0 Pro, Nuki Lock Go or Nuki Lock Ultra in conjunction with Nuki Hub.
+Hybrid mode allows you to use the official Nuki MQTT implementation on a Nuki Lock 3.0 Pro, Nuki Lock 4.0, Nuki Lock 4.0 Pro, Nuki Lock 5.0 Pro, Nuki Lock Go or Nuki Lock Ultra in conjunction with Nuki Hub.
See [hybrid mode](/HYBRID.md) for more information. ## Memory constraints @@ -288,7 +288,7 @@ In a browser navigate to the IP address assigned to the ESP32. #### Basic Nuki Configuration -- Nuki Smartlock enabled: Enable if you want Nuki Hub to connect to a Nuki Lock (1.0-4.0 and Ultra) +- Nuki Smartlock enabled: Enable if you want Nuki Hub to connect to a Nuki Lock (All versions) - Nuki Smartlock Ultra/Go/5th gen enabled: Enable if you want Nuki Hub to connect to a Nuki Lock Ultra/Go/5th gen Pro - Nuki Opener enabled: Enable if you want Nuki Hub to connect to a Nuki Opener @@ -429,7 +429,7 @@ Note that the following options can break Nuki Hub and cause bootloops that will - Enable Nuki readable data debug logging: Enable to log human readable debug information regarding Nuki BLE to MQTT and/or Serial. - Enable Nuki hex data debug logging: Enable to log hex debug information regarding Nuki BLE to MQTT and/or Serial. - Enable Nuki command debug logging: Enable to log debug information regarding Nuki BLE commands to MQTT and/or Serial. -- Pubish free heap over MQTT: Enable to publish free heap to MQTT. +- Publish free heap over MQTT: Enable to publish free heap to MQTT. ## Exposed MQTT Topics diff --git a/platformio.ini b/platformio.ini index e74a8b0..6659a46 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,7 +13,7 @@ default_envs = esp32 boards_dir = boards [env] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.31/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip platform_packages = framework = arduino, espidf build_type = release diff --git a/src/WebCfgServer.cpp b/src/WebCfgServer.cpp index 629f6fd..56d4d9e 100644 --- a/src/WebCfgServer.cpp +++ b/src/WebCfgServer.cpp @@ -5485,7 +5485,6 @@ esp_err_t WebCfgServer::buildMqttConfigHtml(PsychicRequest *request, PsychicResp printCheckBox(&response, "HYBRIDRETRY", "Retry command sent using official MQTT over BLE if failed", _preferences->getBool(preference_official_hybrid_retry), ""); printCheckBox(&response, "HYBRIDREBOOT", "Reboot Nuki lock on official MQTT failure", _preferences->getBool(preference_hybrid_reboot_on_disconnect, false), ""); response.print(""); - response.print("* If no encryption is configured for the MQTT broker, leave empty.

"); response.print("
"); response.print(""); response.print(""); @@ -5530,14 +5529,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR file.close(); ca[filesize] = '\0'; - printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate (*, optional)", "*", 2200, true, true); + printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "*", 2200, true, true); found = true; } } if (!found) { - printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate (*, optional)", "", 2200, true, true); + printTextarea(&response, "MQTTCA", "MQTT SSL CA Certificate", "", 2200, true, true); } } else if (type == 1) @@ -5565,14 +5564,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR file.close(); cert[filesize] = '\0'; - printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate (*, optional)", "*", 2200, true, true); + printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "*", 2200, true, true); found = true; } } if (!found) { - printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate (*, optional)", "", 2200, true, true); + printTextarea(&response, "MQTTCRT", "MQTT SSL Client Certificate", "", 2200, true, true); } } else @@ -5600,14 +5599,14 @@ esp_err_t WebCfgServer::buildMqttSSLConfigHtml(PsychicRequest *request, PsychicR file.close(); key[filesize] = '\0'; - printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key (*, optional)", "*", 2200, true, true); + printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "*", 2200, true, true); found = true; } } if (!found) { - printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key (*, optional)", "", 2200, true, true); + printTextarea(&response, "MQTTKEY", "MQTT SSL Client Key", "", 2200, true, true); } } response.print(""); @@ -5654,14 +5653,14 @@ esp_err_t WebCfgServer::buildHttpSSLConfigHtml(PsychicRequest *request, PsychicR file.close(); cert[filesize] = '\0'; - printTextarea(&response, "HTTPCRT", "HTTP SSL Certificate (*, optional)", "*", 4400, true, true); + printTextarea(&response, "HTTPCRT", "HTTP SSL Certificate", "*", 4400, true, true); found = true; } } if (!found) { - printTextarea(&response, "HTTPCRT", "HTTP SSL Certificate (*, optional)", "", 4400, true, true); + printTextarea(&response, "HTTPCRT", "HTTP SSL Certificate", "", 4400, true, true); } } else if (type == 2) @@ -5689,14 +5688,14 @@ esp_err_t WebCfgServer::buildHttpSSLConfigHtml(PsychicRequest *request, PsychicR file.close(); key[filesize] = '\0'; - printTextarea(&response, "HTTPKEY", "HTTP SSL Key (*, optional)", "*", 2200, true, true); + printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "*", 2200, true, true); found = true; } } if (!found) { - printTextarea(&response, "HTTPKEY", "HTTP SSL Key (*, optional)", "", 2200, true, true); + printTextarea(&response, "HTTPKEY", "HTTP SSL Key", "", 2200, true, true); } } else @@ -5778,7 +5777,7 @@ esp_err_t WebCfgServer::buildAdvancedConfigHtml(PsychicRequest *request, Psychic printCheckBox(&response, "DBGREAD", "Enable Nuki readable data debug logging", _preferences->getBool(preference_debug_readable_data, false), ""); printCheckBox(&response, "DBGHEX", "Enable Nuki hex data debug logging", _preferences->getBool(preference_debug_hex_data, false), ""); printCheckBox(&response, "DBGCOMM", "Enable Nuki command debug logging", _preferences->getBool(preference_debug_command, false), ""); - printCheckBox(&response, "DBGHEAP", "Pubish free heap over MQTT", _preferences->getBool(preference_publish_debug_info, false), ""); + printCheckBox(&response, "DBGHEAP", "Publish free heap over MQTT", _preferences->getBool(preference_publish_debug_info, false), ""); response.print(""); response.print("
"); diff --git a/updater/platformio.ini b/updater/platformio.ini index d7f49c5..925f477 100644 --- a/updater/platformio.ini +++ b/updater/platformio.ini @@ -13,7 +13,7 @@ default_envs = updater_esp32 boards_dir = ../boards [env] -platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.31/platform-espressif32.zip +platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip platform_packages = framework = arduino, espidf build_type = release