Skip to content

Commit 7aa0af3

Browse files
thebenternthebentern
authored
Merge branch 'develop' into thinknode-g3
2 parents 1bfeefb + 7c4367c commit 7aa0af3

File tree

125 files changed

+2951
-681
lines changed

Some content is hidden

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

125 files changed

+2951
-681
lines changed

‎.github/workflows/stale_bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Stale PR+Issues
20-
uses: actions/stale@v10.0.0
20+
uses: actions/stale@v10.1.0
2121
with:
2222
days-before-stale: 45
2323
exempt-issue-labels: pinned,3.0

‎.trunk/trunk.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ plugins:
88
uri: https://github.com/trunk-io/plugins
99
lint:
1010
enabled:
11-
- [email protected].471
12-
- renovate@41.115.6
11+
- [email protected].473
12+
- renovate@41.132.5
1313
- [email protected]
14-
- [email protected].6
14+
- [email protected].8
1515
- [email protected]
1616
- [email protected]
17-
- trivy@0.66.0
17+
- trivy@0.67.0
1818
- [email protected]
19-
- [email protected].0
20-
- isort@6.0.1
19+
- [email protected].2
20+
- isort@6.1.0
2121
- [email protected]
2222
- [email protected]
2323
- [email protected]
2424
- [email protected]
2525
- [email protected]
26-
- hadolint@2.13.1
26+
- hadolint@2.14.0
2727
- [email protected]
2828
- [email protected]
29-
- black@25.1.0
29+
- black@25.9.0
3030
- git-diff-check
3131
- [email protected]
3232
- [email protected]

‎arch/esp32/esp32.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ build_flags =
3636
-DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
3737
-DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
3838
-DSERIAL_BUFFER_SIZE=4096
39+
-DSERIAL_HAS_ON_RECEIVE
3940
-DLIBPAX_ARDUINO
4041
-DLIBPAX_WIFI
4142
-DLIBPAX_BLE

‎arch/portduino/portduino.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[portduino_base]
33
platform =
44
# renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
5-
https://github.com/meshtastic/platform-native/archive/c490bcd019e0658404088a61b96e653c9da22c45.zip
5+
https://github.com/meshtastic/platform-native/archive/d3f6e339534233c7217818867368767590ce549e.zip
66
framework = arduino
77

88
build_src_filter =

‎bin/org.meshtastic.meshtasticd.metainfo.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@
8787
</screenshots>
8888

8989
<releases>
90+
<release version="2.7.12" date="2025-10-01">
91+
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.12</url>
92+
</release>
93+
<release version="2.7.11" date="2025-09-24">
94+
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.11</url>
95+
</release>
9096
<release version="2.7.10" date="2025-09-18">
9197
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.10</url>
9298
</release>

‎bin/platformio-custom.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def esp32_create_combined_bin(source, target, env):
8686

8787
if platform.name == "nordicnrf52":
8888
env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
89-
env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
89+
env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py \"$BUILD_DIR/firmware.hex\" -c -f 0xADA52840 -o \"$BUILD_DIR/firmware.uf2\"",
9090
"Generating UF2 file"))
9191

9292
Import("projenv")

‎boards/heltec_wireless_tracker_v2.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_8MB.csv"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_USB_CDC_ON_BOOT=1",
10+
"-DARDUINO_USB_MODE=0",
11+
"-DARDUINO_RUNNING_CORE=1",
12+
"-DARDUINO_EVENT_RUNNING_CORE=1"
13+
],
14+
"f_cpu": "240000000L",
15+
"f_flash": "80000000L",
16+
"flash_mode": "qio",
17+
"hwids": [["0x303A", "0x1001"]],
18+
"mcu": "esp32s3",
19+
"variant": "heltec_wireless_tracker_v2"
20+
},
21+
"connectivity": ["wifi", "bluetooth", "lora"],
22+
"debug": {
23+
"openocd_target": "esp32s3.cfg"
24+
},
25+
"frameworks": ["arduino", "espidf"],
26+
"name": "Heltec Wireless Tracker V2",
27+
"upload": {
28+
"flash_size": "8MB",
29+
"maximum_ram_size": 327680,
30+
"maximum_size": 8388608,
31+
"wait_for_upload_port": true,
32+
"require_upload_port": true,
33+
"speed": 921600
34+
},
35+
"url": "https://heltec.org",
36+
"vendor": "Heltec"
37+
}

