Skip to content

Commit c926cae

Browse files
CopilotCopilot
authored
Merge remote-tracking branch 'origin/master' into admin-response-pairing
# Conflicts: # .github/workflows/flasher-link-comment.yml # .github/workflows/flasher-link-placeholder.yml # .github/workflows/main_matrix.yml # .github/workflows/stale_bot.yml # .github/workflows/update_protobufs.yml # .trunk/trunk.yaml # platformio.ini # protobufs # src/FSCommon.cpp # src/FSCommon.h # src/Power.cpp # src/detect/LoRaRadioType.h # src/detect/ScanI2C.cpp # src/detect/ScanI2C.h # src/detect/ScanI2CTwoWire.cpp # src/graphics/Screen.cpp # src/graphics/draw/CompassRenderer.cpp # src/graphics/draw/NodeListRenderer.cpp # src/graphics/draw/UIRenderer.cpp # src/mesh/LR11x0Interface.cpp # src/mesh/NodeDB.cpp # src/mesh/PhoneAPI.cpp # src/mesh/PositionPrecision.cpp # src/mesh/PositionPrecision.h # src/mesh/RadioInterface.cpp # src/mesh/RadioInterface.h # src/mesh/RadioLibInterface.cpp # src/mesh/RadioLibInterface.h # src/mesh/generated/meshtastic/atak.pb.h # src/mesh/generated/meshtastic/config.pb.h # src/mesh/generated/meshtastic/mesh.pb.h # src/mesh/generated/meshtastic/telemetry.pb.h # src/modules/StatusLEDModule.cpp # src/modules/WaypointModule.cpp # src/motion/AccelerometerThread.h # src/motion/ICM42607PSensor.cpp # src/motion/ICM42607PSensor.h # src/motion/MMC5983MASensor.cpp # src/motion/MagnetometerThread.h # src/motion/MotionSensor.cpp # src/motion/MotionSensor.h # src/platform/esp32/architecture.h # src/platform/esp32/main-esp32.cpp # src/platform/portduino/SimRadio.cpp # src/power/SGM41562.h # test/test_position_precision/test_main.cpp # test/test_radio/test_main.cpp # variants/esp32/chatter2/platformio.ini # variants/esp32/esp32-common.ini # variants/esp32/m5stack_core/platformio.ini # variants/esp32/wiphone/platformio.ini # variants/esp32s3/ELECROW-ThinkNode-G3/platformio.ini # variants/esp32s3/ELECROW-ThinkNode-M7/platformio.ini # variants/esp32s3/heltec_v4/platformio.ini # variants/esp32s3/heltec_v4_r8/platformio.ini # variants/esp32s3/heltec_wireless_tracker/platformio.ini # variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini # variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini # variants/esp32s3/mesh-tab/platformio.ini # variants/esp32s3/picomputer-s3/platformio.ini # variants/esp32s3/rak_wismesh_tap_v2/platformio.ini # variants/esp32s3/t-deck/platformio.ini # variants/esp32s3/t-watch-s3/platformio.ini # variants/esp32s3/tlora-pager/platformio.ini # variants/esp32s3/tracksenger/platformio.ini # variants/esp32s3/unphone/platformio.ini # variants/native/portduino.ini # variants/nrf52840/heltec_mesh_node_t1/platformio.ini # variants/nrf52840/heltec_mesh_node_t1/variant.h # variants/nrf52840/t-impulse-plus/variant.h # version.properties
2 parents 21a8f96 + 62df860 commit c926cae

14 files changed

Lines changed: 157 additions & 30 deletions

File tree

‎.github/workflows/nightly.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
uses: actions/checkout@v7
1818

1919
- name: Trunk Check
20-
uses: trunk-io/trunk-action@v1
20+
uses: trunk-io/trunk-action@v1.3.1
2121
with:
2222
trunk-token: ${{ secrets.TRUNK_TOKEN }}
2323

2424
trunk_upgrade:
2525
if: github.repository == 'meshtastic/firmware'
26-
# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
26+
# See: https://github.com/trunk-io/trunk-action/blob/main/readme.md#automatic-upgrades
2727
name: Trunk Upgrade (PR)
2828
runs-on: ubuntu-24.04
2929
permissions:
@@ -34,6 +34,6 @@ jobs:
3434
uses: actions/checkout@v7
3535

3636
- name: Trunk Upgrade
37-
uses: trunk-io/trunk-action/upgrade@v1
37+
uses: trunk-io/trunk-action/upgrade@v1.3.1
3838
with:
3939
base: master

‎.github/workflows/trunk_annotate_pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Annotate PR with trunk issues
2-
# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#getting-inline-annotations-for-fork-prs
2+
# See: https://github.com/trunk-io/trunk-action/blob/main/readme.md#getting-inline-annotations-for-fork-prs
33

44
on:
55
workflow_run:
@@ -21,6 +21,6 @@ jobs:
2121
uses: actions/checkout@v7
2222

2323
- name: Trunk Check
24-
uses: trunk-io/trunk-action@v1
24+
uses: trunk-io/trunk-action@v1.3.1
2525
with:
2626
post-annotations: true

