github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-27 04:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some changes after testing

Browse Source
This commit is contained in:
Gunnar Skjold
2021-01-20 07:41:09 +01:00
parent f15cf5d75e
commit ff84278edf
9 changed files with 94 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/web/AmsWebServer.cpp
View File

@@ -33,10 +33,9 @@
#include "base64.h"
AmsWebServer::AmsWebServer(RemoteDebug* Debug, HwTools* hw, EntsoeApi* eapi) {
AmsWebServer::AmsWebServer(RemoteDebug* Debug, HwTools* hw) {
this->debugger = Debug;
this->hw = hw;
this->eapi = eapi;
}
void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, MeterConfig* meterConfig, AmsData* meterState, MQTTClient* mqtt) {
@@ -106,6 +105,10 @@ void AmsWebServer::setMqttEnabled(bool enabled) {
mqttEnabled = enabled;
}
void AmsWebServer::setEntsoeApi(EntsoeApi* eapi) {
this->eapi = eapi;
}
void AmsWebServer::loop() {
server.handleClient();
@@ -241,11 +244,15 @@ void AmsWebServer::price() {
sprintf(ts, "%02d:00", tm.Hour);
html.replace("${time" + String(i) + "}", String(ts));
double price = eapi->getValueForHour(i);
if(price == ENTSOE_NO_VALUE) {
html.replace("${price" + String(i) + "}", "--");
if(eapi != NULL) {
double price = eapi->getValueForHour(i);
if(price == ENTSOE_NO_VALUE) {
html.replace("${price" + String(i) + "}", "--");
} else {
html.replace("${price" + String(i) + "}", String(price, 4));
}
} else {
html.replace("${price" + String(i) + "}", String(price, 4));
html.replace("${price" + String(i) + "}", "--");
}
}
@@ -706,6 +713,8 @@ void AmsWebServer::handleSetup() {
} else {
SystemConfig sys { server.arg("board").toInt() };
config->clear();
config->clearGpio(*gpioConfig);
config->clearMeter(*meterConfig);
@@ -754,8 +763,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->ledPin = 5;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 14;
gpioConfig->vccPin = 35;
gpioConfig->vccMultiplier = 2250;
break;
case 202: // Feather
gpioConfig->hanPin = 16;
@@ -1009,7 +1016,6 @@ void AmsWebServer::handleSave() {
strcpy(entsoe.currency, server.arg("ecu").c_str());
entsoe.multiplier = server.arg("em").toFloat() * 1000;
config->setEntsoeConfig(entsoe);
eapi->setup(entsoe);
}
printI("Saving configuration now...");

5
src/web/AmsWebServer.h
View File

@@ -27,11 +27,12 @@
class AmsWebServer {
public:
AmsWebServer(RemoteDebug* Debug, HwTools* hw, EntsoeApi* eapi);
AmsWebServer(RemoteDebug* Debug, HwTools* hw);
void setup(AmsConfiguration*, GpioConfig*, MeterConfig*, AmsData*, MQTTClient*);
void loop();
void setTimezone(Timezone* tz);
void setMqttEnabled(bool);
void setEntsoeApi(EntsoeApi* eapi);
private:
RemoteDebug* debugger;
@@ -39,7 +40,7 @@ private:
int maxPwr = 0;
HwTools* hw;
Timezone* tz;
EntsoeApi* eapi;
EntsoeApi* eapi = NULL;
AmsConfiguration* config;
GpioConfig* gpioConfig;
MeterConfig* meterConfig;