Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-27 15:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove ping from NearbyScreen, rely on auto-advert for presence

Browse Source 
Ping sent empty messages appearing in target's chat history, and RTT
measurement never worked for direct sendMessage() calls. Removed all
ping state machinery and registerExpectedAck(); detail view now shows
node info only (lat/lon/dist/bearing/type).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-14 16:17:52 +02:00
parent 09ac455806
commit 083ddac85c
2 changed files with 5 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/companion_radio/MyMesh.h
View File

@@ -176,13 +176,6 @@ public:
return false;
}
void registerExpectedAck(uint32_t expected_ack) {
if (!expected_ack) return;
expected_ack_table[next_ack_idx].msg_sent = millis();
expected_ack_table[next_ack_idx].ack = expected_ack;
expected_ack_table[next_ack_idx].contact = nullptr;
next_ack_idx = (next_ack_idx + 1) % EXPECTED_ACK_TABLE_SIZE;
}
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() {

62
examples/companion_radio/ui-new/NearbyScreen.h
View File

@@ -43,15 +43,6 @@ class NearbyScreen : public UIScreen {
// context menu (list view)
PopupMenu _ctx_menu;
// ping state (detail view)
enum PingState { PING_IDLE, PING_WAIT, PING_OK, PING_TIMEOUT };
PingState _ping_state;
uint32_t _ping_expected_ack;
unsigned long _ping_start_ms;
unsigned long _ping_rtt_ms;
bool _ping_ack_seen; // true once ACK entry confirmed in table
static const unsigned long PING_TIMEOUT_MS = 30000UL;
static float haversineKm(int32_t lat1, int32_t lon1, int32_t lat2, int32_t lon2) {
static const float DEG2RAD = (float)M_PI / 180.0f;
float la1 = lat1 * (1e-6f * DEG2RAD);
@@ -148,7 +139,7 @@ class NearbyScreen : public UIScreen {
public:
NearbyScreen(UITask* task)
: _task(task), _filter(0), _scanning(false), _ping_state(PING_IDLE) {}
: _task(task), _filter(0), _scanning(false) {}
void enter() {
_sel = _scroll = 0;
@@ -156,8 +147,6 @@ public:
_filter = 0;
_scanning = false;
_ctx_menu.active = false;
_ping_state = PING_IDLE;
_ping_ack_seen = false;
refresh();
}
@@ -170,19 +159,6 @@ public:
refresh();
}
// poll ping ack
if (_ping_state == PING_WAIT) {
bool pending = the_mesh.isAckPending(_ping_expected_ack);
if (pending) {
_ping_ack_seen = true;
} else if (_ping_ack_seen) {
_ping_rtt_ms = millis() - _ping_start_ms;
_ping_state = PING_OK;
} else if (millis() - _ping_start_ms >= PING_TIMEOUT_MS) {
_ping_state = PING_TIMEOUT;
}
}
// ── detail view ──────────────────────────────────────────────────────────
if (_detail && _sel < _count) {
const Entry& e = _entries[_sel];
@@ -211,19 +187,10 @@ public:
display.setCursor(2, 31); display.print("Dist: no own GPS");
}
display.setCursor(2, 40);
switch (_ping_state) {
case PING_IDLE: display.print("[OK]=Ping"); break;
case PING_WAIT: display.print("Pinging..."); break;
case PING_OK: snprintf(buf,sizeof(buf),"RTT:%lums",_ping_rtt_ms);
display.print(buf); break;
case PING_TIMEOUT: display.print("Ping timeout"); break;
}
snprintf(buf, sizeof(buf), "Type:%s", typeName(e.type));
display.setCursor(2, 49); display.print(buf);
display.setCursor(2, 40); display.print(buf);
return (_ping_state == PING_WAIT) ? 100 : 2000;
return 2000;
}
// ── list view ────────────────────────────────────────────────────────────
@@ -287,24 +254,7 @@ public:
// ── detail view input ────────────────────────────────────────────────────
if (_detail) {
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) {
_detail = false;
_ping_state = PING_IDLE;
_ping_ack_seen = false;
return true;
}
if (c == KEY_ENTER && _ping_state == PING_IDLE) {
ContactInfo ci;
if (the_mesh.getContactByIdx(_entries[_sel].contact_idx, ci)) {
uint32_t expected_ack, est_timeout;
int res = the_mesh.sendMessage(ci, rtc_clock.getCurrentTime(), 0, "", expected_ack, est_timeout);
if (res != MSG_SEND_FAILED && expected_ack != 0) {
the_mesh.registerExpectedAck(expected_ack);
_ping_expected_ack = expected_ack;
_ping_start_ms = millis();
_ping_ack_seen = false;
_ping_state = PING_WAIT;
}
}
_detail = false;
return true;
}
return true;
@@ -342,9 +292,7 @@ public:
return true;
}
if (c == KEY_ENTER && _count > 0) {
_detail = true;
_ping_state = PING_IDLE;
_ping_ack_seen = false;
_detail = true;
return true;
}
if (c == KEY_LEFT) {