‎.github/workflows/trunk_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
uses: actions/checkout@v7
2020

2121
- name: Trunk Check
22-
uses: trunk-io/trunk-action@v1
22+
uses: trunk-io/trunk-action@v1.3.1
2323
with:
2424
save-annotations: true

‎bin/config.d/lora-ZebraHatDuo_R0_1W.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/NebraHat/Duo
2+
# Use for E22P on Duo Hat
3+
# Use for 1 watt hat - Radio 0
4+
Meta:
5+
name: ZebraHatDuo Radio 0 1W
6+
support: community
7+
compatible:
8+
- raspberry-pi
9+
10+
Lora:
11+
Module: sx1262 #
12+
DIO2_AS_RF_SWITCH: true
13+
DIO3_TCXO_VOLTAGE: true
14+
SX126X_MAX_POWER: 18
15+
spidev: spidev0.0
16+
# CS: 8 # Depending on how overlay is setup
17+
IRQ: 18
18+
Busy: 23
19+
Reset: 24
20+
21+
# Uncomment below to enable temp/humid sensors
22+
#I2C:
23+
# I2CDevice: /dev/i2c-1

‎bin/config.d/lora-ZebraHatDuo_R1_1W.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/NebraHat/Duo
2+
# Use for E22P on Duo Hat
3+
# Use for 1 watt hat - Radio 1
4+
Meta:
5+
name: ZebraHatDuo Radio 0 1W
6+
support: community
7+
compatible:
8+
- raspberry-pi
9+
10+
Lora:
11+
Module: sx1262 #
12+
DIO2_AS_RF_SWITCH: true
13+
DIO3_TCXO_VOLTAGE: true
14+
SX126X_MAX_POWER: 18
15+
spidev: spidev0.1
16+
# CS: 8 # Depending on how overlay is setup
17+
IRQ: 22
18+
Busy: 27
19+
Reset: 17
20+
21+
# Uncomment below to enable temp/humid sensors
22+
#I2C:
23+
# I2CDevice: /dev/i2c-1

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

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

8989
<releases>
90+
<release version="2.7.27" date="2026-06-24">
91+
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.27</url>
92+
</release>
93+
<release version="2.7.26" date="2026-06-10">
94+
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.26</url>
95+
</release>
96+
<release version="2.7.25" date="2026-05-23">
97+
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.25</url>
98+
</release>
9099
<release version="2.7.24" date="2026-05-08">
91100
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.24</url>
92101
</release>

‎debian/changelog‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
meshtasticd (2.7.27.0) unstable; urgency=medium
2+
3+
* Version 2.7.27
4+
5+
-- GitHub Actions <github-actions[bot]@users.noreply.github.com> Wed, 24 Jun 2026 11:20:05 +0000
6+
7+
meshtasticd (2.7.26.0) unstable; urgency=medium
8+
9+
* Version 2.7.26
10+
11+
-- GitHub Actions <github-actions[bot]@users.noreply.github.com> Wed, 10 Jun 2026 00:19:23 +0000
12+
13+
meshtasticd (2.7.25.0) unstable; urgency=medium
14+
15+
* Version 2.7.25
16+
17+
-- GitHub Actions <github-actions[bot]@users.noreply.github.com> Sat, 23 May 2026 01:16:20 +0000
18+
119
meshtasticd (2.7.24.0) unstable; urgency=medium
220

321
* Version 2.7.24

‎src/detect/ScanI2CTwoWire.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ScanI2CTwoWire : public ScanI2C
5353

5454
concurrency::Lock lock;
5555

56-
uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth, bool) const;
56+
uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth, bool = false) const;
5757

5858
bool i2cCommandResponseLength(DeviceAddress addr, uint16_t command, uint8_t expectedLength) const;
5959

‎src/graphics/draw/CompassRenderer.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "graphics/Screen.h"
4-
#include "mesh/generated/meshtastic/mesh.pb.h"
54
#include <OLEDDisplay.h>
65
#include <OLEDDisplayUi.h>
76

‎src/mesh/SX126xInterface.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,23 @@ template <typename T> void SX126xInterface<T>::enableInterrupt(void (*callback)(
285285
#endif
286286
}
287287

288+
template <typename T> int16_t SX126xInterface<T>::getCurrentRSSI()
289+
{
290+
float rssi = lora.getRSSI(false);
291+
return (int16_t)round(rssi);
292+
}
293+
294+
template <typename T> void SX126xInterface<T>::enableInterrupt(void (*callback)())
295+
{
296+
#ifdef LORA_DIO1_SOFTWARE_POLL
297+
irqPollingActive = true;
298+
pollTxMode = isIsrTxCallback(callback);
299+
scheduleIrqPollTick();
300+
#else
301+
lora.setDio1Action(callback);
302+
#endif
303+
}
304+
288305
template <typename T> void SX126xInterface<T>::disableInterrupt()
289306
{
290307
#ifdef LORA_DIO1_SOFTWARE_POLL

0 commit comments

Comments
 (0)