‎boards/r1-neo.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
9+
"f_cpu": "64000000L",
10+
"hwids": [
11+
["0x239A", "0x8029"],
12+
["0x239A", "0x0029"],
13+
["0x239A", "0x002A"],
14+
["0x239A", "0x802A"]
15+
],
16+
"usb_product": "Muzi R1 Neo",
17+
"mcu": "nrf52840",
18+
"variant": "r1-neo",
19+
"bsp": {
20+
"name": "adafruit"
21+
},
22+
"softdevice": {
23+
"sd_flags": "-DS140",
24+
"sd_name": "s140",
25+
"sd_version": "6.1.1",
26+
"sd_fwid": "0x00B6"
27+
},
28+
"bootloader": {
29+
"settings_addr": "0xFF000"
30+
}
31+
},
32+
"connectivity": ["bluetooth"],
33+
"debug": {
34+
"jlink_device": "nRF52840_xxAA",
35+
"svd_path": "nrf52840.svd",
36+
"openocd_target": "nrf52840-mdk-rs"
37+
},
38+
"frameworks": ["arduino", "freertos"],
39+
"name": "WisCore RAK4631 Board",
40+
"upload": {
41+
"maximum_ram_size": 248832,
42+
"maximum_size": 815104,
43+
"speed": 115200,
44+
"protocol": "nrfutil",
45+
"protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
46+
"use_1200bps_touch": true,
47+
"require_upload_port": true,
48+
"wait_for_upload_port": true
49+
},
50+
"url": "https://muzi.works/",
51+
"vendor": "Muzi Works"
52+
}

‎debian/changelog‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,13 @@
1-
meshtasticd (2.7.10.0) UNRELEASED; urgency=medium
1+
meshtasticd (2.7.12.0) unstable; urgency=medium
22

3+
[ Austin Lane ]
34
* Initial packaging
45
* Version 2.5.19
56

67
[ ]
78
* GitHub Actions Automatic version bump
89

9-
[ ]
10-
* GitHub Actions Automatic version bump
11-
12-
[ ]
13-
* GitHub Actions Automatic version bump
14-
15-
[ ]
16-
* GitHub Actions Automatic version bump
17-
18-
[ ]
19-
* GitHub Actions Automatic version bump
20-
21-
[ ]
22-
* GitHub Actions Automatic version bump
23-
24-
[ ]
25-
* GitHub Actions Automatic version bump
26-
27-
[ Ubuntu ]
28-
* GitHub Actions Automatic version bump
29-
30-
[ ]
31-
* GitHub Actions Automatic version bump
32-
33-
[ ]
34-
* GitHub Actions Automatic version bump
35-
36-
[ ]
37-
* GitHub Actions Automatic version bump
38-
* GitHub Actions Automatic version bump
39-
40-
[ ]
41-
* GitHub Actions Automatic version bump
42-
43-
[ ]
44-
* GitHub Actions Automatic version bump
45-
46-
[ ]
47-
* GitHub Actions Automatic version bump
10+
[ GitHub Actions ]
11+
* Version 2.7.12
4812

49-
-- <github-actions[bot]@users.noreply.github.com> Thu, 18 Sep 2025 22:11:37 +0000
13+
-- GitHub Actions <github-actions[bot]@users.noreply.github.com> Wed, 01 Oct 2025 19:51:41 +0000

‎platformio.ini‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ build_flags = -Wno-missing-field-initializers
5656
#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
5757
#-D OLED_PL=1
5858
#-D DEBUG_HEAP=1 ; uncomment to add free heap space / memory leak debugging logs
59+
#-D DEBUG_LOOP_TIMING=1 ; uncomment to add main loop timing logs
5960

6061
monitor_speed = 115200
6162
monitor_filters = direct
@@ -119,13 +120,13 @@ lib_deps =
119120
[device-ui_base]
120121
lib_deps =
121122
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
122-
https://github.com/meshtastic/device-ui/archive/9ed5355a24059750e9b2eb5d669574d9ea42a37b.zip
123+
https://github.com/meshtastic/device-ui/archive/505ffadaa7a931df5dc8153229b719a07bbb028c.zip
123124

124125
; Common libs for environmental measurements in telemetry module
125126
[environmental_base]
126127
lib_deps =
127128
# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
128-
adafruit/Adafruit [email protected].3
129+
adafruit/Adafruit [email protected].4
129130
# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
130131
adafruit/Adafruit Unified [email protected]
131132
# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library

0 commit comments

Comments
 (0)