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

Feature: Added option to disable the diagram at the display

Browse Source
This commit is contained in:
Thomas Basler 2024-01-08 14:19:26 +01:00
parent 265a44c517
commit 637d4f06a3
13 changed files with 841 additions and 784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/Configuration.h
View File

@ -143,7 +143,10 @@ struct CONFIG_T {
uint8_t Rotation;
uint8_t Contrast;
uint8_t Language;
uint32_t DiagramDuration;
struct {
uint32_t Duration;
uint8_t Mode;
} Diagram;
} Display;
struct {
@ -166,4 +169,4 @@ public:
INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
};
extern ConfigurationClass Configuration;
extern ConfigurationClass Configuration;

10
include/Display_Graphic.h
View File

@ -15,6 +15,12 @@ enum DisplayType_t {
DisplayType_Max,
};
enum DiagramMode_t {
Off,
Small,
DisplayMode_Max,
};
class DisplayGraphicClass {
public:
DisplayGraphicClass();
@ -25,6 +31,7 @@ public:
void setStatus(const bool turnOn);
void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
void setLanguage(const uint8_t language);
void setDiagramMode(DiagramMode_t mode);
void setStartupDisplay();
DisplayGraphicDiagramClass& Diagram();
@ -47,6 +54,7 @@ private:
bool _displayTurnedOn;
DisplayType_t _display_type = DisplayType_t::None;
DiagramMode_t _diagram_mode = DiagramMode_t::Off;
uint8_t _display_language = DISPLAY_LANGUAGE;
uint8_t _mExtra;
uint16_t _period = 1000;
@ -57,4 +65,4 @@ private:
uint8_t _lineOffsets[5];
};
extern DisplayGraphicClass Display;
extern DisplayGraphicClass Display;

3
include/defaults.h
View File

@ -99,9 +99,10 @@
#define DISPLAY_CONTRAST 60U
#define DISPLAY_LANGUAGE 0U
#define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
#define DISPLAY_DIAGRAM_MODE 1U
#define REACHABLE_THRESHOLD 2U
#define LED_BRIGHTNESS 100U
#define MAX_INVERTER_LIMIT 2250
#define MAX_INVERTER_LIMIT 2250

10
src/Configuration.cpp
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2022 Thomas Basler and others
* Copyright (C) 2022-2024 Thomas Basler and others
*/
#include "Configuration.h"
#include "MessageOutput.h"
@ -109,7 +109,8 @@ bool ConfigurationClass::write()
display["rotation"] = config.Display.Rotation;
display["contrast"] = config.Display.Contrast;
display["language"] = config.Display.Language;
display["diagram_duration"] = config.Display.DiagramDuration;
display["diagram_duration"] = config.Display.Diagram.Duration;
display["diagram_mode"] = config.Display.Diagram.Mode;
JsonArray leds = device.createNestedArray("led");
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
@ -276,7 +277,8 @@ bool ConfigurationClass::read()
config.Display.Rotation = display["rotation"] | DISPLAY_ROTATION;
config.Display.Contrast = display["contrast"] | DISPLAY_CONTRAST;
config.Display.Language = display["language"] | DISPLAY_LANGUAGE;
config.Display.DiagramDuration = display["diagram_duration"] | DISPLAY_DIAGRAM_DURATION;
config.Display.Diagram.Duration = display["diagram_duration"] | DISPLAY_DIAGRAM_DURATION;
config.Display.Diagram.Mode = display["diagram_mode"] | DISPLAY_DIAGRAM_MODE;
JsonArray leds = device["led"];
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
@ -397,4 +399,4 @@ INVERTER_CONFIG_T* ConfigurationClass::getInverterConfig(const uint64_t serial)
return nullptr;
}
ConfigurationClass Configuration;
ConfigurationClass Configuration;

