From 8d810ec22dd200ee763555b33998e267d563328d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 2 Dec 2024 18:09:49 -0800 Subject: [PATCH] update hardware list --- Meshtastic/Helpers/BLEManager.swift | 2 +- Meshtastic/Resources/DeviceHardware.json | 34 +++++++++---------- .../Views/Bluetooth/InvalidVersion.swift | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index bb707885..db1f1e09 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -27,7 +27,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate @Published var automaticallyReconnect: Bool = true @Published var mqttProxyConnected: Bool = false @Published var mqttError: String = "" - public var minimumVersion = "2.0.0" + public var minimumVersion = "2.5.0" public var connectedVersion: String public var isConnecting: Bool = false public var isConnected: Bool = false diff --git a/Meshtastic/Resources/DeviceHardware.json b/Meshtastic/Resources/DeviceHardware.json index 21784122..94c74660 100644 --- a/Meshtastic/Resources/DeviceHardware.json +++ b/Meshtastic/Resources/DeviceHardware.json @@ -26,7 +26,7 @@ "hwModelSlug": "TLORA_V2_1_1P6", "platformioTarget": "tlora-v2-1-1_6", "architecture": "esp32", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "LILYGO T-LoRa V2.1-1.6", "tags": [ @@ -41,7 +41,7 @@ "hwModelSlug": "TBEAM", "platformioTarget": "tbeam", "architecture": "esp32", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "LILYGO T-Beam", "tags": [ @@ -79,7 +79,7 @@ "platformioTarget": "t-echo", "architecture": "nrf52840", "supportLevel": 1, - "activelySupported": false, + "activelySupported": true, "displayName": "LILYGO T-Echo", "tags": [ "LilyGo" @@ -392,7 +392,7 @@ "hwModelSlug": "HELTEC_V3", "platformioTarget": "heltec-v3", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec V3", "tags": [ @@ -408,7 +408,7 @@ "hwModelSlug": "HELTEC_WSL_V3", "platformioTarget": "heltec-wsl-v3", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Wireless Stick Lite V3", "tags": [ @@ -451,7 +451,7 @@ "hwModelSlug": "HELTEC_WIRELESS_TRACKER", "platformioTarget": "heltec-wireless-tracker", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Wireless Tracker V1.1", "tags": [ @@ -480,7 +480,7 @@ "hwModelSlug": "HELTEC_WIRELESS_PAPER", "platformioTarget": "heltec-wireless-paper", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Wireless Paper", "tags": [ @@ -495,7 +495,7 @@ "hwModelSlug": "T_DECK", "platformioTarget": "t-deck", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "LILYGO T-Deck", "tags": [ @@ -511,7 +511,7 @@ "hwModelSlug": "T_WATCH_S3", "platformioTarget": "t-watch-s3", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "LILYGO T-Watch S3", "tags": [ @@ -536,7 +536,7 @@ "platformioTarget": "heltec-ht62-esp32c3-sx1262", "architecture": "esp32-c3", "supportLevel": 1, - "activelySupported": false, + "activelySupported": true, "displayName": "Heltec HT62", "tags": [ "Heltec" @@ -575,7 +575,7 @@ "hwModelSlug": "HELTEC_WIRELESS_TRACKER", "platformioTarget": "tracksenger", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 3, "displayName": "TrackSenger (small TFT)", "requiresDfu": true @@ -585,7 +585,7 @@ "hwModelSlug": "HELTEC_WIRELESS_TRACKER", "platformioTarget": "tracksenger-lcd", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 3, "displayName": "TrackSenger (big TFT)", "requiresDfu": true @@ -595,7 +595,7 @@ "hwModelSlug": "HELTEC_WIRELESS_TRACKER", "platformioTarget": "tracksenger-oled", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 3, "displayName": "TrackSenger (big OLED)" }, @@ -629,7 +629,7 @@ "hwModelSlug": "HELTEC_VISION_MASTER_T190", "platformioTarget": "heltec-vision-master-t190", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Vision Master T190", "tags": [ @@ -645,7 +645,7 @@ "hwModelSlug": "HELTEC_VISION_MASTER_E213", "platformioTarget": "heltec-vision-master-e213", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Vision Master E213", "tags": [ @@ -661,7 +661,7 @@ "hwModelSlug": "HELTEC_VISION_MASTER_E290", "platformioTarget": "heltec-vision-master-e290", "architecture": "esp32-s3", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Vision Master E290", "tags": [ @@ -677,7 +677,7 @@ "hwModelSlug": "HELTEC_MESH_NODE_T114", "platformioTarget": "heltec-mesh-node-t114", "architecture": "nrf52840", - "activelySupported": false, + "activelySupported": true, "supportLevel": 1, "displayName": "Heltec Mesh Node T114", "tags": [ diff --git a/Meshtastic/Views/Bluetooth/InvalidVersion.swift b/Meshtastic/Views/Bluetooth/InvalidVersion.swift index 9c0cca78..24b5429c 100644 --- a/Meshtastic/Views/Bluetooth/InvalidVersion.swift +++ b/Meshtastic/Views/Bluetooth/InvalidVersion.swift @@ -37,11 +37,11 @@ struct InvalidVersion: View { Divider() .padding(.top) VStack { - Text("🦕 End of life Version 🦖 ☄️") + Text("Insecure legacy firmware version") .font(.title3) .foregroundColor(.orange) .padding(.bottom) - Text("Version \(minimumVersion) includes breaking changes to devices and the client apps. Only nodes version \(minimumVersion) and above are supported.") + Text("Version \(minimumVersion) contains substantial security vulnerabilities, you should upgrade to a newer version immediatly. Only nodes version \(minimumVersion) and above are supported.") .font(.callout) .padding([.leading, .trailing, .bottom]) Link("Version 1.2 End of life (EOL) Info", destination: URL(string: "https://meshtastic.org/docs/1.2-End-of-life/")!)