mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-04 20:54:42 +00:00
remove PacketServer -> PacketAPI dependency
This commit is contained in:
parent
a98394327f
commit
0840f07e1a
@ -110,6 +110,7 @@ AudioThread *audioThread;
|
|||||||
#include "DisplayDriverConfig.h"
|
#include "DisplayDriverConfig.h"
|
||||||
#include "PacketClient.h"
|
#include "PacketClient.h"
|
||||||
#include "PacketServer.h"
|
#include "PacketServer.h"
|
||||||
|
#include "api/PacketAPI.h"
|
||||||
|
|
||||||
void tft_task_handler(void *);
|
void tft_task_handler(void *);
|
||||||
|
|
||||||
@ -725,12 +726,14 @@ void setup()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
deviceScreen = &DeviceScreen::create(&displayConfig);
|
deviceScreen = &DeviceScreen::create(&displayConfig);
|
||||||
PacketServer::init();
|
PacketAPI::create(PacketServer::init());
|
||||||
deviceScreen->init(new PacketClient);
|
deviceScreen->init(new PacketClient);
|
||||||
|
} else {
|
||||||
|
LOG_INFO("Running without TFT display!\n");
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
deviceScreen = &DeviceScreen::create();
|
deviceScreen = &DeviceScreen::create();
|
||||||
PacketServer::init();
|
PacketAPI::create(PacketServer::init());
|
||||||
deviceScreen->init(new PacketClient);
|
deviceScreen->init(new PacketClient);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -6,7 +6,13 @@
|
|||||||
|
|
||||||
PacketAPI *packetAPI = nullptr;
|
PacketAPI *packetAPI = nullptr;
|
||||||
|
|
||||||
void PacketAPI::init(void) {}
|
PacketAPI *PacketAPI::create(PacketServer *_server)
|
||||||
|
{
|
||||||
|
if (!packetAPI) {
|
||||||
|
packetAPI = new PacketAPI(_server);
|
||||||
|
}
|
||||||
|
return packetAPI;
|
||||||
|
}
|
||||||
|
|
||||||
PacketAPI::PacketAPI(PacketServer *_server) : concurrency::OSThread("PacketAPI"), isConnected(false), server(_server) {}
|
PacketAPI::PacketAPI(PacketServer *_server) : concurrency::OSThread("PacketAPI"), isConnected(false), server(_server) {}
|
||||||
|
|
||||||
|
@ -12,12 +12,12 @@
|
|||||||
class PacketAPI : public PhoneAPI, public concurrency::OSThread
|
class PacketAPI : public PhoneAPI, public concurrency::OSThread
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PacketAPI(PacketServer *_server);
|
static PacketAPI *create(PacketServer *_server);
|
||||||
static void init(void);
|
|
||||||
virtual ~PacketAPI(){};
|
virtual ~PacketAPI(){};
|
||||||
virtual int32_t runOnce();
|
virtual int32_t runOnce();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
PacketAPI(PacketServer *_server);
|
||||||
// Check the current underlying physical queue to see if the client is fetching packets
|
// Check the current underlying physical queue to see if the client is fetching packets
|
||||||
bool checkIsConnected() override;
|
bool checkIsConnected() override;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user