mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-24 02:37:50 +00:00
beb268ff25
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.
31 lines
827 B
C++
31 lines
827 B
C++
#pragma once
|
|
|
|
#include "ServerAPI.h"
|
|
#include <WiFi.h>
|
|
|
|
#if HAS_ETHERNET && defined(USE_WS5500)
|
|
#include <ETHClass2.h>
|
|
#define ETH ETH2
|
|
#endif // HAS_ETHERNET
|
|
|
|
/**
|
|
* Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
|
|
* (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
|
|
*/
|
|
class WiFiServerAPI : public ServerAPI<WiFiClient>
|
|
{
|
|
public:
|
|
explicit WiFiServerAPI(WiFiClient &_client);
|
|
};
|
|
|
|
/**
|
|
* Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
|
|
*/
|
|
class WiFiServerPort : public APIServerPort<WiFiServerAPI, WiFiServer>
|
|
{
|
|
public:
|
|
explicit WiFiServerPort(int port);
|
|
};
|
|
|
|
void initApiServer(int port = SERVER_API_DEFAULT_PORT);
|
|
void deInitApiServer(); |