meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

update protof

Browse source
This commit is contained in:
Garth Vander Houwen 2024-10-04 16:25:03 -07:00
parent 0f18723a59
commit dc37666114
5 changed files with 131 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
MeshtasticProtobufs/Sources/meshtastic/atak.pb.swift
View file

@ -322,6 +322,17 @@ public struct TAKPacket {
set {payloadVariant = .chat(newValue)}
}
///
/// Generic CoT detail XML
/// May be compressed / truncated by the sender
public var detail: Data {
get {
if case .detail(let v)? = payloadVariant {return v}
return Data()
}
set {payloadVariant = .detail(newValue)}
}
public var unknownFields = SwiftProtobuf.UnknownStorage()
///
@ -333,6 +344,10 @@ public struct TAKPacket {
///
/// ATAK GeoChat message
case chat(GeoChat)
///
/// Generic CoT detail XML
/// May be compressed / truncated by the sender
case detail(Data)
#if !swift(>=4.1)
public static func ==(lhs: TAKPacket.OneOf_PayloadVariant, rhs: TAKPacket.OneOf_PayloadVariant) -> Bool {
@ -348,6 +363,10 @@ public struct TAKPacket {
guard case .chat(let l) = lhs, case .chat(let r) = rhs else { preconditionFailure() }
return l == r
}()
case (.detail, .detail): return {
guard case .detail(let l) = lhs, case .detail(let r) = rhs else { preconditionFailure() }
return l == r
}()
default: return false
}
}
@ -555,6 +574,7 @@ extension TAKPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
4: .same(proto: "status"),
5: .same(proto: "pli"),
6: .same(proto: "chat"),
7: .same(proto: "detail"),
]
public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -593,6 +613,14 @@ extension TAKPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
self.payloadVariant = .chat(v)
}
}()
case 7: try {
var v: Data?
try decoder.decodeSingularBytesField(value: &v)
if let v = v {
if self.payloadVariant != nil {try decoder.handleConflictingOneOf()}
self.payloadVariant = .detail(v)
}
}()
default: break
}
}
@ -624,6 +652,10 @@ extension TAKPacket: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
guard case .chat(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
}()
case .detail?: try {
guard case .detail(let v)? = self.payloadVariant else { preconditionFailure() }
try visitor.visitSingularBytesField(value: v, fieldNumber: 7)
}()
case nil: break
}
try unknownFields.traverse(visitor: &visitor)

54
MeshtasticProtobufs/Sources/meshtastic/clientonly.pb.swift
View file

@ -83,6 +83,39 @@ public struct DeviceProfile {
/// Clears the value of `moduleConfig`. Subsequent reads from it will return its default value.
public mutating func clearModuleConfig() {self._moduleConfig = nil}
///
/// Fixed position data
public var fixedPosition: Position {
get {return _fixedPosition ?? Position()}
set {_fixedPosition = newValue}
}
/// Returns true if `fixedPosition` has been explicitly set.
public var hasFixedPosition: Bool {return self._fixedPosition != nil}
/// Clears the value of `fixedPosition`. Subsequent reads from it will return its default value.
public mutating func clearFixedPosition() {self._fixedPosition = nil}
///
/// Ringtone for ExternalNotification
public var ringtone: String {
get {return _ringtone ?? String()}
set {_ringtone = newValue}
}
/// Returns true if `ringtone` has been explicitly set.
public var hasRingtone: Bool {return self._ringtone != nil}
/// Clears the value of `ringtone`. Subsequent reads from it will return its default value.
public mutating func clearRingtone() {self._ringtone = nil}
///
/// Predefined messages for CannedMessage
public var cannedMessages: String {
get {return _cannedMessages ?? String()}
set {_cannedMessages = newValue}
}
/// Returns true if `cannedMessages` has been explicitly set.
public var hasCannedMessages: Bool {return self._cannedMessages != nil}
/// Clears the value of `cannedMessages`. Subsequent reads from it will return its default value.
public mutating func clearCannedMessages() {self._cannedMessages = nil}
public var unknownFields = SwiftProtobuf.UnknownStorage()
public init() {}
@ -92,6 +125,9 @@ public struct DeviceProfile {
fileprivate var _channelURL: String? = nil
fileprivate var _config: LocalConfig? = nil
fileprivate var _moduleConfig: LocalModuleConfig? = nil
fileprivate var _fixedPosition: Position? = nil
fileprivate var _ringtone: String? = nil
fileprivate var _cannedMessages: String? = nil
}
#if swift(>=5.5) && canImport(_Concurrency)
@ -110,6 +146,9 @@ extension DeviceProfile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
3: .standard(proto: "channel_url"),
4: .same(proto: "config"),
5: .standard(proto: "module_config"),
6: .standard(proto: "fixed_position"),
7: .same(proto: "ringtone"),
8: .standard(proto: "canned_messages"),
]
public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -123,6 +162,9 @@ extension DeviceProfile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
case 3: try { try decoder.decodeSingularStringField(value: &self._channelURL) }()
case 4: try { try decoder.decodeSingularMessageField(value: &self._config) }()
case 5: try { try decoder.decodeSingularMessageField(value: &self._moduleConfig) }()
case 6: try { try decoder.decodeSingularMessageField(value: &self._fixedPosition) }()
case 7: try { try decoder.decodeSingularStringField(value: &self._ringtone) }()
case 8: try { try decoder.decodeSingularStringField(value: &self._cannedMessages) }()
default: break
}
}
@ -148,6 +190,15 @@ extension DeviceProfile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
try { if let v = self._moduleConfig {
try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
} }()
try { if let v = self._fixedPosition {
try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
} }()
try { if let v = self._ringtone {
try visitor.visitSingularStringField(value: v, fieldNumber: 7)
} }()
try { if let v = self._cannedMessages {
try visitor.visitSingularStringField(value: v, fieldNumber: 8)
} }()
try unknownFields.traverse(visitor: &visitor)
}
@ -157,6 +208,9 @@ extension DeviceProfile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
if lhs._channelURL != rhs._channelURL {return false}
if lhs._config != rhs._config {return false}
if lhs._moduleConfig != rhs._moduleConfig {return false}
if lhs._fixedPosition != rhs._fixedPosition {return false}
if lhs._ringtone != rhs._ringtone {return false}
if lhs._cannedMessages != rhs._cannedMessages {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}

