From 698a2bd1bf0f924acf65030e896ca2137b89ed89 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Jun 2022 21:47:41 -0700 Subject: [PATCH] Update protos, fix in region enum issue --- MeshtasticApple/Protobufs/config.pb.swift | 11 ----------- MeshtasticApple/Views/Settings/LoRaConfig.swift | 6 ++++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/MeshtasticApple/Protobufs/config.pb.swift b/MeshtasticApple/Protobufs/config.pb.swift index f4ab0e9d..d446dc4a 100644 --- a/MeshtasticApple/Protobufs/config.pb.swift +++ b/MeshtasticApple/Protobufs/config.pb.swift @@ -392,11 +392,6 @@ struct Config { /// CLI Only Option var isPowerSaving: Bool = false - /// - /// Circumvents the logic block for determining whether the device is powered or not. - /// Useful for devices with finicky ADC issues on the battery sense pins. - var isAlwaysPowered: Bool = false - /// /// If non-zero, the device will fully power off this many seconds after external power is removed. var onBatteryShutdownAfterSecs: UInt32 = 0 @@ -1350,7 +1345,6 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "charge_current"), 2: .standard(proto: "is_power_saving"), - 3: .standard(proto: "is_always_powered"), 4: .standard(proto: "on_battery_shutdown_after_secs"), 6: .standard(proto: "adc_multiplier_override"), 7: .standard(proto: "wait_bluetooth_secs"), @@ -1368,7 +1362,6 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple switch fieldNumber { case 1: try { try decoder.decodeSingularEnumField(value: &self.chargeCurrent) }() case 2: try { try decoder.decodeSingularBoolField(value: &self.isPowerSaving) }() - case 3: try { try decoder.decodeSingularBoolField(value: &self.isAlwaysPowered) }() case 4: try { try decoder.decodeSingularUInt32Field(value: &self.onBatteryShutdownAfterSecs) }() case 6: try { try decoder.decodeSingularFloatField(value: &self.adcMultiplierOverride) }() case 7: try { try decoder.decodeSingularUInt32Field(value: &self.waitBluetoothSecs) }() @@ -1388,9 +1381,6 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple if self.isPowerSaving != false { try visitor.visitSingularBoolField(value: self.isPowerSaving, fieldNumber: 2) } - if self.isAlwaysPowered != false { - try visitor.visitSingularBoolField(value: self.isAlwaysPowered, fieldNumber: 3) - } if self.onBatteryShutdownAfterSecs != 0 { try visitor.visitSingularUInt32Field(value: self.onBatteryShutdownAfterSecs, fieldNumber: 4) } @@ -1418,7 +1408,6 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple static func ==(lhs: Config.PowerConfig, rhs: Config.PowerConfig) -> Bool { if lhs.chargeCurrent != rhs.chargeCurrent {return false} if lhs.isPowerSaving != rhs.isPowerSaving {return false} - if lhs.isAlwaysPowered != rhs.isAlwaysPowered {return false} if lhs.onBatteryShutdownAfterSecs != rhs.onBatteryShutdownAfterSecs {return false} if lhs.adcMultiplierOverride != rhs.adcMultiplierOverride {return false} if lhs.waitBluetoothSecs != rhs.waitBluetoothSecs {return false} diff --git a/MeshtasticApple/Views/Settings/LoRaConfig.swift b/MeshtasticApple/Views/Settings/LoRaConfig.swift index a2e706a8..0217b08c 100644 --- a/MeshtasticApple/Views/Settings/LoRaConfig.swift +++ b/MeshtasticApple/Views/Settings/LoRaConfig.swift @@ -19,7 +19,7 @@ enum RegionCodes : Int, CaseIterable, Identifiable { case kr = 7 case tw = 8 case ru = 9 - //case in = 10 + case `in` = 10 case nz865 case th @@ -47,10 +47,12 @@ enum RegionCodes : Int, CaseIterable, Identifiable { return "Taiwan" case .ru: return "Russia" + case .in: + return "India" case .nz865: return "New Zealand 865mhz" case .th: - return "TH" + return "Thailand" } } }