rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-22 01:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into portduino

Browse Source 
# Conflicts:
#	.vscode/settings.json
This commit is contained in:
Kevin Hester
2021-03-15 12:09:07 +08:00
parent da03490310 27c35f69aa
commit 3f401e8cac
116 changed files with 5000 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/http/ContentHandler.cpp
View File

@@ -11,6 +11,7 @@
#include <HTTPMultipartBodyParser.hpp>
#include <HTTPURLEncodedBodyParser.hpp>
#include <SPIFFS.h>
#include "RadioLibInterface.h"
#ifndef NO_ESP32
#include "esp_task_wdt.h"
@@ -928,10 +929,17 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
res->printf("\"has_battery\": %s,\n", BoolToString(powerStatus->getHasBattery()));
res->printf("\"has_usb\": %s,\n", BoolToString(powerStatus->getHasUSB()));
res->printf("\"is_charging\": %s\n", BoolToString(powerStatus->getIsCharging()));
res->println("},");
res->println("\"radio\": {");
res->printf("\"frequecy\": %f,\n", RadioLibInterface::instance->getFreq());
res->printf("\"lora_channel\": %d\n", RadioLibInterface::instance->getChannelNum());
res->println("}");
res->println("},");
res->println("\"status\": \"ok\"");
res->println("}");
}