Merge pull request #553 from mc-hamster/master

Fix for #551 and #552
1.2-legacy
Jm Casler 2020-12-12 11:56:29 -08:00 zatwierdzone przez GitHub
commit d857f8ba6d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 4 dodań i 0 usunięć

Wyświetl plik

@ -236,6 +236,7 @@ class ButtonThread : public OSThread
if (millis() - longPressTime > 10 * 1000) {
#ifdef TBEAM_V10
if (axp192_found == true) {
setLed(false);
power->shutdown();
}
#endif

Wyświetl plik

@ -858,6 +858,9 @@ void handleRoot(HTTPRequest *req, HTTPResponse *res)
res->setStatusText("Not found");
res->println("404 Not Found");
res->printf("<p>File not found: %s</p>\n", filename.c_str());
res->printf("<p></p>\n");
res->printf("<p>You have gotten this error because the filesystem for the web server has not been loaded.</p>\n");
res->printf("<p>Please review the 'Common Problems' section of the <a href=https://github.com/meshtastic/Meshtastic-device/issues/552>web interface</a> documentation.</p>\n");
return;
}