18
src/Display_Graphic.cpp
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2023 Thomas Basler and others
* Copyright (C) 2023-2024 Thomas Basler and others
*/
#include "Display_Graphic.h"
#include "Datastore.h"
@ -98,7 +98,12 @@ void DisplayGraphicClass::printText(const char* text, const uint8_t line)
if (!_isLarge) {
dispX = (line == 0) ? 5 : 0;
} else {
dispX = (line == 0) ? 10 : 5;
if (_diagram_mode == DiagramMode_t::Small) {
dispX = (line == 0) ? 10 : 5;
} else {
dispX = (line == 0) ? 20 : 5;
}
}
setFont(line);
@ -136,6 +141,13 @@ void DisplayGraphicClass::setLanguage(const uint8_t language)
_display_language = language < sizeof(languages) / sizeof(languages[0]) ? language : DISPLAY_LANGUAGE;
}
void DisplayGraphicClass::setDiagramMode(DiagramMode_t mode)
{
if (mode < DiagramMode_t::DisplayMode_Max) {
_diagram_mode = mode;
}
}
void DisplayGraphicClass::setStartupDisplay()
{
if (!isValidDisplay()) {
@ -162,7 +174,7 @@ void DisplayGraphicClass::loop()
//=====> Actual Production ==========
if (Datastore.getIsAtLeastOneReachable()) {
displayPowerSave = false;
if (_isLarge) {
if (_isLarge && _diagram_mode == DiagramMode_t::Small) {
uint8_t screenSaverOffsetX = enableScreensaver ? (_mExtra % 7) : 0;
_diagram.redraw(screenSaverOffsetX);
}

4
src/Display_Graphic_Diagram.cpp
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2023 Thomas Basler and others
* Copyright (C) 2023-2024 Thomas Basler and others
*/
#include "Display_Graphic_Diagram.h"
#include "Configuration.h"
@ -52,7 +52,7 @@ void DisplayGraphicDiagramClass::dataPointLoop()
uint32_t DisplayGraphicDiagramClass::getSecondsPerDot()
{
return Configuration.get().Display.DiagramDuration / CHART_WIDTH;
return Configuration.get().Display.Diagram.Duration / CHART_WIDTH;
}
void DisplayGraphicDiagramClass::updatePeriod()

9
src/WebApi_device.cpp
View File

@ -83,7 +83,8 @@ void WebApiDeviceClass::onDeviceAdminGet(AsyncWebServerRequest* request)
display["screensaver"] = config.Display.ScreenSaver;
display["contrast"] = config.Display.Contrast;
display["language"] = config.Display.Language;
display["diagramduration"] = config.Display.DiagramDuration;
display["diagramduration"] = config.Display.Diagram.Duration;
display["diagrammode"] = config.Display.Diagram.Mode;
auto leds = root.createNestedArray("led");
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
@ -161,7 +162,8 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
config.Display.ScreenSaver = root["display"]["screensaver"].as<bool>();
config.Display.Contrast = root["display"]["contrast"].as<uint8_t>();
config.Display.Language = root["display"]["language"].as<uint8_t>();
config.Display.DiagramDuration = root["display"]["diagramduration"].as<uint32_t>();
config.Display.Diagram.Duration = root["display"]["diagramduration"].as<uint32_t>();
config.Display.Diagram.Mode = root["display"]["diagrammode"].as<DiagramMode_t>();
for (uint8_t i = 0; i < PINMAPPING_LED_COUNT; i++) {
config.Led_Single[i].Brightness = root["led"][i]["brightness"].as<uint8_t>();
@ -173,6 +175,7 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
Display.enableScreensaver = config.Display.ScreenSaver;
Display.setContrast(config.Display.Contrast);
Display.setLanguage(config.Display.Language);
Display.setDiagramMode(static_cast<DiagramMode_t>(config.Display.Diagram.Mode));
Display.Diagram().updatePeriod();
WebApi.writeConfig(retMsg);
@ -183,4 +186,4 @@ void WebApiDeviceClass::onDeviceAdminPost(AsyncWebServerRequest* request)
if (performRestart) {
Utils::restartDtu();
}
}
}

315
src/main.cpp
View File

@ -1,157 +1,158 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2022-2023 Thomas Basler and others
*/
#include "Configuration.h"
#include "Datastore.h"
#include "Display_Graphic.h"
#include "InverterSettings.h"
#include "Led_Single.h"
#include "MessageOutput.h"
#include "MqttHandleDtu.h"
#include "MqttHandleHass.h"
#include "MqttHandleInverter.h"
#include "MqttHandleInverterTotal.h"
#include "MqttSettings.h"
#include "NetworkSettings.h"
#include "NtpSettings.h"
#include "PinMapping.h"
#include "Scheduler.h"
#include "SunPosition.h"
#include "Utils.h"
#include "WebApi.h"
#include "defaults.h"
#include <Arduino.h>
#include <LittleFS.h>
#include <TaskScheduler.h>
void setup()
{
// Initialize serial output
Serial.begin(SERIAL_BAUDRATE);
#if ARDUINO_USB_CDC_ON_BOOT
Serial.setTxTimeoutMs(0);
delay(100);
#else
while (!Serial)
yield();
#endif
MessageOutput.init(scheduler);
MessageOutput.println();
MessageOutput.println("Starting OpenDTU");
// Initialize file system
MessageOutput.print("Initialize FS... ");
if (!LittleFS.begin(false)) { // Do not format if mount failed
MessageOutput.print("failed... trying to format...");
if (!LittleFS.begin(true)) {
MessageOutput.print("success");
} else {
MessageOutput.print("failed");
}
} else {
MessageOutput.println("done");
}
// Read configuration values
MessageOutput.print("Reading configuration... ");
if (!Configuration.read()) {
MessageOutput.print("initializing... ");
Configuration.init();
if (Configuration.write()) {
MessageOutput.print("written... ");
} else {
MessageOutput.print("failed... ");
}
}
if (Configuration.get().Cfg.Version != CONFIG_VERSION) {
MessageOutput.print("migrated... ");
Configuration.migrate();
}
auto& config = Configuration.get();
MessageOutput.println("done");
// Load PinMapping
MessageOutput.print("Reading PinMapping... ");
if (PinMapping.init(String(Configuration.get().Dev_PinMapping))) {
MessageOutput.print("found valid mapping ");
} else {
MessageOutput.print("using default config ");
}
const auto& pin = PinMapping.get();
MessageOutput.println("done");
// Initialize WiFi
MessageOutput.print("Initialize Network... ");
NetworkSettings.init(scheduler);
MessageOutput.println("done");
NetworkSettings.applyConfig();
// Initialize NTP
MessageOutput.print("Initialize NTP... ");
NtpSettings.init();
MessageOutput.println("done");
// Initialize SunPosition
MessageOutput.print("Initialize SunPosition... ");
SunPosition.init(scheduler);
MessageOutput.println("done");
// Initialize MqTT
MessageOutput.print("Initialize MqTT... ");
MqttSettings.init();
MqttHandleDtu.init(scheduler);
MqttHandleInverter.init(scheduler);
MqttHandleInverterTotal.init(scheduler);
MqttHandleHass.init(scheduler);
MessageOutput.println("done");
// Initialize WebApi
MessageOutput.print("Initialize WebApi... ");
WebApi.init(scheduler);
MessageOutput.println("done");
// Initialize Display
MessageOutput.print("Initialize Display... ");
Display.init(
scheduler,
static_cast<DisplayType_t>(pin.display_type),
pin.display_data,
pin.display_clk,
pin.display_cs,
pin.display_reset);
Display.setOrientation(config.Display.Rotation);
Display.enablePowerSafe = config.Display.PowerSafe;
Display.enableScreensaver = config.Display.ScreenSaver;
Display.setContrast(config.Display.Contrast);
Display.setLanguage(config.Display.Language);
Display.setStartupDisplay();
MessageOutput.println("done");
// Initialize Single LEDs
MessageOutput.print("Initialize LEDs... ");
LedSingle.init(scheduler);
MessageOutput.println("done");
// Check for default DTU serial
MessageOutput.print("Check for default DTU serial... ");
if (config.Dtu.Serial == DTU_SERIAL) {
MessageOutput.print("generate serial based on ESP chip id: ");
const uint64_t dtuId = Utils::generateDtuSerial();
MessageOutput.printf("%0x%08x... ",
((uint32_t)((dtuId >> 32) & 0xFFFFFFFF)),
((uint32_t)(dtuId & 0xFFFFFFFF)));
config.Dtu.Serial = dtuId;
Configuration.write();
}
MessageOutput.println("done");
InverterSettings.init(scheduler);
Datastore.init(scheduler);
}
void loop()
{
scheduler.execute();
}
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (C) 2022-2024 Thomas Basler and others
*/
#include "Configuration.h"
#include "Datastore.h"
#include "Display_Graphic.h"
#include "InverterSettings.h"
#include "Led_Single.h"
#include "MessageOutput.h"
#include "MqttHandleDtu.h"
#include "MqttHandleHass.h"
#include "MqttHandleInverter.h"
#include "MqttHandleInverterTotal.h"
#include "MqttSettings.h"
#include "NetworkSettings.h"
#include "NtpSettings.h"
#include "PinMapping.h"
#include "Scheduler.h"
#include "SunPosition.h"
#include "Utils.h"
#include "WebApi.h"
#include "defaults.h"
#include <Arduino.h>
#include <LittleFS.h>
#include <TaskScheduler.h>
void setup()
{
// Initialize serial output
Serial.begin(SERIAL_BAUDRATE);
#if ARDUINO_USB_CDC_ON_BOOT
Serial.setTxTimeoutMs(0);
delay(100);
#else
while (!Serial)
yield();
#endif
MessageOutput.init(scheduler);
MessageOutput.println();
MessageOutput.println("Starting OpenDTU");
// Initialize file system
MessageOutput.print("Initialize FS... ");
if (!LittleFS.begin(false)) { // Do not format if mount failed
MessageOutput.print("failed... trying to format...");
if (!LittleFS.begin(true)) {
MessageOutput.print("success");
} else {
MessageOutput.print("failed");
}
} else {
MessageOutput.println("done");
}
// Read configuration values
MessageOutput.print("Reading configuration... ");
if (!Configuration.read()) {
MessageOutput.print("initializing... ");
Configuration.init();
if (Configuration.write()) {
MessageOutput.print("written... ");
} else {
MessageOutput.print("failed... ");
}
}
if (Configuration.get().Cfg.Version != CONFIG_VERSION) {
MessageOutput.print("migrated... ");
Configuration.migrate();
}
auto& config = Configuration.get();
MessageOutput.println("done");
// Load PinMapping
MessageOutput.print("Reading PinMapping... ");
if (PinMapping.init(String(Configuration.get().Dev_PinMapping))) {
MessageOutput.print("found valid mapping ");
} else {
MessageOutput.print("using default config ");
}
const auto& pin = PinMapping.get();
MessageOutput.println("done");
// Initialize WiFi
MessageOutput.print("Initialize Network... ");
NetworkSettings.init(scheduler);
MessageOutput.println("done");
NetworkSettings.applyConfig();
// Initialize NTP
MessageOutput.print("Initialize NTP... ");
NtpSettings.init();
MessageOutput.println("done");
// Initialize SunPosition
MessageOutput.print("Initialize SunPosition... ");
SunPosition.init(scheduler);
MessageOutput.println("done");
// Initialize MqTT
MessageOutput.print("Initialize MqTT... ");
MqttSettings.init();
MqttHandleDtu.init(scheduler);
MqttHandleInverter.init(scheduler);
MqttHandleInverterTotal.init(scheduler);
MqttHandleHass.init(scheduler);
MessageOutput.println("done");
// Initialize WebApi
MessageOutput.print("Initialize WebApi... ");
WebApi.init(scheduler);
MessageOutput.println("done");
// Initialize Display
MessageOutput.print("Initialize Display... ");
Display.init(
scheduler,
static_cast<DisplayType_t>(pin.display_type),
pin.display_data,
pin.display_clk,
pin.display_cs,
pin.display_reset);
Display.setOrientation(config.Display.Rotation);
Display.enablePowerSafe = config.Display.PowerSafe;
Display.enableScreensaver = config.Display.ScreenSaver;
Display.setContrast(config.Display.Contrast);
Display.setLanguage(config.Display.Language);
Display.setDiagramMode(static_cast<DiagramMode_t>(config.Display.Diagram.Mode));
Display.setStartupDisplay();
MessageOutput.println("done");
// Initialize Single LEDs
MessageOutput.print("Initialize LEDs... ");
LedSingle.init(scheduler);
MessageOutput.println("done");
// Check for default DTU serial
MessageOutput.print("Check for default DTU serial... ");
if (config.Dtu.Serial == DTU_SERIAL) {
MessageOutput.print("generate serial based on ESP chip id: ");
const uint64_t dtuId = Utils::generateDtuSerial();
MessageOutput.printf("%0x%08x... ",
((uint32_t)((dtuId >> 32) & 0xFFFFFFFF)),
((uint32_t)(dtuId & 0xFFFFFFFF)));
config.Dtu.Serial = dtuId;
Configuration.write();
}
MessageOutput.println("done");
InverterSettings.init(scheduler);
Datastore.init(scheduler);
}
void loop()
{
scheduler.execute();
}

3
webapp/src/locales/de.json
View File

@ -582,6 +582,9 @@
"PowerSafeHint": "Schaltet das Display aus, wenn kein Wechselrichter Strom erzeugt",
"Screensaver": "Bildschirmschoner aktivieren:",
"ScreensaverHint": "Bewegt die Ausgabe bei jeder Aktualisierung um ein Einbrennen zu verhindern (v. a. für OLED-Displays nützlich)",
"DiagramMode": "Diagram Modus:",
"off": "Deaktiviert",
"small": "Klein",
"DiagramDuration": "Diagramm Periode:",
"DiagramDurationHint": "Die Zeitperiode welche im Diagramm dargestellt wird.",
"Seconds": "Sekunden",

3
webapp/src/locales/en.json
View File

@ -582,6 +582,9 @@
"PowerSafeHint": "Turn off the display if no inverter is producing.",
"Screensaver": "Enable Screensaver:",
"ScreensaverHint": "Move the display a little bit on each update to prevent burn-in. (Useful especially for OLED displays)",
"DiagramMode": "Diagram mode:",
"off": "Off",
"small": "Small",
"DiagramDuration": "Diagram duration:",
"DiagramDurationHint": "The time period which is shown in the diagram.",
"Seconds": "Seconds",

1221
webapp/src/locales/fr.json
View File

File diff suppressed because it is too large Load Diff

3
webapp/src/types/DeviceConfig.ts
View File

@ -7,6 +7,7 @@ export interface Display {
contrast: number;
language: number;
diagramduration: number;
diagrammode: number;
}
export interface Led {
@ -17,4 +18,4 @@ export interface DeviceConfig {
curPin: Device;
display: Display;
led: Array<Led>;
}
}

19
webapp/src/views/DeviceAdminView.vue
View File

@ -67,6 +67,19 @@
v-model="deviceConfigList.display.screensaver" type="checkbox"
:tooltip="$t('deviceadmin.ScreensaverHint')" />
<div class="row mb-3">
<label class="col-sm-2 col-form-label">
{{ $t('deviceadmin.DiagramMode') }}
</label>
<div class="col-sm-10">
<select class="form-select" v-model="deviceConfigList.display.diagrammode">
<option v-for="mode in diagramModeList" :key="mode.key" :value="mode.key">
{{ $t(`deviceadmin.` + mode.value) }}
</option>
</select>
</div>
</div>
<InputElement :label="$t('deviceadmin.DiagramDuration')"
v-model="deviceConfigList.display.diagramduration" type="number"
min=600 max=86400
@ -183,6 +196,10 @@ export default defineComponent({
{ key: 1, value: "de" },
{ key: 2, value: "fr" },
],
diagramModeList: [
{ key: 0, value: "off" },
{ key: 1, value: "small" },
]
}
},
created() {
@ -274,4 +291,4 @@ export default defineComponent({
}
},
});
</script>
</script>