Merge branch 'meshtastic:master' into T-beam-display-no-touch

This commit is contained in:
Nasimovy 2025-04-27 13:04:18 +02:00 committed by GitHub
commit 680ea1c340
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View File

@ -1 +1 @@
2.6.0 2.5.3

View File

@ -108,7 +108,7 @@ lib_deps =
[device-ui_base] [device-ui_base]
lib_deps = lib_deps =
# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master # renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
https://github.com/meshtastic/device-ui/archive/65eb74fadf373e3ceec0bddb95a7cb978e2acd81.zip https://github.com/meshtastic/device-ui/archive/189ed6cba42c218e79142a876987f4516d0c87fd.zip
; Common libs for environmental measurements in telemetry module ; Common libs for environmental measurements in telemetry module
; (not included in native / portduino) ; (not included in native / portduino)

View File

@ -24,7 +24,7 @@
// This board has no GPS or Screen for now // This board has no GPS or Screen for now
#undef GPS_RX_PIN #undef GPS_RX_PIN
#undef GPS_TX_PIN #undef GPS_TX_PIN
#define NO_GPS #define NO_GPS 1
#define HAS_GPS 0 #define HAS_GPS 0
#define NO_SCREEN #define NO_SCREEN
#define HAS_SCREEN 0 #define HAS_SCREEN 0