10327 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
vidplace7	fb0a2a4320	Upgrade trunk	2025-09-26 08:07:43 +00:00
Jason P	9980c56d81	Correct Inverted Mute Icon on Clock Display (#8111)	2025-09-26 08:48:34 +10:00
Ben Meadors	191d20ed04	Merge pull request #7982 from meshtastic/develop ... Test develop --> master	2025-09-25 08:34:07 -05: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
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	68fc931518	Merge branch 'master' into develop	2025-09-25 04:48:08 -05:00
github-actions[bot]	0ad6b813fc	Upgrade trunk (#8105) ... Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-09-25 04:45:14 -05:00
WillyJL	47a82bdb98	Fix duplicated lines from merge (#8104)	2025-09-24 16:36:14 -05:00
Ben Meadors	371313080b	Merge branch 'master' into develop	2025-09-24 06:18:13 -05:00
Ben Meadors	db55d8a59d	Trunk	2025-09-24 06:16:51 -05:00
Quency-D	949f881ae8	Add three expansion screens for heltec mesh solar. (#7995) ... * Add three expansion screens for heltec mesh solar. * delete whitespace Update variants/nrf52840/heltec_mesh_solar/variant.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * delete whitespace Update variants/nrf52840/heltec_mesh_solar/platformio.ini Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-09-24 06:16:51 -05:00
renovate[bot]	ca3c45a2f3	Update Adafruit BusIO to v1.17.4 (#8098) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-09-24 06:15:00 -05:00
Quency-D	c33c368315	Add three expansion screens for heltec mesh solar. (#7995) ... * Add three expansion screens for heltec mesh solar. * delete whitespace Update variants/nrf52840/heltec_mesh_solar/variant.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * delete whitespace Update variants/nrf52840/heltec_mesh_solar/platformio.ini Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-09-24 06:14:24 -05:00
github-actions[bot]	1835ff2d78	Upgrade trunk (#8094) ... Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-09-24 06:05:36 -05:00
Ben Meadors	8e04f9f631	Merge branch 'master' into develop	2025-09-24 06:03:14 -05:00
github-actions[bot]	83be632a1a	Automated version bumps (#8100) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-24 06:02:55 -05:00
github-actions[bot]	1ed7aad976	Automated version bumps (#8100) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-24 06:01:31 -05:00
Ben Meadors	94d4bdf05c	Revert "Fix build errors (#8067)" ... This reverts commit d998f70b56.	2025-09-23 08:57:04 -05:00
Ben Meadors	1968a009dd	Clear lasttoradio on BLE disconnect (#8095) ... * On disconnect, clear the lastToRadio buffer * Move it, bucko!	2025-09-23 07:31:25 -05:00
Ben Meadors	8e608e8186	Heltec V4 is 16mb	2025-09-23 06:04:47 -05:00
Jason P	d998f70b56	Fix build errors (#8067)	2025-09-23 05:39:57 -05:00
Ben Meadors	f55db903b2	Merge branch 'master' into develop	2025-09-23 05:38:52 -05:00
Jonathan Bennett	91efaba389	Remove line from BLE pin screen, to make pin readible on tiny screens	2025-09-22 21:59:00 -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
Jonathan Bennett	07b58a82d5	tlora-pager wake on button, and kb backlight toggling (#8090)	2025-09-22 21:06:23 -05:00
Ben Meadors	e1485b530f	Handle ext. notification module things even if not enabled (#8089)	2025-09-22 19:59:05 -05:00
Jonathan Bennett	db941bff3b	portduino bump to fix gpiod bug (#8083) ... An earlier portduino causes problems with initializing gpiod lines. This pulls in the fix.	2025-09-22 12:00:01 -05:00
github-actions[bot]	13e1f99c7e	Upgrade trunk (#8078) ... Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-09-22 05:58:47 -05:00
Tom Fifield	388c821028	Allow label enforcement job to run on self-hosted runners (#7909) ... Previously, this check would only run on github-provided runners.	2025-09-22 10:23:42 +10:00
Jason P	3d51287ba7	Introduce Radio Preset elections through BaseUI (#8071)	2025-09-21 17:54:54 -05:00
Ben Meadors	1e1f2a69b7	Merge branch 'master' into develop	2025-09-21 16:52:20 -05:00
Jason P	b3df32c6c5	Fix build errors (#8067)	2025-09-21 14:04:17 -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
Tom	d1fd102952	Add another seeed_xiao_nrf52840_kit build environment for I2C pinout (#8036) ... * Update platformio.ini * Remove some more extraneous lines	2025-09-21 06:28:28 -05:00
Markus	27b07cd1c5	Fix Rotary Encoder Button (#8001) ... this fixes the Rotary Encoder Button, currenlty its not working at all. Currently the action `ROTARY_ACTION_PRESSED` is only triggerd with a IRQ on RISING, which results in nothing since the function detects the "not longer" pressed button --> no action. the `ROTARY_ACTION_PRESSED` implementation needs to be called on both edges (on press and release of the button) changing the interupt setting to `CHANGE` fixes the problem.	2025-09-21 06:28:05 -05:00
Tom	5701755608	Add another seeed_xiao_nrf52840_kit build environment for I2C pinout (#8036) ... * Update platformio.ini * Remove some more extraneous lines	2025-09-21 06:27:39 -05:00
renovate[bot]	c42513d7c8	Update RadioLib to v7.3.0 (#8065) ... Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-09-21 06:25:32 -05:00
Markus	2010871e4b	Fix Rotary Encoder Button (#8001) ... this fixes the Rotary Encoder Button, currenlty its not working at all. Currently the action `ROTARY_ACTION_PRESSED` is only triggerd with a IRQ on RISING, which results in nothing since the function detects the "not longer" pressed button --> no action. the `ROTARY_ACTION_PRESSED` implementation needs to be called on both edges (on press and release of the button) changing the interupt setting to `CHANGE` fixes the problem.	2025-09-21 06:22:29 -05:00
Jason P	040b3b8c7f	Resolve many warnings for BaseUI during builds (#8063) ... * Resolve many warnings for BaseUI during builds * Don't display "No GPS Lock" twice	2025-09-21 11:33:47 +10: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
WillyJL	db2f79b6c4	Fix last build issues on develop (#8046)	2025-09-20 07:04:27 -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
Markus	44968415a5	fix build with HAS_TELEMETRY 0 (#8051)	2025-09-20 06:34:47 -05:00