10676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
HarukiToreda	526c7f8e4d	Merge remote-tracking branch 'upstream/develop' into multi-message-Storage	2025-09-28 19:20:35 -04:00
Ford Jones	85fe7d26ed	Merge branch 'develop' into 7943-mute-target	2025-09-29 11:10:46 +13:00
HarukiToreda	7f1dc4e76a	Merge remote-tracking branch 'upstream/develop' into multi-message-Storage	2025-09-28 18:09:29 -04:00
Clive Blackledge	a1c658a467	Bug / Send upgraded (duplicate) packets to phone if the queue removal failed. (#8148) ... * Add seenRecently = true if wasUpgraded is true but unable to remove from queue (i.e. already sent/processed). * Consistent comment between FloodingRouter and HopRouter	2025-09-28 16:43:51 -05:00
Clive Blackledge	777e11bad9	Bug / Send upgraded (duplicate) packets to phone if the queue removal failed. (#8148) ... * Add seenRecently = true if wasUpgraded is true but unable to remove from queue (i.e. already sent/processed). * Consistent comment between FloodingRouter and HopRouter	2025-09-28 16:42:51 -05:00
Ben Meadors	a15d654767	Finish deprecating the Repeater role behavior (#8144) ... * Finish deprecating the Repeater role behavior * Validate * Fixed bad if/else block * Get your crap together!	2025-09-28 15:30:53 -05:00
Ben Meadors	033fc0c8f3	Validate CR and SF lora config (#8146) ... * Validate CR and SF lora config * No zero-bw * Update src/modules/AdminModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix braces --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-28 13:13:07 -05:00
Ben Meadors	7633ddcfd1	Merge remote-tracking branch 'origin/master' into develop	2025-09-28 07:43:38 -05:00
github-actions[bot]	8717c60f13	Update protobufs (#8142) ... Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-09-28 07:35:56 -05:00
Jason P	067939ca24	Correct altitudeLine getting clobbered in the great merge (#8138) ... * Correct altitudeLine getting clobbered in the great merge * Fix variable usage in altitude calculation	2025-09-28 06:11:01 -05:00
HarukiToreda	34bb858588	Emote picker fix	2025-09-28 02:32:28 -04:00
HarukiToreda	4ae5e8a48e	removed legacy temporary messages	2025-09-28 01:41:51 -04:00
HarukiToreda	e3553c4eb3	Dismiss feature fixed	2025-09-28 01:31:32 -04:00
HarukiToreda	3e4f654f58	Ack message cleanup	2025-09-28 00:58:48 -04:00
ford-jones	abc011aeb9	Use channel as specified in the received packet for OLED screen notifications	2025-09-28 16:26:45 +13:00
ford-jones	a4a6ee1df4	Merge branch '7943-mute-target' of https://github.com/ford-jones/firmware into 7943-mute-target	2025-09-28 13:21:56 +13:00
ford-jones	6448f069f8	Use channel as specified in the received packet	2025-09-28 13:18:21 +13:00
ford-jones	f6a28e15d2	Pull latest, regen protos	2025-09-28 11:38:36 +13:00
Ben Meadors	2b60bae61c	Merge remote-tracking branch 'origin/develop'	2025-09-27 09:08:59 -05:00
dfsx1	bc516ebbac	Remove memcpy (#8079) ... Obsolete since #7652 returns false for mismatching keys Co-authored-by: dfsx1 <dfsx1@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-09-27 08:33:07 -05:00
Ben Meadors	045176789e	Fix int comparison and client_base base should really not be on this list	2025-09-27 08:32:43 -05:00
Ben Meadors	667b7c50e2	Merge pull request #8136 from plashchynski/fix_no_gps_double_message ... UIRenderer: display "No GPS present" only on the first line to avoid duplication	2025-09-27 08:24:00 -05:00
Ben Meadors	9b1a118103	Merge branch 'develop' into 7943-mute-target	2025-09-27 08:22:14 -05:00
Ben Meadors	64c268f055	Merge branch 'develop' into fix_no_gps_double_message	2025-09-27 08:11:00 -05:00
Ben Meadors	806bf6ce2c	Merge pull request #7703 from ford-jones/clear-rangetest-results ... Range-test: Clean on reboot	2025-09-27 08:08:31 -05:00
Ford Jones	7eb0109e33	Merge branch 'develop' into clear-rangetest-results	2025-09-28 01:02:44 +12:00
Ford Jones	4dec912a39	Merge branch 'develop' into 7943-mute-target	2025-09-28 01:01:48 +12:00
Ben Meadors	73147c4028	Merge pull request #8110 from meshtastic/develop ... Develop --> Master	2025-09-27 08:00:52 -05:00
Dzmitry Plashchynski	e8627b2d01	UIRenderer: display "No GPS present" only on the first line to avoid duplication	2025-09-27 15:56:52 +03: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
WillyJL	a2d86454d3	I2S: Fix silent RTTTL regression (#8129)	2025-09-27 15:07:38 +10:00
Jonathan Bennett	bc3db1b5c1	Properly output the TCXO Voltage in yaml (#8128)	2025-09-26 18:23:09 -05:00
HarukiToreda	28502c93c9	Ack on messages sent	2025-09-26 16:51:09 -04:00
HarukiToreda	07d3726cde	Cannedmessage cleanup and emotes fixed	2025-09-26 15:10:19 -04:00
github-actions[bot]	2f1198ddf3	Upgrade trunk (#8118) ... Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-09-26 11:17:38 -05:00
Jason P	0624059683	Saving changes are required (#8122)	2025-09-26 11:17:15 -05:00
HarukiToreda	ebbb8a6f9f	Decoupled message packets from screen.cpp and cleaned up	2025-09-26 00:28:25 -04:00
HarukiToreda	dd7a5cf31f	Messages from phone show on screen	2025-09-25 22:44:23 -04:00
Ford Jones	52ee655fd2	Merge branch 'develop' into 7943-mute-target	2025-09-26 13:06:50 +12:00
Jason P	9980c56d81	Correct Inverted Mute Icon on Clock Display (#8111)	2025-09-26 08:48:34 +10:00
Ben Meadors	fc9f1ac056	Merge branch 'master' into develop	2025-09-25 17:09:47 -05:00
Ben Meadors	c65dbe490e	Merge pull request #8101 from Links2004/reduce_cpu_load ... reduce cpu load by optimizing OSThread runOnce calls	2025-09-25 16:29:42 -05:00
Ben Meadors	44636cc9f5	Merge pull request #8053 from GUVWAF/assymRelay ... Make sure next-hop is only set when they received us directly	2025-09-25 13:54:22 -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
Ben Meadors	d9f0590f8e	Merge branch 'develop' into reduce_cpu_load	2025-09-25 11:59:22 -05:00
Ben Meadors	191d20ed04	Merge pull request #7982 from meshtastic/develop ... Test develop --> master	2025-09-25 08:34:07 -05:00
Ford Jones	79bc286b35	Merge branch 'develop' into 7943-mute-target	2025-09-25 22:52:44 +12:00
Ford Jones	8d9fda38d6	Merge branch 'develop' into clear-rangetest-results	2025-09-25 22:47:16 +12: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