mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #645 from mc-hamster/master 

#635 Added web_request_count and fixed printf of psram
pull/648/head^2
Jm Casler 2021-01-17 17:26:56 -08:00 zatwierdzone przez GitHub
rodzic 84b9028ecb 81e320c9cf
commit 046e691d4e
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 27 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
src/mesh/http/WebServer.cpp
Wyświetl plik

@ -80,6 +80,8 @@ bool isCertReady = 0;
uint32_t timeSpeedUp = 0;
uint32_t numberOfRequests = 0;
// We need to specify some content-type mapping, so the resources get delivered with the
// right content type and are displayed correctly in the browser
char contentTypes[][2][32] = {{".txt", "text/plain"}, {".html", "text/html"},
@ -337,6 +339,8 @@ void middlewareSpeedUp240(HTTPRequest *req, HTTPResponse *res, std::function<voi
setCpuFrequencyMhz(240);
timeSpeedUp = millis();
numberOfRequests++;
}
void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<void()> next)
@ -355,6 +359,8 @@ void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<voi
setCpuFrequencyMhz(160);
}
timeSpeedUp = millis();
numberOfRequests++;
}
void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
@ -1159,6 +1165,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
res->println("\"wifi\": {");
res->printf("\"web_request_count\": %d,\n", numberOfRequests);
res->println("\"rssi\": " + String(WiFi.RSSI()) + ",");
if (radioConfig.preferences.wifi_ap_mode || isSoftAPForced()) {
@ -1170,13 +1177,13 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
res->println("},");
res->println("\"memory\": {");
res->printf("\"heap_total\": %u,\n", ESP.getHeapSize());
res->printf("\"heap_free\": %u,\n", ESP.getFreeHeap());
res->printf("\"psram_total\": %s,\n", ESP.getPsramSize());
res->printf("\"psram_free\": %s,\n", ESP.getFreePsram());
res->print("\"spiffs_total\" : " + String(SPIFFS.totalBytes()) + ",");
res->print("\"spiffs_used\" : " + String(SPIFFS.usedBytes()) + ",");
res->print("\"spiffs_free\" : " + String(SPIFFS.totalBytes() - SPIFFS.usedBytes()));
res->printf("\"heap_total\": %d,\n", ESP.getHeapSize());
res->printf("\"heap_free\": %d,\n", ESP.getFreeHeap());
res->printf("\"psram_total\": %d,\n", ESP.getPsramSize());
res->printf("\"psram_free\": %d,\n", ESP.getFreePsram());
res->println("\"spiffs_total\" : " + String(SPIFFS.totalBytes()) + ",");
res->println("\"spiffs_used\" : " + String(SPIFFS.usedBytes()) + ",");
res->println("\"spiffs_free\" : " + String(SPIFFS.totalBytes() - SPIFFS.usedBytes()));
res->println("},");
res->println("\"power\": {");

15
src/plugins/SerialPlugin.cpp
Wyświetl plik

@ -66,6 +66,17 @@ char serialStringChar[Constants_DATA_PAYLOAD_LEN];
int32_t SerialPlugin::runOnce()
{
#ifndef NO_ESP32
/*
Uncomment the preferences below if you want to use the plugin
without having to configure it from the PythonAPI or WebUI.
*/
// radioConfig.preferences.serialplugin_enabled = 1;
// radioConfig.preferences.serialplugin_rxd = 35;
// radioConfig.preferences.serialplugin_txd = 15;
// radioConfig.preferences.serialplugin_timeout = 1000;
if (radioConfig.preferences.serialplugin_enabled) {
if (firstTime) {
@ -147,8 +158,8 @@ bool SerialPluginRadio::handleReceived(const MeshPacket &mp)
if (radioConfig.preferences.serialplugin_enabled) {
auto &p = mp.decoded.data;
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n", nodeDB.getNodeNum(),
// mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
// DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
// nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
if (mp.from == nodeDB.getNodeNum()) {