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

Feature: debug (settings)

Browse source
This commit is contained in:
Patrick Amrhein 2024-03-27 19:18:08 +01:00
parent 0ca2eb8287
commit 737308ebe6
5 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/config/settings.h
View file

@ -344,6 +344,7 @@ typedef struct {
bool enabled;
bool log_over_webserial;
bool log_over_mqtt;
bool debug;
zeroExportGroup_t groups[ZEROEXPORT_MAX_GROUPS];
@ -673,6 +674,7 @@ class settings {
mCfg.plugin.zeroExport.enabled = false;
mCfg.plugin.zeroExport.log_over_webserial = false;
mCfg.plugin.zeroExport.log_over_mqtt = false;
mCfg.plugin.zeroExport.debug = false;
for(uint8_t group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
// General
mCfg.plugin.zeroExport.groups[group].enabled = false;
@ -1085,6 +1087,7 @@ class settings {
obj[F("enabled")] = mCfg.plugin.zeroExport.enabled;
obj[F("log_over_webserial")] = mCfg.plugin.zeroExport.log_over_webserial;
obj[F("log_over_mqtt")] = mCfg.plugin.zeroExport.log_over_mqtt;
obj[F("debug")] = mCfg.plugin.zeroExport.debug;
JsonArray grpArr = obj.createNestedArray(F("groups"));
for(uint8_t group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
jsonZeroExportGroup(grpArr.createNestedObject(), group, set);
@ -1098,6 +1101,8 @@ class settings {
getVal<bool>(obj, F("log_over_webserial"), &mCfg.plugin.zeroExport.log_over_webserial);
if (obj.containsKey(F("log_over_mqtt")))
getVal<bool>(obj, F("log_over_mqtt"), &mCfg.plugin.zeroExport.log_over_mqtt);
if (obj.containsKey(F("debug")))
getVal<bool>(obj, F("debug"), &mCfg.plugin.zeroExport.debug);
if (obj.containsKey(F("groups"))) {
for(uint8_t group = 0; group < ZEROEXPORT_MAX_GROUPS; group++) {
jsonZeroExportGroup(obj[F("groups")][group], group, set);

1
src/web/RestApi.h
View file

@ -814,6 +814,7 @@ class RestApi {
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;
obj[F("debug")] = (bool) mConfig->plugin.zeroExport.debug;
// Groups
obj[F("max_groups")] = ZEROEXPORT_MAX_GROUPS;
JsonArray arrGroup = obj.createNestedArray(F("groups"));

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

@ -318,6 +318,8 @@
<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 class="col-12 col-sm-3 my-2">{#ZE_DEBUG}</div>
<div class="col-12 col-sm-9"><input type="checkbox" name="ze_debug"/></div>
</div>
<div id="ze_groups"></div>
</fieldset>
@ -1638,6 +1640,9 @@
// log_over_mqtt
document.getElementsByName("ze_log_over_mqtt")[0].checked = obj["log_over_mqtt"];
// debug
document.getElementsByName("ze_debug")[0].checked = obj["debug"];
// groups
maxGroups = obj["max_groups"];

5
src/web/lang.json
View file

@ -788,6 +788,11 @@
"en": "Log over MQTT",
"de": "Log in MQTT"
},
{
"token": "ZE_DEBUG",
"en": "Debug",
"de": "Debug"
},
{
"token": "ZE_GROUP_ENABLED",
"en": "State:",

1
src/web/web.h
View file

@ -588,6 +588,7 @@ class Web {
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");
mConfig->plugin.zeroExport.debug = (request->arg("ze_debug") == "on");
// TODO: sortieren
// mConfig->plugin.zeroExport.enabled = (request->arg("en_zeroexport") == "on");
// mConfig->plugin.zeroExport.two_percent = (request->arg("two_percent") == "on");