mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-15 16:01:19 +10:00
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
33 lines
668 B
C++
33 lines
668 B
C++
#include "configuration.h"
|
|
#include <Arduino.h>
|
|
|
|
#if HAS_WIFI
|
|
#include "WiFiServerAPI.h"
|
|
|
|
static WiFiServerPort *apiPort;
|
|
|
|
void initApiServer(int port)
|
|
{
|
|
// Start API server on port 4403
|
|
if (!apiPort) {
|
|
apiPort = new WiFiServerPort(port);
|
|
LOG_INFO("API server listen on TCP port %d", port);
|
|
apiPort->init();
|
|
}
|
|
}
|
|
void deInitApiServer()
|
|
{
|
|
if (apiPort) {
|
|
delete apiPort;
|
|
apiPort = nullptr;
|
|
}
|
|
}
|
|
|
|
WiFiServerAPI::WiFiServerAPI(WiFiClient &_client) : ServerAPI(_client)
|
|
{
|
|
api_type = TYPE_WIFI;
|
|
LOG_INFO("Incoming wifi connection");
|
|
}
|
|
|
|
WiFiServerPort::WiFiServerPort(int port) : APIServerPort(port) {}
|
|
#endif |