14
MeshtasticProtobufs/Sources/meshtastic/deviceonly.pb.swift
View file

@ -235,9 +235,13 @@ public struct NodeInfoLite {
///
/// Number of hops away from us this node is (0 if adjacent)
public var hopsAway: UInt32 {
get {return _storage._hopsAway}
get {return _storage._hopsAway ?? 0}
set {_uniqueStorage()._hopsAway = newValue}
}
/// Returns true if `hopsAway` has been explicitly set.
public var hasHopsAway: Bool {return _storage._hopsAway != nil}
/// Clears the value of `hopsAway`. Subsequent reads from it will return its default value.
public mutating func clearHopsAway() {_uniqueStorage()._hopsAway = nil}
///
/// True if node is in our favorites list
@ -620,7 +624,7 @@ extension NodeInfoLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
var _deviceMetrics: DeviceMetrics? = nil
var _channel: UInt32 = 0
var _viaMqtt: Bool = false
var _hopsAway: UInt32 = 0
var _hopsAway: UInt32? = nil
var _isFavorite: Bool = false
#if swift(>=5.10)
@ -710,9 +714,9 @@ extension NodeInfoLite: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
if _storage._viaMqtt != false {
try visitor.visitSingularBoolField(value: _storage._viaMqtt, fieldNumber: 8)
}
if _storage._hopsAway != 0 {
try visitor.visitSingularUInt32Field(value: _storage._hopsAway, fieldNumber: 9)
}
try { if let v = _storage._hopsAway {
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 9)
} }()
if _storage._isFavorite != false {
try visitor.visitSingularBoolField(value: _storage._isFavorite, fieldNumber: 10)
}

40
MeshtasticProtobufs/Sources/meshtastic/mesh.pb.swift
View file

