- src/Mesh.cpp	Reverted #ifdef ZEPHCORE_COMPANION block → back to vanilla self_id.copyHashTo
- helpers/ContactInfo.h	Removed OUT_PATH_SENT
- helpers/ui-joystick/joystick_defs.h	Added OUT_PATH_SENT here (with comment clarifying it's UI-only)
- helpers/ui-joystick/joystick_ui_task.h	Removed dead _next_batt_refresh field
- helpers/ui-joystick/joystick_ui_task.cpp	Removed _next_batt_refresh(0) from ctor init list
- helpers/ui-joystick/joystick_screens.h	MsgEntry::origin[80]→[32]; MAX_UNREAD_MSGS 32→16
- Kconfig	DOOM help text now lists both UI activation paths
- ARCHITECTURE.md	Same correction in §8.5
This commit is contained in:
liquidraver
2026-05-20 22:53:02 +02:00
parent 781b4f5a33
commit 83f00ab200
8 changed files with 14 additions and 18 deletions
+1 -10
View File
@@ -92,16 +92,7 @@ DispatcherAction Mesh::routeRecvPacket(Packet *packet)
if (packet->isRouteFlood() && !packet->isMarkedDoNotRetransmit()
&& (n + 1)*packet->getPathHashSize() <= MAX_PATH_SIZE && allowPacketForward(packet)) {
// append this node's hash to 'path'
#ifdef ZEPHCORE_COMPANION
uint8_t prefix[4] = {};
/* Avoid confusions while using offgrid mode with real repeaters and force 01 (MOBILE node) */
prefix[0] = 0x01;
memcpy(&packet->path[n * packet->getPathHashSize()],
prefix,
packet->getPathHashSize());
#else
self_id.copyHashTo(&packet->path[n * packet->getPathHashSize()], packet->getPathHashSize());
#endif
self_id.copyHashTo(&packet->path[n * packet->getPathHashSize()], packet->getPathHashSize());
packet->setPathHashCount(n + 1);
uint32_t h = ContentionTracker::computePacketHash32(packet);
_contention.trackRetransmit(h, (uint32_t)_ms->getMillis());