patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added WebAPI to setup display settings. Also reboot only if device profile was changed.

Browse Source
This commit is contained in:
Thomas Basler 2023-01-19 23:14:08 +01:00
parent f7fb9a2bd6
commit e89fd64439
5 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Configuration.h
View File

@ -92,6 +92,11 @@ struct CONFIG_T {
bool Security_AllowReadonly; bool Security_AllowReadonly;
char Dev_PinMapping[DEV_MAX_MAPPING_NAME_STRLEN + 1]; char Dev_PinMapping[DEV_MAX_MAPPING_NAME_STRLEN + 1];
bool Display_PowerSafe;
bool Display_ScreenSaver;
bool Display_ShowLogo;
uint8_t Display_Contrast;
}; };
class ConfigurationClass { class ConfigurationClass {

5
include/defaults.h
View File

@ -80,3 +80,8 @@
#define MQTT_HASS_INDIVIDUALPANELS false #define MQTT_HASS_INDIVIDUALPANELS false
#define DEV_PINMAPPING "" #define DEV_PINMAPPING ""
#define DISPLAY_POWERSAFE true
#define DISPLAY_SCREENSAVER true
#define DISPLAY_SHOWLOGO true
#define DISPLAY_CONTRAST 60

12
src/Configuration.cpp
View File

@ -83,6 +83,12 @@ bool ConfigurationClass::write()
JsonObject device = doc.createNestedObject("device"); JsonObject device = doc.createNestedObject("device");
device["pinmapping"] = config.Dev_PinMapping; device["pinmapping"] = config.Dev_PinMapping;
JsonObject display = device.createNestedObject("display");
display["powersafe"] = config.Display_PowerSafe;
display["screensaver"] = config.Display_ScreenSaver;
display["showlogo"] = config.Display_ShowLogo;
display["contrast"] = config.Display_Contrast;
JsonArray inverters = doc.createNestedArray("inverters"); JsonArray inverters = doc.createNestedArray("inverters");
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) { for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
JsonObject inv = inverters.createNestedObject(); JsonObject inv = inverters.createNestedObject();
@ -207,6 +213,12 @@ bool ConfigurationClass::read()
JsonObject device = doc["device"]; JsonObject device = doc["device"];
strlcpy(config.Dev_PinMapping, device["pinmapping"] | DEV_PINMAPPING, sizeof(config.Dev_PinMapping)); strlcpy(config.Dev_PinMapping, device["pinmapping"] | DEV_PINMAPPING, sizeof(config.Dev_PinMapping));
JsonObject display = device["display"];
config.Display_PowerSafe = display["powersafe"] | DISPLAY_POWERSAFE;
config.Display_ScreenSaver = display["screensaver"] | DISPLAY_SCREENSAVER;
config.Display_ShowLogo = display["showlogo"] | DISPLAY_SHOWLOGO;
config.Display_Contrast = display["contrast"] | DISPLAY_CONTRAST;
JsonArray inverters = doc["inverters"]; JsonArray inverters = doc["inverters"];
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) { for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
JsonObject inv = inverters[i].as<JsonObject>(); JsonObject inv = inverters[i].as<JsonObject>();

73
src/WebApi_device.cpp
View File

@ -4,6 +4,7 @@
*/ */
#include "WebApi_device.h" #include "WebApi_device.h"
#include "Configuration.h" #include "Configuration.h"
#include "Display_Graphic.h"
#include "PinMapping.h" #include "PinMapping.h"
#include "WebApi.h" #include "WebApi.h"
#include "WebApi_errors.h" #include "WebApi_errors.h"
@ -38,29 +39,35 @@ void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)
JsonObject curPin = root.createNestedObject("curPin"); JsonObject curPin = root.createNestedObject("curPin");
curPin[F("name")] = config.Dev_PinMapping; curPin[F("name")] = config.Dev_PinMapping;
JsonObject nrfObj = curPin.createNestedObject("nrf24"); JsonObject nrfPinObj = curPin.createNestedObject("nrf24");
nrfObj[F("clk")] = pin.nrf24_clk; nrfPinObj[F("clk")] = pin.nrf24_clk;
nrfObj[F("cs")] = pin.nrf24_cs; nrfPinObj[F("cs")] = pin.nrf24_cs;
nrfObj[F("en")] = pin.nrf24_en; nrfPinObj[F("en")] = pin.nrf24_en;
nrfObj[F("irq")] = pin.nrf24_irq; nrfPinObj[F("irq")] = pin.nrf24_irq;
nrfObj[F("miso")] = pin.nrf24_miso; nrfPinObj[F("miso")] = pin.nrf24_miso;
nrfObj[F("mosi")] = pin.nrf24_mosi; nrfPinObj[F("mosi")] = pin.nrf24_mosi;
JsonObject ethObj = curPin.createNestedObject("eth"); JsonObject ethPinObj = curPin.createNestedObject("eth");
ethObj[F("enabled")] = pin.eth_enabled; ethPinObj[F("enabled")] = pin.eth_enabled;
ethObj[F("phy_addr")] = pin.eth_phy_addr; ethPinObj[F("phy_addr")] = pin.eth_phy_addr;
ethObj[F("power")] = pin.eth_power; ethPinObj[F("power")] = pin.eth_power;
ethObj[F("mdc")] = pin.eth_mdc; ethPinObj[F("mdc")] = pin.eth_mdc;
ethObj[F("mdio")] = pin.eth_mdio; ethPinObj[F("mdio")] = pin.eth_mdio;
ethObj[F("type")] = pin.eth_type; ethPinObj[F("type")] = pin.eth_type;
ethObj[F("clk_mode")] = pin.eth_clk_mode; ethPinObj[F("clk_mode")] = pin.eth_clk_mode;
JsonObject displayObj = curPin.createNestedObject("display"); JsonObject displayPinObj = curPin.createNestedObject("display");
displayObj[F("type")] = pin.display_type; displayPinObj[F("type")] = pin.display_type;
displayObj[F("data")] = pin.display_data; displayPinObj[F("data")] = pin.display_data;
displayObj[F("clk")] = pin.display_clk; displayPinObj[F("clk")] = pin.display_clk;
displayObj[F("cs")] = pin.display_cs; displayPinObj[F("cs")] = pin.display_cs;
displayObj[F("reset")] = pin.display_reset; displayPinObj[F("reset")] = pin.display_reset;
JsonObject display = root.createNestedObject("display");
display[F("show_logo")] = config.Display_ShowLogo;
display[F("power_safe")] = config.Display_PowerSafe;
display[F("screensaver")] = config.Display_ScreenSaver;
display[F("contrast")] = config.Display_Contrast;
response->setLength(); response->setLength();
request->send(response); request->send(response);
@ -105,7 +112,7 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
return; return;
} }
if (!(root.containsKey("curPin"))) { if (!(root.containsKey("curPin") || root.containsKey("display"))) {
retMsg[F("message")] = F("Values are missing!"); retMsg[F("message")] = F("Values are missing!");
retMsg[F("code")] = WebApiError::GenericValueMissing; retMsg[F("code")] = WebApiError::GenericValueMissing;
response->setLength(); response->setLength();
@ -123,7 +130,19 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
} }
CONFIG_T& config = Configuration.get(); CONFIG_T& config = Configuration.get();
bool performRestart = root[F("curPin")][F("name")].as<String>() != config.Dev_PinMapping;
strlcpy(config.Dev_PinMapping, root[F("curPin")][F("name")].as<String>().c_str(), sizeof(config.Dev_PinMapping)); strlcpy(config.Dev_PinMapping, root[F("curPin")][F("name")].as<String>().c_str(), sizeof(config.Dev_PinMapping));
config.Display_ShowLogo = root[F("display")][F("show_logo")].as<bool>();
config.Display_PowerSafe = root[F("display")][F("power_safe")].as<bool>();
config.Display_ScreenSaver = root[F("display")][F("screensaver")].as<bool>();
config.Display_Contrast = root[F("display")][F("contrast")].as<uint8_t>();
Display.showLogo = config.Display_ShowLogo;
Display.enablePowerSafe = config.Display_PowerSafe;
Display.enableScreensaver = config.Display_ScreenSaver;
Display.contrast = config.Display_Contrast;
Configuration.write(); Configuration.write();
retMsg[F("type")] = F("success"); retMsg[F("type")] = F("success");
@ -133,8 +152,10 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
response->setLength(); response->setLength();
request->send(response); request->send(response);
yield(); if (performRestart) {
delay(1000); yield();
yield(); delay(1000);
ESP.restart(); yield();
ESP.restart();
}
} }

