diff --git a/MeshtasticProtobufs/Sources/meshtastic/admin.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/admin.pb.swift
index 4028fdcd..0f1c3586 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/admin.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/admin.pb.swift
@@ -24,11 +24,17 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
/// This message is used to do settings operations to both remote AND local nodes.
/// (Prior to 1.2 these operations were done via special ToRadio operations)
-public struct AdminMessage: Sendable {
+public struct AdminMessage {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
+ ///
+ /// The node generates this key and sends it with any get_x_response packets.
+ /// The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
+ /// Prevents replay attacks for admin messages.
+ public var sessionPasskey: Data = Data()
+
///
/// TODO: REPLACE
public var payloadVariant: AdminMessage.OneOf_PayloadVariant? = nil
@@ -369,6 +375,17 @@ public struct AdminMessage: Sendable {
set {payloadVariant = .removeFixedPosition(newValue)}
}
+ ///
+ /// Set time only on the node
+ /// Convenience method to set the time on the node (as Net quality) without any other position data
+ public var setTimeOnly: UInt32 {
+ get {
+ if case .setTimeOnly(let v)? = payloadVariant {return v}
+ return 0
+ }
+ set {payloadVariant = .setTimeOnly(newValue)}
+ }
+
///
/// Begins an edit transaction for config, module config, owner, and channel settings changes
/// This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)
@@ -466,7 +483,7 @@ public struct AdminMessage: Sendable {
///
/// TODO: REPLACE
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// Send the specified channel in the response to this message
/// NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present)
@@ -573,6 +590,10 @@ public struct AdminMessage: Sendable {
/// Clear fixed position coordinates and then set position.fixed_position = false
case removeFixedPosition(Bool)
///
+ /// Set time only on the node
+ /// Convenience method to set the time on the node (as Net quality) without any other position data
+ case setTimeOnly(UInt32)
+ ///
/// Begins an edit transaction for config, module config, owner, and channel settings changes
/// This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)
case beginEditSettings(Bool)
@@ -603,11 +624,193 @@ public struct AdminMessage: Sendable {
/// Tell the node to reset the nodedb.
case nodedbReset(Int32)
+ #if !swift(>=4.1)
+ public static func ==(lhs: AdminMessage.OneOf_PayloadVariant, rhs: AdminMessage.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.getChannelRequest, .getChannelRequest): return {
+ guard case .getChannelRequest(let l) = lhs, case .getChannelRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getChannelResponse, .getChannelResponse): return {
+ guard case .getChannelResponse(let l) = lhs, case .getChannelResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getOwnerRequest, .getOwnerRequest): return {
+ guard case .getOwnerRequest(let l) = lhs, case .getOwnerRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getOwnerResponse, .getOwnerResponse): return {
+ guard case .getOwnerResponse(let l) = lhs, case .getOwnerResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getConfigRequest, .getConfigRequest): return {
+ guard case .getConfigRequest(let l) = lhs, case .getConfigRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getConfigResponse, .getConfigResponse): return {
+ guard case .getConfigResponse(let l) = lhs, case .getConfigResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getModuleConfigRequest, .getModuleConfigRequest): return {
+ guard case .getModuleConfigRequest(let l) = lhs, case .getModuleConfigRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getModuleConfigResponse, .getModuleConfigResponse): return {
+ guard case .getModuleConfigResponse(let l) = lhs, case .getModuleConfigResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getCannedMessageModuleMessagesRequest, .getCannedMessageModuleMessagesRequest): return {
+ guard case .getCannedMessageModuleMessagesRequest(let l) = lhs, case .getCannedMessageModuleMessagesRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getCannedMessageModuleMessagesResponse, .getCannedMessageModuleMessagesResponse): return {
+ guard case .getCannedMessageModuleMessagesResponse(let l) = lhs, case .getCannedMessageModuleMessagesResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getDeviceMetadataRequest, .getDeviceMetadataRequest): return {
+ guard case .getDeviceMetadataRequest(let l) = lhs, case .getDeviceMetadataRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getDeviceMetadataResponse, .getDeviceMetadataResponse): return {
+ guard case .getDeviceMetadataResponse(let l) = lhs, case .getDeviceMetadataResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getRingtoneRequest, .getRingtoneRequest): return {
+ guard case .getRingtoneRequest(let l) = lhs, case .getRingtoneRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getRingtoneResponse, .getRingtoneResponse): return {
+ guard case .getRingtoneResponse(let l) = lhs, case .getRingtoneResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getDeviceConnectionStatusRequest, .getDeviceConnectionStatusRequest): return {
+ guard case .getDeviceConnectionStatusRequest(let l) = lhs, case .getDeviceConnectionStatusRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getDeviceConnectionStatusResponse, .getDeviceConnectionStatusResponse): return {
+ guard case .getDeviceConnectionStatusResponse(let l) = lhs, case .getDeviceConnectionStatusResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setHamMode, .setHamMode): return {
+ guard case .setHamMode(let l) = lhs, case .setHamMode(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getNodeRemoteHardwarePinsRequest, .getNodeRemoteHardwarePinsRequest): return {
+ guard case .getNodeRemoteHardwarePinsRequest(let l) = lhs, case .getNodeRemoteHardwarePinsRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.getNodeRemoteHardwarePinsResponse, .getNodeRemoteHardwarePinsResponse): return {
+ guard case .getNodeRemoteHardwarePinsResponse(let l) = lhs, case .getNodeRemoteHardwarePinsResponse(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.enterDfuModeRequest, .enterDfuModeRequest): return {
+ guard case .enterDfuModeRequest(let l) = lhs, case .enterDfuModeRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.deleteFileRequest, .deleteFileRequest): return {
+ guard case .deleteFileRequest(let l) = lhs, case .deleteFileRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setScale, .setScale): return {
+ guard case .setScale(let l) = lhs, case .setScale(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setOwner, .setOwner): return {
+ guard case .setOwner(let l) = lhs, case .setOwner(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setChannel, .setChannel): return {
+ guard case .setChannel(let l) = lhs, case .setChannel(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setConfig, .setConfig): return {
+ guard case .setConfig(let l) = lhs, case .setConfig(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setModuleConfig, .setModuleConfig): return {
+ guard case .setModuleConfig(let l) = lhs, case .setModuleConfig(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setCannedMessageModuleMessages, .setCannedMessageModuleMessages): return {
+ guard case .setCannedMessageModuleMessages(let l) = lhs, case .setCannedMessageModuleMessages(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setRingtoneMessage, .setRingtoneMessage): return {
+ guard case .setRingtoneMessage(let l) = lhs, case .setRingtoneMessage(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.removeByNodenum, .removeByNodenum): return {
+ guard case .removeByNodenum(let l) = lhs, case .removeByNodenum(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setFavoriteNode, .setFavoriteNode): return {
+ guard case .setFavoriteNode(let l) = lhs, case .setFavoriteNode(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.removeFavoriteNode, .removeFavoriteNode): return {
+ guard case .removeFavoriteNode(let l) = lhs, case .removeFavoriteNode(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setFixedPosition, .setFixedPosition): return {
+ guard case .setFixedPosition(let l) = lhs, case .setFixedPosition(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.removeFixedPosition, .removeFixedPosition): return {
+ guard case .removeFixedPosition(let l) = lhs, case .removeFixedPosition(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.setTimeOnly, .setTimeOnly): return {
+ guard case .setTimeOnly(let l) = lhs, case .setTimeOnly(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.beginEditSettings, .beginEditSettings): return {
+ guard case .beginEditSettings(let l) = lhs, case .beginEditSettings(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.commitEditSettings, .commitEditSettings): return {
+ guard case .commitEditSettings(let l) = lhs, case .commitEditSettings(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.factoryResetDevice, .factoryResetDevice): return {
+ guard case .factoryResetDevice(let l) = lhs, case .factoryResetDevice(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.rebootOtaSeconds, .rebootOtaSeconds): return {
+ guard case .rebootOtaSeconds(let l) = lhs, case .rebootOtaSeconds(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.exitSimulator, .exitSimulator): return {
+ guard case .exitSimulator(let l) = lhs, case .exitSimulator(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.rebootSeconds, .rebootSeconds): return {
+ guard case .rebootSeconds(let l) = lhs, case .rebootSeconds(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.shutdownSeconds, .shutdownSeconds): return {
+ guard case .shutdownSeconds(let l) = lhs, case .shutdownSeconds(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.factoryResetConfig, .factoryResetConfig): return {
+ guard case .factoryResetConfig(let l) = lhs, case .factoryResetConfig(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.nodedbReset, .nodedbReset): return {
+ guard case .nodedbReset(let l) = lhs, case .nodedbReset(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
/// TODO: REPLACE
- public enum ConfigType: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum ConfigType: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -675,23 +878,11 @@ public struct AdminMessage: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [AdminMessage.ConfigType] = [
- .deviceConfig,
- .positionConfig,
- .powerConfig,
- .networkConfig,
- .displayConfig,
- .loraConfig,
- .bluetoothConfig,
- .securityConfig,
- ]
-
}
///
/// TODO: REPLACE
- public enum ModuleConfigType: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum ModuleConfigType: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -789,31 +980,51 @@ public struct AdminMessage: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [AdminMessage.ModuleConfigType] = [
- .mqttConfig,
- .serialConfig,
- .extnotifConfig,
- .storeforwardConfig,
- .rangetestConfig,
- .telemetryConfig,
- .cannedmsgConfig,
- .audioConfig,
- .remotehardwareConfig,
- .neighborinfoConfig,
- .ambientlightingConfig,
- .detectionsensorConfig,
- .paxcounterConfig,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension AdminMessage.ConfigType: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [AdminMessage.ConfigType] = [
+ .deviceConfig,
+ .positionConfig,
+ .powerConfig,
+ .networkConfig,
+ .displayConfig,
+ .loraConfig,
+ .bluetoothConfig,
+ .securityConfig,
+ ]
+}
+
+extension AdminMessage.ModuleConfigType: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [AdminMessage.ModuleConfigType] = [
+ .mqttConfig,
+ .serialConfig,
+ .extnotifConfig,
+ .storeforwardConfig,
+ .rangetestConfig,
+ .telemetryConfig,
+ .cannedmsgConfig,
+ .audioConfig,
+ .remotehardwareConfig,
+ .neighborinfoConfig,
+ .ambientlightingConfig,
+ .detectionsensorConfig,
+ .paxcounterConfig,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// Parameters for setting up Meshtastic for ameteur radio usage
-public struct HamParameters: Sendable {
+public struct HamParameters {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -843,7 +1054,7 @@ public struct HamParameters: Sendable {
///
/// Response envelope for node_remote_hardware_pins
-public struct NodeRemoteHardwarePinsResponse: Sendable {
+public struct NodeRemoteHardwarePinsResponse {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -857,6 +1068,15 @@ public struct NodeRemoteHardwarePinsResponse: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension AdminMessage: @unchecked Sendable {}
+extension AdminMessage.OneOf_PayloadVariant: @unchecked Sendable {}
+extension AdminMessage.ConfigType: @unchecked Sendable {}
+extension AdminMessage.ModuleConfigType: @unchecked Sendable {}
+extension HamParameters: @unchecked Sendable {}
+extension NodeRemoteHardwarePinsResponse: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -864,6 +1084,7 @@ fileprivate let _protobuf_package = "meshtastic"
extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
public static let protoMessageName: String = _protobuf_package + ".AdminMessage"
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+ 101: .standard(proto: "session_passkey"),
1: .standard(proto: "get_channel_request"),
2: .standard(proto: "get_channel_response"),
3: .standard(proto: "get_owner_request"),
@@ -897,6 +1118,7 @@ extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
40: .standard(proto: "remove_favorite_node"),
41: .standard(proto: "set_fixed_position"),
42: .standard(proto: "remove_fixed_position"),
+ 43: .standard(proto: "set_time_only"),
64: .standard(proto: "begin_edit_settings"),
65: .standard(proto: "commit_edit_settings"),
94: .standard(proto: "factory_reset_device"),
@@ -1243,6 +1465,14 @@ extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
self.payloadVariant = .removeFixedPosition(v)
}
}()
+ case 43: try {
+ var v: UInt32?
+ try decoder.decodeSingularFixed32Field(value: &v)
+ if let v = v {
+ if self.payloadVariant != nil {try decoder.handleConflictingOneOf()}
+ self.payloadVariant = .setTimeOnly(v)
+ }
+ }()
case 64: try {
var v: Bool?
try decoder.decodeSingularBoolField(value: &v)
@@ -1315,6 +1545,7 @@ extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
self.payloadVariant = .nodedbReset(v)
}
}()
+ case 101: try { try decoder.decodeSingularBytesField(value: &self.sessionPasskey) }()
default: break
}
}
@@ -1458,6 +1689,10 @@ extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
guard case .removeFixedPosition(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularBoolField(value: v, fieldNumber: 42)
}()
+ case .setTimeOnly?: try {
+ guard case .setTimeOnly(let v)? = self.payloadVariant else { preconditionFailure() }
+ try visitor.visitSingularFixed32Field(value: v, fieldNumber: 43)
+ }()
case .beginEditSettings?: try {
guard case .beginEditSettings(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularBoolField(value: v, fieldNumber: 64)
@@ -1496,10 +1731,14 @@ extension AdminMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
}()
case nil: break
}
+ if !self.sessionPasskey.isEmpty {
+ try visitor.visitSingularBytesField(value: self.sessionPasskey, fieldNumber: 101)
+ }
try unknownFields.traverse(visitor: &visitor)
}
public static func ==(lhs: AdminMessage, rhs: AdminMessage) -> Bool {
+ if lhs.sessionPasskey != rhs.sessionPasskey {return false}
if lhs.payloadVariant != rhs.payloadVariant {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
@@ -1568,7 +1807,7 @@ extension HamParameters: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
if self.txPower != 0 {
try visitor.visitSingularInt32Field(value: self.txPower, fieldNumber: 2)
}
- if self.frequency.bitPattern != 0 {
+ if self.frequency != 0 {
try visitor.visitSingularFloatField(value: self.frequency, fieldNumber: 3)
}
if !self.shortName.isEmpty {
diff --git a/MeshtasticProtobufs/Sources/meshtastic/apponly.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/apponly.pb.swift
index 18e66d8e..0457077c 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/apponly.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/apponly.pb.swift
@@ -26,7 +26,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// any SECONDARY channels.
/// No DISABLED channels are included.
/// This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
-public struct ChannelSet: Sendable {
+public struct ChannelSet {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -53,6 +53,10 @@ public struct ChannelSet: Sendable {
fileprivate var _loraConfig: Config.LoRaConfig? = nil
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension ChannelSet: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/atak.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/atak.pb.swift
index 1dd12469..4406deb3 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/atak.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/atak.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public enum Team: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum Team: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -130,6 +130,11 @@ public enum Team: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension Team: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [Team] = [
.unspecifedColor,
@@ -148,12 +153,13 @@ public enum Team: SwiftProtobuf.Enum, Swift.CaseIterable {
.darkGreen,
.brown,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Role of the group member
-public enum MemberRole: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum MemberRole: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -227,6 +233,11 @@ public enum MemberRole: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension MemberRole: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [MemberRole] = [
.unspecifed,
@@ -239,12 +250,13 @@ public enum MemberRole: SwiftProtobuf.Enum, Swift.CaseIterable {
.rto,
.k9,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Packets for the official ATAK Plugin
-public struct TAKPacket: Sendable {
+public struct TAKPacket {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -314,7 +326,7 @@ public struct TAKPacket: Sendable {
///
/// The payload of the packet
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// TAK position report
case pli(PLI)
@@ -322,6 +334,24 @@ public struct TAKPacket: Sendable {
/// ATAK GeoChat message
case chat(GeoChat)
+ #if !swift(>=4.1)
+ public static func ==(lhs: TAKPacket.OneOf_PayloadVariant, rhs: TAKPacket.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.pli, .pli): return {
+ guard case .pli(let l) = lhs, case .pli(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.chat, .chat): return {
+ guard case .chat(let l) = lhs, case .chat(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
@@ -333,7 +363,7 @@ public struct TAKPacket: Sendable {
///
/// ATAK GeoChat message
-public struct GeoChat: Sendable {
+public struct GeoChat {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -375,7 +405,7 @@ public struct GeoChat: Sendable {
///
/// ATAK Group
/// <__group role='Team Member' name='Cyan'/>
-public struct Group: Sendable {
+public struct Group {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -397,7 +427,7 @@ public struct Group: Sendable {
///
/// ATAK EUD Status
///
-public struct Status: Sendable {
+public struct Status {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -414,7 +444,7 @@ public struct Status: Sendable {
///
/// ATAK Contact
///
-public struct Contact: Sendable {
+public struct Contact {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -434,7 +464,7 @@ public struct Contact: Sendable {
///
/// Position Location Information from ATAK
-public struct PLI: Sendable {
+public struct PLI {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -466,6 +496,18 @@ public struct PLI: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension Team: @unchecked Sendable {}
+extension MemberRole: @unchecked Sendable {}
+extension TAKPacket: @unchecked Sendable {}
+extension TAKPacket.OneOf_PayloadVariant: @unchecked Sendable {}
+extension GeoChat: @unchecked Sendable {}
+extension Group: @unchecked Sendable {}
+extension Status: @unchecked Sendable {}
+extension Contact: @unchecked Sendable {}
+extension PLI: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/cannedmessages.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/cannedmessages.pb.swift
index a43393e1..1b8c84de 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/cannedmessages.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/cannedmessages.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// Canned message module configuration.
-public struct CannedMessageModuleConfig: Sendable {
+public struct CannedMessageModuleConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -36,6 +36,10 @@ public struct CannedMessageModuleConfig: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension CannedMessageModuleConfig: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/channel.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/channel.pb.swift
index a8c96595..5b9c7e49 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/channel.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/channel.pb.swift
@@ -36,15 +36,13 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// FIXME: Add description of multi-channel support and how primary vs secondary channels are used.
/// FIXME: explain how apps use channels for security.
/// explain how remote settings and remote gpio are managed as an example
-public struct ChannelSettings: @unchecked Sendable {
+public struct ChannelSettings {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
///
/// Deprecated in favor of LoraConfig.channel_num
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var channelNum: UInt32 = 0
///
@@ -113,7 +111,7 @@ public struct ChannelSettings: @unchecked Sendable {
///
/// This message is specifically for modules to store per-channel configuration data.
-public struct ModuleSettings: Sendable {
+public struct ModuleSettings {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -134,7 +132,7 @@ public struct ModuleSettings: Sendable {
///
/// A pair of a channel number, mode and the (sharable) settings for that channel
-public struct Channel: Sendable {
+public struct Channel {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -172,7 +170,7 @@ public struct Channel: Sendable {
/// cross band routing as needed.
/// If a device has only a single radio (the common case) only one channel can be PRIMARY at a time
/// (but any number of SECONDARY channels can't be sent received on that common frequency)
- public enum Role: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Role: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -211,13 +209,6 @@ public struct Channel: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Channel.Role] = [
- .disabled,
- .primary,
- .secondary,
- ]
-
}
public init() {}
@@ -225,6 +216,26 @@ public struct Channel: Sendable {
fileprivate var _settings: ChannelSettings? = nil
}
+#if swift(>=4.2)
+
+extension Channel.Role: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Channel.Role] = [
+ .disabled,
+ .primary,
+ .secondary,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension ChannelSettings: @unchecked Sendable {}
+extension ModuleSettings: @unchecked Sendable {}
+extension Channel: @unchecked Sendable {}
+extension Channel.Role: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/clientonly.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/clientonly.pb.swift
index 89370cc5..c3d93bf7 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/clientonly.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/clientonly.pb.swift
@@ -23,7 +23,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// This abstraction is used to contain any configuration for provisioning a node on any client.
/// It is useful for importing and exporting configurations.
-public struct DeviceProfile: Sendable {
+public struct DeviceProfile {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -94,6 +94,10 @@ public struct DeviceProfile: Sendable {
fileprivate var _moduleConfig: LocalModuleConfig? = nil
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension DeviceProfile: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/config.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/config.pb.swift
index ecfeeefa..4b953470 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/config.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/config.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public struct Config: Sendable {
+public struct Config {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -97,7 +97,7 @@ public struct Config: Sendable {
///
/// Payload Variant
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
case device(Config.DeviceConfig)
case position(Config.PositionConfig)
case power(Config.PowerConfig)
@@ -107,11 +107,53 @@ public struct Config: Sendable {
case bluetooth(Config.BluetoothConfig)
case security(Config.SecurityConfig)
+ #if !swift(>=4.1)
+ public static func ==(lhs: Config.OneOf_PayloadVariant, rhs: Config.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.device, .device): return {
+ guard case .device(let l) = lhs, case .device(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.position, .position): return {
+ guard case .position(let l) = lhs, case .position(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.power, .power): return {
+ guard case .power(let l) = lhs, case .power(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.network, .network): return {
+ guard case .network(let l) = lhs, case .network(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.display, .display): return {
+ guard case .display(let l) = lhs, case .display(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.lora, .lora): return {
+ guard case .lora(let l) = lhs, case .lora(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.bluetooth, .bluetooth): return {
+ guard case .bluetooth(let l) = lhs, case .bluetooth(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.security, .security): return {
+ guard case .security(let l) = lhs, case .security(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
/// Configuration
- public struct DeviceConfig: Sendable {
+ public struct DeviceConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -123,16 +165,12 @@ public struct Config: Sendable {
///
/// Disabling this will disable the SerialConsole by not initilizing the StreamAPI
/// Moved to SecurityConfig
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var serialEnabled: Bool = false
///
/// By default we turn off logging as soon as an API client connects (to keep shared serial link quiet).
/// Set this to true to leave the debug log outputting even when API is active.
/// Moved to SecurityConfig
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var debugLogEnabled: Bool = false
///
@@ -162,8 +200,6 @@ public struct Config: Sendable {
/// If true, device is considered to be "managed" by a mesh administrator
/// Clients should then limit available configuration and administrative options inside the user interface
/// Moved to SecurityConfig
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var isManaged: Bool = false
///
@@ -182,7 +218,7 @@ public struct Config: Sendable {
///
/// Defines the device's role on the Mesh network
- public enum Role: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Role: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -200,8 +236,6 @@ public struct Config: Sendable {
/// The wifi radio and the oled screen will be put to sleep.
/// This mode may still potentially have higher power usage due to it's preference in message rebroadcasting on the mesh.
case router // = 2
-
- /// NOTE: This enum value was marked as deprecated in the .proto file
case routerClient // = 3
///
@@ -292,26 +326,11 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DeviceConfig.Role] = [
- .client,
- .clientMute,
- .router,
- .routerClient,
- .repeater,
- .tracker,
- .sensor,
- .tak,
- .clientHidden,
- .lostAndFound,
- .takTracker,
- ]
-
}
///
/// Defines the device's behavior for how messages are rebroadcast
- public enum RebroadcastMode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum RebroadcastMode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -359,14 +378,6 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DeviceConfig.RebroadcastMode] = [
- .all,
- .allSkipDecoding,
- .localOnly,
- .knownOnly,
- ]
-
}
public init() {}
@@ -374,7 +385,7 @@ public struct Config: Sendable {
///
/// Position Config
- public struct PositionConfig: Sendable {
+ public struct PositionConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -396,8 +407,6 @@ public struct Config: Sendable {
///
/// Is GPS enabled for this node?
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var gpsEnabled: Bool = false
///
@@ -408,8 +417,6 @@ public struct Config: Sendable {
///
/// Deprecated in favor of using smart / regular broadcast intervals as implicit attempt time
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var gpsAttemptTime: UInt32 = 0
///
@@ -450,7 +457,7 @@ public struct Config: Sendable {
/// are always included (also time if GPS-synced)
/// NOTE: the more fields are included, the larger the message will be -
/// leading to longer airtime and a higher risk of packet loss
- public enum PositionFlags: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum PositionFlags: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -540,24 +547,9 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.PositionConfig.PositionFlags] = [
- .unset,
- .altitude,
- .altitudeMsl,
- .geoidalSeparation,
- .dop,
- .hvdop,
- .satinview,
- .seqNo,
- .timestamp,
- .heading,
- .speed,
- ]
-
}
- public enum GpsMode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum GpsMode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -595,13 +587,6 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.PositionConfig.GpsMode] = [
- .disabled,
- .enabled,
- .notPresent,
- ]
-
}
public init() {}
@@ -610,7 +595,7 @@ public struct Config: Sendable {
///
/// Power Config\
/// See [Power Config](/docs/settings/config/power) for additional power config details.
- public struct PowerConfig: Sendable {
+ public struct PowerConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -670,7 +655,7 @@ public struct Config: Sendable {
///
/// Network Config
- public struct NetworkConfig: Sendable {
+ public struct NetworkConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -717,7 +702,7 @@ public struct Config: Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum AddressMode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum AddressMode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -749,15 +734,9 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.NetworkConfig.AddressMode] = [
- .dhcp,
- .static,
- ]
-
}
- public struct IpV4Config: Sendable {
+ public struct IpV4Config {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -790,7 +769,7 @@ public struct Config: Sendable {
///
/// Display Config
- public struct DisplayConfig: Sendable {
+ public struct DisplayConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -846,7 +825,7 @@ public struct Config: Sendable {
///
/// How the GPS coordinates are displayed on the OLED screen.
- public enum GpsCoordinateFormat: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum GpsCoordinateFormat: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -909,21 +888,11 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DisplayConfig.GpsCoordinateFormat] = [
- .dec,
- .dms,
- .utm,
- .mgrs,
- .olc,
- .osgr,
- ]
-
}
///
/// Unit display preference
- public enum DisplayUnits: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum DisplayUnits: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -955,17 +924,11 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DisplayConfig.DisplayUnits] = [
- .metric,
- .imperial,
- ]
-
}
///
/// Override OLED outo detect with this if it fails.
- public enum OledType: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum OledType: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1009,17 +972,9 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DisplayConfig.OledType] = [
- .oledAuto,
- .oledSsd1306,
- .oledSh1106,
- .oledSh1107,
- ]
-
}
- public enum DisplayMode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum DisplayMode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1063,17 +1018,9 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DisplayConfig.DisplayMode] = [
- .default,
- .twocolor,
- .inverted,
- .color,
- ]
-
}
- public enum CompassOrientation: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum CompassOrientation: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1141,18 +1088,6 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.DisplayConfig.CompassOrientation] = [
- .degrees0,
- .degrees90,
- .degrees180,
- .degrees270,
- .degrees0Inverted,
- .degrees90Inverted,
- .degrees180Inverted,
- .degrees270Inverted,
- ]
-
}
public init() {}
@@ -1160,7 +1095,7 @@ public struct Config: Sendable {
///
/// Lora Config
- public struct LoRaConfig: @unchecked Sendable {
+ public struct LoRaConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1317,7 +1252,7 @@ public struct Config: Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum RegionCode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum RegionCode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1451,35 +1386,12 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.LoRaConfig.RegionCode] = [
- .unset,
- .us,
- .eu433,
- .eu868,
- .cn,
- .jp,
- .anz,
- .kr,
- .tw,
- .ru,
- .in,
- .nz865,
- .th,
- .lora24,
- .ua433,
- .ua868,
- .my433,
- .my919,
- .sg923,
- ]
-
}
///
/// Standard predefined channel settings
/// Note: these mappings must match ModemPreset Choice in the device code.
- public enum ModemPreset: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum ModemPreset: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1493,8 +1405,6 @@ public struct Config: Sendable {
///
/// Very Long Range - Slow
/// Deprecated in 2.5: Works only with txco and is unusably slow
- ///
- /// NOTE: This enum value was marked as deprecated in the .proto file
case veryLongSlow // = 2
///
@@ -1558,19 +1468,6 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.LoRaConfig.ModemPreset] = [
- .longFast,
- .longSlow,
- .veryLongSlow,
- .mediumSlow,
- .mediumFast,
- .shortSlow,
- .shortFast,
- .longModerate,
- .shortTurbo,
- ]
-
}
public init() {}
@@ -1578,7 +1475,7 @@ public struct Config: Sendable {
fileprivate var _storage = _StorageClass.defaultInstance
}
- public struct BluetoothConfig: Sendable {
+ public struct BluetoothConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1598,13 +1495,11 @@ public struct Config: Sendable {
///
/// Enables device (serial style logs) over Bluetooth
/// Moved to SecurityConfig
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var deviceLoggingEnabled: Bool = false
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum PairingMode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum PairingMode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1642,19 +1537,12 @@ public struct Config: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Config.BluetoothConfig.PairingMode] = [
- .randomPin,
- .fixedPin,
- .noPin,
- ]
-
}
public init() {}
}
- public struct SecurityConfig: @unchecked Sendable {
+ public struct SecurityConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1703,6 +1591,201 @@ public struct Config: Sendable {
public init() {}
}
+#if swift(>=4.2)
+
+extension Config.DeviceConfig.Role: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DeviceConfig.Role] = [
+ .client,
+ .clientMute,
+ .router,
+ .routerClient,
+ .repeater,
+ .tracker,
+ .sensor,
+ .tak,
+ .clientHidden,
+ .lostAndFound,
+ .takTracker,
+ ]
+}
+
+extension Config.DeviceConfig.RebroadcastMode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DeviceConfig.RebroadcastMode] = [
+ .all,
+ .allSkipDecoding,
+ .localOnly,
+ .knownOnly,
+ ]
+}
+
+extension Config.PositionConfig.PositionFlags: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.PositionConfig.PositionFlags] = [
+ .unset,
+ .altitude,
+ .altitudeMsl,
+ .geoidalSeparation,
+ .dop,
+ .hvdop,
+ .satinview,
+ .seqNo,
+ .timestamp,
+ .heading,
+ .speed,
+ ]
+}
+
+extension Config.PositionConfig.GpsMode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.PositionConfig.GpsMode] = [
+ .disabled,
+ .enabled,
+ .notPresent,
+ ]
+}
+
+extension Config.NetworkConfig.AddressMode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.NetworkConfig.AddressMode] = [
+ .dhcp,
+ .static,
+ ]
+}
+
+extension Config.DisplayConfig.GpsCoordinateFormat: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DisplayConfig.GpsCoordinateFormat] = [
+ .dec,
+ .dms,
+ .utm,
+ .mgrs,
+ .olc,
+ .osgr,
+ ]
+}
+
+extension Config.DisplayConfig.DisplayUnits: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DisplayConfig.DisplayUnits] = [
+ .metric,
+ .imperial,
+ ]
+}
+
+extension Config.DisplayConfig.OledType: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DisplayConfig.OledType] = [
+ .oledAuto,
+ .oledSsd1306,
+ .oledSh1106,
+ .oledSh1107,
+ ]
+}
+
+extension Config.DisplayConfig.DisplayMode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DisplayConfig.DisplayMode] = [
+ .default,
+ .twocolor,
+ .inverted,
+ .color,
+ ]
+}
+
+extension Config.DisplayConfig.CompassOrientation: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.DisplayConfig.CompassOrientation] = [
+ .degrees0,
+ .degrees90,
+ .degrees180,
+ .degrees270,
+ .degrees0Inverted,
+ .degrees90Inverted,
+ .degrees180Inverted,
+ .degrees270Inverted,
+ ]
+}
+
+extension Config.LoRaConfig.RegionCode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.LoRaConfig.RegionCode] = [
+ .unset,
+ .us,
+ .eu433,
+ .eu868,
+ .cn,
+ .jp,
+ .anz,
+ .kr,
+ .tw,
+ .ru,
+ .in,
+ .nz865,
+ .th,
+ .lora24,
+ .ua433,
+ .ua868,
+ .my433,
+ .my919,
+ .sg923,
+ ]
+}
+
+extension Config.LoRaConfig.ModemPreset: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.LoRaConfig.ModemPreset] = [
+ .longFast,
+ .longSlow,
+ .veryLongSlow,
+ .mediumSlow,
+ .mediumFast,
+ .shortSlow,
+ .shortFast,
+ .longModerate,
+ .shortTurbo,
+ ]
+}
+
+extension Config.BluetoothConfig.PairingMode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Config.BluetoothConfig.PairingMode] = [
+ .randomPin,
+ .fixedPin,
+ .noPin,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension Config: @unchecked Sendable {}
+extension Config.OneOf_PayloadVariant: @unchecked Sendable {}
+extension Config.DeviceConfig: @unchecked Sendable {}
+extension Config.DeviceConfig.Role: @unchecked Sendable {}
+extension Config.DeviceConfig.RebroadcastMode: @unchecked Sendable {}
+extension Config.PositionConfig: @unchecked Sendable {}
+extension Config.PositionConfig.PositionFlags: @unchecked Sendable {}
+extension Config.PositionConfig.GpsMode: @unchecked Sendable {}
+extension Config.PowerConfig: @unchecked Sendable {}
+extension Config.NetworkConfig: @unchecked Sendable {}
+extension Config.NetworkConfig.AddressMode: @unchecked Sendable {}
+extension Config.NetworkConfig.IpV4Config: @unchecked Sendable {}
+extension Config.DisplayConfig: @unchecked Sendable {}
+extension Config.DisplayConfig.GpsCoordinateFormat: @unchecked Sendable {}
+extension Config.DisplayConfig.DisplayUnits: @unchecked Sendable {}
+extension Config.DisplayConfig.OledType: @unchecked Sendable {}
+extension Config.DisplayConfig.DisplayMode: @unchecked Sendable {}
+extension Config.DisplayConfig.CompassOrientation: @unchecked Sendable {}
+extension Config.LoRaConfig: @unchecked Sendable {}
+extension Config.LoRaConfig.RegionCode: @unchecked Sendable {}
+extension Config.LoRaConfig.ModemPreset: @unchecked Sendable {}
+extension Config.BluetoothConfig: @unchecked Sendable {}
+extension Config.BluetoothConfig.PairingMode: @unchecked Sendable {}
+extension Config.SecurityConfig: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -2177,7 +2260,7 @@ extension Config.PowerConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
if self.onBatteryShutdownAfterSecs != 0 {
try visitor.visitSingularUInt32Field(value: self.onBatteryShutdownAfterSecs, fieldNumber: 2)
}
- if self.adcMultiplierOverride.bitPattern != 0 {
+ if self.adcMultiplierOverride != 0 {
try visitor.visitSingularFloatField(value: self.adcMultiplierOverride, fieldNumber: 3)
}
if self.waitBluetoothSecs != 0 {
@@ -2621,7 +2704,7 @@ extension Config.LoRaConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem
if _storage._codingRate != 0 {
try visitor.visitSingularUInt32Field(value: _storage._codingRate, fieldNumber: 5)
}
- if _storage._frequencyOffset.bitPattern != 0 {
+ if _storage._frequencyOffset != 0 {
try visitor.visitSingularFloatField(value: _storage._frequencyOffset, fieldNumber: 6)
}
if _storage._region != .unset {
@@ -2645,7 +2728,7 @@ extension Config.LoRaConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem
if _storage._sx126XRxBoostedGain != false {
try visitor.visitSingularBoolField(value: _storage._sx126XRxBoostedGain, fieldNumber: 13)
}
- if _storage._overrideFrequency.bitPattern != 0 {
+ if _storage._overrideFrequency != 0 {
try visitor.visitSingularFloatField(value: _storage._overrideFrequency, fieldNumber: 14)
}
if _storage._paFanDisabled != false {
diff --git a/MeshtasticProtobufs/Sources/meshtastic/connection_status.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/connection_status.pb.swift
index a4569714..a2ec180e 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/connection_status.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/connection_status.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public struct DeviceConnectionStatus: Sendable {
+public struct DeviceConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -81,7 +81,7 @@ public struct DeviceConnectionStatus: Sendable {
///
/// WiFi connection status
-public struct WifiConnectionStatus: Sendable {
+public struct WifiConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -114,7 +114,7 @@ public struct WifiConnectionStatus: Sendable {
///
/// Ethernet connection status
-public struct EthernetConnectionStatus: Sendable {
+public struct EthernetConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -139,7 +139,7 @@ public struct EthernetConnectionStatus: Sendable {
///
/// Ethernet or WiFi connection status
-public struct NetworkConnectionStatus: Sendable {
+public struct NetworkConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -167,7 +167,7 @@ public struct NetworkConnectionStatus: Sendable {
///
/// Bluetooth connection status
-public struct BluetoothConnectionStatus: Sendable {
+public struct BluetoothConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -191,7 +191,7 @@ public struct BluetoothConnectionStatus: Sendable {
///
/// Serial connection status
-public struct SerialConnectionStatus: Sendable {
+public struct SerialConnectionStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -209,6 +209,15 @@ public struct SerialConnectionStatus: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension DeviceConnectionStatus: @unchecked Sendable {}
+extension WifiConnectionStatus: @unchecked Sendable {}
+extension EthernetConnectionStatus: @unchecked Sendable {}
+extension NetworkConnectionStatus: @unchecked Sendable {}
+extension BluetoothConnectionStatus: @unchecked Sendable {}
+extension SerialConnectionStatus: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/deviceonly.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/deviceonly.pb.swift
index 076e639e..43506399 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/deviceonly.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/deviceonly.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// Font sizes for the device screen
-public enum ScreenFonts: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum ScreenFonts: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -60,18 +60,24 @@ public enum ScreenFonts: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension ScreenFonts: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [ScreenFonts] = [
.fontSmall,
.fontMedium,
.fontLarge,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Position with static location information only for NodeDBLite
-public struct PositionLite: Sendable {
+public struct PositionLite {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -106,15 +112,13 @@ public struct PositionLite: Sendable {
public init() {}
}
-public struct UserLite: @unchecked Sendable {
+public struct UserLite {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
///
/// This is the addr of the radio.
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var macaddr: Data = Data()
///
@@ -153,7 +157,7 @@ public struct UserLite: @unchecked Sendable {
public init() {}
}
-public struct NodeInfoLite: @unchecked Sendable {
+public struct NodeInfoLite {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -256,7 +260,7 @@ public struct NodeInfoLite: @unchecked Sendable {
/// FIXME, since we write this each time we enter deep sleep (and have infinite
/// flash) it would be better to use some sort of append only data structure for
/// the receive queue and use the preferences store for the other stuff
-public struct DeviceState: @unchecked Sendable {
+public struct DeviceState {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -316,8 +320,6 @@ public struct DeviceState: @unchecked Sendable {
/// Used only during development.
/// Indicates developer is testing and changes should never be saved to flash.
/// Deprecated in 2.3.1
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var noSave: Bool {
get {return _storage._noSave}
set {_uniqueStorage()._noSave = newValue}
@@ -366,7 +368,7 @@ public struct DeviceState: @unchecked Sendable {
///
/// The on-disk saved channels
-public struct ChannelFile: Sendable {
+public struct ChannelFile {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -389,7 +391,7 @@ public struct ChannelFile: Sendable {
///
/// This can be used for customizing the firmware distribution. If populated,
/// show a secondary bootup screen with custom logo and text for 2.5 seconds.
-public struct OEMStore: @unchecked Sendable {
+public struct OEMStore {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -448,6 +450,16 @@ public struct OEMStore: @unchecked Sendable {
fileprivate var _oemLocalModuleConfig: LocalModuleConfig? = nil
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension ScreenFonts: @unchecked Sendable {}
+extension PositionLite: @unchecked Sendable {}
+extension UserLite: @unchecked Sendable {}
+extension NodeInfoLite: @unchecked Sendable {}
+extension DeviceState: @unchecked Sendable {}
+extension ChannelFile: @unchecked Sendable {}
+extension OEMStore: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -683,7 +695,7 @@ extension NodeInfoLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
try { if let v = _storage._position {
try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
} }()
- if _storage._snr.bitPattern != 0 {
+ if _storage._snr != 0 {
try visitor.visitSingularFloatField(value: _storage._snr, fieldNumber: 4)
}
if _storage._lastHeard != 0 {
diff --git a/MeshtasticProtobufs/Sources/meshtastic/localonly.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/localonly.pb.swift
index f2ef681d..0af27466 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/localonly.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/localonly.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public struct LocalConfig: @unchecked Sendable {
+public struct LocalConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -129,7 +129,7 @@ public struct LocalConfig: @unchecked Sendable {
fileprivate var _storage = _StorageClass.defaultInstance
}
-public struct LocalModuleConfig: @unchecked Sendable {
+public struct LocalModuleConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -293,6 +293,11 @@ public struct LocalModuleConfig: @unchecked Sendable {
fileprivate var _storage = _StorageClass.defaultInstance
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension LocalConfig: @unchecked Sendable {}
+extension LocalModuleConfig: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/mesh.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/mesh.pb.swift
index 2aa80dc1..1f4c60a5 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/mesh.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/mesh.pb.swift
@@ -25,7 +25,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// bin/build-all.sh script.
/// Because they will be used to find firmware filenames in the android app for OTA updates.
/// To match the old style filenames, _ is converted to -, p is converted to .
-public enum HardwareModel: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum HardwareModel: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -515,6 +515,11 @@ public enum HardwareModel: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension HardwareModel: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [HardwareModel] = [
.unset,
@@ -593,12 +598,13 @@ public enum HardwareModel: SwiftProtobuf.Enum, Swift.CaseIterable {
.radiomaster900Bandit,
.privateHw,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Shared constants between device and phone
-public enum Constants: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum Constants: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -633,20 +639,26 @@ public enum Constants: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension Constants: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [Constants] = [
.zero,
.dataPayloadLen,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Error codes for critical errors
/// The device might report these fault codes on the screen.
/// If you encounter a fault code, please post on the meshtastic.discourse.group
/// and we'll try to help.
-public enum CriticalErrorCode: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum CriticalErrorCode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -755,6 +767,11 @@ public enum CriticalErrorCode: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension CriticalErrorCode: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [CriticalErrorCode] = [
.none,
@@ -772,12 +789,13 @@ public enum CriticalErrorCode: SwiftProtobuf.Enum, Swift.CaseIterable {
.flashCorruptionRecoverable,
.flashCorruptionUnrecoverable,
]
-
}
+#endif // swift(>=4.2)
+
///
/// a gps position
-public struct Position: @unchecked Sendable {
+public struct Position {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -994,7 +1012,7 @@ public struct Position: @unchecked Sendable {
///
/// How the location was acquired: manual, onboard GPS, external (EUD) GPS
- public enum LocSource: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum LocSource: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1038,20 +1056,12 @@ public struct Position: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Position.LocSource] = [
- .locUnset,
- .locManual,
- .locInternal,
- .locExternal,
- ]
-
}
///
/// How the altitude was acquired: manual, GPS int/ext, etc
/// Default: same as location_source if present
- public enum AltSource: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum AltSource: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1101,15 +1111,6 @@ public struct Position: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Position.AltSource] = [
- .altUnset,
- .altManual,
- .altInternal,
- .altExternal,
- .altBarometric,
- ]
-
}
public init() {}
@@ -1117,6 +1118,31 @@ public struct Position: @unchecked Sendable {
fileprivate var _storage = _StorageClass.defaultInstance
}
+#if swift(>=4.2)
+
+extension Position.LocSource: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Position.LocSource] = [
+ .locUnset,
+ .locManual,
+ .locInternal,
+ .locExternal,
+ ]
+}
+
+extension Position.AltSource: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Position.AltSource] = [
+ .altUnset,
+ .altManual,
+ .altInternal,
+ .altExternal,
+ .altBarometric,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// Broadcast when a newly powered mesh node wants to find a node num it can use
/// Sent from the phone over bluetooth to set the user id for the owner of this node.
@@ -1138,7 +1164,7 @@ public struct Position: @unchecked Sendable {
/// A few nodenums are reserved and will never be requested:
/// 0xff - broadcast
/// 0 through 3 - for future use
-public struct User: @unchecked Sendable {
+public struct User {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1163,8 +1189,6 @@ public struct User: @unchecked Sendable {
/// Deprecated in Meshtastic 2.1.x
/// This is the addr of the radio.
/// Not populated by the phone, but added by the esp32 when broadcasting
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var macaddr: Data = Data()
///
@@ -1196,7 +1220,7 @@ public struct User: @unchecked Sendable {
///
/// A message used in our Dynamic Source Routing protocol (RFC 4728 based)
-public struct RouteDiscovery: Sendable {
+public struct RouteDiscovery {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1212,7 +1236,7 @@ public struct RouteDiscovery: Sendable {
///
/// A Routing control Data packet handled by the routing module
-public struct Routing: Sendable {
+public struct Routing {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1252,7 +1276,7 @@ public struct Routing: Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum OneOf_Variant: Equatable, Sendable {
+ public enum OneOf_Variant: Equatable {
///
/// A route request going from the requester
case routeRequest(RouteDiscovery)
@@ -1264,12 +1288,34 @@ public struct Routing: Sendable {
/// in addition to ack.fail_id to provide details on the type of failure).
case errorReason(Routing.Error)
+ #if !swift(>=4.1)
+ public static func ==(lhs: Routing.OneOf_Variant, rhs: Routing.OneOf_Variant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.routeRequest, .routeRequest): return {
+ guard case .routeRequest(let l) = lhs, case .routeRequest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.routeReply, .routeReply): return {
+ guard case .routeReply(let l) = lhs, case .routeReply(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.errorReason, .errorReason): return {
+ guard case .errorReason(let l) = lhs, case .errorReason(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
/// A failure in delivering a message (usually used for routing control messages, but might be provided in addition to ack.fail_id to provide
/// details on the type of failure).
- public enum Error: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Error: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1375,34 +1421,40 @@ public struct Routing: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [Routing.Error] = [
- .none,
- .noRoute,
- .gotNak,
- .timeout,
- .noInterface,
- .maxRetransmit,
- .noChannel,
- .tooLarge,
- .noResponse,
- .dutyCycleLimit,
- .badRequest,
- .notAuthorized,
- .pkiFailed,
- .pkiUnknownPubkey,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension Routing.Error: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [Routing.Error] = [
+ .none,
+ .noRoute,
+ .gotNak,
+ .timeout,
+ .noInterface,
+ .maxRetransmit,
+ .noChannel,
+ .tooLarge,
+ .noResponse,
+ .dutyCycleLimit,
+ .badRequest,
+ .notAuthorized,
+ .pkiFailed,
+ .pkiUnknownPubkey,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// (Formerly called SubPacket)
/// The payload portion fo a packet, this is the actual bytes that are sent
/// inside a radio packet (because from/to are broken out by the comms library)
-public struct DataMessage: @unchecked Sendable {
+public struct DataMessage {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1456,7 +1508,7 @@ public struct DataMessage: @unchecked Sendable {
///
/// Waypoint message, used to share arbitrary locations across the mesh
-public struct Waypoint: Sendable {
+public struct Waypoint {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1518,7 +1570,7 @@ public struct Waypoint: Sendable {
///
/// This message will be proxied over the PhoneAPI for the client to deliver to the MQTT server
-public struct MqttClientProxyMessage: @unchecked Sendable {
+public struct MqttClientProxyMessage {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1559,7 +1611,7 @@ public struct MqttClientProxyMessage: @unchecked Sendable {
///
/// The actual service envelope payload or text for mqtt pub / sub
- public enum OneOf_PayloadVariant: Equatable, @unchecked Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// Bytes
case data(Data)
@@ -1567,6 +1619,24 @@ public struct MqttClientProxyMessage: @unchecked Sendable {
/// Text
case text(String)
+ #if !swift(>=4.1)
+ public static func ==(lhs: MqttClientProxyMessage.OneOf_PayloadVariant, rhs: MqttClientProxyMessage.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.data, .data): return {
+ guard case .data(let l) = lhs, case .data(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.text, .text): return {
+ guard case .text(let l) = lhs, case .text(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
@@ -1576,7 +1646,7 @@ public struct MqttClientProxyMessage: @unchecked Sendable {
/// A packet envelope sent/received over the mesh
/// only payload_variant is sent in the payload portion of the LORA packet.
/// The other fields are either not sent at all, or sent in the special 16 byte LORA header.
-public struct MeshPacket: @unchecked Sendable {
+public struct MeshPacket {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1710,8 +1780,6 @@ public struct MeshPacket: @unchecked Sendable {
///
/// Describe if this message is delayed
- ///
- /// NOTE: This field was marked as deprecated in the .proto file.
public var delayed: MeshPacket.Delayed {
get {return _storage._delayed}
set {_uniqueStorage()._delayed = newValue}
@@ -1748,7 +1816,7 @@ public struct MeshPacket: @unchecked Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum OneOf_PayloadVariant: Equatable, @unchecked Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// TODO: REPLACE
case decoded(DataMessage)
@@ -1756,6 +1824,24 @@ public struct MeshPacket: @unchecked Sendable {
/// TODO: REPLACE
case encrypted(Data)
+ #if !swift(>=4.1)
+ public static func ==(lhs: MeshPacket.OneOf_PayloadVariant, rhs: MeshPacket.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.decoded, .decoded): return {
+ guard case .decoded(let l) = lhs, case .decoded(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.encrypted, .encrypted): return {
+ guard case .encrypted(let l) = lhs, case .encrypted(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
@@ -1777,7 +1863,7 @@ public struct MeshPacket: @unchecked Sendable {
/// So I bit the bullet and implemented a new (internal - not sent over the air)
/// field in MeshPacket called 'priority'.
/// And the transmission queue in the router object is now a priority queue.
- public enum Priority: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Priority: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1842,22 +1928,11 @@ public struct MeshPacket: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [MeshPacket.Priority] = [
- .unset,
- .min,
- .background,
- .default,
- .reliable,
- .ack,
- .max,
- ]
-
}
///
/// Identify if this is a delayed packet
- public enum Delayed: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Delayed: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1895,13 +1970,6 @@ public struct MeshPacket: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [MeshPacket.Delayed] = [
- .noDelay,
- .broadcast,
- .direct,
- ]
-
}
public init() {}
@@ -1909,6 +1977,32 @@ public struct MeshPacket: @unchecked Sendable {
fileprivate var _storage = _StorageClass.defaultInstance
}
+#if swift(>=4.2)
+
+extension MeshPacket.Priority: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [MeshPacket.Priority] = [
+ .unset,
+ .min,
+ .background,
+ .default,
+ .reliable,
+ .ack,
+ .max,
+ ]
+}
+
+extension MeshPacket.Delayed: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [MeshPacket.Delayed] = [
+ .noDelay,
+ .broadcast,
+ .direct,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// The bluetooth to device link:
/// Old BTLE protocol docs from TODO, merge in above and make real docs...
@@ -1926,7 +2020,7 @@ public struct MeshPacket: @unchecked Sendable {
/// level etc) SET_CONFIG (switches device to a new set of radio params and
/// preshared key, drops all existing nodes, force our node to rejoin this new group)
/// Full information about a node on the mesh
-public struct NodeInfo: @unchecked Sendable {
+public struct NodeInfo {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2027,7 +2121,7 @@ public struct NodeInfo: @unchecked Sendable {
/// Unique local debugging info for this node
/// Note: we don't include position or the user info, because that will come in the
/// Sent to the phone in response to WantNodes.
-public struct MyNodeInfo: Sendable {
+public struct MyNodeInfo {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2058,7 +2152,7 @@ public struct MyNodeInfo: Sendable {
/// on the message it is assumed to be a continuation of the previously sent message.
/// This allows the device code to use fixed maxlen 64 byte strings for messages,
/// and then extend as needed by emitting multiple records.
-public struct LogRecord: Sendable {
+public struct LogRecord {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2083,7 +2177,7 @@ public struct LogRecord: Sendable {
///
/// Log levels, chosen to match python logging conventions.
- public enum Level: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Level: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -2145,23 +2239,29 @@ public struct LogRecord: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [LogRecord.Level] = [
- .unset,
- .critical,
- .error,
- .warning,
- .info,
- .debug,
- .trace,
- ]
-
}
public init() {}
}
-public struct QueueStatus: Sendable {
+#if swift(>=4.2)
+
+extension LogRecord.Level: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [LogRecord.Level] = [
+ .unset,
+ .critical,
+ .error,
+ .warning,
+ .info,
+ .debug,
+ .trace,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+public struct QueueStatus {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2188,7 +2288,7 @@ public struct QueueStatus: Sendable {
/// It will support READ and NOTIFY. When a new packet arrives the device will BLE notify?
/// It will sit in that descriptor until consumed by the phone,
/// at which point the next item in the FIFO will be populated.
-public struct FromRadio: Sendable {
+public struct FromRadio {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2364,7 +2464,7 @@ public struct FromRadio: Sendable {
///
/// Log levels, chosen to match python logging conventions.
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// Log levels, chosen to match python logging conventions.
case packet(MeshPacket)
@@ -2419,6 +2519,76 @@ public struct FromRadio: Sendable {
/// Notification message to the client
case clientNotification(ClientNotification)
+ #if !swift(>=4.1)
+ public static func ==(lhs: FromRadio.OneOf_PayloadVariant, rhs: FromRadio.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.packet, .packet): return {
+ guard case .packet(let l) = lhs, case .packet(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.myInfo, .myInfo): return {
+ guard case .myInfo(let l) = lhs, case .myInfo(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.nodeInfo, .nodeInfo): return {
+ guard case .nodeInfo(let l) = lhs, case .nodeInfo(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.config, .config): return {
+ guard case .config(let l) = lhs, case .config(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.logRecord, .logRecord): return {
+ guard case .logRecord(let l) = lhs, case .logRecord(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.configCompleteID, .configCompleteID): return {
+ guard case .configCompleteID(let l) = lhs, case .configCompleteID(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.rebooted, .rebooted): return {
+ guard case .rebooted(let l) = lhs, case .rebooted(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.moduleConfig, .moduleConfig): return {
+ guard case .moduleConfig(let l) = lhs, case .moduleConfig(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.channel, .channel): return {
+ guard case .channel(let l) = lhs, case .channel(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.queueStatus, .queueStatus): return {
+ guard case .queueStatus(let l) = lhs, case .queueStatus(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.xmodemPacket, .xmodemPacket): return {
+ guard case .xmodemPacket(let l) = lhs, case .xmodemPacket(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.metadata, .metadata): return {
+ guard case .metadata(let l) = lhs, case .metadata(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.mqttClientProxyMessage, .mqttClientProxyMessage): return {
+ guard case .mqttClientProxyMessage(let l) = lhs, case .mqttClientProxyMessage(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.fileInfo, .fileInfo): return {
+ guard case .fileInfo(let l) = lhs, case .fileInfo(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.clientNotification, .clientNotification): return {
+ guard case .clientNotification(let l) = lhs, case .clientNotification(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
@@ -2429,7 +2599,7 @@ public struct FromRadio: Sendable {
/// To be used for important messages that should to be displayed to the user
/// in the form of push notifications or validation messages when saving
/// invalid configuration.
-public struct ClientNotification: Sendable {
+public struct ClientNotification {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2466,7 +2636,7 @@ public struct ClientNotification: Sendable {
///
/// Individual File info for the device
-public struct FileInfo: Sendable {
+public struct FileInfo {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2487,7 +2657,7 @@ public struct FileInfo: Sendable {
///
/// Packets/commands to the radio will be written (reliably) to the toRadio characteristic.
/// Once the write completes the phone can assume it is handled.
-public struct ToRadio: Sendable {
+public struct ToRadio {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2567,7 +2737,7 @@ public struct ToRadio: Sendable {
///
/// Log levels, chosen to match python logging conventions.
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// Send this packet on the mesh
case packet(MeshPacket)
@@ -2594,6 +2764,40 @@ public struct ToRadio: Sendable {
/// Heartbeat message (used to keep the device connection awake on serial)
case heartbeat(Heartbeat)
+ #if !swift(>=4.1)
+ public static func ==(lhs: ToRadio.OneOf_PayloadVariant, rhs: ToRadio.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.packet, .packet): return {
+ guard case .packet(let l) = lhs, case .packet(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.wantConfigID, .wantConfigID): return {
+ guard case .wantConfigID(let l) = lhs, case .wantConfigID(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.disconnect, .disconnect): return {
+ guard case .disconnect(let l) = lhs, case .disconnect(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.xmodemPacket, .xmodemPacket): return {
+ guard case .xmodemPacket(let l) = lhs, case .xmodemPacket(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.mqttClientProxyMessage, .mqttClientProxyMessage): return {
+ guard case .mqttClientProxyMessage(let l) = lhs, case .mqttClientProxyMessage(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.heartbeat, .heartbeat): return {
+ guard case .heartbeat(let l) = lhs, case .heartbeat(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
@@ -2601,7 +2805,7 @@ public struct ToRadio: Sendable {
///
/// Compressed message payload
-public struct Compressed: @unchecked Sendable {
+public struct Compressed {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2621,7 +2825,7 @@ public struct Compressed: @unchecked Sendable {
///
/// Full info on edges for a single node
-public struct NeighborInfo: Sendable {
+public struct NeighborInfo {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2649,7 +2853,7 @@ public struct NeighborInfo: Sendable {
///
/// A single edge in the mesh
-public struct Neighbor: Sendable {
+public struct Neighbor {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2679,7 +2883,7 @@ public struct Neighbor: Sendable {
///
/// Device metadata response
-public struct DeviceMetadata: Sendable {
+public struct DeviceMetadata {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2732,7 +2936,7 @@ public struct DeviceMetadata: Sendable {
///
/// A heartbeat message is sent to the node from the client to keep the connection alive.
/// This is currently only needed to keep serial connections alive, but can be used by any PhoneAPI.
-public struct Heartbeat: Sendable {
+public struct Heartbeat {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2744,7 +2948,7 @@ public struct Heartbeat: Sendable {
///
/// RemoteHardwarePins associated with a node
-public struct NodeRemoteHardwarePin: Sendable {
+public struct NodeRemoteHardwarePin {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2771,7 +2975,7 @@ public struct NodeRemoteHardwarePin: Sendable {
fileprivate var _pin: RemoteHardwarePin? = nil
}
-public struct ChunkedPayload: @unchecked Sendable {
+public struct ChunkedPayload {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2799,7 +3003,7 @@ public struct ChunkedPayload: @unchecked Sendable {
///
/// Wrapper message for broken repeated oneof support
-public struct resend_chunks: Sendable {
+public struct resend_chunks {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2813,7 +3017,7 @@ public struct resend_chunks: Sendable {
///
/// Responses to a ChunkedPayload request
-public struct ChunkedPayloadResponse: Sendable {
+public struct ChunkedPayloadResponse {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -2856,7 +3060,7 @@ public struct ChunkedPayloadResponse: Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// Request to transfer chunked payload
case requestTransfer(Bool)
@@ -2867,11 +3071,76 @@ public struct ChunkedPayloadResponse: Sendable {
/// Request missing indexes in the chunked payload
case resendChunks(resend_chunks)
+ #if !swift(>=4.1)
+ public static func ==(lhs: ChunkedPayloadResponse.OneOf_PayloadVariant, rhs: ChunkedPayloadResponse.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.requestTransfer, .requestTransfer): return {
+ guard case .requestTransfer(let l) = lhs, case .requestTransfer(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.acceptTransfer, .acceptTransfer): return {
+ guard case .acceptTransfer(let l) = lhs, case .acceptTransfer(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.resendChunks, .resendChunks): return {
+ guard case .resendChunks(let l) = lhs, case .resendChunks(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension HardwareModel: @unchecked Sendable {}
+extension Constants: @unchecked Sendable {}
+extension CriticalErrorCode: @unchecked Sendable {}
+extension Position: @unchecked Sendable {}
+extension Position.LocSource: @unchecked Sendable {}
+extension Position.AltSource: @unchecked Sendable {}
+extension User: @unchecked Sendable {}
+extension RouteDiscovery: @unchecked Sendable {}
+extension Routing: @unchecked Sendable {}
+extension Routing.OneOf_Variant: @unchecked Sendable {}
+extension Routing.Error: @unchecked Sendable {}
+extension DataMessage: @unchecked Sendable {}
+extension Waypoint: @unchecked Sendable {}
+extension MqttClientProxyMessage: @unchecked Sendable {}
+extension MqttClientProxyMessage.OneOf_PayloadVariant: @unchecked Sendable {}
+extension MeshPacket: @unchecked Sendable {}
+extension MeshPacket.OneOf_PayloadVariant: @unchecked Sendable {}
+extension MeshPacket.Priority: @unchecked Sendable {}
+extension MeshPacket.Delayed: @unchecked Sendable {}
+extension NodeInfo: @unchecked Sendable {}
+extension MyNodeInfo: @unchecked Sendable {}
+extension LogRecord: @unchecked Sendable {}
+extension LogRecord.Level: @unchecked Sendable {}
+extension QueueStatus: @unchecked Sendable {}
+extension FromRadio: @unchecked Sendable {}
+extension FromRadio.OneOf_PayloadVariant: @unchecked Sendable {}
+extension ClientNotification: @unchecked Sendable {}
+extension FileInfo: @unchecked Sendable {}
+extension ToRadio: @unchecked Sendable {}
+extension ToRadio.OneOf_PayloadVariant: @unchecked Sendable {}
+extension Compressed: @unchecked Sendable {}
+extension NeighborInfo: @unchecked Sendable {}
+extension Neighbor: @unchecked Sendable {}
+extension DeviceMetadata: @unchecked Sendable {}
+extension Heartbeat: @unchecked Sendable {}
+extension NodeRemoteHardwarePin: @unchecked Sendable {}
+extension ChunkedPayload: @unchecked Sendable {}
+extension resend_chunks: @unchecked Sendable {}
+extension ChunkedPayloadResponse: @unchecked Sendable {}
+extension ChunkedPayloadResponse.OneOf_PayloadVariant: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -3846,7 +4115,7 @@ extension MeshPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio
if _storage._rxTime != 0 {
try visitor.visitSingularFixed32Field(value: _storage._rxTime, fieldNumber: 7)
}
- if _storage._rxSnr.bitPattern != 0 {
+ if _storage._rxSnr != 0 {
try visitor.visitSingularFloatField(value: _storage._rxSnr, fieldNumber: 8)
}
if _storage._hopLimit != 0 {
@@ -4029,7 +4298,7 @@ extension NodeInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
try { if let v = _storage._position {
try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
} }()
- if _storage._snr.bitPattern != 0 {
+ if _storage._snr != 0 {
try visitor.visitSingularFloatField(value: _storage._snr, fieldNumber: 4)
}
if _storage._lastHeard != 0 {
@@ -4874,7 +5143,7 @@ extension Neighbor: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
if self.nodeID != 0 {
try visitor.visitSingularUInt32Field(value: self.nodeID, fieldNumber: 1)
}
- if self.snr.bitPattern != 0 {
+ if self.snr != 0 {
try visitor.visitSingularFloatField(value: self.snr, fieldNumber: 2)
}
if self.lastRxTime != 0 {
@@ -4987,8 +5256,8 @@ extension Heartbeat: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
public static let _protobuf_nameMap = SwiftProtobuf._NameMap()
public mutating func decodeMessage(decoder: inout D) throws {
- // Load everything into unknown fields
- while try decoder.nextFieldNumber() != nil {}
+ while let _ = try decoder.nextFieldNumber() {
+ }
}
public func traverse(visitor: inout V) throws {
diff --git a/MeshtasticProtobufs/Sources/meshtastic/module_config.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/module_config.pb.swift
index 6f3b2d76..c68ffd83 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/module_config.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/module_config.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public enum RemoteHardwarePinType: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum RemoteHardwarePinType: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -58,18 +58,24 @@ public enum RemoteHardwarePinType: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension RemoteHardwarePinType: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [RemoteHardwarePinType] = [
.unknown,
.digitalRead,
.digitalWrite,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Module Config
-public struct ModuleConfig: Sendable {
+public struct ModuleConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -212,7 +218,7 @@ public struct ModuleConfig: Sendable {
///
/// TODO: REPLACE
- public enum OneOf_PayloadVariant: Equatable, Sendable {
+ public enum OneOf_PayloadVariant: Equatable {
///
/// TODO: REPLACE
case mqtt(ModuleConfig.MQTTConfig)
@@ -253,11 +259,73 @@ public struct ModuleConfig: Sendable {
/// TODO: REPLACE
case paxcounter(ModuleConfig.PaxcounterConfig)
+ #if !swift(>=4.1)
+ public static func ==(lhs: ModuleConfig.OneOf_PayloadVariant, rhs: ModuleConfig.OneOf_PayloadVariant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.mqtt, .mqtt): return {
+ guard case .mqtt(let l) = lhs, case .mqtt(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.serial, .serial): return {
+ guard case .serial(let l) = lhs, case .serial(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.externalNotification, .externalNotification): return {
+ guard case .externalNotification(let l) = lhs, case .externalNotification(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.storeForward, .storeForward): return {
+ guard case .storeForward(let l) = lhs, case .storeForward(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.rangeTest, .rangeTest): return {
+ guard case .rangeTest(let l) = lhs, case .rangeTest(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.telemetry, .telemetry): return {
+ guard case .telemetry(let l) = lhs, case .telemetry(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.cannedMessage, .cannedMessage): return {
+ guard case .cannedMessage(let l) = lhs, case .cannedMessage(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.audio, .audio): return {
+ guard case .audio(let l) = lhs, case .audio(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.remoteHardware, .remoteHardware): return {
+ guard case .remoteHardware(let l) = lhs, case .remoteHardware(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.neighborInfo, .neighborInfo): return {
+ guard case .neighborInfo(let l) = lhs, case .neighborInfo(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.ambientLighting, .ambientLighting): return {
+ guard case .ambientLighting(let l) = lhs, case .ambientLighting(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.detectionSensor, .detectionSensor): return {
+ guard case .detectionSensor(let l) = lhs, case .detectionSensor(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.paxcounter, .paxcounter): return {
+ guard case .paxcounter(let l) = lhs, case .paxcounter(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
/// MQTT Client Config
- public struct MQTTConfig: Sendable {
+ public struct MQTTConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -332,7 +400,7 @@ public struct ModuleConfig: Sendable {
///
/// Settings for reporting unencrypted information about our node to a map via MQTT
- public struct MapReportSettings: Sendable {
+ public struct MapReportSettings {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -352,7 +420,7 @@ public struct ModuleConfig: Sendable {
///
/// RemoteHardwareModule Config
- public struct RemoteHardwareConfig: Sendable {
+ public struct RemoteHardwareConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -376,7 +444,7 @@ public struct ModuleConfig: Sendable {
///
/// NeighborInfoModule Config
- public struct NeighborInfoConfig: Sendable {
+ public struct NeighborInfoConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -397,7 +465,7 @@ public struct ModuleConfig: Sendable {
///
/// Detection Sensor Module Config
- public struct DetectionSensorConfig: Sendable {
+ public struct DetectionSensorConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -448,7 +516,7 @@ public struct ModuleConfig: Sendable {
///
/// Audio Config for codec2 voice
- public struct AudioConfig: Sendable {
+ public struct AudioConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -485,7 +553,7 @@ public struct ModuleConfig: Sendable {
///
/// Baudrate for codec2 voice
- public enum Audio_Baud: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Audio_Baud: SwiftProtobuf.Enum {
public typealias RawValue = Int
case codec2Default // = 0
case codec23200 // = 1
@@ -532,19 +600,6 @@ public struct ModuleConfig: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [ModuleConfig.AudioConfig.Audio_Baud] = [
- .codec2Default,
- .codec23200,
- .codec22400,
- .codec21600,
- .codec21400,
- .codec21300,
- .codec21200,
- .codec2700,
- .codec2700B,
- ]
-
}
public init() {}
@@ -552,7 +607,7 @@ public struct ModuleConfig: Sendable {
///
/// Config for the Paxcounter Module
- public struct PaxcounterConfig: Sendable {
+ public struct PaxcounterConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -578,7 +633,7 @@ public struct ModuleConfig: Sendable {
///
/// Serial Config
- public struct SerialConfig: Sendable {
+ public struct SerialConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -621,7 +676,7 @@ public struct ModuleConfig: Sendable {
///
/// TODO: REPLACE
- public enum Serial_Baud: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Serial_Baud: SwiftProtobuf.Enum {
public typealias RawValue = Int
case baudDefault // = 0
case baud110 // = 1
@@ -689,31 +744,11 @@ public struct ModuleConfig: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [ModuleConfig.SerialConfig.Serial_Baud] = [
- .baudDefault,
- .baud110,
- .baud300,
- .baud600,
- .baud1200,
- .baud2400,
- .baud4800,
- .baud9600,
- .baud19200,
- .baud38400,
- .baud57600,
- .baud115200,
- .baud230400,
- .baud460800,
- .baud576000,
- .baud921600,
- ]
-
}
///
/// TODO: REPLACE
- public enum Serial_Mode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Serial_Mode: SwiftProtobuf.Enum {
public typealias RawValue = Int
case `default` // = 0
case simple // = 1
@@ -758,17 +793,6 @@ public struct ModuleConfig: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [ModuleConfig.SerialConfig.Serial_Mode] = [
- .default,
- .simple,
- .proto,
- .textmsg,
- .nmea,
- .caltopo,
- .ws85,
- ]
-
}
public init() {}
@@ -776,7 +800,7 @@ public struct ModuleConfig: Sendable {
///
/// External Notifications Config
- public struct ExternalNotificationConfig: Sendable {
+ public struct ExternalNotificationConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -859,7 +883,7 @@ public struct ModuleConfig: Sendable {
///
/// Store and Forward Module Config
- public struct StoreForwardConfig: Sendable {
+ public struct StoreForwardConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -895,7 +919,7 @@ public struct ModuleConfig: Sendable {
///
/// Preferences for the RangeTestModule
- public struct RangeTestConfig: Sendable {
+ public struct RangeTestConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -920,7 +944,7 @@ public struct ModuleConfig: Sendable {
///
/// Configuration for both device and environment metrics
- public struct TelemetryConfig: Sendable {
+ public struct TelemetryConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -977,7 +1001,7 @@ public struct ModuleConfig: Sendable {
///
/// TODO: REPLACE
- public struct CannedMessageConfig: Sendable {
+ public struct CannedMessageConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1032,7 +1056,7 @@ public struct ModuleConfig: Sendable {
///
/// TODO: REPLACE
- public enum InputEventChar: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum InputEventChar: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -1100,18 +1124,6 @@ public struct ModuleConfig: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [ModuleConfig.CannedMessageConfig.InputEventChar] = [
- .none,
- .up,
- .down,
- .left,
- .right,
- .select,
- .back,
- .cancel,
- ]
-
}
public init() {}
@@ -1120,7 +1132,7 @@ public struct ModuleConfig: Sendable {
///
///Ambient Lighting Module - Settings for control of onboard LEDs to allow users to adjust the brightness levels and respective color levels.
///Initially created for the RAK14001 RGB LED module.
- public struct AmbientLightingConfig: Sendable {
+ public struct AmbientLightingConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1153,9 +1165,77 @@ public struct ModuleConfig: Sendable {
public init() {}
}
+#if swift(>=4.2)
+
+extension ModuleConfig.AudioConfig.Audio_Baud: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [ModuleConfig.AudioConfig.Audio_Baud] = [
+ .codec2Default,
+ .codec23200,
+ .codec22400,
+ .codec21600,
+ .codec21400,
+ .codec21300,
+ .codec21200,
+ .codec2700,
+ .codec2700B,
+ ]
+}
+
+extension ModuleConfig.SerialConfig.Serial_Baud: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [ModuleConfig.SerialConfig.Serial_Baud] = [
+ .baudDefault,
+ .baud110,
+ .baud300,
+ .baud600,
+ .baud1200,
+ .baud2400,
+ .baud4800,
+ .baud9600,
+ .baud19200,
+ .baud38400,
+ .baud57600,
+ .baud115200,
+ .baud230400,
+ .baud460800,
+ .baud576000,
+ .baud921600,
+ ]
+}
+
+extension ModuleConfig.SerialConfig.Serial_Mode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [ModuleConfig.SerialConfig.Serial_Mode] = [
+ .default,
+ .simple,
+ .proto,
+ .textmsg,
+ .nmea,
+ .caltopo,
+ .ws85,
+ ]
+}
+
+extension ModuleConfig.CannedMessageConfig.InputEventChar: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [ModuleConfig.CannedMessageConfig.InputEventChar] = [
+ .none,
+ .up,
+ .down,
+ .left,
+ .right,
+ .select,
+ .back,
+ .cancel,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// A GPIO pin definition for remote hardware module
-public struct RemoteHardwarePin: Sendable {
+public struct RemoteHardwarePin {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -1177,6 +1257,31 @@ public struct RemoteHardwarePin: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension RemoteHardwarePinType: @unchecked Sendable {}
+extension ModuleConfig: @unchecked Sendable {}
+extension ModuleConfig.OneOf_PayloadVariant: @unchecked Sendable {}
+extension ModuleConfig.MQTTConfig: @unchecked Sendable {}
+extension ModuleConfig.MapReportSettings: @unchecked Sendable {}
+extension ModuleConfig.RemoteHardwareConfig: @unchecked Sendable {}
+extension ModuleConfig.NeighborInfoConfig: @unchecked Sendable {}
+extension ModuleConfig.DetectionSensorConfig: @unchecked Sendable {}
+extension ModuleConfig.AudioConfig: @unchecked Sendable {}
+extension ModuleConfig.AudioConfig.Audio_Baud: @unchecked Sendable {}
+extension ModuleConfig.PaxcounterConfig: @unchecked Sendable {}
+extension ModuleConfig.SerialConfig: @unchecked Sendable {}
+extension ModuleConfig.SerialConfig.Serial_Baud: @unchecked Sendable {}
+extension ModuleConfig.SerialConfig.Serial_Mode: @unchecked Sendable {}
+extension ModuleConfig.ExternalNotificationConfig: @unchecked Sendable {}
+extension ModuleConfig.StoreForwardConfig: @unchecked Sendable {}
+extension ModuleConfig.RangeTestConfig: @unchecked Sendable {}
+extension ModuleConfig.TelemetryConfig: @unchecked Sendable {}
+extension ModuleConfig.CannedMessageConfig: @unchecked Sendable {}
+extension ModuleConfig.CannedMessageConfig.InputEventChar: @unchecked Sendable {}
+extension ModuleConfig.AmbientLightingConfig: @unchecked Sendable {}
+extension RemoteHardwarePin: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/mqtt.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/mqtt.pb.swift
index fc5e37a1..efe6cdd5 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/mqtt.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/mqtt.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
-public struct ServiceEnvelope: Sendable {
+public struct ServiceEnvelope {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -57,7 +57,7 @@ public struct ServiceEnvelope: Sendable {
///
/// Information about a node intended to be reported unencrypted to a map using MQTT.
-public struct MapReport: Sendable {
+public struct MapReport {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -121,6 +121,11 @@ public struct MapReport: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension ServiceEnvelope: @unchecked Sendable {}
+extension MapReport: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/paxcount.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/paxcount.pb.swift
index f82b3c51..cf8aa463 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/paxcount.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/paxcount.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// TODO: REPLACE
-public struct Paxcount: Sendable {
+public struct Paxcount {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -44,6 +44,10 @@ public struct Paxcount: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension Paxcount: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/portnums.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/portnums.pb.swift
index c5348a8a..c728c961 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/portnums.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/portnums.pb.swift
@@ -33,7 +33,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// Note: This was formerly a Type enum named 'typ' with the same id #
/// We have change to this 'portnum' based scheme for specifying app handlers for particular payloads.
/// This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically.
-public enum PortNum: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum PortNum: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -277,6 +277,11 @@ public enum PortNum: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension PortNum: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [PortNum] = [
.unknownApp,
@@ -308,9 +313,14 @@ public enum PortNum: SwiftProtobuf.Enum, Swift.CaseIterable {
.atakForwarder,
.max,
]
-
}
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension PortNum: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
extension PortNum: SwiftProtobuf._ProtoNameProviding {
diff --git a/MeshtasticProtobufs/Sources/meshtastic/powermon.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/powermon.pb.swift
index 9c61e6d0..5f51e948 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/powermon.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/powermon.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// Note: There are no 'PowerMon' messages normally in use (PowerMons are sent only as structured logs - slogs).
///But we wrap our State enum in this message to effectively nest a namespace (without our linter yelling at us)
-public struct PowerMon: Sendable {
+public struct PowerMon {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -31,7 +31,7 @@ public struct PowerMon: Sendable {
/// Any significant power changing event in meshtastic should be tagged with a powermon state transition.
///If you are making new meshtastic features feel free to add new entries at the end of this definition.
- public enum State: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum State: SwiftProtobuf.Enum {
public typealias RawValue = Int
case none // = 0
case cpuDeepSleep // = 1
@@ -104,31 +104,37 @@ public struct PowerMon: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [PowerMon.State] = [
- .none,
- .cpuDeepSleep,
- .cpuLightSleep,
- .vext1On,
- .loraRxon,
- .loraTxon,
- .loraRxactive,
- .btOn,
- .ledOn,
- .screenOn,
- .screenDrawing,
- .wifiOn,
- .gpsActive,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension PowerMon.State: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [PowerMon.State] = [
+ .none,
+ .cpuDeepSleep,
+ .cpuLightSleep,
+ .vext1On,
+ .loraRxon,
+ .loraTxon,
+ .loraRxactive,
+ .btOn,
+ .ledOn,
+ .screenOn,
+ .screenDrawing,
+ .wifiOn,
+ .gpsActive,
+ ]
+}
+
+#endif // swift(>=4.2)
+
///
/// PowerStress testing support via the C++ PowerStress module
-public struct PowerStressMessage: Sendable {
+public struct PowerStressMessage {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -145,7 +151,7 @@ public struct PowerStressMessage: Sendable {
/// What operation would we like the UUT to perform.
///note: senders should probably set want_response in their request packets, so that they can know when the state
///machine has started processing their request
- public enum Opcode: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Opcode: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -266,35 +272,48 @@ public struct PowerStressMessage: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [PowerStressMessage.Opcode] = [
- .unset,
- .printInfo,
- .forceQuiet,
- .endQuiet,
- .screenOn,
- .screenOff,
- .cpuIdle,
- .cpuDeepsleep,
- .cpuFullon,
- .ledOn,
- .ledOff,
- .loraOff,
- .loraTx,
- .loraRx,
- .btOff,
- .btOn,
- .wifiOff,
- .wifiOn,
- .gpsOff,
- .gpsOn,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension PowerStressMessage.Opcode: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [PowerStressMessage.Opcode] = [
+ .unset,
+ .printInfo,
+ .forceQuiet,
+ .endQuiet,
+ .screenOn,
+ .screenOff,
+ .cpuIdle,
+ .cpuDeepsleep,
+ .cpuFullon,
+ .ledOn,
+ .ledOff,
+ .loraOff,
+ .loraTx,
+ .loraRx,
+ .btOff,
+ .btOn,
+ .wifiOff,
+ .wifiOn,
+ .gpsOff,
+ .gpsOn,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension PowerMon: @unchecked Sendable {}
+extension PowerMon.State: @unchecked Sendable {}
+extension PowerStressMessage: @unchecked Sendable {}
+extension PowerStressMessage.Opcode: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -304,8 +323,8 @@ extension PowerMon: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
public static let _protobuf_nameMap = SwiftProtobuf._NameMap()
public mutating func decodeMessage(decoder: inout D) throws {
- // Load everything into unknown fields
- while try decoder.nextFieldNumber() != nil {}
+ while let _ = try decoder.nextFieldNumber() {
+ }
}
public func traverse(visitor: inout V) throws {
@@ -360,7 +379,7 @@ extension PowerStressMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
if self.cmd != .unset {
try visitor.visitSingularEnumField(value: self.cmd, fieldNumber: 1)
}
- if self.numSeconds.bitPattern != 0 {
+ if self.numSeconds != 0 {
try visitor.visitSingularFloatField(value: self.numSeconds, fieldNumber: 2)
}
try unknownFields.traverse(visitor: &visitor)
diff --git a/MeshtasticProtobufs/Sources/meshtastic/remote_hardware.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/remote_hardware.pb.swift
index 60f64504..ac6eeb26 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/remote_hardware.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/remote_hardware.pb.swift
@@ -30,7 +30,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
/// because no security yet (beyond the channel mechanism).
/// It should be off by default and then protected based on some TBD mechanism
/// (a special channel once multichannel support is included?)
-public struct HardwareMessage: Sendable {
+public struct HardwareMessage {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -52,7 +52,7 @@ public struct HardwareMessage: Sendable {
///
/// TODO: REPLACE
- public enum TypeEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum TypeEnum: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -110,21 +110,32 @@ public struct HardwareMessage: Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [HardwareMessage.TypeEnum] = [
- .unset,
- .writeGpios,
- .watchGpios,
- .gpiosChanged,
- .readGpios,
- .readGpiosReply,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension HardwareMessage.TypeEnum: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [HardwareMessage.TypeEnum] = [
+ .unset,
+ .writeGpios,
+ .watchGpios,
+ .gpiosChanged,
+ .readGpios,
+ .readGpiosReply,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension HardwareMessage: @unchecked Sendable {}
+extension HardwareMessage.TypeEnum: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/rtttl.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/rtttl.pb.swift
index c1f3f678..6fdf3208 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/rtttl.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/rtttl.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// Canned message module configuration.
-public struct RTTTLConfig: Sendable {
+public struct RTTTLConfig {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -36,6 +36,10 @@ public struct RTTTLConfig: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension RTTTLConfig: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/storeforward.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/storeforward.pb.swift
index 0b67eaf6..54efa77b 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/storeforward.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/storeforward.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// TODO: REPLACE
-public struct StoreAndForward: @unchecked Sendable {
+public struct StoreAndForward {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -79,7 +79,7 @@ public struct StoreAndForward: @unchecked Sendable {
///
/// TODO: REPLACE
- public enum OneOf_Variant: Equatable, @unchecked Sendable {
+ public enum OneOf_Variant: Equatable {
///
/// TODO: REPLACE
case stats(StoreAndForward.Statistics)
@@ -93,12 +93,38 @@ public struct StoreAndForward: @unchecked Sendable {
/// Text from history message.
case text(Data)
+ #if !swift(>=4.1)
+ public static func ==(lhs: StoreAndForward.OneOf_Variant, rhs: StoreAndForward.OneOf_Variant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.stats, .stats): return {
+ guard case .stats(let l) = lhs, case .stats(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.history, .history): return {
+ guard case .history(let l) = lhs, case .history(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.heartbeat, .heartbeat): return {
+ guard case .heartbeat(let l) = lhs, case .heartbeat(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.text, .text): return {
+ guard case .text(let l) = lhs, case .text(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
///
/// 001 - 063 = From Router
/// 064 - 127 = From Client
- public enum RequestResponse: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum RequestResponse: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -216,31 +242,11 @@ public struct StoreAndForward: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [StoreAndForward.RequestResponse] = [
- .unset,
- .routerError,
- .routerHeartbeat,
- .routerPing,
- .routerPong,
- .routerBusy,
- .routerHistory,
- .routerStats,
- .routerTextDirect,
- .routerTextBroadcast,
- .clientError,
- .clientHistory,
- .clientStats,
- .clientPing,
- .clientPong,
- .clientAbort,
- ]
-
}
///
/// TODO: REPLACE
- public struct Statistics: Sendable {
+ public struct Statistics {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -288,7 +294,7 @@ public struct StoreAndForward: @unchecked Sendable {
///
/// TODO: REPLACE
- public struct History: Sendable {
+ public struct History {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -313,7 +319,7 @@ public struct StoreAndForward: @unchecked Sendable {
///
/// TODO: REPLACE
- public struct Heartbeat: Sendable {
+ public struct Heartbeat {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -334,6 +340,41 @@ public struct StoreAndForward: @unchecked Sendable {
public init() {}
}
+#if swift(>=4.2)
+
+extension StoreAndForward.RequestResponse: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [StoreAndForward.RequestResponse] = [
+ .unset,
+ .routerError,
+ .routerHeartbeat,
+ .routerPing,
+ .routerPong,
+ .routerBusy,
+ .routerHistory,
+ .routerStats,
+ .routerTextDirect,
+ .routerTextBroadcast,
+ .clientError,
+ .clientHistory,
+ .clientStats,
+ .clientPing,
+ .clientPong,
+ .clientAbort,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension StoreAndForward: @unchecked Sendable {}
+extension StoreAndForward.OneOf_Variant: @unchecked Sendable {}
+extension StoreAndForward.RequestResponse: @unchecked Sendable {}
+extension StoreAndForward.Statistics: @unchecked Sendable {}
+extension StoreAndForward.History: @unchecked Sendable {}
+extension StoreAndForward.Heartbeat: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/MeshtasticProtobufs/Sources/meshtastic/telemetry.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/telemetry.pb.swift
index 7289b713..e4b9ee08 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/telemetry.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/telemetry.pb.swift
@@ -22,7 +22,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
///
/// Supported I2C Sensors for telemetry in Meshtastic
-public enum TelemetrySensorType: SwiftProtobuf.Enum, Swift.CaseIterable {
+public enum TelemetrySensorType: SwiftProtobuf.Enum {
public typealias RawValue = Int
///
@@ -216,6 +216,11 @@ public enum TelemetrySensorType: SwiftProtobuf.Enum, Swift.CaseIterable {
}
}
+}
+
+#if swift(>=4.2)
+
+extension TelemetrySensorType: CaseIterable {
// The compiler won't synthesize support with the UNRECOGNIZED case.
public static let allCases: [TelemetrySensorType] = [
.sensorUnset,
@@ -248,12 +253,13 @@ public enum TelemetrySensorType: SwiftProtobuf.Enum, Swift.CaseIterable {
.icm20948,
.max17048,
]
-
}
+#endif // swift(>=4.2)
+
///
/// Key native device metrics such as battery level
-public struct DeviceMetrics: Sendable {
+public struct DeviceMetrics {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -326,7 +332,7 @@ public struct DeviceMetrics: Sendable {
///
/// Weather station or other environmental metrics
-public struct EnvironmentMetrics: @unchecked Sendable {
+public struct EnvironmentMetrics {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -529,7 +535,7 @@ public struct EnvironmentMetrics: @unchecked Sendable {
///
/// Power Metrics (voltage / current / etc)
-public struct PowerMetrics: Sendable {
+public struct PowerMetrics {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -614,7 +620,7 @@ public struct PowerMetrics: Sendable {
///
/// Air quality metrics
-public struct AirQualityMetrics: Sendable {
+public struct AirQualityMetrics {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -769,9 +775,53 @@ public struct AirQualityMetrics: Sendable {
fileprivate var _particles100Um: UInt32? = nil
}
+///
+/// Local device mesh statistics
+public struct LocalStats {
+ // SwiftProtobuf.Message conformance is added in an extension below. See the
+ // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
+ // methods supported on all messages.
+
+ ///
+ /// How long the device has been running since the last reboot (in seconds)
+ public var uptimeSeconds: UInt32 = 0
+
+ ///
+ /// Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).
+ public var channelUtilization: Float = 0
+
+ ///
+ /// Percent of airtime for transmission used within the last hour.
+ public var airUtilTx: Float = 0
+
+ ///
+ /// Number of packets sent
+ public var numPacketsTx: UInt32 = 0
+
+ ///
+ /// Number of packets received good
+ public var numPacketsRx: UInt32 = 0
+
+ ///
+ /// Number of packets received that are malformed or violate the protocol
+ public var numPacketsRxBad: UInt32 = 0
+
+ ///
+ /// Number of nodes online (in the past 2 hours)
+ public var numOnlineNodes: UInt32 = 0
+
+ ///
+ /// Number of nodes total
+ public var numTotalNodes: UInt32 = 0
+
+ public var unknownFields = SwiftProtobuf.UnknownStorage()
+
+ public init() {}
+}
+
///
/// Types of Measurements the telemetry module is equipped to handle
-public struct Telemetry: Sendable {
+public struct Telemetry {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -822,9 +872,19 @@ public struct Telemetry: Sendable {
set {variant = .powerMetrics(newValue)}
}
+ ///
+ /// Local device mesh statistics
+ public var localStats: LocalStats {
+ get {
+ if case .localStats(let v)? = variant {return v}
+ return LocalStats()
+ }
+ set {variant = .localStats(newValue)}
+ }
+
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum OneOf_Variant: Equatable, Sendable {
+ public enum OneOf_Variant: Equatable {
///
/// Key native device metrics such as battery level
case deviceMetrics(DeviceMetrics)
@@ -837,7 +897,40 @@ public struct Telemetry: Sendable {
///
/// Power Metrics
case powerMetrics(PowerMetrics)
+ ///
+ /// Local device mesh statistics
+ case localStats(LocalStats)
+ #if !swift(>=4.1)
+ public static func ==(lhs: Telemetry.OneOf_Variant, rhs: Telemetry.OneOf_Variant) -> Bool {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch (lhs, rhs) {
+ case (.deviceMetrics, .deviceMetrics): return {
+ guard case .deviceMetrics(let l) = lhs, case .deviceMetrics(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.environmentMetrics, .environmentMetrics): return {
+ guard case .environmentMetrics(let l) = lhs, case .environmentMetrics(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.airQualityMetrics, .airQualityMetrics): return {
+ guard case .airQualityMetrics(let l) = lhs, case .airQualityMetrics(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.powerMetrics, .powerMetrics): return {
+ guard case .powerMetrics(let l) = lhs, case .powerMetrics(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ case (.localStats, .localStats): return {
+ guard case .localStats(let l) = lhs, case .localStats(let r) = rhs else { preconditionFailure() }
+ return l == r
+ }()
+ default: return false
+ }
+ }
+ #endif
}
public init() {}
@@ -845,7 +938,7 @@ public struct Telemetry: Sendable {
///
/// NAU7802 Telemetry configuration, for saving to flash
-public struct Nau7802Config: Sendable {
+public struct Nau7802Config {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -863,6 +956,18 @@ public struct Nau7802Config: Sendable {
public init() {}
}
+#if swift(>=5.5) && canImport(_Concurrency)
+extension TelemetrySensorType: @unchecked Sendable {}
+extension DeviceMetrics: @unchecked Sendable {}
+extension EnvironmentMetrics: @unchecked Sendable {}
+extension PowerMetrics: @unchecked Sendable {}
+extension AirQualityMetrics: @unchecked Sendable {}
+extension LocalStats: @unchecked Sendable {}
+extension Telemetry: @unchecked Sendable {}
+extension Telemetry.OneOf_Variant: @unchecked Sendable {}
+extension Nau7802Config: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
@@ -1333,6 +1438,80 @@ extension AirQualityMetrics: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem
}
}
+extension LocalStats: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+ public static let protoMessageName: String = _protobuf_package + ".LocalStats"
+ public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+ 1: .standard(proto: "uptime_seconds"),
+ 2: .standard(proto: "channel_utilization"),
+ 3: .standard(proto: "air_util_tx"),
+ 4: .standard(proto: "num_packets_tx"),
+ 5: .standard(proto: "num_packets_rx"),
+ 6: .standard(proto: "num_packets_rx_bad"),
+ 7: .standard(proto: "num_online_nodes"),
+ 8: .standard(proto: "num_total_nodes"),
+ ]
+
+ public mutating func decodeMessage(decoder: inout D) throws {
+ while let fieldNumber = try decoder.nextFieldNumber() {
+ // The use of inline closures is to circumvent an issue where the compiler
+ // allocates stack space for every case branch when no optimizations are
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
+ switch fieldNumber {
+ case 1: try { try decoder.decodeSingularUInt32Field(value: &self.uptimeSeconds) }()
+ case 2: try { try decoder.decodeSingularFloatField(value: &self.channelUtilization) }()
+ case 3: try { try decoder.decodeSingularFloatField(value: &self.airUtilTx) }()
+ case 4: try { try decoder.decodeSingularUInt32Field(value: &self.numPacketsTx) }()
+ case 5: try { try decoder.decodeSingularUInt32Field(value: &self.numPacketsRx) }()
+ case 6: try { try decoder.decodeSingularUInt32Field(value: &self.numPacketsRxBad) }()
+ case 7: try { try decoder.decodeSingularUInt32Field(value: &self.numOnlineNodes) }()
+ case 8: try { try decoder.decodeSingularUInt32Field(value: &self.numTotalNodes) }()
+ default: break
+ }
+ }
+ }
+
+ public func traverse(visitor: inout V) throws {
+ if self.uptimeSeconds != 0 {
+ try visitor.visitSingularUInt32Field(value: self.uptimeSeconds, fieldNumber: 1)
+ }
+ if self.channelUtilization != 0 {
+ try visitor.visitSingularFloatField(value: self.channelUtilization, fieldNumber: 2)
+ }
+ if self.airUtilTx != 0 {
+ try visitor.visitSingularFloatField(value: self.airUtilTx, fieldNumber: 3)
+ }
+ if self.numPacketsTx != 0 {
+ try visitor.visitSingularUInt32Field(value: self.numPacketsTx, fieldNumber: 4)
+ }
+ if self.numPacketsRx != 0 {
+ try visitor.visitSingularUInt32Field(value: self.numPacketsRx, fieldNumber: 5)
+ }
+ if self.numPacketsRxBad != 0 {
+ try visitor.visitSingularUInt32Field(value: self.numPacketsRxBad, fieldNumber: 6)
+ }
+ if self.numOnlineNodes != 0 {
+ try visitor.visitSingularUInt32Field(value: self.numOnlineNodes, fieldNumber: 7)
+ }
+ if self.numTotalNodes != 0 {
+ try visitor.visitSingularUInt32Field(value: self.numTotalNodes, fieldNumber: 8)
+ }
+ try unknownFields.traverse(visitor: &visitor)
+ }
+
+ public static func ==(lhs: LocalStats, rhs: LocalStats) -> Bool {
+ if lhs.uptimeSeconds != rhs.uptimeSeconds {return false}
+ if lhs.channelUtilization != rhs.channelUtilization {return false}
+ if lhs.airUtilTx != rhs.airUtilTx {return false}
+ if lhs.numPacketsTx != rhs.numPacketsTx {return false}
+ if lhs.numPacketsRx != rhs.numPacketsRx {return false}
+ if lhs.numPacketsRxBad != rhs.numPacketsRxBad {return false}
+ if lhs.numOnlineNodes != rhs.numOnlineNodes {return false}
+ if lhs.numTotalNodes != rhs.numTotalNodes {return false}
+ if lhs.unknownFields != rhs.unknownFields {return false}
+ return true
+ }
+}
+
extension Telemetry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
public static let protoMessageName: String = _protobuf_package + ".Telemetry"
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
@@ -1341,6 +1520,7 @@ extension Telemetry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
3: .standard(proto: "environment_metrics"),
4: .standard(proto: "air_quality_metrics"),
5: .standard(proto: "power_metrics"),
+ 6: .standard(proto: "local_stats"),
]
public mutating func decodeMessage(decoder: inout D) throws {
@@ -1402,6 +1582,19 @@ extension Telemetry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
self.variant = .powerMetrics(v)
}
}()
+ case 6: try {
+ var v: LocalStats?
+ var hadOneofValue = false
+ if let current = self.variant {
+ hadOneofValue = true
+ if case .localStats(let m) = current {v = m}
+ }
+ try decoder.decodeSingularMessageField(value: &v)
+ if let v = v {
+ if hadOneofValue {try decoder.handleConflictingOneOf()}
+ self.variant = .localStats(v)
+ }
+ }()
default: break
}
}
@@ -1432,6 +1625,10 @@ extension Telemetry: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
guard case .powerMetrics(let v)? = self.variant else { preconditionFailure() }
try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
}()
+ case .localStats?: try {
+ guard case .localStats(let v)? = self.variant else { preconditionFailure() }
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
+ }()
case nil: break
}
try unknownFields.traverse(visitor: &visitor)
@@ -1469,7 +1666,7 @@ extension Nau7802Config: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
if self.zeroOffset != 0 {
try visitor.visitSingularInt32Field(value: self.zeroOffset, fieldNumber: 1)
}
- if self.calibrationFactor.bitPattern != 0 {
+ if self.calibrationFactor != 0 {
try visitor.visitSingularFloatField(value: self.calibrationFactor, fieldNumber: 2)
}
try unknownFields.traverse(visitor: &visitor)
diff --git a/MeshtasticProtobufs/Sources/meshtastic/xmodem.pb.swift b/MeshtasticProtobufs/Sources/meshtastic/xmodem.pb.swift
index 89d0097c..1f41fe0b 100644
--- a/MeshtasticProtobufs/Sources/meshtastic/xmodem.pb.swift
+++ b/MeshtasticProtobufs/Sources/meshtastic/xmodem.pb.swift
@@ -20,7 +20,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
typealias Version = _2
}
-public struct XModem: @unchecked Sendable {
+public struct XModem {
// SwiftProtobuf.Message conformance is added in an extension below. See the
// `Message` and `Message+*Additions` files in the SwiftProtobuf library for
// methods supported on all messages.
@@ -35,7 +35,7 @@ public struct XModem: @unchecked Sendable {
public var unknownFields = SwiftProtobuf.UnknownStorage()
- public enum Control: SwiftProtobuf.Enum, Swift.CaseIterable {
+ public enum Control: SwiftProtobuf.Enum {
public typealias RawValue = Int
case nul // = 0
case soh // = 1
@@ -79,23 +79,34 @@ public struct XModem: @unchecked Sendable {
}
}
- // The compiler won't synthesize support with the UNRECOGNIZED case.
- public static let allCases: [XModem.Control] = [
- .nul,
- .soh,
- .stx,
- .eot,
- .ack,
- .nak,
- .can,
- .ctrlz,
- ]
-
}
public init() {}
}
+#if swift(>=4.2)
+
+extension XModem.Control: CaseIterable {
+ // The compiler won't synthesize support with the UNRECOGNIZED case.
+ public static let allCases: [XModem.Control] = [
+ .nul,
+ .soh,
+ .stx,
+ .eot,
+ .ack,
+ .nak,
+ .can,
+ .ctrlz,
+ ]
+}
+
+#endif // swift(>=4.2)
+
+#if swift(>=5.5) && canImport(_Concurrency)
+extension XModem: @unchecked Sendable {}
+extension XModem.Control: @unchecked Sendable {}
+#endif // swift(>=5.5) && canImport(_Concurrency)
+
// MARK: - Code below here is support for the SwiftProtobuf runtime.
fileprivate let _protobuf_package = "meshtastic"
diff --git a/protobufs b/protobufs
index 3e753697..59d035a3 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 3e753697aa1140d2c998cb63739729e733002874
+Subproject commit 59d035a37dbeadb28db97acce5f738ba52ee9d3a