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

add gpio configuration to sysinfo page

Browse Source
This commit is contained in:
technyon
2023-04-07 21:17:16 +02:00
parent c2ce5a151d
commit 16a7f6fc78
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define NUKI_HUB_VERSION "8.21" #define NUKI_HUB_VERSION "8.22-pre-1"
#define MQTT_QOS_LEVEL 1 #define MQTT_QOS_LEVEL 1
#define MQTT_CLEAN_SESSIONS false #define MQTT_CLEAN_SESSIONS false

6
Gpio.cpp
View File

@@ -174,10 +174,8 @@ String Gpio::getRoleDescription(PinRole role) const
} }
} }
void Gpio::getConfigurationText(String& text, const std::vector<PinEntry>& pinConfiguration) const void Gpio::getConfigurationText(String& text, const std::vector<PinEntry>& pinConfiguration, const String& linebreak) const
{ {
text.clear();
for(const auto& entry : pinConfiguration) for(const auto& entry : pinConfiguration)
{ {
if(entry.role != PinRole::Disabled) if(entry.role != PinRole::Disabled)
@@ -190,7 +188,7 @@ void Gpio::getConfigurationText(String& text, const std::vector<PinEntry>& pinCo
} }
text.concat(": "); text.concat(": ");
text.concat(getRoleDescription(entry.role)); text.concat(getRoleDescription(entry.role));
text.concat("\n\r"); text.concat(linebreak);
} }
} }
} }

2
Gpio.h
View File

@@ -56,7 +56,7 @@ public:
const std::vector<PinEntry>& pinConfiguration() const; const std::vector<PinEntry>& pinConfiguration() const;
String getRoleDescription(PinRole role) const; String getRoleDescription(PinRole role) const;
void getConfigurationText(String& text, const std::vector<PinEntry>& pinConfiguration) const; void getConfigurationText(String& text, const std::vector<PinEntry>& pinConfiguration, const String& linebreak = "\n") const;
const std::vector<PinRole>& getAllRoles() const; const std::vector<PinRole>& getAllRoles() const;

2
WebCfgServer.cpp
View File

@@ -938,6 +938,8 @@ void WebCfgServer::buildInfoHtml(String &response)
response.concat(uxTaskGetStackHighWaterMark(presenceDetectionTaskHandle)); response.concat(uxTaskGetStackHighWaterMark(presenceDetectionTaskHandle));
response.concat("\n"); response.concat("\n");
_gpio->getConfigurationText(response, _gpio->pinConfiguration());
response.concat("Restart reason FW: "); response.concat("Restart reason FW: ");
response.concat(getRestartReason()); response.concat(getRestartReason());
response.concat( "\n"); response.concat( "\n");

2
main.cpp
View File

@@ -211,7 +211,7 @@ void setup()
gpio = new Gpio(preferences); gpio = new Gpio(preferences);
String gpioDesc; String gpioDesc;
gpio->getConfigurationText(gpioDesc, gpio->pinConfiguration()); gpio->getConfigurationText(gpioDesc, gpio->pinConfiguration(), "\n\r");
Serial.print(gpioDesc.c_str()); Serial.print(gpioDesc.c_str());
Log->println(lockEnabled ? F("NUKI Lock enabled") : F("NUKI Lock disabled")); Log->println(lockEnabled ? F("NUKI Lock enabled") : F("NUKI Lock disabled"));