pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

remove PacketServer -> PacketAPI dependency

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -110,6 +110,7 @@ AudioThread *audioThread;
#include "DisplayDriverConfig.h"
#include "PacketClient.h"
#include "PacketServer.h"
#include "api/PacketAPI.h"
void tft_task_handler(void *);
@ -725,12 +726,14 @@ void setup()
});
}
deviceScreen = &DeviceScreen::create(&displayConfig);
PacketServer::init();
PacketAPI::create(PacketServer::init());
deviceScreen->init(new PacketClient);
} else {
LOG_INFO("Running without TFT display!\n");
}
#else
deviceScreen = &DeviceScreen::create();
PacketServer::init();
PacketAPI::create(PacketServer::init());
deviceScreen->init(new PacketClient);
#endif
#endif

8
src/mesh/api/PacketAPI.cpp
View File

@ -6,7 +6,13 @@
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) {}

4
src/mesh/api/PacketAPI.h
View File

@ -12,12 +12,12 @@
class PacketAPI : public PhoneAPI, public concurrency::OSThread
{
public:
PacketAPI(PacketServer *_server);
static void init(void);
static PacketAPI *create(PacketServer *_server);
virtual ~PacketAPI(){};
virtual int32_t runOnce();
protected:
PacketAPI(PacketServer *_server);
// Check the current underlying physical queue to see if the client is fetching packets
bool checkIsConnected() override;