3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-10 06:31:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.910008-zero

Browse source
This commit is contained in:
Patrick Amrhein 2024-03-14 10:04:55 +01:00
parent 1c4a83dfd0
commit 3dfbee82c7
8 changed files with 1204 additions and 716 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/web/RestApi.h
View file

@ -718,6 +718,8 @@ class RestApi {
#if defined(PLUGIN_ZEROEXPORT)
void getZeroExport(JsonObject obj) {
obj[F("enabled")] = (bool) mConfig->plugin.zeroExport.enabled;
obj[F("log_over_webserial")] = (bool) mConfig->plugin.zeroExport.log_over_webserial;
obj[F("log_over_mqtt")] = (bool) mConfig->plugin.zeroExport.log_over_mqtt;
// Groups
obj[F("max_groups")] = ZEROEXPORT_MAX_GROUPS;
JsonArray arrGroup = obj.createNestedArray(F("groups"));

11
src/web/html/setup.html
View file

@ -314,6 +314,10 @@
<div class="row mb-3">
<div class="col-12 col-sm-3 my-2">{#ZE_ENABLED}</div>
<div class="col-12 col-sm-9"><input type="checkbox" name="ze_enabled"/></div>
<div class="col-12 col-sm-3 my-2">{#ZE_LOG_OVER_WEBSERIAL}</div>
<div class="col-12 col-sm-9"><input type="checkbox" name="ze_log_over_webserial"/></div>
<div class="col-12 col-sm-3 my-2">{#ZE_LOG_OVER_MQTT}</div>
<div class="col-12 col-sm-9"><input type="checkbox" name="ze_log_over_mqtt"/></div>
</div>
<div id="ze_groups"></div>
</fieldset>
@ -1563,7 +1567,6 @@
}
}
/*ENDIF_PLUGIN_ZEROEXPORT*/
function parseZeroExport(obj, type) {
@ -1573,6 +1576,12 @@
// enabled
document.getElementsByName("ze_enabled")[0].checked = obj["enabled"];
// log_over_webserial
document.getElementsByName("ze_log_over_webserial")[0].checked = obj["log_over_webserial"];
// log_over_mqtt
document.getElementsByName("ze_log_over_mqtt")[0].checked = obj["log_over_mqtt"];
// groups
maxGroups = obj["max_groups"];

10
src/web/lang.json
View file

@ -778,6 +778,16 @@
"en": "Enabled",
"de": "Aktiviert"
},
{
"token": "ZE_LOG_OVER_WEBSERIAL",
"en": "Log over Webserial",
"de": "Log in Webserial"
},
{
"token": "ZE_LOG_OVER_MQTT",
"en": "Log over MQTT",
"de": "Log in MQTT"
},
{
"token": "ZE_GROUP_ENABLED",
"en": "State:",

2
src/web/web.h
View file

@ -589,6 +589,8 @@ class Web {
// Plugin ZeroExport
#if defined(PLUGIN_ZEROEXPORT)
mConfig->plugin.zeroExport.enabled = (request->arg("ze_enabled") == "on");
mConfig->plugin.zeroExport.log_over_webserial = (request->arg("ze_log_over_webserial") == "on");
mConfig->plugin.zeroExport.log_over_mqtt = (request->arg("ze_log_over_mqtt") == "on");
// TODO: sortieren
// mConfig->plugin.zeroExport.enabled = (request->arg("en_zeroexport") == "on");
// mConfig->plugin.zeroExport.two_percent = (request->arg("two_percent") == "on");