topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

0.8.1030007

pull/1615/head
Patrick Amrhein 9 months ago
parent
99d274c257
commit
139baf680a
5 changed files with 38 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/config/settings.h
  2. 2
      src/defines.h
  3. 6
      src/web/RestApi.h
  4. 17
      src/web/html/setup.html
  5. 17
      src/web/lang.json

16
src/config/settings.h
View File

@ -210,6 +210,7 @@ typedef struct {
#define ZEROEXPORT_GROUP_MAX_LEN_PM_JSONPATH 100 #define ZEROEXPORT_GROUP_MAX_LEN_PM_JSONPATH 100
#define ZEROEXPORT_GROUP_MAX_LEN_PM_USER 25 #define ZEROEXPORT_GROUP_MAX_LEN_PM_USER 25
#define ZEROEXPORT_GROUP_MAX_LEN_PM_PASS 25 #define ZEROEXPORT_GROUP_MAX_LEN_PM_PASS 25
#define ZEROEXPORT_GROUP_MAX_LEN_BATTERY_SOC 100
#define ZEROEXPORT_GROUP_MAX_INVERTERS 3 #define ZEROEXPORT_GROUP_MAX_INVERTERS 3
#define ZEROEXPORT_POWERMETER_MAX_ERRORS 5 #define ZEROEXPORT_POWERMETER_MAX_ERRORS 5
#define ZEROEXPORT_DEF_INV_WAITINGTIME_MS 10000 #define ZEROEXPORT_DEF_INV_WAITINGTIME_MS 10000
@ -290,9 +291,10 @@ typedef struct {
bool battEnabled; bool battEnabled;
float battVoltageOn; float battVoltageOn;
float battVoltageOff; float battVoltageOff;
char battSoC[ZEROEXPORT_GROUP_MAX_LEN_BATTERY_SOC];
// Advanced // Advanced
int16_t setPoint; int16_t setPoint;
uint8_t refresh; bool minimum;
float power; float power;
uint8_t powerTolerance; uint8_t powerTolerance;
uint16_t powerMax; uint16_t powerMax;
@ -688,9 +690,10 @@ class settings {
mCfg.plugin.zeroExport.groups[group].battEnabled = false; mCfg.plugin.zeroExport.groups[group].battEnabled = false;
mCfg.plugin.zeroExport.groups[group].battVoltageOn = 0; mCfg.plugin.zeroExport.groups[group].battVoltageOn = 0;
mCfg.plugin.zeroExport.groups[group].battVoltageOff = 0; mCfg.plugin.zeroExport.groups[group].battVoltageOff = 0;
snprintf(mCfg.plugin.zeroExport.groups[group].battSoC, ZEROEXPORT_GROUP_MAX_LEN_BATTERY_SOC, "%s", DEF_ZEXPORT);
// Advanced // Advanced
mCfg.plugin.zeroExport.groups[group].setPoint = 0; mCfg.plugin.zeroExport.groups[group].setPoint = 0;
mCfg.plugin.zeroExport.groups[group].refresh = 10; mCfg.plugin.zeroExport.groups[group].minimum = true;
mCfg.plugin.zeroExport.groups[group].powerTolerance = 10; mCfg.plugin.zeroExport.groups[group].powerTolerance = 10;
mCfg.plugin.zeroExport.groups[group].powerMax = 600; mCfg.plugin.zeroExport.groups[group].powerMax = 600;
mCfg.plugin.zeroExport.groups[group].Kp = -1; mCfg.plugin.zeroExport.groups[group].Kp = -1;
@ -1034,9 +1037,10 @@ class settings {
obj[F("battEnabled")] = mCfg.plugin.zeroExport.groups[group].battEnabled; obj[F("battEnabled")] = mCfg.plugin.zeroExport.groups[group].battEnabled;
obj[F("battVoltageOn")] = mCfg.plugin.zeroExport.groups[group].battVoltageOn; obj[F("battVoltageOn")] = mCfg.plugin.zeroExport.groups[group].battVoltageOn;
obj[F("battVoltageOff")] = mCfg.plugin.zeroExport.groups[group].battVoltageOff; obj[F("battVoltageOff")] = mCfg.plugin.zeroExport.groups[group].battVoltageOff;
obj[F("battSoC")] = mCfg.plugin.zeroExport.groups[group].battSoC;
// Advanced // Advanced
obj[F("setPoint")] = mCfg.plugin.zeroExport.groups[group].setPoint; obj[F("setPoint")] = mCfg.plugin.zeroExport.groups[group].setPoint;
obj[F("refresh")] = mCfg.plugin.zeroExport.groups[group].refresh; obj[F("minimum")] = mCfg.plugin.zeroExport.groups[group].minimum;
obj[F("powerTolerance")] = mCfg.plugin.zeroExport.groups[group].powerTolerance; obj[F("powerTolerance")] = mCfg.plugin.zeroExport.groups[group].powerTolerance;
obj[F("powerMax")] = mCfg.plugin.zeroExport.groups[group].powerMax; obj[F("powerMax")] = mCfg.plugin.zeroExport.groups[group].powerMax;
obj[F("Kp")] = mCfg.plugin.zeroExport.groups[group].Kp; obj[F("Kp")] = mCfg.plugin.zeroExport.groups[group].Kp;
@ -1072,11 +1076,13 @@ class settings {
getVal<float>(obj, F("battVoltageOn"), &mCfg.plugin.zeroExport.groups[group].battVoltageOn); getVal<float>(obj, F("battVoltageOn"), &mCfg.plugin.zeroExport.groups[group].battVoltageOn);
if (obj.containsKey(F("battVoltageOff"))) if (obj.containsKey(F("battVoltageOff")))
getVal<float>(obj, F("battVoltageOff"), &mCfg.plugin.zeroExport.groups[group].battVoltageOff); getVal<float>(obj, F("battVoltageOff"), &mCfg.plugin.zeroExport.groups[group].battVoltageOff);
if (obj.containsKey(F("battSoC")))
getChar(obj, F("battSoC"), mCfg.plugin.zeroExport.groups[group].battSoC, ZEROEXPORT_GROUP_MAX_LEN_BATTERY_SOC);
// Advanced // Advanced
if (obj.containsKey(F("setPoint"))) if (obj.containsKey(F("setPoint")))
getVal<int16_t>(obj, F("setPoint"), &mCfg.plugin.zeroExport.groups[group].setPoint); getVal<int16_t>(obj, F("setPoint"), &mCfg.plugin.zeroExport.groups[group].setPoint);
if (obj.containsKey(F("refresh"))) if (obj.containsKey(F("minimum")))
getVal<uint8_t>(obj, F("refresh"), &mCfg.plugin.zeroExport.groups[group].refresh); getVal<bool>(obj, F("minimum"), &mCfg.plugin.zeroExport.groups[group].minimum);
if (obj.containsKey(F("powerTolerance"))) if (obj.containsKey(F("powerTolerance")))
getVal<uint8_t>(obj, F("powerTolerance"), &mCfg.plugin.zeroExport.groups[group].powerTolerance); getVal<uint8_t>(obj, F("powerTolerance"), &mCfg.plugin.zeroExport.groups[group].powerTolerance);
if (obj.containsKey(F("powerMax"))) if (obj.containsKey(F("powerMax")))

2
src/defines.h
View File

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 1030006 #define VERSION_PATCH 1030007
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
uint8_t ch; uint8_t ch;

6
src/web/RestApi.h
View File

@ -857,9 +857,10 @@ class RestApi {
objGroup[F("battEnabled")] = (bool)mConfig->plugin.zeroExport.groups[group].battEnabled; objGroup[F("battEnabled")] = (bool)mConfig->plugin.zeroExport.groups[group].battEnabled;
objGroup[F("battVoltageOn")] = ah::round1((float)mConfig->plugin.zeroExport.groups[group].battVoltageOn); objGroup[F("battVoltageOn")] = ah::round1((float)mConfig->plugin.zeroExport.groups[group].battVoltageOn);
objGroup[F("battVoltageOff")] = ah::round1((float)mConfig->plugin.zeroExport.groups[group].battVoltageOff); objGroup[F("battVoltageOff")] = ah::round1((float)mConfig->plugin.zeroExport.groups[group].battVoltageOff);
objGroup[F("battSoC")] = String(mConfig->plugin.zeroExport.groups[group].battSoC);
// Advanced // Advanced
objGroup[F("setPoint")] = (int16_t)mConfig->plugin.zeroExport.groups[group].setPoint; objGroup[F("setPoint")] = (int16_t)mConfig->plugin.zeroExport.groups[group].setPoint;
objGroup[F("refresh")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].refresh; objGroup[F("minimum")] = (bool)mConfig->plugin.zeroExport.groups[group].minimum;
objGroup[F("power")] = (int32_t)mConfig->plugin.zeroExport.groups[group].power; objGroup[F("power")] = (int32_t)mConfig->plugin.zeroExport.groups[group].power;
objGroup[F("powerTolerance")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].powerTolerance; objGroup[F("powerTolerance")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].powerTolerance;
objGroup[F("powerMax")] = (uint16_t)mConfig->plugin.zeroExport.groups[group].powerMax; objGroup[F("powerMax")] = (uint16_t)mConfig->plugin.zeroExport.groups[group].powerMax;
@ -1171,9 +1172,10 @@ class RestApi {
mConfig->plugin.zeroExport.groups[group].battEnabled = jsonIn[F("battEnabled")]; mConfig->plugin.zeroExport.groups[group].battEnabled = jsonIn[F("battEnabled")];
mConfig->plugin.zeroExport.groups[group].battVoltageOn = jsonIn[F("battVoltageOn")]; mConfig->plugin.zeroExport.groups[group].battVoltageOn = jsonIn[F("battVoltageOn")];
mConfig->plugin.zeroExport.groups[group].battVoltageOff = jsonIn[F("battVoltageOff")]; mConfig->plugin.zeroExport.groups[group].battVoltageOff = jsonIn[F("battVoltageOff")];
snprintf(mConfig->plugin.zeroExport.groups[group].battSoC, ZEROEXPORT_GROUP_MAX_LEN_BATTERY_SOC, "%s", jsonIn[F("battSoC")].as<const char*>());
// Advanced // Advanced
mConfig->plugin.zeroExport.groups[group].setPoint = jsonIn[F("setPoint")]; mConfig->plugin.zeroExport.groups[group].setPoint = jsonIn[F("setPoint")];
mConfig->plugin.zeroExport.groups[group].refresh = jsonIn[F("refresh")]; mConfig->plugin.zeroExport.groups[group].minimum = jsonIn[F("minimum")];
mConfig->plugin.zeroExport.groups[group].powerTolerance = jsonIn[F("powerTolerance")]; mConfig->plugin.zeroExport.groups[group].powerTolerance = jsonIn[F("powerTolerance")];
mConfig->plugin.zeroExport.groups[group].powerMax = jsonIn[F("powerMax")]; mConfig->plugin.zeroExport.groups[group].powerMax = jsonIn[F("powerMax")];
mConfig->plugin.zeroExport.groups[group].Kp = jsonIn[F("Kp")]; mConfig->plugin.zeroExport.groups[group].Kp = jsonIn[F("Kp")];

17
src/web/html/setup.html
View File

@ -1362,6 +1362,8 @@
cb_battEnabled.checked = (obj.battEnabled); cb_battEnabled.checked = (obj.battEnabled);
// Tab_Advanced // Tab_Advanced
var cb_minimum = ml("input", {name: "minimum", type: "checkbox"}, null);
cb_minimum.checked = (obj.minimum);
// Tab // Tab
var html = ml("div", {}, [ var html = ml("div", {}, [
@ -1421,9 +1423,10 @@
]), ]),
// Battery // Battery
ml("div", {id: "div{#ZE_GROUP_TAB_BATTERY}", class: "tab-content hide"}, [ ml("div", {id: "div{#ZE_GROUP_TAB_BATTERY}", class: "tab-content hide"}, [
divRow("{#ZE_GROUP_TAB_BATTERY_BATTENABLED}", cb_battEnabled), divRow("{#ZE_GROUP_TAB_BATTERY_ENABLED}", cb_battEnabled),
divRow("{#ZE_GROUP_TAB_BATTERY_BATTVOLTAGEON}", ml("input", {name: "battVoltageOn", class: "text", type: "number", min: "0", max: "100", step: "0.1", value: obj.battVoltageOn}, null)), divRow("{#ZE_GROUP_TAB_BATTERY_VOLTAGEON}", ml("input", {name: "battVoltageOn", class: "text", type: "number", min: "0", max: "100", step: "0.1", value: obj.battVoltageOn}, null)),
divRow("{#ZE_GROUP_TAB_BATTERY_BATTVOLTAGEOFF}", ml("input", {name: "battVoltageOff", class: "text", type: "number", min: "0", max: "100", step: "0.1", value: obj.battVoltageOff}, null)), divRow("{#ZE_GROUP_TAB_BATTERY_VOLTAGEOFF}", ml("input", {name: "battVoltageOff", class: "text", type: "number", min: "0", max: "100", step: "0.1", value: obj.battVoltageOff}, null)),
divRow("{#ZE_GROUP_TAB_BATTERY_SOC}", ml("input", {name: "battSoC", class: "text", type: "text", value: obj.battSoC}, null)),
divRow("{#ZE_GROUP_TAB_BATTERY_ONOFF}", ml("input", {name: "battSwitch", id: "battSwitch", class: "btn", type: "button", value: "{#BTN_ONOFF}", onclick: battOnOff()}, null)), divRow("{#ZE_GROUP_TAB_BATTERY_ONOFF}", ml("input", {name: "battSwitch", id: "battSwitch", class: "btn", type: "button", value: "{#BTN_ONOFF}", onclick: battOnOff()}, null)),
// TODO: Uebersetzen mit lang.json und auf die entsprechende Dokuseite verlinken // TODO: Uebersetzen mit lang.json und auf die entsprechende Dokuseite verlinken
divRow("Hinweis: ", divRow("Hinweis: ",
@ -1437,7 +1440,7 @@
// Advanced // Advanced
ml("div", {id: "div{#ZE_GROUP_TAB_ADVANCED}", class: "tab-content hide"}, [ ml("div", {id: "div{#ZE_GROUP_TAB_ADVANCED}", class: "tab-content hide"}, [
divRow("{#ZE_GROUP_TAB_ADVANCED_SETPOINT}", ml("input", {name: "setPoint", class: "text", type: "number", min: "-32768", max: "32767", step: "1", value: obj.setPoint}, null)), divRow("{#ZE_GROUP_TAB_ADVANCED_SETPOINT}", ml("input", {name: "setPoint", class: "text", type: "number", min: "-32768", max: "32767", step: "1", value: obj.setPoint}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_REFRESH}", ml("input", {name: "refresh", class: "text", type: "number", min: "0", max: "255", value: obj.refresh}, null)), divRow("{#ZE_GROUP_TAB_ADVANCED_MINIMUM}", cb_minimum),
divRow("{#ZE_GROUP_TAB_ADVANCED_POWERTOLERANCE}", ml("input", {name: "powerTolerance", class: "text", type: "number", min: "0", max: "255", value: obj.powerTolerance}, null)), divRow("{#ZE_GROUP_TAB_ADVANCED_POWERTOLERANCE}", ml("input", {name: "powerTolerance", class: "text", type: "number", min: "0", max: "255", value: obj.powerTolerance}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_POWERMAX}", ml("input", {name: "powerMax", class: "text", type: "number", min: "0", max: "65535", value: obj.powerMax}, null)), divRow("{#ZE_GROUP_TAB_ADVANCED_POWERMAX}", ml("input", {name: "powerMax", class: "text", type: "number", min: "0", max: "65535", value: obj.powerMax}, null)),
divRow("{#ZE_GROUP_TAB_ADVANCED_KP}", ml("input", {name: "Kp", class: "text", type: "number", min: "-1", max: "0", step: "0.001", value: obj.Kp}, null)), divRow("{#ZE_GROUP_TAB_ADVANCED_KP}", ml("input", {name: "Kp", class: "text", type: "number", min: "-1", max: "0", step: "0.001", value: obj.Kp}, null)),
@ -1563,9 +1566,10 @@
o.battEnabled = document.getElementsByName("battEnabled")[0].checked; o.battEnabled = document.getElementsByName("battEnabled")[0].checked;
o.battVoltageOn = document.getElementsByName("battVoltageOn")[0].value; o.battVoltageOn = document.getElementsByName("battVoltageOn")[0].value;
o.battVoltageOff = document.getElementsByName("battVoltageOff")[0].value; o.battVoltageOff = document.getElementsByName("battVoltageOff")[0].value;
o.battSoC = document.getElementsByName("battSoC")[0].value;
// Advanced // Advanced
o.setPoint = document.getElementsByName("setPoint")[0].value; o.setPoint = document.getElementsByName("setPoint")[0].value;
o.refresh = document.getElementsByName("refresh")[0].value; o.minimum = document.getElementsByName("minimum")[0].checked;
o.powerTolerance = document.getElementsByName("powerTolerance")[0].value; o.powerTolerance = document.getElementsByName("powerTolerance")[0].value;
o.powerMax = document.getElementsByName("powerMax")[0].value; o.powerMax = document.getElementsByName("powerMax")[0].value;
o.Kp = document.getElementsByName("Kp")[0].value; o.Kp = document.getElementsByName("Kp")[0].value;
@ -1626,9 +1630,10 @@
o.battEnabled = false; o.battEnabled = false;
o.battVoltageOn = 0; o.battVoltageOn = 0;
o.battVoltageOff = 0; o.battVoltageOff = 0;
o.battSoC = "";
// Advanced // Advanced
o.setPoint = 0; o.setPoint = 0;
o.refresh = 10; o.minimum = true;
o.power = 0; o.power = 0;
o.powerTolerance = 10; o.powerTolerance = 10;
o.powerMax = 600; o.powerMax = 600;

17
src/web/lang.json
View File

@ -944,20 +944,25 @@
"de": "Batterie" "de": "Batterie"
}, },
{ {
"token": "ZE_GROUP_TAB_BATTERY_BATTENABLED", "token": "ZE_GROUP_TAB_BATTERY_ENABLED",
"en": "Enabled:", "en": "Enabled:",
"de": "Aktiviert:" "de": "Aktiviert:"
}, },
{ {
"token": "ZE_GROUP_TAB_BATTERY_BATTVOLTAGEON", "token": "ZE_GROUP_TAB_BATTERY_VOLTAGEON",
"en": "Voltage on (Volt):", "en": "Voltage on (Volt):",
"de": "Spannung Ein (Volt):" "de": "Spannung Ein (Volt):"
}, },
{ {
"token": "ZE_GROUP_TAB_BATTERY_BATTVOLTAGEOFF", "token": "ZE_GROUP_TAB_BATTERY_VOLTAGEOFF",
"en": "Voltage off (Volt):", "en": "Voltage off (Volt):",
"de": "Spannung Aus (Volt):" "de": "Spannung Aus (Volt):"
}, },
{
"token": "ZE_GROUP_TAB_BATTERY_SOC",
"en": "SoC % (MQTT Topic):",
"de": "SoC (MQTT Topic):"
},
{ {
"token": "ZE_GROUP_TAB_BATTERY_ONOFF", "token": "ZE_GROUP_TAB_BATTERY_ONOFF",
"en": "Power:", "en": "Power:",
@ -979,9 +984,9 @@
"de": "Zielpunkt (Watt):" "de": "Zielpunkt (Watt):"
}, },
{ {
"token": "ZE_GROUP_TAB_ADVANCED_REFRESH", "token": "ZE_GROUP_TAB_ADVANCED_MINIMUM",
"en": "Refresh rate (sec):", "en": "Minimum:",
"de": "Aktualisierung (sec):" "de": "Minimum (Grundlast):"
}, },
{ {
"token": "ZE_GROUP_TAB_ADVANCED_POWERTOLERANCE", "token": "ZE_GROUP_TAB_ADVANCED_POWERTOLERANCE",

Write Preview
Loading…
Cancel
Save