pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-05 13:23:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Be a little smarter with setting the CPU frequency

Browse Source 
in the event we have HTTPS and HTTP requests within close periods, let the speed set by the HTTPS request take presidence.
This commit is contained in:
Jm Casler 2020-10-15 19:28:20 -07:00
parent 3b2f5fa5e3
commit 038ddb887f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/meshwifi/meshhttp.cpp
View File

@ -53,6 +53,7 @@ void handle404(HTTPRequest *req, HTTPResponse *res);
void middlewareSpeedUp240(HTTPRequest *req, HTTPResponse *res, std::function<void()> next);
void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<void()> next);
void middlewareSession(HTTPRequest *req, HTTPResponse *res, std::function<void()> next);
bool isWebServerReady = 0;
bool isCertReady = 0;
@ -104,7 +105,6 @@ void taskCreateCert(void *parameter)
DEBUG_MSG("Existing SSL Certificate found!\n");
} else {
DEBUG_MSG("Creating the certificate. This may take a while. Please wait...\n");
screen->print("Powered...\n");
cert = new SSLCert();
// disableCore1WDT();
int createCertResult = createSelfSignedCert(*cert, KEYSIZE_2048, "CN=meshtastic.local,O=Meshtastic,C=US",
@ -240,7 +240,6 @@ void initWebServer()
insecureServer->addMiddleware(&middlewareSpeedUp160);
DEBUG_MSG("Starting Web Server...\n");
secureServer->start();
insecureServer->start();
@ -264,7 +263,12 @@ void middlewareSpeedUp160(HTTPRequest *req, HTTPResponse *res, std::function<voi
// We want to print the response status, so we need to call next() first.
next();
setCpuFrequencyMhz(160);
// If the frequency is 240mhz, we have recently gotten a HTTPS request.
// In that case, leave the frequency where it is and just update the
// countdown timer (timeSpeedUp).
if (getCpuFrequencyMhz() != 240) {
setCpuFrequencyMhz(160);
}
timeSpeedUp = millis();
}
@ -328,11 +332,9 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
// Status code is 200 OK by default.
res->setHeader("Content-Type", "application/x-protobuf");
//res->setHeader("Content-Type", "application/json");
uint8_t txBuf[MAX_STREAM_BUF_SIZE];
uint32_t len = 1;
while (len) {
len = webAPI.getFromRadio(txBuf);
@ -357,15 +359,7 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
// Status code is 200 OK by default.
res->setHeader("Content-Type", "application/x-protobuf");
//res->setHeader("Content-Type", "application/json");
// webAPI.handleToRadio(p);
// We use text/plain for the response
//res->setHeader("Content-Type", "text/plain");
// Stream the incoming request body to the response body
// Theoretically, this should work for every request size.
byte buffer[MAX_TO_FROM_RADIO_SIZE];
size_t s = req->readBytes(buffer, MAX_TO_FROM_RADIO_SIZE);