Merge branch 'master' into 2.7-fixes-w2

This commit is contained in:
Jason P 2025-06-30 09:34:02 -05:00 committed by GitHub
commit 742101f900
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 4 deletions

View File

@ -87,6 +87,9 @@
</screenshots>
<releases>
<release version="2.7.1" date="2025-06-27">
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.1</url>
</release>
<release version="2.7.0" date="2025-06-20">
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.0</url>
</release>

7
debian/changelog vendored
View File

@ -1,4 +1,4 @@
meshtasticd (2.7.0.0) UNRELEASED; urgency=medium
meshtasticd (2.7.1.0) UNRELEASED; urgency=medium
[ Austin Lane ]
* Initial packaging
@ -22,4 +22,7 @@ meshtasticd (2.7.0.0) UNRELEASED; urgency=medium
[ ]
* GitHub Actions Automatic version bump
-- <github-actions[bot]@users.noreply.github.com> Mon, 16 Jun 2025 02:10:49 +0000
[ ]
* GitHub Actions Automatic version bump
-- <github-actions[bot]@users.noreply.github.com> Fri, 27 Jun 2025 20:12:21 +0000

View File

@ -179,7 +179,11 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define I2C_NO_RESCAN // I2C is a bit finicky, don't scan too much
#define WIRE_INTERFACES_COUNT 1
#if !defined(XIAO_BLE_LEGACY_PINOUT) && !defined(GPS_L76K)
#if defined(XIAO_BLE_LEGACY_PINOUT)
// Used for I2C by DIY xiao_ble variant
#define PIN_WIRE_SDA D4
#define PIN_WIRE_SCL D5
#elif !defined(GPS_L76K)
// If D6 and D7 are free, I2C is probably the most versatile assignment
#define PIN_WIRE_SDA D6
#define PIN_WIRE_SCL D7

View File

@ -1,4 +1,4 @@
[VERSION]
major = 2
minor = 7
build = 0
build = 1