@ -1416,6 +1416,14 @@ public struct Routing {
///
/// The receiving node does not have a Public Key to decode with
case pkiUnknownPubkey // = 35
///
/// Admin packet otherwise checks out, but uses a bogus or expired session key
case adminBadSessionKey // = 36
///
/// Admin packet sent using PKC, but not from a public key on the admin key list
case adminPublicKeyUnauthorized // = 37
case UNRECOGNIZED(Int)
public init() {
@ -1438,6 +1446,8 @@ public struct Routing {
case 33: self = .notAuthorized
case 34: self = .pkiFailed
case 35: self = .pkiUnknownPubkey
case 36: self = .adminBadSessionKey
case 37: self = .adminPublicKeyUnauthorized
default: self = .UNRECOGNIZED(rawValue)
}
}
@ -1458,6 +1468,8 @@ public struct Routing {
case .notAuthorized: return 33
case .pkiFailed: return 34
case .pkiUnknownPubkey: return 35
case .adminBadSessionKey: return 36
case .adminPublicKeyUnauthorized: return 37
case .UNRECOGNIZED(let i): return i
}
}
@ -1486,6 +1498,8 @@ extension Routing.Error: CaseIterable {
.notAuthorized,
.pkiFailed,
.pkiUnknownPubkey,
.adminBadSessionKey,
.adminPublicKeyUnauthorized,
]
}
@ -2167,9 +2181,13 @@ public struct NodeInfo {
///
/// Number of hops away from us this node is (0 if adjacent)
public var hopsAway: UInt32 {
get {return _storage._hopsAway}
get {return _storage._hopsAway ?? 0}
set {_uniqueStorage()._hopsAway = newValue}
}
/// Returns true if `hopsAway` has been explicitly set.
public var hasHopsAway: Bool {return _storage._hopsAway != nil}
/// Clears the value of `hopsAway`. Subsequent reads from it will return its default value.
public mutating func clearHopsAway() {_uniqueStorage()._hopsAway = nil}
///
/// True if node is in our favorites list
@ -2997,6 +3015,10 @@ public struct DeviceMetadata {
/// Has Remote Hardware enabled
public var hasRemoteHardware_p: Bool = false
///
/// Has PKC capabilities
public var hasPkc_p: Bool = false
public var unknownFields = SwiftProtobuf.UnknownStorage()
public init() {}
@ -3818,6 +3840,8 @@ extension Routing.Error: SwiftProtobuf._ProtoNameProviding {
33: .same(proto: "NOT_AUTHORIZED"),
34: .same(proto: "PKI_FAILED"),
35: .same(proto: "PKI_UNKNOWN_PUBKEY"),
36: .same(proto: "ADMIN_BAD_SESSION_KEY"),
37: .same(proto: "ADMIN_PUBLIC_KEY_UNAUTHORIZED"),
]
}
@ -4326,7 +4350,7 @@ extension NodeInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
var _deviceMetrics: DeviceMetrics? = nil
var _channel: UInt32 = 0
var _viaMqtt: Bool = false
var _hopsAway: UInt32 = 0
var _hopsAway: UInt32? = nil
var _isFavorite: Bool = false
#if swift(>=5.10)
@ -4416,9 +4440,9 @@ extension NodeInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
if _storage._viaMqtt != false {
try visitor.visitSingularBoolField(value: _storage._viaMqtt, fieldNumber: 8)
}
if _storage._hopsAway != 0 {
try visitor.visitSingularUInt32Field(value: _storage._hopsAway, fieldNumber: 9)
}
try { if let v = _storage._hopsAway {
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 9)
} }()
if _storage._isFavorite != false {
try visitor.visitSingularBoolField(value: _storage._isFavorite, fieldNumber: 10)
}
@ -5281,6 +5305,7 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
8: .standard(proto: "position_flags"),
9: .standard(proto: "hw_model"),
10: .same(proto: "hasRemoteHardware"),
11: .same(proto: "hasPKC"),
]
public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -5299,6 +5324,7 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
case 8: try { try decoder.decodeSingularUInt32Field(value: &self.positionFlags) }()
case 9: try { try decoder.decodeSingularEnumField(value: &self.hwModel) }()
case 10: try { try decoder.decodeSingularBoolField(value: &self.hasRemoteHardware_p) }()
case 11: try { try decoder.decodeSingularBoolField(value: &self.hasPkc_p) }()
default: break
}
}
@ -5335,6 +5361,9 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
if self.hasRemoteHardware_p != false {
try visitor.visitSingularBoolField(value: self.hasRemoteHardware_p, fieldNumber: 10)
}
if self.hasPkc_p != false {
try visitor.visitSingularBoolField(value: self.hasPkc_p, fieldNumber: 11)
}
try unknownFields.traverse(visitor: &visitor)
}
@ -5349,6 +5378,7 @@ extension DeviceMetadata: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
if lhs.positionFlags != rhs.positionFlags {return false}
if lhs.hwModel != rhs.hwModel {return false}
if lhs.hasRemoteHardware_p != rhs.hasRemoteHardware_p {return false}
if lhs.hasPkc_p != rhs.hasPkc_p {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}

2
protobufs

@ -1 +1 @@
Subproject commit 0acaec6eff00e748beeae89148093221f131cd9c
Subproject commit 5709c0a05eaefccbc9cb8ed3917adbf5fd134197