From 42af720b02749a8d5bdb978ac1f35ceace32630c Mon Sep 17 00:00:00 2001
From: Scott Powell <sqij@protonmail.com>
Date: Sun, 26 Jan 2025 07:00:56 +1100
Subject: [PATCH] * fix for RAK terminal chat

---
 platformio.ini               | 4 ++--
 src/helpers/BaseChatMesh.cpp | 2 +-
 src/helpers/BaseChatMesh.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index f58aff12..b3df266d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -96,7 +96,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags} 
   -D MAX_CONTACTS=100
-  -D MAX_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
@@ -263,7 +263,7 @@ extends = rak4631
 build_flags =
   ${rak4631.build_flags} 
   -D MAX_CONTACTS=100
-  -D MAX_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=1
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
 build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
diff --git a/src/helpers/BaseChatMesh.cpp b/src/helpers/BaseChatMesh.cpp
index e9ea6673..a7e8b715 100644
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -267,7 +267,7 @@ bool BaseChatMesh::addContact(const ContactInfo& contact) {
 }
 
 mesh::GroupChannel* BaseChatMesh::addChannel(const char* psk_base64) {
-  if (num_channels < MAX_CHANNELS) {
+  if (num_channels < MAX_GROUP_CHANNELS) {
     auto dest = &channels[num_channels];
 
     memset(dest->secret, 0, sizeof(dest->secret));
diff --git a/src/helpers/BaseChatMesh.h b/src/helpers/BaseChatMesh.h
index f3a35be7..61af0c3a 100644
--- a/src/helpers/BaseChatMesh.h
+++ b/src/helpers/BaseChatMesh.h
@@ -48,7 +48,7 @@ class BaseChatMesh : public mesh::Mesh {
   int sort_array[MAX_CONTACTS];
   int matching_peer_indexes[MAX_SEARCH_RESULTS];
   unsigned long txt_send_timeout;
-  mesh::GroupChannel channels[MAX_CHANNELS];
+  mesh::GroupChannel channels[MAX_GROUP_CHANNELS];
   int num_channels;
 
   mesh::Packet* composeMsgPacket(const ContactInfo& recipient, uint8_t attempt, const char *text, uint32_t& expected_ack);