JorropoandGitHub
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.
38 lines
1.0 KiB
C++
38 lines
1.0 KiB
C++
#pragma once
|
|
|
|
#include "PhoneAPI.h"
|
|
#include "comms/PacketServer.h"
|
|
#include "concurrency/OSThread.h"
|
|
|
|
/**
|
|
* A version of the phone API used for inter task communication based on protobuf packets, e.g.
|
|
* between two tasks running on CPU0 and CPU1, respectively.
|
|
*
|
|
*/
|
|
class PacketAPI : public PhoneAPI, public concurrency::OSThread
|
|
{
|
|
public:
|
|
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;
|
|
|
|
void onNowHasData(uint32_t fromRadioNum) override {}
|
|
void onConnectionChanged(bool connected) override {}
|
|
|
|
private:
|
|
bool receivePacket(void);
|
|
bool sendPacket(void);
|
|
bool notifyProgrammingMode(void);
|
|
|
|
bool isConnected;
|
|
bool programmingMode;
|
|
PacketServer *server;
|
|
uint8_t txBuf[MAX_TO_FROM_RADIO_SIZE] = {0}; // dummy buf to obey PhoneAPI
|
|
};
|
|
|
|
extern PacketAPI *packetAPI; |