Browse Source

DebugLvl

pull/310/head
DanielR92 3 years ago
parent
commit
6d18048151
  1. 1
      tools/esp8266/app.cpp
  2. 3
      tools/esp8266/defines.h
  3. 17
      tools/esp8266/html/setup.html
  4. 8
      tools/esp8266/web.cpp

1
tools/esp8266/app.cpp

@ -723,6 +723,7 @@ void app::loadDefaultConfig(void) {
mConfig.pinCe = DEF_RF24_CE_PIN; mConfig.pinCe = DEF_RF24_CE_PIN;
mConfig.pinIrq = DEF_RF24_IRQ_PIN; mConfig.pinIrq = DEF_RF24_IRQ_PIN;
mConfig.amplifierPower = DEF_AMPLIFIERPOWER & 0x03; mConfig.amplifierPower = DEF_AMPLIFIERPOWER & 0x03;
mConfig.DebugLvl = 0;
// ntp // ntp
snprintf(mConfig.ntpAddr, NTP_ADDR_LEN, "%s", DEF_NTP_SERVER_NAME); snprintf(mConfig.ntpAddr, NTP_ADDR_LEN, "%s", DEF_NTP_SERVER_NAME);

3
tools/esp8266/defines.h

@ -126,6 +126,9 @@ typedef struct {
uint8_t pinIrq; uint8_t pinIrq;
uint8_t amplifierPower; uint8_t amplifierPower;
// Debug Level
uint8_t DebugLvl;
// ntp // ntp
char ntpAddr[NTP_ADDR_LEN]; char ntpAddr[NTP_ADDR_LEN];
uint16_t ntpPort; uint16_t ntpPort;

17
tools/esp8266/html/setup.html

@ -89,7 +89,15 @@
<label for="serDbg">Serial Debug</label> <label for="serDbg">Serial Debug</label>
<input type="checkbox" class="cb" name="serDbg"/><br/> <input type="checkbox" class="cb" name="serDbg"/><br/>
<label for="serIntvl">Interval [s]</label> <label for="serIntvl">Interval [s]</label>
<input type="text" class="text" name="serIntvl"/> <input type="text" class="text" name="serIntvl"/><br/><br/>
<label for="lvl">Debug Level:</label>
Off<input type="radio" id="lvl" name="dbg_lvl0" value="0">
Error<input type="radio" id="lvl" name="dbg_lvl1" value="1">
Warn<input type="radio" id="lvl" name="dbg_lvl2" value="2">
Info<input type="radio" id="lvl" name="dbg_lvl3" value="3">
Debug<input type="radio" id="lvl" name="dbg_lvl4" value="4">
All<input type="radio" id="lvl" name="dbg_lvl5" value="5">
</fieldset> </fieldset>
</div> </div>
@ -261,6 +269,12 @@
document.getElementsByName("serIntvl")[0].value = obj["interval"]; document.getElementsByName("serIntvl")[0].value = obj["interval"];
} }
function parseSDebugLvl(obj) {
for(var i of ["dbg_lvl0", "dbg_lvl1", "dbg_lvl2", "dbg_lvl3", "dbg_lvl4", "dbg_lvl5"])
document.getElementsByName(i[0])[0].checked = obj[i[1]];
}
function parse(root) { function parse(root) {
if(null != root) { if(null != root) {
parseSys(root["system"]); parseSys(root["system"]);
@ -270,6 +284,7 @@
parsePinout(root["pinout"]); parsePinout(root["pinout"]);
parseRadio(root["radio"]); parseRadio(root["radio"]);
parseSerial(root["serial"]); parseSerial(root["serial"]);
parseSDebugLvl(root["dbg_lvl"]);
} }
} }

8
tools/esp8266/web.cpp

@ -288,6 +288,9 @@ void web::showSave(AsyncWebServerRequest *request) {
} }
} }
// debug level
mConfig->DebugLvl = request->arg("lvl").toInt();
// nrf24 amplifier power // nrf24 amplifier power
mConfig->amplifierPower = request->arg("rf24Power").toInt() & 0x03; mConfig->amplifierPower = request->arg("rf24Power").toInt() & 0x03;
@ -319,6 +322,11 @@ void web::showSave(AsyncWebServerRequest *request) {
mMain->mSys->Radio.mSerialDebug = mConfig->serialDebug; mMain->mSys->Radio.mSerialDebug = mConfig->serialDebug;
} }
// debug level
if(request->arg("lvl") != "") {
mConfig->DebugLvl = request->arg("lvl").toInt();
}
mMain->saveValues(); mMain->saveValues();
if(request->arg("reboot") == "on") if(request->arg("reboot") == "on")

Loading…
Cancel
Save