Skip to content

Commit 5bfaa33

Browse files
ssp97github-actions[bot]vidplace7renovate[bot]thebentern
authored
merge (#1)
* Upgrade trunk (meshtastic#8976) Co-authored-by: vidplace7 <[email protected]> * Update GitHub Artifact Actions (meshtastic#8954) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * rp2xx0: Update to arduino-pico 5.4.4 (meshtastic#8979) * Update protobufs (meshtastic#8982) Co-authored-by: thebentern <[email protected]> * Update meshtastic/device-ui digest to 862ed04 (meshtastic#8980) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * PIO: Fix ESP32 sub-variant inheritance (meshtastic#8983) * Replace PIO fuzzy version matches (reproducible builds) (meshtastic#8984) This change does not introduce version *changes*, but simply "updates" to the version already being referenced by the fuzzy-match (^) * PIO: Remove useless inheritence (references extends env) (meshtastic#8987) Remove lib_deps section for all PlatformIO envs which are unneeded (only references the `extends` lib_deps, thus pointless) This makes the configs more concise and make future PIO variants/ libdeps audits easier. * Upgrade trunk (meshtastic#8989) Co-authored-by: vidplace7 <[email protected]> * Implement Long Turbo preset (meshtastic#8985) * Implement Long_Turbo preset * Oops * Start to DRY up menu handler by actually using OO concepts instead of jank separate arrays * Move the implementation back into the method * Dummy comment * Listen to copilot feedback and prevent dangling pointer * Static and optional * Detect if NTP is active on native (meshtastic#8962) * Detect if NTP is active on native * Drop debug warning * Update RDEF parameters for CN region * Upgrade trunk (meshtastic#9000) Co-authored-by: vidplace7 <[email protected]> * Upgrade all esp32 targets to NimBLE 2.X (meshtastic#9003) * Upgrade all esp32 targets to NimBLE 2.X * Remove guard * Renovate all the things (meshtastic#8994) * Prep work for better Store and Forward (meshtastic#8999) * make channels.h getHash public * router.* make the encrypted packet copy available for modules to access * Update src/mesh/Router.h Co-authored-by: Copilot <[email protected]> * Set p_encrypted to nullptr after release --------- Co-authored-by: Copilot <[email protected]> * PlatformIO: Restructure networking_base for re-use (meshtastic#8964) * Macro guard heap_caps_malloc_extmem_enable from SENSECAP_INDICATOR (meshtastic#9007) * More blinkenlights work for Thinknode-m3 (meshtastic#8940) * More blinkenlights work for Thinknode-m3 * Update src/mesh/NodeDB.cpp Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Copilot <[email protected]> * Upgrade trunk (meshtastic#9011) Co-authored-by: vidplace7 <[email protected]> * CLIENT_BASE: Act like ROUTER_LATE for fav'd nodes, instead of like ROUTER (meshtastic#8567) * Client_Base - Dont rebroadcast in early (Router) window Removed early rebroadcast check for CLIENT_BASE role. * Client_Base - Clamp rebroadcast to late (Router_Late) window on dupe * Only clamp to Router_Late window if packet from fav'd node --------- Co-authored-by: Ben Meadors <[email protected]> * Be more judicious about responding to want_response in existing meshes (meshtastic#9014) * Be more judicious about sending want_response in existing meshes and responding to nodes we already heard from * Turns out we don't actually use this * For our first position send on boot, validate that we have received a fresh position (meshtastic#9023) * Add Rebooting to DFU mode notification as a simple pop-up (meshtastic#8970) * Add DFU notification as a simple pop-up * Add safe conditional of IF_SCREEN * Forgot #if HAS_SCREEN * rp2xx0: Update to arduino-pico 5.4.4 (meshtastic#8979) * CLIENT_BASE: Act like ROUTER_LATE for fav'd nodes, instead of like ROUTER (meshtastic#8567) * Client_Base - Dont rebroadcast in early (Router) window Removed early rebroadcast check for CLIENT_BASE role. * Client_Base - Clamp rebroadcast to late (Router_Late) window on dupe * Only clamp to Router_Late window if packet from fav'd node --------- Co-authored-by: Ben Meadors <[email protected]> * Macro guard heap_caps_malloc_extmem_enable from SENSECAP_INDICATOR (meshtastic#9007) * Actions: Compact manifest job output summary (meshtastic#8957) * fmt * Additional Emoji (meshtastic#9020) * Refactor emote dimensions to 16x16 pixels Updated the dimensions of various emotes in emotes.h from 30x30 or 25x25 to 16x16 pixels for consistency and optimization. Added new emotes including heart_smile, Heart_eyes, and others, all with the same 16x16 size. This change improves memory usage and aligns with the design specifications for smaller emotes. * Add new emotes and their corresponding bitmap definitions * Add strong emoji and first quarter moon face * Add definitions for new emoji graphics * Fix missing newline at end of file in emotes.cpp * Add new emotes: eyes, eye, shrug, turkey, turkey leg * Add turkey and related emote definitions * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.h Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> * Update src/graphics/emotes.cpp Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Copilot <[email protected]> * Emoji naming convention consistency * Automated version bumps (meshtastic#9025) Co-authored-by: thebentern <[email protected]> * Automated version bumps (meshtastic#9025) Co-authored-by: thebentern <[email protected]> * In protobuf update, allow develop branch to auto-update (meshtastic#9027) * Update protobufs (meshtastic#9028) Co-authored-by: jp-bennett <[email protected]> * Fix -ota.zip in manifest and build output * Revert "Automated version bumps (meshtastic#9025)" This reverts commit 1021d96. * Adding support for InkHUD joystick navigation for the Seeed Wio Tracker L1 E-ink (meshtastic#8678) * TwoButtonExtened mirrors TwoButton but added joystick functionality * basic ui navigation with a joystick settings->joystick.enabled setting added and SETTINGS_VERSION incremented by one in InkHUD/Persistence.h in seeed_wio_tracker_L1_eink/nicheGraphics.h enable joystick and disable "Next Tile" menu item in implement prevTile and prevApplet functions in InkHUD/WindowManager.h,cpp and InkHUD/InkHUD.h,cpp onStickCenterShort, onStickCenterLong, onStickUp, onStickDown, onStickLeft, and onStickRight functions added to: - InkHUD/InkHUD.h,cpp - InkHUD/Events.h,cpp - InkHUD/Applet.h change navigation actions in InkHUD/Events.cpp events based on whether the joystick is enabled or not in seeed_wio_tracker_L1_eink/nicheGraphics.h connect joystick events to the new joystick handler functions * handle joystick input in NotificationApplet and TipsApplet Both the joystick center short press and the user button short press can be used to advance through the Tips applet. dismiss notifications with any joystick input * MenuApplet controls allows menu navigation including a back button * add AlignStickApplet for aligning the joystick with the screen add joystick.aligned and joystick.alignment to InkHUD/Persistence.h for storing alignment status and relative angle create AlignStick applet that prompts the user for a joystick input and rotates the controls to align with the screen AlignStick applet is run after the tips applet if the joystick is enabled and not aligned add menu item for opening the AlignStick applet * update tips applet with joystick controls * format InkHUD additions * fix stroke consistency when resizing joystick graphic * tweak button tips for order consistency * increase joystick debounce * fix comments * remove unnecessary '+' * remap joystick controls to match standard inkHUD behavior Input with a joystick now behaves as follows User Button (joystick center): - short press in applet -> opens menu - long press in applet -> opens menu - short press in menu -> selects - long press in menu -> selects Exit Button: - short press in applet -> switches tile - long press in applet -> nothing for now - short press in menu -> closes menu - long press in menu -> nothing for now --------- Co-authored-by: scobert <[email protected]> Co-authored-by: HarukiToreda <[email protected]> * implement basic github action comment reporting target diffs (meshtastic#9022) This is missing logic: - report average - don't bother reporting if the results are negligeable - praise the user if it's improving the situation - shame the user if it's not improving the situation * RTC: PCF85063 support, port to SensorLib 0.3.1 (meshtastic#8061) * RTC: PCF85063 support, port to SensorLib 0.3.1 * Tidy up defines * Remove RTC/PCF8563 mentions from unrelated variants * Bump SensorLib 0.3.2 * Use SensorRtcHelper * Consistent warning message * Fix oversight Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Manuel <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Copilot <[email protected]> * add namiji-c3v1 * add namiji-c3v1 for github action build * in shame.py do not complain about missing targets (meshtastic#9032) PR CI only runs a small subset of all tests. It is very likely a file we didn't found in the PR is just not tested in PR. * In statusLEDModule, also detect isCharging (meshtastic#9050) * PlatformIO: Re-Org ESP32 family shared props (meshtastic#9060) * Update meshtastic-esp8266-oled-ssd1306 digest to b34c681 (meshtastic#9062) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Upgrade trunk (meshtastic#9047) Co-authored-by: vidplace7 <[email protected]> * Cleanup: Remove icarus custom arduino-esp32 (meshtastic#9064) * Update lewisxhe/SensorLib to 0.3.3 (meshtastic#9061) * Upgrade trunk (meshtastic#9067) Co-authored-by: vidplace7 <[email protected]> * M6 shutdown and LEDs work (meshtastic#9065) Co-authored-by: Ben Meadors <[email protected]> * Fix gps pin defs for various NRF variants. (meshtastic#9034) * fix on nrf52_promicro * try fix for GPS issue * fix GPS pin assignment in variant.h * cleared up some comments and confirmed pinouts from schematics --------- Co-authored-by: macvenez <[email protected]> * Multi message storage (meshtastic#8182) * First try at multimessage storage and display * Nrf built issue fix * Message view mode * Add channel name instead of channel slot * trunk fix * Fix for DM threading * fix for message time * rename of view mode to Conversations * Reply in thread feature * rename Select View Mode to Select Conversation * dismiss all live fix * Messages from phone show on screen * Decoupled message packets from screen.cpp and cleaned up * Cannedmessage cleanup and emotes fixed * Ack on messages sent * Ack message cleanup * Dismiss feature fixed * removed legacy temporary messages * Emote picker fix * Memory size debug * Build error fix * Sanity checks are okay sometimes * Lengthen channel name and finalize cleanup removal of Broadcast * Change DM to @ in order to unify on a single method * Continue unifying display, also show message status on the "isMine" lines * Add context for incoming messages * Better to say "in" vs "on" * crash fix for confirmation nodes * Fix outbound labels based to avoid creating delays * Eink autoscroll dissabled * gating for message storage when not using a screen * revert * Build fail fix * Don't error out with unset MAC address in unit tests * Provide some extra spacing for low hanging characters in messages * Reorder menu options and reword Respond * Reword menus to better reflect actions * Go to thread from favorite screen * Reorder Favorite Action Menu with simple word modifications * Consolidate wording on "Chats" * Mute channel fix * trunk fix * Clean up how muting works along with when we wake the screen * Fix builds for HELTEC_MESH_SOLAR * Signal bars for message ack * fix for notification renderer * Remove duplicate code, fix more Chats, and fix C6L MessageRenderer * Fix to many warnings related to BaseUI * preset aware signal strength display * More C6L fixes and clean up header lines * Use text aligns for message layout where necessary * Attempt to fix memory usage of invalidLifetime * Update channel mute for adjusted protobuf * Missed a comma in merge conflicts * cleanup to get more space * Trunk fixes * Optimize Hi Rez Chirpy to save space * more fixes * More cleanup * Remove used getConversationWith * Remove unused dismissNewestMessage * Fix another build error on occassion * Dimiss key combo function deprecated * More cleanup * Fn symbol code removed * Waypoint cleanup * Trunk fix * Fixup Waypoint screen with BaseUI code * Implement Haruki's ClockRenderer and broadcast decomposeTime across various files. * Revert "Implement Haruki's ClockRenderer and broadcast decomposeTime across various files." This reverts commit 2f65721. * Implement Haruki's ClockRenderer and broadcast decomposeTime across various files. Attempt 2! * remove memory usage debug * Revert only RangeTestModule.cpp change * Switch from dynamic std::string storage to fixed-size char[] * Removing old left over code * More optimization * Free Heap when not on Message screen * build error fixes * Restore ellipsis to end of long names * Remove legacy function renderMessageContent * improved destination filtering * force PKI * cleanup * Shorten longNames to not exceed message popups * log messages sent from apps * Trunk fix * Improve layout of messages screen * Fix potential crash for undefined variable * Revert changes to RedirectablePrint.cpp * Apply shortening to longNames in Select Destination * Fix short name displays * Fix sprintfOverlappingData issue * Fix nullPointerRedundantCheck warning on ESP32 * Add "Delete All Chats" to all chat views * Improve getSafeNodeName / sanitizeString code. * Improve getSafeNodeName further * Restore auto favorite; but only if not CLIENT_BASE * Don't favorite if WE are CLIENT_BASE role * Don't run message persistent in MUI * Fix broken endifs * Unkwnown nodes no longer show as ??? on message thread * More delete options and cleanup of code * fix for delete this chat * Message menu cleanup * trunk fix * Clean up some menu options and remove some Unit C6L ifdefines * Rework Delete flow * Desperate times call for desperate measures * Create a background on the connected icon to reduce overlap impact * Optimize code for background image * Fix for Muzi_Base * Trunk Fixes * Remove the up/down shortcut to launch canned messages (meshtastic#8370) * Remove the up/down shortcut to launch canned messages * Enabled MQTT and WEBSERVER by default (meshtastic#8679) Signed-off-by: kur1k0 <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Jonathan Bennett <[email protected]> --------- Signed-off-by: kur1k0 <[email protected]> Co-authored-by: Riker <[email protected]> Co-authored-by: Ben Meadors <[email protected]> * Correct string length calculation for signal bars * Manual message scrolling * Fix * Restore CannedMessages on Home Frame * UpDown situational destination for textMessage * Correct up/down destinations on textMessage frame * Update Screen.h for handleTextMessage * Update Screen.cpp to repair a merge issue * Add nudge scroll on UpDownEncoder devices. * Set nodeName to maximum size * Revert "Set nodeName to maximum size" This reverts commit e254f39. * Reflow Node Lists and TLora Pager Views (meshtastic#8942) * Add files via upload * Move files into the right place * Short or Long Names for everyone! * Add scrolling to Node list * Pagination fix for Latest to oldest per page * Page counters * Dynamic scaling of column counts based upon screen size, clean up box drawing * Reflow Node Lists and TLora Pager Views (meshtastic#8942) * Add files via upload * Move files into the right place * Short or Long Names for everyone! * Add scrolling to Node list * Pagination fix for Latest to oldest per page * Page counters * Dynamic scaling of column counts based upon screen size, clean up box drawing * Update exempt labels for stale bot workflow Adds triaged and backlog to the list of exempt labels. * Update naming of Frame Visibility toggles * Fix to scrolling * Fix for content cutting off when from us * Fix for "delete this chat" now it does delete the current one * Rework isHighResolution to be an enum called ScreenResolution * Migrate Unit C6L macro guards into currentResolution UltraLow checks * Mistakes happen - restoring NodeList Renderer line --------- Signed-off-by: kur1k0 <[email protected]> Co-authored-by: Jason P <[email protected]> Co-authored-by: Jonathan Bennett <[email protected]> Co-authored-by: Riker <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: whywilson <[email protected]> Co-authored-by: Tom Fifield <[email protected]> * Upgrade trunk (meshtastic#9072) Co-authored-by: vidplace7 <[email protected]> * Implement HAS_PHYSICAL_KEYBOARD for devices with physical keyboards (meshtastic#9071) - Implement HAS_PHYSICAL_KEYBOARD for devices with physical keyboards - Add HAS_PHYSICAL_KEYBOARD to variant.h for: - TDeck - TLora Pager - TDeck Pro * update: namiji-c3v1 and namiji-c3v0 * disable some board * disable some board * In autoconf, don't probe Wire unless i2c device is set (meshtastic#9081) Found another bit of code that crashes my desktop, by probing the wrong i2c bus. * action: skip trying to comment binary size change results if it is not a PR (meshtastic#9033) * action: skip trying to comment binary size change results if it is not a PR * action: fix halucinations in the clanker's code * action: cleanup one line --------- Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Austin <[email protected]> * Correctly set type for event_mode max() position threshold (meshtastic#9083) Fixes EVENT_MODE firmware builds * pioarduino .gitignore (meshtastic#9085) I'm already going insane! * Upgrade trunk (meshtastic#9076) Co-authored-by: vidplace7 <[email protected]> * Fix PR#8061 SensorLib nRF ThinkNode M-series (meshtastic#9084) * pass GH_TOKEN to shame's gh run download step (meshtastic#9087) * Fix -ota.zip in manifest and build output * Revert "Automated version bumps (meshtastic#9025)" This reverts commit 1021d96. * In statusLEDModule, also detect isCharging (meshtastic#9050) * Update meshtastic-esp8266-oled-ssd1306 digest to b34c681 (meshtastic#9062) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Upgrade trunk (meshtastic#9047) Co-authored-by: vidplace7 <[email protected]> * Upgrade trunk (meshtastic#9067) Co-authored-by: vidplace7 <[email protected]> * M6 shutdown and LEDs work (meshtastic#9065) Co-authored-by: Ben Meadors <[email protected]> * Upgrade trunk (meshtastic#9072) Co-authored-by: vidplace7 <[email protected]> * In autoconf, don't probe Wire unless i2c device is set (meshtastic#9081) Found another bit of code that crashes my desktop, by probing the wrong i2c bus. * Upgrade trunk (meshtastic#9076) Co-authored-by: vidplace7 <[email protected]> * PIN_PWR_DELAY_MS --> PERIPHERAL_WARMUP_MS (meshtastic#8467) It turns out we had two methods for delaying startup while peripherals warmed up. They were invented within months of each other and just missed the chance to merge. Let's delete PIN_PWR_DELAY_MS and use PERIPHERAL_WARMUP_MS, since it's most common and earlier in the sequence. * Fix gps pin defs for various NRF variants. (meshtastic#9034) * fix on nrf52_promicro * try fix for GPS issue * fix GPS pin assignment in variant.h * cleared up some comments and confirmed pinouts from schematics --------- Co-authored-by: macvenez <[email protected]> * Implement HAS_PHYSICAL_KEYBOARD for devices with physical keyboards (meshtastic#9071) - Implement HAS_PHYSICAL_KEYBOARD for devices with physical keyboards - Add HAS_PHYSICAL_KEYBOARD to variant.h for: - TDeck - TLora Pager - TDeck Pro * Improve sanitizeString function for Node Names (meshtastic#9086) * Add menus for Smart Position, Broadcast Interval and Position Interval (meshtastic#9080) * Add menus for Smart Position, Broadcast Interval and Position Interval * Realigned time intervals to match Android app options * Fixed missing last option * GPS Menu Validation Fix - Missed in Reviews (meshtastic#9093) * Reviews sometimes miss things, whoops * Validation is hard - but this fixes it * Use IF_SCREEN macro to guard against null screen object * Update meshtastic/device-ui digest to caff403 (meshtastic#9104) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Upgrade trunk (meshtastic#9106) Co-authored-by: vidplace7 <[email protected]> * chore(deps): update meshtastic/device-ui digest to d234bd9 (meshtastic#9108) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update protobufs (meshtastic#9109) Co-authored-by: jp-bennett <[email protected]> * Noop "download" portion of #shame (meshtastic#9114) * Update meshtastic/device-ui digest to 7656d49 (meshtastic#9111) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Upgrade trunk (meshtastic#9121) Co-authored-by: vidplace7 <[email protected]> * Calculate hops correctly even when hop_start==0 (meshtastic#9120) * Calculate hops correctly even when hop_start==0. * Use the same type (int8_t) in the loop, avoiding signed/unsigned mismatches. * Clarify defaultIfUnknown is returned for encrypted packets. * Revert "Upgrade all esp32 targets to NimBLE 2.X (meshtastic#9003)" (meshtastic#9125) This reverts commit 40f1f91. * Calculate hops correctly even when hop_start==0 (meshtastic#9120) * Calculate hops correctly even when hop_start==0. * Use the same type (int8_t) in the loop, avoiding signed/unsigned mismatches. * Clarify defaultIfUnknown is returned for encrypted packets. * Add a welcome message for new contributors (meshtastic#9119) To assist with onboarding the denizens of the greater internet with our norms and ways of working, this action will post a message on PRs and issues from first-timers. * Add STORE_FORWARD_PLUSPLUS_APP to core portnum checks (meshtastic#9127) * Add Temporary Mute to Home frame and unbury Notification Options (meshtastic#9097) * Add Temporary Mute to Home frame and unbury Notifications * Only show Temporary Mute if it applies * Remove banner notification, we display the icon immediately * Remove extranous isMuted, there are better ways! * chore(deps): update meshtastic/device-ui digest to 940ba85 (meshtastic#9129) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Rak3112 support (meshtastic#8591) * Add rak3112 to board variants * Add rak3112 to architecture definitions * Disable SDcard support * Update comments * Remove duplicate definitions and use expected SPI naming for SDcard module * SDcard module serial interface chip set definition * Refactor modular variant into existing environment * Make requested changes * Extend 3312 variants * Remove duplicate architecture definition * Fix definition naming * Apparently I marked board level extra on the wrong tbeam target * Add null check for p_encrypted before MQTT publish (meshtastic#9136) * Add null check for p_encrypted before MQTT publish A user on BayMesh observed a strange crash in MQTT::onSend that seemed to be a null pointer dereference of this value. * Trunk * Syntax fix for first timer welcome bot. (meshtastic#9144) URL formatting was inverted. * KZ_863 is not wide lora (meshtastic#9075) KZ_863 was set to wide_lora = true. This was a mistake, induced because the regulations would allow SHORT_TURBO. However, that interpretation of the code was incorrect and wide_lora has a different meaning. Fixes meshtastic#9054 * chore(deps): update meshtastic/device-ui digest to a8e2f94 (meshtastic#9140) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dorny/test-reporter action to v2.4.0 (meshtastic#9135) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(platformio): add non-USB environment configuration for esp32c3_super_mini * Update security policy to reflect new stage * Automated version bumps (meshtastic#9030) Co-authored-by: thebentern <[email protected]> * Refactored some of the system menus to the new DRY method (Redux) (meshtastic#9152) * Refactored some of the system menus to the new DRY method * Fix menu name from Position to GPS * I think this is supposed to be extra * Add custom coding rate configuration for LoRa (meshtastic#9155) * Faster rotary encoder events (meshtastic#9146) Co-authored-by: Ben Meadors <[email protected]> * Fix link formatting in welcome message (meshtastic#9163) --------- Signed-off-by: kur1k0 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: vidplace7 <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Austin <[email protected]> Co-authored-by: thebentern <[email protected]> Co-authored-by: Ben Meadors <[email protected]> Co-authored-by: Jonathan Bennett <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Jason P <[email protected]> Co-authored-by: korbinianbauer <[email protected]> Co-authored-by: Ixitxachitl <[email protected]> Co-authored-by: jp-bennett <[email protected]> Co-authored-by: zeropt <[email protected]> Co-authored-by: scobert <[email protected]> Co-authored-by: HarukiToreda <[email protected]> Co-authored-by: Jorropo <[email protected]> Co-authored-by: WillyJL <[email protected]> Co-authored-by: Manuel <[email protected]> Co-authored-by: Tom <[email protected]> Co-authored-by: macvenez <[email protected]> Co-authored-by: Riker <[email protected]> Co-authored-by: whywilson <[email protected]> Co-authored-by: Tom Fifield <[email protected]> Co-authored-by: Eric Severance <[email protected]> Co-authored-by: Ford Jones <[email protected]> Co-authored-by: brad112358 <[email protected]>
1 parent 320b86b commit 5bfaa33

File tree

305 files changed

+7779
-2822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+7779
-2822
lines changed

.github/actions/build-variant/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ runs:
100100
id: version
101101

102102
- name: Store binaries as an artifact
103-
uses: actions/upload-artifact@v5
103+
uses: actions/upload-artifact@v6
104104
with:
105105
name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
106106
overwrite: true

.github/workflows/build_debian_src.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
PKG_VERSION: ${{ steps.version.outputs.deb }}
6565

6666
- name: Store binaries as an artifact
67-
uses: actions/upload-artifact@v5
67+
uses: actions/upload-artifact@v6
6868
with:
6969
name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
7070
overwrite: true

.github/workflows/build_firmware.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Use 'arctastic' self-hosted runner pool when building in the main repo
2222
runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
2323
outputs:
24-
artifact-id: ${{ steps.upload.outputs.artifact-id }}
24+
artifact-id: ${{ steps.upload-firmware.outputs.artifact-id }}
2525
steps:
2626
- uses: actions/checkout@v6
2727
with:
@@ -70,8 +70,8 @@ jobs:
7070
echo "</details>" >> $GITHUB_STEP_SUMMARY
7171
7272
- name: Store binaries as an artifact
73-
uses: actions/upload-artifact@v5
74-
id: upload
73+
uses: actions/upload-artifact@v6
74+
id: upload-firmware
7575
with:
7676
name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
7777
overwrite: true
@@ -84,3 +84,12 @@ jobs:
8484
release/*.zip
8585
release/device-*.sh
8686
release/device-*.bat
87+
88+
- name: Store manifests as an artifact
89+
uses: actions/upload-artifact@v6
90+
id: upload-manifest
91+
with:
92+
name: manifest-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
93+
overwrite: true
94+
path: |
95+
release/*.mt.json

.github/workflows/build_one_target.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
ref: ${{github.event.pull_request.head.ref}}
9999
repository: ${{github.event.pull_request.head.repo.full_name}}
100100

101-
- uses: actions/download-artifact@v6
101+
- uses: actions/download-artifact@v7
102102
with:
103103
path: ./
104104
pattern: firmware-*-*
@@ -111,7 +111,7 @@ jobs:
111111
run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
112112

113113
- name: Repackage in single firmware zip
114-
uses: actions/upload-artifact@v5
114+
uses: actions/upload-artifact@v6
115115
with:
116116
name: firmware-${{inputs.target}}-${{ needs.version.outputs.long }}
117117
overwrite: true
@@ -127,7 +127,7 @@ jobs:
127127
./Meshtastic_nRF52_factory_erase*.uf2
128128
retention-days: 30
129129

130-
- uses: actions/download-artifact@v6
130+
- uses: actions/download-artifact@v7
131131
with:
132132
pattern: firmware-*-${{ needs.version.outputs.long }}
133133
merge-multiple: true
@@ -146,7 +146,7 @@ jobs:
146146
run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output
147147

148148
- name: Repackage in single elfs zip
149-
uses: actions/upload-artifact@v5
149+
uses: actions/upload-artifact@v6
150150
with:
151151
name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
152152
overwrite: true
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Welcome First-Time Contributor
2+
3+
on:
4+
issues:
5+
types: opened
6+
pull_request_target:
7+
types: opened
8+
9+
permissions: {}
10+
11+
jobs:
12+
welcome:
13+
runs-on: ubuntu-latest
14+
permissions:
15+
issues: write # Required to post comments and labels on issues
16+
pull-requests: write # Required to post comments and labels on PRs
17+
steps:
18+
- uses: plbstl/first-contribution@v4
19+
with:
20+
labels: first-contribution
21+
issue-opened-msg: |
22+
### @{fc-author}, Welcome to Meshtastic! :wave:
23+
24+
Thanks for opening your first issue. If it's helpful, an easy way
25+
to get logs is the "Open Serial Monitor" button on the [Web Flasher](https://flasher.meshtastic.org).
26+
27+
If you have ideas for features, note that we often debate big ideas
28+
in the [discussions tab](https://github.com/meshtastic/firmware/discussions/categories/ideas)
29+
first. This tracker tends to be for ideas that have community
30+
consensus and a clear implementation.
31+
32+
We're very active [on discord](https://discord.com/invite/meshtastic),
33+
especially the \#firmware and \#alphanauts-testing channels. If you'll
34+
be around for a while, we'd love to see you there!
35+
36+
Welcome to the community! :heart:
37+
38+
pr-opened-msg: |
39+
### @{fc-author}, Welcome to Meshtastic!
40+
41+
Thanks for opening your first pull request. We really appreciate it.
42+
43+
We discuss work as a team in discord, please join us in the [#firmware channel](https://discord.com/invite/meshtastic).
44+
There's a big backlog of patches at the moment. If you have time,
45+
please help us with some code review and testing of [other PRs](https://github.com/meshtastic/firmware/pulls)!
46+
47+
Welcome to the team :smile:

.github/workflows/main_matrix.yml

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
ref: ${{github.event.pull_request.head.ref}}
174174
repository: ${{github.event.pull_request.head.repo.full_name}}
175175

176-
- uses: actions/download-artifact@v6
176+
- uses: actions/download-artifact@v7
177177
with:
178178
path: ./
179179
pattern: firmware-${{matrix.arch}}-*
@@ -183,7 +183,7 @@ jobs:
183183
run: ls -R
184184

185185
- name: Repackage in single firmware zip
186-
uses: actions/upload-artifact@v5
186+
uses: actions/upload-artifact@v6
187187
with:
188188
name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
189189
overwrite: true
@@ -200,7 +200,7 @@ jobs:
200200
./Meshtastic_nRF52_factory_erase*.uf2
201201
retention-days: 30
202202

203-
- uses: actions/download-artifact@v6
203+
- uses: actions/download-artifact@v7
204204
with:
205205
name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
206206
merge-multiple: true
@@ -219,7 +219,7 @@ jobs:
219219
run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
220220

221221
- name: Repackage in single elfs zip
222-
uses: actions/upload-artifact@v5
222+
uses: actions/upload-artifact@v6
223223
with:
224224
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
225225
overwrite: true
@@ -233,6 +233,48 @@ jobs:
233233
description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
234234
github-token: ${{ secrets.GITHUB_TOKEN }}
235235

236+
shame:
237+
if: github.repository == 'meshtastic/firmware'
238+
continue-on-error: true
239+
runs-on: ubuntu-latest
240+
needs: [build]
241+
steps:
242+
- uses: actions/checkout@v6
243+
if: github.event_name == 'pull_request_target'
244+
with:
245+
filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
246+
fetch-depth: 0
247+
- name: Download the current manifests
248+
uses: actions/download-artifact@v7
249+
with:
250+
path: ./manifests-new/
251+
pattern: manifest-*
252+
merge-multiple: true
253+
- name: Upload combined manifests for later commit and global stats crunching.
254+
uses: actions/upload-artifact@v6
255+
id: upload-manifest
256+
with:
257+
name: manifests-${{ github.sha }}
258+
overwrite: true
259+
path: manifests-new/*.mt.json
260+
- name: Find the merge base
261+
if: github.event_name == 'pull_request_target'
262+
run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
263+
env:
264+
base: ${{ github.base_ref }}
265+
head: ${{ github.sha }}
266+
# Currently broken (for-loop through EVERY artifact -- rate limiting)
267+
# - name: Download the old manifests
268+
# if: github.event_name == 'pull_request_target'
269+
# run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
270+
# env:
271+
# GH_TOKEN: ${{ github.token }}
272+
# merge_base: ${{ env.MERGE_BASE }}
273+
# repo: ${{ github.repository }}
274+
# - name: Do scan and post comment
275+
# if: github.event_name == 'pull_request_target'
276+
# run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/
277+
236278
release-artifacts:
237279
runs-on: ubuntu-latest
238280
if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
@@ -260,14 +302,14 @@ jobs:
260302
Autogenerated by github action, developer should edit as required before publishing...
261303
262304
- name: Download source deb
263-
uses: actions/download-artifact@v6
305+
uses: actions/download-artifact@v7
264306
with:
265307
pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
266308
merge-multiple: true
267309
path: ./output/debian-src
268310

269311
- name: Download `native-tft` pio deps
270-
uses: actions/download-artifact@v6
312+
uses: actions/download-artifact@v7
271313
with:
272314
pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
273315
merge-multiple: true
@@ -291,7 +333,7 @@ jobs:
291333
}' > firmware-${{ needs.version.outputs.long }}.json
292334
293335
- name: Save Release manifest artifact
294-
uses: actions/upload-artifact@v5
336+
uses: actions/upload-artifact@v6
295337
with:
296338
name: manifest-${{ needs.version.outputs.long }}
297339
overwrite: true
@@ -332,7 +374,7 @@ jobs:
332374
with:
333375
python-version: 3.x
334376

335-
- uses: actions/download-artifact@v6
377+
- uses: actions/download-artifact@v7
336378
with:
337379
pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
338380
merge-multiple: true
@@ -349,7 +391,7 @@ jobs:
349391
- name: Zip firmware
350392
run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
351393

352-
- uses: actions/download-artifact@v6
394+
- uses: actions/download-artifact@v7
353395
with:
354396
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
355397
merge-multiple: true
@@ -388,14 +430,14 @@ jobs:
388430
python-version: 3.x
389431

390432
- name: Get firmware artifacts
391-
uses: actions/download-artifact@v6
433+
uses: actions/download-artifact@v7
392434
with:
393435
pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
394436
merge-multiple: true
395437
path: ./publish
396438

397439
- name: Get manifest artifact
398-
uses: actions/download-artifact@v6
440+
uses: actions/download-artifact@v7
399441
with:
400442
pattern: manifest-${{ needs.version.outputs.long }}
401443
path: ./publish

.github/workflows/merge_queue.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
ref: ${{github.event.pull_request.head.ref}}
148148
repository: ${{github.event.pull_request.head.repo.full_name}}
149149

150-
- uses: actions/download-artifact@v6
150+
- uses: actions/download-artifact@v7
151151
with:
152152
path: ./
153153
pattern: firmware-${{matrix.arch}}-*
@@ -160,7 +160,7 @@ jobs:
160160
run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
161161

162162
- name: Repackage in single firmware zip
163-
uses: actions/upload-artifact@v5
163+
uses: actions/upload-artifact@v6
164164
with:
165165
name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
166166
overwrite: true
@@ -176,7 +176,7 @@ jobs:
176176
./Meshtastic_nRF52_factory_erase*.uf2
177177
retention-days: 30
178178

179-
- uses: actions/download-artifact@v6
179+
- uses: actions/download-artifact@v7
180180
with:
181181
name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
182182
merge-multiple: true
@@ -195,7 +195,7 @@ jobs:
195195
run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
196196

197197
- name: Repackage in single elfs zip
198-
uses: actions/upload-artifact@v5
198+
uses: actions/upload-artifact@v6
199199
with:
200200
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
201201
overwrite: true
@@ -235,14 +235,14 @@ jobs:
235235
Autogenerated by github action, developer should edit as required before publishing...
236236
237237
- name: Download source deb
238-
uses: actions/download-artifact@v6
238+
uses: actions/download-artifact@v7
239239
with:
240240
pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
241241
merge-multiple: true
242242
path: ./output/debian-src
243243

244244
- name: Download `native-tft` pio deps
245-
uses: actions/download-artifact@v6
245+
uses: actions/download-artifact@v7
246246
with:
247247
pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
248248
merge-multiple: true
@@ -292,7 +292,7 @@ jobs:
292292
with:
293293
python-version: 3.x
294294

295-
- uses: actions/download-artifact@v6
295+
- uses: actions/download-artifact@v7
296296
with:
297297
pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
298298
merge-multiple: true
@@ -309,7 +309,7 @@ jobs:
309309
- name: Zip firmware
310310
run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
311311

312-
- uses: actions/download-artifact@v6
312+
- uses: actions/download-artifact@v7
313313
with:
314314
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
315315
merge-multiple: true
@@ -347,7 +347,7 @@ jobs:
347347
with:
348348
python-version: 3.x
349349

350-
- uses: actions/download-artifact@v6
350+
- uses: actions/download-artifact@v7
351351
with:
352352
pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
353353
merge-multiple: true

.github/workflows/package_obs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
id: version
5959

6060
- name: Download artifacts
61-
uses: actions/download-artifact@v6
61+
uses: actions/download-artifact@v7
6262
with:
6363
name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
6464
merge-multiple: true

.github/workflows/package_pio_deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
PLATFORMIO_CORE_DIR: pio/core
5757

5858
- name: Store binaries as an artifact
59-
uses: actions/upload-artifact@v5
59+
uses: actions/upload-artifact@v6
6060
with:
6161
name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
6262
overwrite: true

.github/workflows/package_ppa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
id: version
6161

6262
- name: Download artifacts
63-
uses: actions/download-artifact@v6
63+
uses: actions/download-artifact@v7
6464
with:
6565
name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
6666
merge-multiple: true

0 commit comments

Comments
 (0)