fromRadio now returns all the vailable protobufs. a request to http sets the cpu clock to 160mhz, https to 240mhz then will clock it back down after 2 minutes.

1.2-legacy
Jm Casler 2020-10-14 20:24:19 -07:00
rodzic 97adb598b6
commit 3b2f5fa5e3
1 zmienionych plików z 22 dodań i 8 usunięć

Wyświetl plik

@ -31,8 +31,6 @@ Preferences prefs;
#include <HTTPServer.hpp> #include <HTTPServer.hpp>
#include <SSLCert.hpp> #include <SSLCert.hpp>
#define HEADER_LEN 4
// The HTTPS Server comes in a separate namespace. For easier use, include it here. // The HTTPS Server comes in a separate namespace. For easier use, include it here.
using namespace httpsserver; using namespace httpsserver;
@ -53,7 +51,8 @@ void handleFavicon(HTTPRequest *req, HTTPResponse *res);
void handleRoot(HTTPRequest *req, HTTPResponse *res); void handleRoot(HTTPRequest *req, HTTPResponse *res);
void handle404(HTTPRequest *req, HTTPResponse *res); void handle404(HTTPRequest *req, HTTPResponse *res);
void middlewareLogging(HTTPRequest *req, HTTPResponse *res, std::function<void()> next); void middlewareSpeedUp240(HTTPRequest *req, HTTPResponse *res, std::function<void()> next);
void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<void()> next);
bool isWebServerReady = 0; bool isWebServerReady = 0;
bool isCertReady = 0; bool isCertReady = 0;
@ -227,7 +226,7 @@ void initWebServer()
secureServer->registerNode(nodeRoot); secureServer->registerNode(nodeRoot);
secureServer->setDefaultNode(node404); secureServer->setDefaultNode(node404);
secureServer->addMiddleware(&middlewareLogging); secureServer->addMiddleware(&middlewareSpeedUp240);
// Insecure nodes // Insecure nodes
insecureServer->registerNode(nodeAPIv1ToRadio); insecureServer->registerNode(nodeAPIv1ToRadio);
@ -239,6 +238,9 @@ void initWebServer()
insecureServer->registerNode(nodeRoot); insecureServer->registerNode(nodeRoot);
insecureServer->setDefaultNode(node404); insecureServer->setDefaultNode(node404);
insecureServer->addMiddleware(&middlewareSpeedUp160);
DEBUG_MSG("Starting Web Server...\n"); DEBUG_MSG("Starting Web Server...\n");
secureServer->start(); secureServer->start();
insecureServer->start(); insecureServer->start();
@ -248,16 +250,24 @@ void initWebServer()
} }
} }
void middlewareLogging(HTTPRequest *req, HTTPResponse *res, std::function<void()> next) void middlewareSpeedUp240(HTTPRequest *req, HTTPResponse *res, std::function<void()> next)
{ {
// We want to print the response status, so we need to call next() first. // We want to print the response status, so we need to call next() first.
next(); next();
//setCPUFast(true); // Set CPU to 240mhz when we're plugged in to wall power.
setCpuFrequencyMhz(240); setCpuFrequencyMhz(240);
timeSpeedUp = millis(); timeSpeedUp = millis();
} }
void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<void()> next)
{
// We want to print the response status, so we need to call next() first.
next();
setCpuFrequencyMhz(160);
timeSpeedUp = millis();
}
void handle404(HTTPRequest *req, HTTPResponse *res) void handle404(HTTPRequest *req, HTTPResponse *res)
{ {
@ -322,9 +332,13 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
uint8_t txBuf[MAX_STREAM_BUF_SIZE]; uint8_t txBuf[MAX_STREAM_BUF_SIZE];
uint32_t len = webAPI.getFromRadio(txBuf + HEADER_LEN);
uint32_t len = 1;
while (len) {
len = webAPI.getFromRadio(txBuf);
res->write(txBuf, len);
}
res->write(txBuf, len);
DEBUG_MSG("--------------- webAPI handleAPIv1FromRadio, len %d\n", len); DEBUG_MSG("--------------- webAPI handleAPIv1FromRadio, len %d\n", len);
} }