2309 Commits

Author	SHA1	Message	Date
Ben Meadors	73147c4028	Merge pull request #8110 from meshtastic/develop ... Develop --> Master	2025-09-27 08:00:52 -05:00
Ben Meadors	ab00e991f6	Revert cross-preset default-key bridging with UDP and disable UDP by default (#8130) ... * Revert cross-preset UDP bridging * Don't enable UDP by default	2025-09-27 07:09:24 -05:00
GUVWAF	aa876ba42f	Merge branch 'develop' into assymRelay	2025-09-25 20:01:35 +02:00
GUVWAF	12c3ddf457	Resolve comments	2025-09-25 19:59:38 +02:00
Erayd	3c25652cdf	If a packet is heard multiple times, rebroadcast using the highest hop limit (#5534) ... * If a packet is heard multiple times, rebroadcast using the highest hop limit Sometimes a packet will be in the TX queue waiting to be transmitted, when it is overheard being rebroadcast by another node, with a higher hop limit remaining. When this occurs, modify the pending packet in the TX queue to avoid unnecessarily wasting hops. * Reprocess instead of modifying queued packet In order to ensure that the traceroute module works correctly, rather than modifying the hop limnit of the existing queued version of the packet, simply drop it ifrom the queue and reprocess the version of the packet with the superior hop limit. * Update protobufs submodule * Merge upstream/develop into overheard-hoptimisation branch Resolved conflicts in: - src/mesh/FloodingRouter.cpp: Integrated hop limit optimization with refactored duplicate handling - src/mesh/MeshPacketQueue.h: Kept both hop_limit_lt parameter and new find() method * Improve method naming and code clarity - Rename findPacket() to getPacketFromQueue() for better clarity - Make code DRY by having find() use getPacketFromQueue() internally - Resolves method overloading conflict with clearer naming * If a packet is heard multiple times, rebroadcast using the highest hop limit Sometimes a packet will be in the TX queue waiting to be transmitted, when it is overheard being rebroadcast by another node, with a higher hop limit remaining. When this occurs, modify the pending packet in the TX queue to avoid unnecessarily wasting hops. * Improve router role checking using IS_ONE_OF macro - Replace multiple individual role checks with cleaner IS_ONE_OF macro - Add CLIENT_BASE support as suggested in PR #7992 - Include MeshTypes.h for IS_ONE_OF macro - Makes code more maintainable and consistent with other parts of codebase * Apply IS_ONE_OF improvement to NextHopRouter.cpp - Replace multiple individual role checks with cleaner IS_ONE_OF macro - Add CLIENT_BASE support for consistency - Include MeshTypes.h for IS_ONE_OF macro - Matches the pattern used in FloodingRouter.cpp * Create and apply IS_ROUTER_ROLE() macro across codebase - Add IS_ROUTER_ROLE() macro to meshUtils.h for consistent router role checking - Update FloodingRouter.cpp to use macro in multiple locations - Update NextHopRouter.cpp to use macro - Include CLIENT_BASE role support * Core Changes: - Add hop_limit field to PacketRecord (17B→20B due to alignment) - Extend wasSeenRecently() with wasUpgraded parameter - Enable router optimization without duplicate app delivery - Handle ROUTER_LATE delayed transmission properly Technical Details: - Memory overhead: ~4000 bytes for 1000 records - Prevents duplicate message delivery while enabling routing optimization - Maintains protocol integrity for ACK/NAK handling - Supports upgrade from hop_limit=0 to hop_limit>0 scenarios * Delete files accdentally added for merge * Trunk formatting * Packets are supposed to be unsigned. Thankfully, it's only a log message. * Upgrade all packets, not just 0 hop packets. * Not just unsigned, but hex. Updating packet log IDs. * Fixed order of operations issue that prevented packetrs from being removed from the queue * Fixing some bugs after testing. Only storing the maximum hop value in PacketRecord which makes sense. Also, updating messaging to make more sense in the logs. * Fixed flow logic about how to handle re-inserting duplicate packets. Removed IS_ROUTER_ROLE macro and replaced it with better isRebroadcaster(). * Add logic to re-run modules, but avoid re-sending to phone. * Refactor how to process the new packet with hops. Only update nodeDB and traceRouteModule. * - Apply changes to both FloodingRouter and NextHopRouter classes to make packets mutable for traceroute - MESHTASTIC_EXCLUDE_TRACEROUTE guard for when we don't want traceroute * Allow MeshPacket to be modified in-place in processUpgradePacket * let's not make a copy where a copy is unncessary. --------- Co-authored-by: Clive Blackledge <clive@ansible.org> Co-authored-by: Clive Blackledge <git@ansible.org> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-09-25 05:44:49 -05:00
Ben Meadors	9b3d76967b	Merge branch 'develop' into assymRelay	2025-09-25 05:18:56 -05:00
Clive Blackledge	fd5ca8b73c	Feat/0-cost hops for favorite routers (#7992) ... * feat: implement router hop preservation for router-to-router communication - Preserve hop_limit when both local device and previous relay are routers/CLIENT_BASE - Only preserve hops for favorite routers to prevent abuse - Apply to both FloodingRouter and NextHopRouter - Update hop counting logic in MeshService for router-to-router communication This allows routers to communicate over longer distances without consuming hop limits, improving mesh network efficiency for infrastructure nodes. * chore: update protobufs submodule to latest * Optimized to check friend list first before nodedb. * Reverting unintended changes * revert: remove protobufs submodule update This reverts the protobufs submodule back to a84657c22 to remove unintended changes from this branch. * Slight rewrite to remove flawed NO_RELAY_NODE logic and added logic to add isFirstHop. If isFirstHop, always decrease hop_limit to avoid retry logic. * DRY code. Remove NodeInfo logic that was left over. * Trunk formatting	2025-09-25 05:17:51 -05:00
Chloe Bethel	18058ef507	Fix 2.4GHz reconfiguration on LR11xx (#8102) ... Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-09-25 04:50:56 -05:00
Ben Meadors	8ed6514771	Merge branch 'develop' into assymRelay	2025-09-24 15:17:40 -05:00
Ben Meadors	f55db903b2	Merge branch 'master' into develop	2025-09-23 05:38:52 -05:00
Jonathan Bennett	a8c66547cc	Also pull a deviceID from esp32c6 devices (#8092)	2025-09-22 21:46:57 -05:00
Ben Meadors	f77ca2533b	Try-fix: Unstick that PhoneAPI state (#8091) ... Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>	2025-09-22 21:46:35 -05:00
Quency-D	cea9e1238b	Add heltec_v4 board. (#7845) ... * add heltec_v4 board. * Update variants/esp32s3/heltec_v4/platformio.ini Co-authored-by: Austin <vidplace7@gmail.com> * Limit the maximum output power. * Trunk fixes Fixes formatting to match meshtastic trunk linter. * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Austin <vidplace7@gmail.com> Co-authored-by: Tom Fifield <tom@tomfifield.net> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-21 07:13:28 -05:00
Quency-D	11eb4a5b90	Add heltec_v4 board. (#7845) ... * add heltec_v4 board. * Update variants/esp32s3/heltec_v4/platformio.ini Co-authored-by: Austin <vidplace7@gmail.com> * Limit the maximum output power. * Trunk fixes Fixes formatting to match meshtastic trunk linter. * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Austin <vidplace7@gmail.com> Co-authored-by: Tom Fifield <tom@tomfifield.net> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-21 07:03:44 -05:00
Ben Meadors	d09baddce5	Merge branch 'develop' into assymRelay	2025-09-21 06:27:20 -05:00
Ben Meadors	b49496d99d	Merge branch 'master' into develop	2025-09-20 12:18:55 -05:00
GUVWAF	34c2191f63	Use lora.use_preset config to get name (#8057)	2025-09-20 12:17:49 -05:00
GUVWAF	52527e281d	Use lora.use_preset config to get name (#8057)	2025-09-20 12:17:14 -05:00
Markus	9b6cf53730	move HTTP contentTypes to Flash - saves 768 Bytes of RAM (#8055)	2025-09-20 12:16:42 -05:00
Markus	6a3b2ceafe	move HTTP contentTypes to Flash - saves 768 Bytes of RAM (#8055)	2025-09-20 12:15:41 -05:00
GUVWAF	1d3c47c5fa	Make sure to ACK ACKs/replies if next-hop routing is used (#8052) ... * Make sure to ACK ACKs/replies if next-hop routing is used To stop their retransmissions; hop limit of 0 is enough * Update src/mesh/ReliableRouter.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-20 06:37:40 -05:00
GUVWAF	1fc07607cb	Make sure next-hop is only set when they received us directly	2025-09-20 13:03:46 +02:00
Ben Meadors	cc3ff1504a	Merge branch 'master' into develop	2025-09-19 16:11:07 -05:00
github-actions[bot]	fdc8796052	Update protobufs (#8045) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-19 15:50:33 -05:00
Ben Meadors	edb250e782	Merge branch 'master' into develop	2025-09-19 11:35:46 -05:00
github-actions[bot]	42fbb62f18	Update protobufs (#8038) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-19 08:47:53 -05:00
Ben Meadors	c11680fcc0	Fix formatting and trunk issues	2025-09-19 08:37:58 -05:00
Jonathan Bennett	cc579dd0bd	Portduino config refactor (#7796) ... * Start portduino_config refactor * refactor GPIOs to new portduino_config * More portduino_config work * More conversion to portduino_config * Finish portduino_config transition * trunk * yaml output work * Simplify the GPIO config * Trunk	2025-09-19 08:24:35 -05:00
Ben Meadors	1ac2382d7c	Revert "Fix excluded modules configuration handling (#7838)" ... This reverts commit 9c6544ebfa.	2025-09-19 07:29:54 -05:00
Ben Meadors	e2ce369782	Fixes	2025-09-19 06:29:18 -05:00
Ben Meadors	b14e5770d5	Merge pull request #7873 from compumike/compumike/client-base-role ... Add `CLIENT_BASE` role: `ROUTER` for favorites, `CLIENT` otherwise (for attic/roof nodes!)	2025-09-18 20:40:39 -05:00
Michael	2bafac242e	Feature: Seamless Cross-Preset Communication via UDP Multicast Bridging (#7753) ... * Added compatibility between nodes on different Presets through `Mesh via UDP` * Optimize multicast handling and channel mapping - FloodingRouter: remove redundant UDP-encrypted rebroadcast suppression. - Router: guard multicast fallback with HAS_UDP_MULTICAST and map fallback-decoded packets to the local default channel via isDefaultChannel() - UdpMulticastHandler: set transport_mechanism only after successful decode * trunk fmt * Move setting transport mechanism. --------- Co-authored-by: GUVWAF <thijs@havinga.eu>	2025-09-18 20:37:05 -05:00
Ben Meadors	8f0e17a653	Merge branch 'master' into develop	2025-09-18 19:18:53 -05:00
Thomas Göttgens	71d84404c6	add WIP for Unit C6L (#7433) ... * add WIP for Unit C6L * adapt to new config structure * Add c6l BLE and screen support (#7991) * Minor c6l fix * Move out of PRIVATE_HW --------- Co-authored-by: Austin <vidplace7@gmail.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> Co-authored-by: Jason P <Xaositek@users.noreply.github.com> Co-authored-by: Markus <Links2004@users.noreply.github.com>	2025-09-17 22:40:55 +02:00
Ben Meadors	f16aa730d3	Merge pull request #8006 from meshtastic/master ... Backmerge	2025-09-16 07:21:31 -05:00
github-actions[bot]	cc3c568501	Update protobufs (#8005) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-16 07:20:44 -05:00
Ben Meadors	d31e3839fb	Use long name	2025-09-16 06:11:29 -05:00
Michael	b9d53d667e	Feature: Seamless Cross-Preset Communication via UDP Multicast Bridging (#7753) ... * Added compatibility between nodes on different Presets through `Mesh via UDP` * Optimize multicast handling and channel mapping - FloodingRouter: remove redundant UDP-encrypted rebroadcast suppression. - Router: guard multicast fallback with HAS_UDP_MULTICAST and map fallback-decoded packets to the local default channel via isDefaultChannel() - UdpMulticastHandler: set transport_mechanism only after successful decode * trunk fmt * Move setting transport mechanism. --------- Co-authored-by: GUVWAF <thijs@havinga.eu>	2025-09-15 19:29:47 -05:00
Ben Meadors	09de0e3edb	Merge branch 'master' into develop	2025-09-14 08:15:25 -05:00
Ben Meadors	9977035499	Fix DRAM overflow on old esp32 targets	2025-09-13 20:14:10 -05:00
Ben Meadors	096afa07f8	Tweak maximums	2025-09-13 18:57:00 -05:00
Ben Meadors	760471d620	Fix json report crashes on esp32 (#7978)	2025-09-13 18:52:46 -05:00
Ben Meadors	ae814b5463	Drop the limit	2025-09-13 12:07:14 -05:00
Ben Meadors	78dfb05eeb	Portduino dynamic alloc	2025-09-13 11:59:50 -05:00
Ben Meadors	9211b1bb4b	Static memory pool allocation (#7966) ... * Static memory pool * Initializer * T-Lora Pager: Support LR1121 and SX1280 models (#7956) * T-Lora Pager: Support LR1121 and SX1280 models * Remove ifdefs --------- Co-authored-by: WillyJL <me@willyjl.dev>	2025-09-13 07:01:07 -05:00
github-actions[bot]	b6dd99917d	Update protobufs (#7973) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-13 06:37:58 -05:00
Ben Meadors	e6bfc4a97a	Merge pull request #7969 from meshtastic/master ... Backmerge	2025-09-12 18:23:40 -05:00
Ben Meadors	8989de118c	Only queue 2 client notification	2025-09-12 16:07:27 -05:00
Ben Meadors	1914fa0321	Formatting	2025-09-12 15:49:56 -05:00
Mike Robbins	962e5d513c	Fix memory leak in NextHopRouter: always free packet copy when removing from pending	2025-09-12 13:16:48 -05:00