meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixes for various targets (BaseChatMesh not compiling for non-terminal chat targets)

Browse source
This commit is contained in:
Scott Powell 2025-01-26 15:40:32 +11:00
parent a3ce65c770
commit 40c3dfa20b
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/helpers/BaseChatMesh.h
View file

@ -36,6 +36,10 @@ public:
bool hasNext(const BaseChatMesh* mesh, ContactInfo& dest);
};
#ifndef MAX_CONTACTS
#define MAX_CONTACTS 32
#endif
/**
* \brief abstract Mesh class for common 'chat' client
*/
@ -48,8 +52,10 @@ class BaseChatMesh : public mesh::Mesh {
int sort_array[MAX_CONTACTS];
int matching_peer_indexes[MAX_SEARCH_RESULTS];
unsigned long txt_send_timeout;
#ifdef MAX_GROUP_CHANNELS
mesh::GroupChannel channels[MAX_GROUP_CHANNELS];
int num_channels;
#endif
mesh::Packet* composeMsgPacket(const ContactInfo& recipient, uint8_t attempt, const char *text, uint32_t& expected_ack);
@ -58,7 +64,9 @@ protected:
: mesh::Mesh(radio, ms, rng, rtc, mgr, tables)
{
num_contacts = 0;
#ifdef MAX_GROUP_CHANNELS
num_channels = 0;
#endif
txt_send_timeout = 0;
}
@ -79,7 +87,9 @@ protected:
void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override;
#ifdef MAX_GROUP_CHANNELS
int searchChannelsByHash(const uint8_t* hash, mesh::GroupChannel channels[], int max_matches) override;
#endif
void onGroupDataRecv(mesh::Packet* packet, uint8_t type, const mesh::GroupChannel& channel, uint8_t* data, size_t len) override;
public: