From 94723c07c25249c5cff436ec4e4d05b877cf92ce Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 14 Mar 2023 19:16:04 -0700 Subject: [PATCH] Update protos --- Meshtastic/Helpers/BLEManager.swift | 17 +--- .../Protobufs/meshtastic/admin.pb.swift | 22 ++--- .../Protobufs/meshtastic/apponly.pb.swift | 8 +- .../meshtastic/cannedmessages.pb.swift | 6 +- .../Protobufs/meshtastic/channel.pb.swift | 14 +-- .../Protobufs/meshtastic/config.pb.swift | 88 +++++++++---------- .../meshtastic/connection_status.pb.swift | 38 ++++---- .../Protobufs/meshtastic/deviceonly.pb.swift | 30 +++---- .../Protobufs/meshtastic/localonly.pb.swift | 40 ++++----- Meshtastic/Protobufs/meshtastic/mesh.pb.swift | 80 ++++++++--------- .../meshtastic/module_config.pb.swift | 42 ++++----- Meshtastic/Protobufs/meshtastic/mqtt.pb.swift | 8 +- .../Protobufs/meshtastic/portnums.pb.swift | 6 +- .../meshtastic/remote_hardware.pb.swift | 10 +-- .../Protobufs/meshtastic/rtttl.pb.swift | 6 +- .../meshtastic/storeforward.pb.swift | 18 ++-- .../Protobufs/meshtastic/telemetry.pb.swift | 20 ++--- .../Protobufs/meshtastic/xmodem.pb.swift | 10 +-- .../Views/Settings/Config/DisplayConfig.swift | 2 +- .../Views/Settings/Config/LoRaConfig.swift | 2 +- 20 files changed, 227 insertions(+), 240 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 3ca3936d..32940e50 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -1176,7 +1176,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..(decoder: inout D) throws { @@ -1315,7 +1315,7 @@ extension AdminMessage.ConfigType: SwiftProtobuf._ProtoNameProviding { 3: .same(proto: "NETWORK_CONFIG"), 4: .same(proto: "DISPLAY_CONFIG"), 5: .same(proto: "LORA_CONFIG"), - 6: .same(proto: "BLUETOOTH_CONFIG") + 6: .same(proto: "BLUETOOTH_CONFIG"), ] } @@ -1329,7 +1329,7 @@ extension AdminMessage.ModuleConfigType: SwiftProtobuf._ProtoNameProviding { 5: .same(proto: "TELEMETRY_CONFIG"), 6: .same(proto: "CANNEDMSG_CONFIG"), 7: .same(proto: "AUDIO_CONFIG"), - 8: .same(proto: "REMOTEHARDWARE_CONFIG") + 8: .same(proto: "REMOTEHARDWARE_CONFIG"), ] } @@ -1339,7 +1339,7 @@ extension HamParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa 1: .standard(proto: "call_sign"), 2: .standard(proto: "tx_power"), 3: .same(proto: "frequency"), - 4: .standard(proto: "short_name") + 4: .standard(proto: "short_name"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/apponly.pb.swift b/Meshtastic/Protobufs/meshtastic/apponly.pb.swift index 03d3695a..dfa98782 100644 --- a/Meshtastic/Protobufs/meshtastic/apponly.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/apponly.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -50,7 +50,7 @@ struct ChannelSet { init() {} - fileprivate var _loraConfig: Config.LoRaConfig? + fileprivate var _loraConfig: Config.LoRaConfig? = nil } #if swift(>=5.5) && canImport(_Concurrency) @@ -59,13 +59,13 @@ extension ChannelSet: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension ChannelSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ChannelSet" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "settings"), - 2: .standard(proto: "lora_config") + 2: .standard(proto: "lora_config"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/cannedmessages.pb.swift b/Meshtastic/Protobufs/meshtastic/cannedmessages.pb.swift index 9b01a442..7d70da3b 100644 --- a/Meshtastic/Protobufs/meshtastic/cannedmessages.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/cannedmessages.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -42,12 +42,12 @@ extension CannedMessageModuleConfig: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension CannedMessageModuleConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".CannedMessageModuleConfig" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "messages") + 1: .same(proto: "messages"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/channel.pb.swift b/Meshtastic/Protobufs/meshtastic/channel.pb.swift index 8daac7aa..f635dddd 100644 --- a/Meshtastic/Protobufs/meshtastic/channel.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/channel.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -183,7 +183,7 @@ struct Channel { init() {} - fileprivate var _settings: ChannelSettings? + fileprivate var _settings: ChannelSettings? = nil } #if swift(>=4.2) @@ -193,7 +193,7 @@ extension Channel.Role: CaseIterable { static var allCases: [Channel.Role] = [ .disabled, .primary, - .secondary + .secondary, ] } @@ -207,7 +207,7 @@ extension Channel.Role: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension ChannelSettings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ChannelSettings" @@ -217,7 +217,7 @@ extension ChannelSettings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplemen 3: .same(proto: "name"), 4: .same(proto: "id"), 5: .standard(proto: "uplink_enabled"), - 6: .standard(proto: "downlink_enabled") + 6: .standard(proto: "downlink_enabled"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -276,7 +276,7 @@ extension Channel: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "index"), 2: .same(proto: "settings"), - 3: .same(proto: "role") + 3: .same(proto: "role"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -323,6 +323,6 @@ extension Channel.Role: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "DISABLED"), 1: .same(proto: "PRIMARY"), - 2: .same(proto: "SECONDARY") + 2: .same(proto: "SECONDARY"), ] } diff --git a/Meshtastic/Protobufs/meshtastic/config.pb.swift b/Meshtastic/Protobufs/meshtastic/config.pb.swift index 3707b384..04f17cdb 100644 --- a/Meshtastic/Protobufs/meshtastic/config.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/config.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -27,7 +27,7 @@ struct Config { /// /// Payload Variant - var payloadVariant: Config.OneOf_PayloadVariant? + var payloadVariant: Config.OneOf_PayloadVariant? = nil var device: Config.DeviceConfig { get { @@ -632,7 +632,7 @@ struct Config { init() {} - fileprivate var _ipv4Config: Config.NetworkConfig.IpV4Config? + fileprivate var _ipv4Config: Config.NetworkConfig.IpV4Config? = nil } /// @@ -891,7 +891,7 @@ struct Config { // methods supported on all messages. /// - /// When enabled, the `modem_preset` fields will be adheared to, else the `bandwidth`/`spread_factor`/`coding_rate` + /// When enabled, the `modem_preset` fields will be adhered to, else the `bandwidth`/`spread_factor`/`coding_rate` /// will be taked from their respective manually defined fields var usePreset: Bool = false @@ -940,14 +940,14 @@ struct Config { var txEnabled: Bool = false /// - /// If zero then, use default max legal continuous power (ie. something that won't + /// If zero, then use default max legal continuous power (ie. something that won't /// burn out the radio hardware) /// In most cases you should use zero here. /// Units are in dBm. var txPower: Int32 = 0 /// - /// This is controlling the actual hardware frequency the radio is transmitting on. + /// This controls the actual hardware frequency the radio transmits on. /// Most users should never need to be exposed to this field/concept. /// A channel number between 1 and NUM_CHANNELS (whatever the max is in the current region). /// If ZERO then the rule is "use the old channel name hash based @@ -977,7 +977,7 @@ struct Config { /// /// For testing it is useful sometimes to force a node to never listen to /// particular other nodes (simulating radio out of range). All nodenums listed - /// in ignore_incoming will have packets they send droped on receive (by router.cpp) + /// in ignore_incoming will have packets they send dropped on receive (by router.cpp) var ignoreIncoming: [UInt32] = [] var unknownFields = SwiftProtobuf.UnknownStorage() @@ -998,7 +998,7 @@ struct Config { case eu433 // = 2 /// - /// European Union 433mhz + /// European Union 868mhz case eu868 // = 3 /// @@ -1190,7 +1190,7 @@ struct Config { var mode: Config.BluetoothConfig.PairingMode = .randomPin /// - /// Specified pin for PairingMode.FixedPin + /// Specified PIN for PairingMode.FixedPin var fixedPin: UInt32 = 0 var unknownFields = SwiftProtobuf.UnknownStorage() @@ -1199,15 +1199,15 @@ struct Config { typealias RawValue = Int /// - /// Device generates a random pin that will be shown on the screen of the device for pairing + /// Device generates a random PIN that will be shown on the screen of the device for pairing case randomPin // = 0 /// - /// Device requires a specified fixed pin for pairing + /// Device requires a specified fixed PIN for pairing case fixedPin // = 1 /// - /// Device requires no pin for pairing + /// Device requires no PIN for pairing case noPin // = 2 case UNRECOGNIZED(Int) @@ -1252,7 +1252,7 @@ extension Config.DeviceConfig.Role: CaseIterable { .routerClient, .repeater, .tracker, - .sensor + .sensor, ] } @@ -1261,7 +1261,7 @@ extension Config.DeviceConfig.RebroadcastMode: CaseIterable { static var allCases: [Config.DeviceConfig.RebroadcastMode] = [ .all, .allSkipDecoding, - .localOnly + .localOnly, ] } @@ -1278,7 +1278,7 @@ extension Config.PositionConfig.PositionFlags: CaseIterable { .seqNo, .timestamp, .heading, - .speed + .speed, ] } @@ -1286,7 +1286,7 @@ extension Config.NetworkConfig.AddressMode: CaseIterable { // The compiler won't synthesize support with the UNRECOGNIZED case. static var allCases: [Config.NetworkConfig.AddressMode] = [ .dhcp, - .static + .static, ] } @@ -1298,7 +1298,7 @@ extension Config.DisplayConfig.GpsCoordinateFormat: CaseIterable { .utm, .mgrs, .olc, - .osgr + .osgr, ] } @@ -1306,7 +1306,7 @@ extension Config.DisplayConfig.DisplayUnits: CaseIterable { // The compiler won't synthesize support with the UNRECOGNIZED case. static var allCases: [Config.DisplayConfig.DisplayUnits] = [ .metric, - .imperial + .imperial, ] } @@ -1316,7 +1316,7 @@ extension Config.DisplayConfig.OledType: CaseIterable { .oledAuto, .oledSsd1306, .oledSh1106, - .oledSh1107 + .oledSh1107, ] } @@ -1326,7 +1326,7 @@ extension Config.DisplayConfig.DisplayMode: CaseIterable { .default, .twocolor, .inverted, - .color + .color, ] } @@ -1348,7 +1348,7 @@ extension Config.LoRaConfig.RegionCode: CaseIterable { .th, .lora24, .ua433, - .ua868 + .ua868, ] } @@ -1362,7 +1362,7 @@ extension Config.LoRaConfig.ModemPreset: CaseIterable { .mediumFast, .shortSlow, .shortFast, - .longModerate + .longModerate, ] } @@ -1371,7 +1371,7 @@ extension Config.BluetoothConfig.PairingMode: CaseIterable { static var allCases: [Config.BluetoothConfig.PairingMode] = [ .randomPin, .fixedPin, - .noPin + .noPin, ] } @@ -1403,7 +1403,7 @@ extension Config.BluetoothConfig.PairingMode: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension Config: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".Config" @@ -1414,7 +1414,7 @@ extension Config: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBas 4: .same(proto: "network"), 5: .same(proto: "display"), 6: .same(proto: "lora"), - 7: .same(proto: "bluetooth") + 7: .same(proto: "bluetooth"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1574,7 +1574,7 @@ extension Config.DeviceConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl 4: .standard(proto: "button_gpio"), 5: .standard(proto: "buzzer_gpio"), 6: .standard(proto: "rebroadcast_mode"), - 7: .standard(proto: "node_info_broadcast_secs") + 7: .standard(proto: "node_info_broadcast_secs"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1641,7 +1641,7 @@ extension Config.DeviceConfig.Role: SwiftProtobuf._ProtoNameProviding { 3: .same(proto: "ROUTER_CLIENT"), 4: .same(proto: "REPEATER"), 5: .same(proto: "TRACKER"), - 6: .same(proto: "SENSOR") + 6: .same(proto: "SENSOR"), ] } @@ -1649,7 +1649,7 @@ extension Config.DeviceConfig.RebroadcastMode: SwiftProtobuf._ProtoNameProviding static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "ALL"), 1: .same(proto: "ALL_SKIP_DECODING"), - 2: .same(proto: "LOCAL_ONLY") + 2: .same(proto: "LOCAL_ONLY"), ] } @@ -1664,7 +1664,7 @@ extension Config.PositionConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageIm 6: .standard(proto: "gps_attempt_time"), 7: .standard(proto: "position_flags"), 8: .standard(proto: "rx_gpio"), - 9: .standard(proto: "tx_gpio") + 9: .standard(proto: "tx_gpio"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1745,7 +1745,7 @@ extension Config.PositionConfig.PositionFlags: SwiftProtobuf._ProtoNameProviding 64: .same(proto: "SEQ_NO"), 128: .same(proto: "TIMESTAMP"), 256: .same(proto: "HEADING"), - 512: .same(proto: "SPEED") + 512: .same(proto: "SPEED"), ] } @@ -1759,7 +1759,7 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple 5: .standard(proto: "mesh_sds_timeout_secs"), 6: .standard(proto: "sds_secs"), 7: .standard(proto: "ls_secs"), - 8: .standard(proto: "min_wake_secs") + 8: .standard(proto: "min_wake_secs"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1833,7 +1833,7 @@ extension Config.NetworkConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImp 6: .standard(proto: "eth_enabled"), 7: .standard(proto: "address_mode"), 8: .standard(proto: "ipv4_config"), - 9: .standard(proto: "rsyslog_server") + 9: .standard(proto: "rsyslog_server"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1904,7 +1904,7 @@ extension Config.NetworkConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImp extension Config.NetworkConfig.AddressMode: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "DHCP"), - 1: .same(proto: "STATIC") + 1: .same(proto: "STATIC"), ] } @@ -1914,7 +1914,7 @@ extension Config.NetworkConfig.IpV4Config: SwiftProtobuf.Message, SwiftProtobuf. 1: .same(proto: "ip"), 2: .same(proto: "gateway"), 3: .same(proto: "subnet"), - 4: .same(proto: "dns") + 4: .same(proto: "dns"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1969,7 +1969,7 @@ extension Config.DisplayConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImp 6: .same(proto: "units"), 7: .same(proto: "oled"), 8: .same(proto: "displaymode"), - 9: .standard(proto: "heading_bold") + 9: .standard(proto: "heading_bold"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2045,14 +2045,14 @@ extension Config.DisplayConfig.GpsCoordinateFormat: SwiftProtobuf._ProtoNameProv 2: .same(proto: "UTM"), 3: .same(proto: "MGRS"), 4: .same(proto: "OLC"), - 5: .same(proto: "OSGR") + 5: .same(proto: "OSGR"), ] } extension Config.DisplayConfig.DisplayUnits: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "METRIC"), - 1: .same(proto: "IMPERIAL") + 1: .same(proto: "IMPERIAL"), ] } @@ -2061,7 +2061,7 @@ extension Config.DisplayConfig.OledType: SwiftProtobuf._ProtoNameProviding { 0: .same(proto: "OLED_AUTO"), 1: .same(proto: "OLED_SSD1306"), 2: .same(proto: "OLED_SH1106"), - 3: .same(proto: "OLED_SH1107") + 3: .same(proto: "OLED_SH1107"), ] } @@ -2070,7 +2070,7 @@ extension Config.DisplayConfig.DisplayMode: SwiftProtobuf._ProtoNameProviding { 0: .same(proto: "DEFAULT"), 1: .same(proto: "TWOCOLOR"), 2: .same(proto: "INVERTED"), - 3: .same(proto: "COLOR") + 3: .same(proto: "COLOR"), ] } @@ -2091,7 +2091,7 @@ extension Config.LoRaConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem 12: .standard(proto: "override_duty_cycle"), 13: .standard(proto: "sx126x_rx_boosted_gain"), 14: .standard(proto: "override_frequency"), - 103: .standard(proto: "ignore_incoming") + 103: .standard(proto: "ignore_incoming"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2207,7 +2207,7 @@ extension Config.LoRaConfig.RegionCode: SwiftProtobuf._ProtoNameProviding { 12: .same(proto: "TH"), 13: .same(proto: "LORA_24"), 14: .same(proto: "UA_433"), - 15: .same(proto: "UA_868") + 15: .same(proto: "UA_868"), ] } @@ -2220,7 +2220,7 @@ extension Config.LoRaConfig.ModemPreset: SwiftProtobuf._ProtoNameProviding { 4: .same(proto: "MEDIUM_FAST"), 5: .same(proto: "SHORT_SLOW"), 6: .same(proto: "SHORT_FAST"), - 7: .same(proto: "LONG_MODERATE") + 7: .same(proto: "LONG_MODERATE"), ] } @@ -2229,7 +2229,7 @@ extension Config.BluetoothConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageI static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "enabled"), 2: .same(proto: "mode"), - 3: .standard(proto: "fixed_pin") + 3: .standard(proto: "fixed_pin"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2272,6 +2272,6 @@ extension Config.BluetoothConfig.PairingMode: SwiftProtobuf._ProtoNameProviding static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "RANDOM_PIN"), 1: .same(proto: "FIXED_PIN"), - 2: .same(proto: "NO_PIN") + 2: .same(proto: "NO_PIN"), ] } diff --git a/Meshtastic/Protobufs/meshtastic/connection_status.pb.swift b/Meshtastic/Protobufs/meshtastic/connection_status.pb.swift index 1b36cd25..b305533f 100644 --- a/Meshtastic/Protobufs/meshtastic/connection_status.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/connection_status.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -73,10 +73,10 @@ struct DeviceConnectionStatus { init() {} - fileprivate var _wifi: WifiConnectionStatus? - fileprivate var _ethernet: EthernetConnectionStatus? - fileprivate var _bluetooth: BluetoothConnectionStatus? - fileprivate var _serial: SerialConnectionStatus? + fileprivate var _wifi: WifiConnectionStatus? = nil + fileprivate var _ethernet: EthernetConnectionStatus? = nil + fileprivate var _bluetooth: BluetoothConnectionStatus? = nil + fileprivate var _serial: SerialConnectionStatus? = nil } /// @@ -98,18 +98,18 @@ struct WifiConnectionStatus { mutating func clearStatus() {self._status = nil} /// - /// WiFi access point ssid + /// WiFi access point SSID var ssid: String = String() /// - /// Rssi of wireless connection + /// RSSI of wireless connection var rssi: Int32 = 0 var unknownFields = SwiftProtobuf.UnknownStorage() init() {} - fileprivate var _status: NetworkConnectionStatus? + fileprivate var _status: NetworkConnectionStatus? = nil } /// @@ -134,7 +134,7 @@ struct EthernetConnectionStatus { init() {} - fileprivate var _status: NetworkConnectionStatus? + fileprivate var _status: NetworkConnectionStatus? = nil } /// @@ -173,11 +173,11 @@ struct BluetoothConnectionStatus { // methods supported on all messages. /// - /// The pairing pin for bluetooth + /// The pairing PIN for bluetooth var pin: UInt32 = 0 /// - /// Rssi of bluetooth connection + /// RSSI of bluetooth connection var rssi: Int32 = 0 /// @@ -197,7 +197,7 @@ struct SerialConnectionStatus { // methods supported on all messages. /// - /// The serial baud rate + /// Serial baud rate var baud: UInt32 = 0 /// @@ -220,7 +220,7 @@ extension SerialConnectionStatus: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension DeviceConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".DeviceConnectionStatus" @@ -228,7 +228,7 @@ extension DeviceConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageI 1: .same(proto: "wifi"), 2: .same(proto: "ethernet"), 3: .same(proto: "bluetooth"), - 4: .same(proto: "serial") + 4: .same(proto: "serial"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -281,7 +281,7 @@ extension WifiConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImp static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "status"), 2: .same(proto: "ssid"), - 3: .same(proto: "rssi") + 3: .same(proto: "rssi"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -327,7 +327,7 @@ extension WifiConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImp extension EthernetConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".EthernetConnectionStatus" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "status") + 1: .same(proto: "status"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -366,7 +366,7 @@ extension NetworkConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._Message 1: .standard(proto: "ip_address"), 2: .standard(proto: "is_connected"), 3: .standard(proto: "is_mqtt_connected"), - 4: .standard(proto: "is_syslog_connected") + 4: .standard(proto: "is_syslog_connected"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -415,7 +415,7 @@ extension BluetoothConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._Messa static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "pin"), 2: .same(proto: "rssi"), - 3: .standard(proto: "is_connected") + 3: .standard(proto: "is_connected"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -458,7 +458,7 @@ extension SerialConnectionStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageI static let protoMessageName: String = _protobuf_package + ".SerialConnectionStatus" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "baud"), - 2: .standard(proto: "is_connected") + 2: .standard(proto: "is_connected"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/deviceonly.pb.swift b/Meshtastic/Protobufs/meshtastic/deviceonly.pb.swift index 1b526036..d0c52075 100644 --- a/Meshtastic/Protobufs/meshtastic/deviceonly.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/deviceonly.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -69,7 +69,7 @@ extension ScreenFonts: CaseIterable { static var allCases: [ScreenFonts] = [ .fontSmall, .fontMedium, - .fontLarge + .fontLarge, ] } @@ -153,7 +153,7 @@ struct DeviceState { } /// - /// Some GPSes seem to have bogus settings from the factory, so we always do one factory reset. + /// Some GPS receivers seem to have bogus settings from the factory, so we always do one factory reset. var didGpsReset: Bool { get {return _storage._didGpsReset} set {_uniqueStorage()._didGpsReset = newValue} @@ -190,7 +190,7 @@ struct ChannelFile { /// /// This can be used for customizing the firmware distribution. If populated, -/// show a secondary bootup screen with cuatom logo and text for 2.5 seconds. +/// show a secondary bootup screen with custom logo and text for 2.5 seconds. struct OEMStore { // SwiftProtobuf.Message conformance is added in an extension below. See the // `Message` and `Message+*Additions` files in the SwiftProtobuf library for @@ -205,7 +205,7 @@ struct OEMStore { var oemIconHeight: UInt32 = 0 /// - /// The Logo in xbm bytechar format + /// The Logo in XBM bytechar format var oemIconBits: Data = Data() /// @@ -246,8 +246,8 @@ struct OEMStore { init() {} - fileprivate var _oemLocalConfig: LocalConfig? - fileprivate var _oemLocalModuleConfig: LocalModuleConfig? + fileprivate var _oemLocalConfig: LocalConfig? = nil + fileprivate var _oemLocalModuleConfig: LocalModuleConfig? = nil } #if swift(>=5.5) && canImport(_Concurrency) @@ -259,13 +259,13 @@ extension OEMStore: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension ScreenFonts: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "FONT_SMALL"), 1: .same(proto: "FONT_MEDIUM"), - 2: .same(proto: "FONT_LARGE") + 2: .same(proto: "FONT_LARGE"), ] } @@ -279,16 +279,16 @@ extension DeviceState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati 8: .same(proto: "version"), 7: .standard(proto: "rx_text_message"), 9: .standard(proto: "no_save"), - 11: .standard(proto: "did_gps_reset") + 11: .standard(proto: "did_gps_reset"), ] fileprivate class _StorageClass { - var _myNode: MyNodeInfo? - var _owner: User? + var _myNode: MyNodeInfo? = nil + var _owner: User? = nil var _nodeDb: [NodeInfo] = [] var _receiveQueue: [MeshPacket] = [] var _version: UInt32 = 0 - var _rxTextMessage: MeshPacket? + var _rxTextMessage: MeshPacket? = nil var _noSave: Bool = false var _didGpsReset: Bool = false @@ -397,7 +397,7 @@ extension ChannelFile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati static let protoMessageName: String = _protobuf_package + ".ChannelFile" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "channels"), - 2: .same(proto: "version") + 2: .same(proto: "version"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -441,7 +441,7 @@ extension OEMStore: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB 5: .standard(proto: "oem_text"), 6: .standard(proto: "oem_aes_key"), 7: .standard(proto: "oem_local_config"), - 8: .standard(proto: "oem_local_module_config") + 8: .standard(proto: "oem_local_module_config"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/localonly.pb.swift b/Meshtastic/Protobufs/meshtastic/localonly.pb.swift index 97fa0b18..7f16ac02 100644 --- a/Meshtastic/Protobufs/meshtastic/localonly.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/localonly.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -245,7 +245,7 @@ extension LocalModuleConfig: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension LocalConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".LocalConfig" @@ -257,17 +257,17 @@ extension LocalConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati 5: .same(proto: "display"), 6: .same(proto: "lora"), 7: .same(proto: "bluetooth"), - 8: .same(proto: "version") + 8: .same(proto: "version"), ] fileprivate class _StorageClass { - var _device: Config.DeviceConfig? - var _position: Config.PositionConfig? - var _power: Config.PowerConfig? - var _network: Config.NetworkConfig? - var _display: Config.DisplayConfig? - var _lora: Config.LoRaConfig? - var _bluetooth: Config.BluetoothConfig? + var _device: Config.DeviceConfig? = nil + var _position: Config.PositionConfig? = nil + var _power: Config.PowerConfig? = nil + var _network: Config.NetworkConfig? = nil + var _display: Config.DisplayConfig? = nil + var _lora: Config.LoRaConfig? = nil + var _bluetooth: Config.BluetoothConfig? = nil var _version: UInt32 = 0 static let defaultInstance = _StorageClass() @@ -383,19 +383,19 @@ extension LocalModuleConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem 7: .standard(proto: "canned_message"), 9: .same(proto: "audio"), 10: .standard(proto: "remote_hardware"), - 8: .same(proto: "version") + 8: .same(proto: "version"), ] fileprivate class _StorageClass { - var _mqtt: ModuleConfig.MQTTConfig? - var _serial: ModuleConfig.SerialConfig? - var _externalNotification: ModuleConfig.ExternalNotificationConfig? - var _storeForward: ModuleConfig.StoreForwardConfig? - var _rangeTest: ModuleConfig.RangeTestConfig? - var _telemetry: ModuleConfig.TelemetryConfig? - var _cannedMessage: ModuleConfig.CannedMessageConfig? - var _audio: ModuleConfig.AudioConfig? - var _remoteHardware: ModuleConfig.RemoteHardwareConfig? + var _mqtt: ModuleConfig.MQTTConfig? = nil + var _serial: ModuleConfig.SerialConfig? = nil + var _externalNotification: ModuleConfig.ExternalNotificationConfig? = nil + var _storeForward: ModuleConfig.StoreForwardConfig? = nil + var _rangeTest: ModuleConfig.RangeTestConfig? = nil + var _telemetry: ModuleConfig.TelemetryConfig? = nil + var _cannedMessage: ModuleConfig.CannedMessageConfig? = nil + var _audio: ModuleConfig.AudioConfig? = nil + var _remoteHardware: ModuleConfig.RemoteHardwareConfig? = nil var _version: UInt32 = 0 static let defaultInstance = _StorageClass() diff --git a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift index 1602d428..7fa22878 100644 --- a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -302,7 +302,7 @@ extension HardwareModel: CaseIterable { .heltecWslV3, .betafpv2400Tx, .betafpv900NanoTx, - .privateHw + .privateHw, ] } @@ -353,7 +353,7 @@ extension Constants: CaseIterable { // The compiler won't synthesize support with the UNRECOGNIZED case. static var allCases: [Constants] = [ .zero, - .dataPayloadLen + .dataPayloadLen, ] } @@ -476,7 +476,7 @@ extension CriticalErrorCode: CaseIterable { .transmitFailed, .brownout, .sx1262Failure, - .radioSpiBug + .radioSpiBug, ] } @@ -781,7 +781,7 @@ extension Position.LocSource: CaseIterable { .locUnset, .locManual, .locInternal, - .locExternal + .locExternal, ] } @@ -792,7 +792,7 @@ extension Position.AltSource: CaseIterable { .altManual, .altInternal, .altExternal, - .altBarometric + .altBarometric, ] } @@ -886,7 +886,7 @@ struct Routing { // `Message` and `Message+*Additions` files in the SwiftProtobuf library for // methods supported on all messages. - var variant: Routing.OneOf_Variant? + var variant: Routing.OneOf_Variant? = nil /// /// A route request going from the requester @@ -1075,7 +1075,7 @@ extension Routing.Error: CaseIterable { .noResponse, .dutyCycleLimit, .badRequest, - .notAuthorized + .notAuthorized, ] } @@ -1503,7 +1503,7 @@ extension MeshPacket.Priority: CaseIterable { .default, .reliable, .ack, - .max + .max, ] } @@ -1512,7 +1512,7 @@ extension MeshPacket.Delayed: CaseIterable { static var allCases: [MeshPacket.Delayed] = [ .noDelay, .broadcast, - .direct + .direct, ] } @@ -1591,9 +1591,9 @@ struct NodeInfo { init() {} - fileprivate var _user: User? - fileprivate var _position: Position? - fileprivate var _deviceMetrics: DeviceMetrics? + fileprivate var _user: User? = nil + fileprivate var _position: Position? = nil + fileprivate var _deviceMetrics: DeviceMetrics? = nil } /// @@ -1796,7 +1796,7 @@ extension LogRecord.Level: CaseIterable { .warning, .info, .debug, - .trace + .trace, ] } @@ -2102,7 +2102,7 @@ struct ToRadio { /// /// Log levels, chosen to match python logging conventions. - var payloadVariant: ToRadio.OneOf_PayloadVariant? + var payloadVariant: ToRadio.OneOf_PayloadVariant? = nil /// /// Send this packet on the mesh @@ -2308,7 +2308,7 @@ extension DeviceMetadata: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension HardwareModel: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ @@ -2346,14 +2346,14 @@ extension HardwareModel: SwiftProtobuf._ProtoNameProviding { 44: .same(proto: "HELTEC_WSL_V3"), 45: .same(proto: "BETAFPV_2400_TX"), 46: .same(proto: "BETAFPV_900_NANO_TX"), - 255: .same(proto: "PRIVATE_HW") + 255: .same(proto: "PRIVATE_HW"), ] } extension Constants: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "ZERO"), - 237: .same(proto: "DATA_PAYLOAD_LEN") + 237: .same(proto: "DATA_PAYLOAD_LEN"), ] } @@ -2370,7 +2370,7 @@ extension CriticalErrorCode: SwiftProtobuf._ProtoNameProviding { 8: .same(proto: "TRANSMIT_FAILED"), 9: .same(proto: "BROWNOUT"), 10: .same(proto: "SX1262_FAILURE"), - 11: .same(proto: "RADIO_SPI_BUG") + 11: .same(proto: "RADIO_SPI_BUG"), ] } @@ -2398,7 +2398,7 @@ extension Position: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB 19: .standard(proto: "sats_in_view"), 20: .standard(proto: "sensor_id"), 21: .standard(proto: "next_update"), - 22: .standard(proto: "seq_number") + 22: .standard(proto: "seq_number"), ] fileprivate class _StorageClass { @@ -2611,7 +2611,7 @@ extension Position.LocSource: SwiftProtobuf._ProtoNameProviding { 0: .same(proto: "LOC_UNSET"), 1: .same(proto: "LOC_MANUAL"), 2: .same(proto: "LOC_INTERNAL"), - 3: .same(proto: "LOC_EXTERNAL") + 3: .same(proto: "LOC_EXTERNAL"), ] } @@ -2621,7 +2621,7 @@ extension Position.AltSource: SwiftProtobuf._ProtoNameProviding { 1: .same(proto: "ALT_MANUAL"), 2: .same(proto: "ALT_INTERNAL"), 3: .same(proto: "ALT_EXTERNAL"), - 4: .same(proto: "ALT_BAROMETRIC") + 4: .same(proto: "ALT_BAROMETRIC"), ] } @@ -2633,7 +2633,7 @@ extension User: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, 3: .standard(proto: "short_name"), 4: .same(proto: "macaddr"), 5: .standard(proto: "hw_model"), - 6: .standard(proto: "is_licensed") + 6: .standard(proto: "is_licensed"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2690,7 +2690,7 @@ extension User: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, extension RouteDiscovery: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".RouteDiscovery" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "route") + 1: .same(proto: "route"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2724,7 +2724,7 @@ extension Routing: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "route_request"), 2: .standard(proto: "route_reply"), - 3: .standard(proto: "error_reason") + 3: .standard(proto: "error_reason"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2815,7 +2815,7 @@ extension Routing.Error: SwiftProtobuf._ProtoNameProviding { 8: .same(proto: "NO_RESPONSE"), 9: .same(proto: "DUTY_CYCLE_LIMIT"), 32: .same(proto: "BAD_REQUEST"), - 33: .same(proto: "NOT_AUTHORIZED") + 33: .same(proto: "NOT_AUTHORIZED"), ] } @@ -2829,7 +2829,7 @@ extension DataMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati 5: .same(proto: "source"), 6: .standard(proto: "request_id"), 7: .standard(proto: "reply_id"), - 8: .same(proto: "emoji") + 8: .same(proto: "emoji"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2903,7 +2903,7 @@ extension Waypoint: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB 5: .standard(proto: "locked_to"), 6: .same(proto: "name"), 7: .same(proto: "description"), - 8: .same(proto: "icon") + 8: .same(proto: "icon"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -2982,7 +2982,7 @@ extension MeshPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio 10: .standard(proto: "want_ack"), 11: .same(proto: "priority"), 12: .standard(proto: "rx_rssi"), - 13: .same(proto: "delayed") + 13: .same(proto: "delayed"), ] fileprivate class _StorageClass { @@ -3160,7 +3160,7 @@ extension MeshPacket.Priority: SwiftProtobuf._ProtoNameProviding { 64: .same(proto: "DEFAULT"), 70: .same(proto: "RELIABLE"), 120: .same(proto: "ACK"), - 127: .same(proto: "MAX") + 127: .same(proto: "MAX"), ] } @@ -3168,7 +3168,7 @@ extension MeshPacket.Delayed: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 0: .same(proto: "NO_DELAY"), 1: .same(proto: "DELAYED_BROADCAST"), - 2: .same(proto: "DELAYED_DIRECT") + 2: .same(proto: "DELAYED_DIRECT"), ] } @@ -3180,7 +3180,7 @@ extension NodeInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB 3: .same(proto: "position"), 4: .same(proto: "snr"), 5: .standard(proto: "last_heard"), - 6: .standard(proto: "device_metrics") + 6: .standard(proto: "device_metrics"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3256,7 +3256,7 @@ extension MyNodeInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio 13: .standard(proto: "air_period_rx"), 14: .standard(proto: "has_wifi"), 15: .standard(proto: "channel_utilization"), - 16: .standard(proto: "air_util_tx") + 16: .standard(proto: "air_util_tx"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3366,7 +3366,7 @@ extension LogRecord: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation 1: .same(proto: "message"), 2: .same(proto: "time"), 3: .same(proto: "source"), - 4: .same(proto: "level") + 4: .same(proto: "level"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3418,7 +3418,7 @@ extension LogRecord.Level: SwiftProtobuf._ProtoNameProviding { 20: .same(proto: "INFO"), 30: .same(proto: "WARNING"), 40: .same(proto: "ERROR"), - 50: .same(proto: "CRITICAL") + 50: .same(proto: "CRITICAL"), ] } @@ -3428,7 +3428,7 @@ extension QueueStatus: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati 1: .same(proto: "res"), 2: .same(proto: "free"), 3: .same(proto: "maxlen"), - 4: .standard(proto: "mesh_packet_id") + 4: .standard(proto: "mesh_packet_id"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3487,7 +3487,7 @@ extension FromRadio: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation 10: .same(proto: "channel"), 11: .same(proto: "queueStatus"), 12: .same(proto: "xmodemPacket"), - 13: .same(proto: "metadata") + 13: .same(proto: "metadata"), ] fileprivate class _StorageClass { @@ -3758,7 +3758,7 @@ extension ToRadio: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa 1: .same(proto: "packet"), 3: .standard(proto: "want_config_id"), 4: .same(proto: "disconnect"), - 5: .same(proto: "xmodemPacket") + 5: .same(proto: "xmodemPacket"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3852,7 +3852,7 @@ extension Compressed: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio static let protoMessageName: String = _protobuf_package + ".Compressed" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "portnum"), - 2: .same(proto: "data") + 2: .same(proto: "data"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -3897,7 +3897,7 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement 6: .same(proto: "hasEthernet"), 7: .same(proto: "role"), 8: .standard(proto: "position_flags"), - 9: .standard(proto: "hw_model") + 9: .standard(proto: "hw_model"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/module_config.pb.swift b/Meshtastic/Protobufs/meshtastic/module_config.pb.swift index 456a18ca..914b5f9f 100644 --- a/Meshtastic/Protobufs/meshtastic/module_config.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/module_config.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -29,7 +29,7 @@ struct ModuleConfig { /// /// TODO: REPLACE - var payloadVariant: ModuleConfig.OneOf_PayloadVariant? + var payloadVariant: ModuleConfig.OneOf_PayloadVariant? = nil /// /// TODO: REPLACE @@ -829,7 +829,7 @@ extension ModuleConfig.AudioConfig.Audio_Baud: CaseIterable { .codec21300, .codec21200, .codec2700, - .codec2700B + .codec2700B, ] } @@ -851,7 +851,7 @@ extension ModuleConfig.SerialConfig.Serial_Baud: CaseIterable { .baud230400, .baud460800, .baud576000, - .baud921600 + .baud921600, ] } @@ -862,7 +862,7 @@ extension ModuleConfig.SerialConfig.Serial_Mode: CaseIterable { .simple, .proto, .textmsg, - .nmea + .nmea, ] } @@ -876,7 +876,7 @@ extension ModuleConfig.CannedMessageConfig.InputEventChar: CaseIterable { .right, .select, .back, - .cancel + .cancel, ] } @@ -902,7 +902,7 @@ extension ModuleConfig.CannedMessageConfig.InputEventChar: @unchecked Sendable { // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension ModuleConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ModuleConfig" @@ -915,7 +915,7 @@ extension ModuleConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat 6: .same(proto: "telemetry"), 7: .standard(proto: "canned_message"), 8: .same(proto: "audio"), - 9: .standard(proto: "remote_hardware") + 9: .standard(proto: "remote_hardware"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1108,7 +1108,7 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message 3: .same(proto: "username"), 4: .same(proto: "password"), 5: .standard(proto: "encryption_enabled"), - 6: .standard(proto: "json_enabled") + 6: .standard(proto: "json_enabled"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1165,7 +1165,7 @@ extension ModuleConfig.MQTTConfig: SwiftProtobuf.Message, SwiftProtobuf._Message extension ModuleConfig.RemoteHardwareConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = ModuleConfig.protoMessageName + ".RemoteHardwareConfig" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "enabled") + 1: .same(proto: "enabled"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1203,7 +1203,7 @@ extension ModuleConfig.AudioConfig: SwiftProtobuf.Message, SwiftProtobuf._Messag 4: .standard(proto: "i2s_ws"), 5: .standard(proto: "i2s_sd"), 6: .standard(proto: "i2s_din"), - 7: .standard(proto: "i2s_sck") + 7: .standard(proto: "i2s_sck"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1272,7 +1272,7 @@ extension ModuleConfig.AudioConfig.Audio_Baud: SwiftProtobuf._ProtoNameProviding 5: .same(proto: "CODEC2_1300"), 6: .same(proto: "CODEC2_1200"), 7: .same(proto: "CODEC2_700"), - 8: .same(proto: "CODEC2_700B") + 8: .same(proto: "CODEC2_700B"), ] } @@ -1285,7 +1285,7 @@ extension ModuleConfig.SerialConfig: SwiftProtobuf.Message, SwiftProtobuf._Messa 4: .same(proto: "txd"), 5: .same(proto: "baud"), 6: .same(proto: "timeout"), - 7: .same(proto: "mode") + 7: .same(proto: "mode"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1361,7 +1361,7 @@ extension ModuleConfig.SerialConfig.Serial_Baud: SwiftProtobuf._ProtoNameProvidi 12: .same(proto: "BAUD_230400"), 13: .same(proto: "BAUD_460800"), 14: .same(proto: "BAUD_576000"), - 15: .same(proto: "BAUD_921600") + 15: .same(proto: "BAUD_921600"), ] } @@ -1371,7 +1371,7 @@ extension ModuleConfig.SerialConfig.Serial_Mode: SwiftProtobuf._ProtoNameProvidi 1: .same(proto: "SIMPLE"), 2: .same(proto: "PROTO"), 3: .same(proto: "TEXTMSG"), - 4: .same(proto: "NMEA") + 4: .same(proto: "NMEA"), ] } @@ -1391,7 +1391,7 @@ extension ModuleConfig.ExternalNotificationConfig: SwiftProtobuf.Message, SwiftP 12: .standard(proto: "alert_bell_vibra"), 13: .standard(proto: "alert_bell_buzzer"), 7: .standard(proto: "use_pwm"), - 14: .standard(proto: "nag_timeout") + 14: .standard(proto: "nag_timeout"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1492,7 +1492,7 @@ extension ModuleConfig.StoreForwardConfig: SwiftProtobuf.Message, SwiftProtobuf. 2: .same(proto: "heartbeat"), 3: .same(proto: "records"), 4: .standard(proto: "history_return_max"), - 5: .standard(proto: "history_return_window") + 5: .standard(proto: "history_return_window"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1546,7 +1546,7 @@ extension ModuleConfig.RangeTestConfig: SwiftProtobuf.Message, SwiftProtobuf._Me static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "enabled"), 2: .same(proto: "sender"), - 3: .same(proto: "save") + 3: .same(proto: "save"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1594,7 +1594,7 @@ extension ModuleConfig.TelemetryConfig: SwiftProtobuf.Message, SwiftProtobuf._Me 4: .standard(proto: "environment_screen_enabled"), 5: .standard(proto: "environment_display_fahrenheit"), 6: .standard(proto: "air_quality_enabled"), - 7: .standard(proto: "air_quality_interval") + 7: .standard(proto: "air_quality_interval"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1666,7 +1666,7 @@ extension ModuleConfig.CannedMessageConfig: SwiftProtobuf.Message, SwiftProtobuf 8: .standard(proto: "updown1_enabled"), 9: .same(proto: "enabled"), 10: .standard(proto: "allow_input_source"), - 11: .standard(proto: "send_bell") + 11: .standard(proto: "send_bell"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -1754,6 +1754,6 @@ extension ModuleConfig.CannedMessageConfig.InputEventChar: SwiftProtobuf._ProtoN 19: .same(proto: "LEFT"), 20: .same(proto: "RIGHT"), 24: .same(proto: "CANCEL"), - 27: .same(proto: "BACK") + 27: .same(proto: "BACK"), ] } diff --git a/Meshtastic/Protobufs/meshtastic/mqtt.pb.swift b/Meshtastic/Protobufs/meshtastic/mqtt.pb.swift index de297a69..73fe4c30 100644 --- a/Meshtastic/Protobufs/meshtastic/mqtt.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/mqtt.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -52,7 +52,7 @@ struct ServiceEnvelope { init() {} - fileprivate var _packet: MeshPacket? + fileprivate var _packet: MeshPacket? = nil } #if swift(>=5.5) && canImport(_Concurrency) @@ -61,14 +61,14 @@ extension ServiceEnvelope: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension ServiceEnvelope: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".ServiceEnvelope" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "packet"), 2: .standard(proto: "channel_id"), - 3: .standard(proto: "gateway_id") + 3: .standard(proto: "gateway_id"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/portnums.pb.swift b/Meshtastic/Protobufs/meshtastic/portnums.pb.swift index 5bd3c705..9b7198a5 100644 --- a/Meshtastic/Protobufs/meshtastic/portnums.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/portnums.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -238,7 +238,7 @@ extension PortNum: CaseIterable { .tracerouteApp, .privateApp, .atakForwarder, - .max + .max, ] } @@ -273,6 +273,6 @@ extension PortNum: SwiftProtobuf._ProtoNameProviding { 70: .same(proto: "TRACEROUTE_APP"), 256: .same(proto: "PRIVATE_APP"), 257: .same(proto: "ATAK_FORWARDER"), - 511: .same(proto: "MAX") + 511: .same(proto: "MAX"), ] } diff --git a/Meshtastic/Protobufs/meshtastic/remote_hardware.pb.swift b/Meshtastic/Protobufs/meshtastic/remote_hardware.pb.swift index 2b257297..1f24d0db 100644 --- a/Meshtastic/Protobufs/meshtastic/remote_hardware.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/remote_hardware.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -125,7 +125,7 @@ extension HardwareMessage.TypeEnum: CaseIterable { .watchGpios, .gpiosChanged, .readGpios, - .readGpiosReply + .readGpiosReply, ] } @@ -138,14 +138,14 @@ extension HardwareMessage.TypeEnum: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension HardwareMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".HardwareMessage" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "type"), 2: .standard(proto: "gpio_mask"), - 3: .standard(proto: "gpio_value") + 3: .standard(proto: "gpio_value"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -191,6 +191,6 @@ extension HardwareMessage.TypeEnum: SwiftProtobuf._ProtoNameProviding { 2: .same(proto: "WATCH_GPIOS"), 3: .same(proto: "GPIOS_CHANGED"), 4: .same(proto: "READ_GPIOS"), - 5: .same(proto: "READ_GPIOS_REPLY") + 5: .same(proto: "READ_GPIOS_REPLY"), ] } diff --git a/Meshtastic/Protobufs/meshtastic/rtttl.pb.swift b/Meshtastic/Protobufs/meshtastic/rtttl.pb.swift index 2780c6ad..3adac8a2 100644 --- a/Meshtastic/Protobufs/meshtastic/rtttl.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/rtttl.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -42,12 +42,12 @@ extension RTTTLConfig: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension RTTTLConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".RTTTLConfig" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ - 1: .same(proto: "ringtone") + 1: .same(proto: "ringtone"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/storeforward.pb.swift b/Meshtastic/Protobufs/meshtastic/storeforward.pb.swift index d467b249..925eb558 100644 --- a/Meshtastic/Protobufs/meshtastic/storeforward.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/storeforward.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -33,7 +33,7 @@ struct StoreAndForward { /// /// TODO: REPLACE - var variant: StoreAndForward.OneOf_Variant? + var variant: StoreAndForward.OneOf_Variant? = nil /// /// TODO: REPLACE @@ -345,7 +345,7 @@ extension StoreAndForward.RequestResponse: CaseIterable { .clientStats, .clientPing, .clientPong, - .clientAbort + .clientAbort, ] } @@ -362,7 +362,7 @@ extension StoreAndForward.Heartbeat: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension StoreAndForward: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".StoreAndForward" @@ -371,7 +371,7 @@ extension StoreAndForward: SwiftProtobuf.Message, SwiftProtobuf._MessageImplemen 2: .same(proto: "stats"), 3: .same(proto: "history"), 4: .same(proto: "heartbeat"), - 5: .same(proto: "empty") + 5: .same(proto: "empty"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -486,7 +486,7 @@ extension StoreAndForward.RequestResponse: SwiftProtobuf._ProtoNameProviding { 66: .same(proto: "CLIENT_STATS"), 67: .same(proto: "CLIENT_PING"), 68: .same(proto: "CLIENT_PONG"), - 106: .same(proto: "CLIENT_ABORT") + 106: .same(proto: "CLIENT_ABORT"), ] } @@ -501,7 +501,7 @@ extension StoreAndForward.Statistics: SwiftProtobuf.Message, SwiftProtobuf._Mess 6: .standard(proto: "requests_history"), 7: .same(proto: "heartbeat"), 8: .standard(proto: "return_max"), - 9: .standard(proto: "return_window") + 9: .standard(proto: "return_window"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -575,7 +575,7 @@ extension StoreAndForward.History: SwiftProtobuf.Message, SwiftProtobuf._Message static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .standard(proto: "history_messages"), 2: .same(proto: "window"), - 3: .standard(proto: "last_request") + 3: .standard(proto: "last_request"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -618,7 +618,7 @@ extension StoreAndForward.Heartbeat: SwiftProtobuf.Message, SwiftProtobuf._Messa static let protoMessageName: String = StoreAndForward.protoMessageName + ".Heartbeat" static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ 1: .same(proto: "period"), - 2: .same(proto: "secondary") + 2: .same(proto: "secondary"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift b/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift index 01fa9e2e..f41b4b80 100644 --- a/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -146,7 +146,7 @@ extension TelemetrySensorType: CaseIterable { .qmi8658, .qmc5883L, .sht31, - .pmsa003I + .pmsa003I, ] } @@ -160,7 +160,7 @@ struct DeviceMetrics { // methods supported on all messages. /// - /// 1-100 (0 means powered) + /// 0-100 (>100 means powered) var batteryLevel: UInt32 = 0 /// @@ -291,7 +291,7 @@ struct Telemetry { /// seconds since 1970 var time: UInt32 = 0 - var variant: Telemetry.OneOf_Variant? + var variant: Telemetry.OneOf_Variant? = nil /// /// Key native device metrics such as battery level @@ -374,7 +374,7 @@ extension Telemetry.OneOf_Variant: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension TelemetrySensorType: SwiftProtobuf._ProtoNameProviding { static let _protobuf_nameMap: SwiftProtobuf._NameMap = [ @@ -391,7 +391,7 @@ extension TelemetrySensorType: SwiftProtobuf._ProtoNameProviding { 10: .same(proto: "QMI8658"), 11: .same(proto: "QMC5883L"), 12: .same(proto: "SHT31"), - 13: .same(proto: "PMSA003I") + 13: .same(proto: "PMSA003I"), ] } @@ -401,7 +401,7 @@ extension DeviceMetrics: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa 1: .standard(proto: "battery_level"), 2: .same(proto: "voltage"), 3: .standard(proto: "channel_utilization"), - 4: .standard(proto: "air_util_tx") + 4: .standard(proto: "air_util_tx"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -453,7 +453,7 @@ extension EnvironmentMetrics: SwiftProtobuf.Message, SwiftProtobuf._MessageImple 3: .standard(proto: "barometric_pressure"), 4: .standard(proto: "gas_resistance"), 5: .same(proto: "voltage"), - 6: .same(proto: "current") + 6: .same(proto: "current"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -521,7 +521,7 @@ extension AirQualityMetrics: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem 9: .standard(proto: "particles_10um"), 10: .standard(proto: "particles_25um"), 11: .standard(proto: "particles_50um"), - 12: .standard(proto: "particles_100um") + 12: .standard(proto: "particles_100um"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -611,7 +611,7 @@ extension Telemetry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation 1: .same(proto: "time"), 2: .standard(proto: "device_metrics"), 3: .standard(proto: "environment_metrics"), - 4: .standard(proto: "air_quality_metrics") + 4: .standard(proto: "air_quality_metrics"), ] mutating func decodeMessage(decoder: inout D) throws { diff --git a/Meshtastic/Protobufs/meshtastic/xmodem.pb.swift b/Meshtastic/Protobufs/meshtastic/xmodem.pb.swift index 15d977b1..a70841f2 100644 --- a/Meshtastic/Protobufs/meshtastic/xmodem.pb.swift +++ b/Meshtastic/Protobufs/meshtastic/xmodem.pb.swift @@ -15,7 +15,7 @@ import SwiftProtobuf // incompatible with the version of SwiftProtobuf to which you are linking. // Please ensure that you are building against the same version of the API // that was used to generate this file. -private struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { +fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck { struct _2: SwiftProtobuf.ProtobufAPIVersion_2 {} typealias Version = _2 } @@ -96,7 +96,7 @@ extension XModem.Control: CaseIterable { .ack, .nak, .can, - .ctrlz + .ctrlz, ] } @@ -109,7 +109,7 @@ extension XModem.Control: @unchecked Sendable {} // MARK: - Code below here is support for the SwiftProtobuf runtime. -private let _protobuf_package = "meshtastic" +fileprivate let _protobuf_package = "meshtastic" extension XModem: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding { static let protoMessageName: String = _protobuf_package + ".XModem" @@ -117,7 +117,7 @@ extension XModem: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBas 1: .same(proto: "control"), 2: .same(proto: "seq"), 3: .same(proto: "crc16"), - 4: .same(proto: "buffer") + 4: .same(proto: "buffer"), ] mutating func decodeMessage(decoder: inout D) throws { @@ -170,6 +170,6 @@ extension XModem.Control: SwiftProtobuf._ProtoNameProviding { 6: .same(proto: "ACK"), 21: .same(proto: "NAK"), 24: .same(proto: "CAN"), - 26: .same(proto: "CTRLZ") + 26: .same(proto: "CTRLZ"), ] } diff --git a/Meshtastic/Views/Settings/Config/DisplayConfig.swift b/Meshtastic/Views/Settings/Config/DisplayConfig.swift index 5c5d189b..71feade9 100644 --- a/Meshtastic/Views/Settings/Config/DisplayConfig.swift +++ b/Meshtastic/Views/Settings/Config/DisplayConfig.swift @@ -185,7 +185,7 @@ struct DisplayConfig: View { // Need to request a LoRaConfig from the remote node before allowing changes if bleManager.connectedPeripheral != nil && node?.displayConfig == nil { print("empty display config") - let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context) + let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context) if node != nil && connectedNode != nil { _ = bleManager.requestDisplayConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0) } diff --git a/Meshtastic/Views/Settings/Config/LoRaConfig.swift b/Meshtastic/Views/Settings/Config/LoRaConfig.swift index f9686fee..716a0d0e 100644 --- a/Meshtastic/Views/Settings/Config/LoRaConfig.swift +++ b/Meshtastic/Views/Settings/Config/LoRaConfig.swift @@ -194,7 +194,7 @@ struct LoRaConfig: View { let nodeName = node?.user?.longName ?? NSLocalizedString("unknown", comment: "Unknown") let buttonText = String.localizedStringWithFormat(NSLocalizedString("save.config %@", comment: "Save Config for %@"), nodeName) Button(buttonText) { - let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context) + let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context) if connectedNode != nil { var lc = Config.LoRaConfig() lc.hopLimit = UInt32(hopLimit)