diff --git a/Config.h b/Config.h index 36f9084..36f828a 100644 --- a/Config.h +++ b/Config.h @@ -1,6 +1,6 @@ #pragma once -#define NUKI_HUB_VERSION "8.21" +#define NUKI_HUB_VERSION "8.22-pre-1" #define MQTT_QOS_LEVEL 1 #define MQTT_CLEAN_SESSIONS false diff --git a/Gpio.cpp b/Gpio.cpp index 90e961c..e3680cc 100644 --- a/Gpio.cpp +++ b/Gpio.cpp @@ -174,10 +174,8 @@ String Gpio::getRoleDescription(PinRole role) const } } -void Gpio::getConfigurationText(String& text, const std::vector& pinConfiguration) const +void Gpio::getConfigurationText(String& text, const std::vector& pinConfiguration, const String& linebreak) const { - text.clear(); - for(const auto& entry : pinConfiguration) { if(entry.role != PinRole::Disabled) @@ -190,7 +188,7 @@ void Gpio::getConfigurationText(String& text, const std::vector& pinCo } text.concat(": "); text.concat(getRoleDescription(entry.role)); - text.concat("\n\r"); + text.concat(linebreak); } } } diff --git a/Gpio.h b/Gpio.h index b67eed8..768d717 100644 --- a/Gpio.h +++ b/Gpio.h @@ -56,7 +56,7 @@ public: const std::vector& pinConfiguration() const; String getRoleDescription(PinRole role) const; - void getConfigurationText(String& text, const std::vector& pinConfiguration) const; + void getConfigurationText(String& text, const std::vector& pinConfiguration, const String& linebreak = "\n") const; const std::vector& getAllRoles() const; diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index 0e14c58..e6ca370 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -938,6 +938,8 @@ void WebCfgServer::buildInfoHtml(String &response) response.concat(uxTaskGetStackHighWaterMark(presenceDetectionTaskHandle)); response.concat("\n"); + _gpio->getConfigurationText(response, _gpio->pinConfiguration()); + response.concat("Restart reason FW: "); response.concat(getRestartReason()); response.concat( "\n"); diff --git a/main.cpp b/main.cpp index e88522e..97dc63b 100644 --- a/main.cpp +++ b/main.cpp @@ -211,7 +211,7 @@ void setup() gpio = new Gpio(preferences); String gpioDesc; - gpio->getConfigurationText(gpioDesc, gpio->pinConfiguration()); + gpio->getConfigurationText(gpioDesc, gpio->pinConfiguration(), "\n\r"); Serial.print(gpioDesc.c_str()); Log->println(lockEnabled ? F("NUKI Lock enabled") : F("NUKI Lock disabled"));