6
src/main.cpp
View File

@ -56,6 +56,7 @@ void setup()
MessageOutput.print(F("migrated... ")); MessageOutput.print(F("migrated... "));
Configuration.migrate(); Configuration.migrate();
} }
CONFIG_T& config = Configuration.get();
MessageOutput.println(F("done")); MessageOutput.println(F("done"));
// Load PinMapping // Load PinMapping
@ -100,11 +101,14 @@ void setup()
pin.display_clk, pin.display_clk,
pin.display_cs, pin.display_cs,
pin.display_reset); pin.display_reset);
Display.showLogo = config.Display_ShowLogo;
Display.enablePowerSafe = config.Display_PowerSafe;
Display.enableScreensaver = config.Display_ScreenSaver;
Display.contrast = config.Display_Contrast;
MessageOutput.println(F("done")); MessageOutput.println(F("done"));
// Check for default DTU serial // Check for default DTU serial
MessageOutput.print(F("Check for default DTU serial... ")); MessageOutput.print(F("Check for default DTU serial... "));
CONFIG_T& config = Configuration.get();
if (config.Dtu_Serial == DTU_SERIAL) { if (config.Dtu_Serial == DTU_SERIAL) {
MessageOutput.print(F("generate serial based on ESP chip id: ")); MessageOutput.print(F("generate serial based on ESP chip id: "));
uint64_t dtuId = Utils::generateDtuSerial(); uint64_t dtuId = Utils::generateDtuSerial();