[create-pull-request] automated change (#5989 )

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Fix T-Deck/T-Watch no BT (#5998 )
2025-09-06 11:39:32 +00:00 · 2025-02-06 14:11:32 -06:00 · 2025-02-06 14:11:17 -06:00
3 changed files with 6 additions and 5 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,8 +1,9 @@
-meshtasticd (2.5.21.0) UNRELEASED; urgency=medium
+meshtasticd (2.5.22.0) UNRELEASED; urgency=medium

  * Initial packaging
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump
+  * GitHub Actions Automatic version bump

- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Sat, 25 Jan 2025 01:39:16 +0000
+ -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@ -407,7 +407,7 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
        rebootAtMsec = millis() + (5 * 1000);
    }

-#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3)) && defined(HAS_TFT)
+#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3)) && HAS_TFT
    // as long as PhoneAPI shares BT and TFT app switch BT off
    config.bluetooth.enabled = false;
    if (moduleConfig.external_notification.nag_timeout == 60)
@ -1528,4 +1528,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
    LOG_ERROR("A critical failure occurred, portduino is exiting");
    exit(2);
 #endif
-}
+}
--- a/version.properties
+++ b/version.properties
@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 21
+build = 22
Author	SHA1	Message	Date
github-actions[bot]	cb0519dd9c	[create-pull-request] automated change (#5989 ) Some checks failed CI / build-debian-src (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-debian-amd64 (push) Waiting to run Details CI / docker-alpine-amd64 (push) Waiting to run Details CI / docker-debian-arm64 (push) Waiting to run Details CI / docker-debian-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Flawfinder Scan / Flawfinder (push) Waiting to run Details Daily Packaging / docker-multiarch (push) Has been cancelled Details Daily Packaging / package-ppa (jammy) (push) Has been cancelled Details Daily Packaging / package-ppa (noble) (push) Has been cancelled Details Daily Packaging / package-ppa (oracular) (push) Has been cancelled Details Daily Packaging / package-ppa (plucky) (push) Has been cancelled Details Daily Packaging / package-obs (push) Has been cancelled Details Daily Packaging / hook-copr (push) Has been cancelled Details Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-02-06 14:11:32 -06:00
Manuel	9db51a72a4	Fix T-Deck/T-Watch no BT (#5998 ) fixes #5997	2025-02-06 14:11:17 -06:00