diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json new file mode 100644 index 00000000..a02a95fb --- /dev/null +++ b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Heltec_turq 1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Heltec_turq 2.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Heltec_turq.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png new file mode 100644 index 00000000..c4454bcc Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png new file mode 100644 index 00000000..c4454bcc Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq.png b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq.png new file mode 100644 index 00000000..c4454bcc Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "play_store_icon_114px-2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "play_store_icon_114px-3.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "play_store_icon_114px-4.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Protobufs/mesh.pb.swift b/Meshtastic/Protobufs/mesh.pb.swift index 6d64e08e..860dcc91 100644 --- a/Meshtastic/Protobufs/mesh.pb.swift +++ b/Meshtastic/Protobufs/mesh.pb.swift @@ -142,6 +142,14 @@ enum HardwareModel: SwiftProtobuf.Enum { /// M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ case m5Stack // = 42 + /// + /// New Heltec LoRA32 with ESP32-S3 CPU + case heltecV3 // = 43 + + /// + /// New Heltec Wireless Stick Lite with ESP32-S3 CPU + case heltecWslV3 // = 44 + /// /// Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. case privateHw // = 255 @@ -181,6 +189,8 @@ enum HardwareModel: SwiftProtobuf.Enum { case 40: self = .nrf52840Pca10059 case 41: self = .drDev case 42: self = .m5Stack + case 43: self = .heltecV3 + case 44: self = .heltecWslV3 case 255: self = .privateHw default: self = .UNRECOGNIZED(rawValue) } @@ -216,6 +226,8 @@ enum HardwareModel: SwiftProtobuf.Enum { case .nrf52840Pca10059: return 40 case .drDev: return 41 case .m5Stack: return 42 + case .heltecV3: return 43 + case .heltecWslV3: return 44 case .privateHw: return 255 case .UNRECOGNIZED(let i): return i } @@ -256,6 +268,8 @@ extension HardwareModel: CaseIterable { .nrf52840Pca10059, .drDev, .m5Stack, + .heltecV3, + .heltecWslV3, .privateHw, ] } @@ -2144,6 +2158,8 @@ extension HardwareModel: SwiftProtobuf._ProtoNameProviding { 40: .same(proto: "NRF52840_PCA10059"), 41: .same(proto: "DR_DEV"), 42: .same(proto: "M5STACK"), + 43: .same(proto: "HELTEC_V3"), + 44: .same(proto: "HELTEC_WSL_V3"), 255: .same(proto: "PRIVATE_HW"), ] } diff --git a/Meshtastic/Protobufs/telemetry.pb.swift b/Meshtastic/Protobufs/telemetry.pb.swift index 3e745000..f0404197 100644 --- a/Meshtastic/Protobufs/telemetry.pb.swift +++ b/Meshtastic/Protobufs/telemetry.pb.swift @@ -68,6 +68,10 @@ enum TelemetrySensorType: SwiftProtobuf.Enum { /// /// 6-Axis inertial measurement sensor case qmi8658 // = 10 + + /// + /// 3-Axis magnetic sensor + case qmc5883L // = 11 case UNRECOGNIZED(Int) init() { @@ -87,6 +91,7 @@ enum TelemetrySensorType: SwiftProtobuf.Enum { case 8: self = .lps22 case 9: self = .qmc6310 case 10: self = .qmi8658 + case 11: self = .qmc5883L default: self = .UNRECOGNIZED(rawValue) } } @@ -104,6 +109,7 @@ enum TelemetrySensorType: SwiftProtobuf.Enum { case .lps22: return 8 case .qmc6310: return 9 case .qmi8658: return 10 + case .qmc5883L: return 11 case .UNRECOGNIZED(let i): return i } } @@ -126,6 +132,7 @@ extension TelemetrySensorType: CaseIterable { .lps22, .qmc6310, .qmi8658, + .qmc5883L, ] } @@ -288,6 +295,7 @@ extension TelemetrySensorType: SwiftProtobuf._ProtoNameProviding { 8: .same(proto: "LPS22"), 9: .same(proto: "QMC6310"), 10: .same(proto: "QMI8658"), + 11: .same(proto: "QMC5883L"), ] }