remove PacketServer -> PacketAPI dependency

This commit is contained in:
mverch67 2024-04-17 20:32:11 +01:00
parent a98394327f
commit 0840f07e1a
3 changed files with 14 additions and 5 deletions

View File

@ -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

View File

@ -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) {}

View File

@ -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;