Update protobufs, tag for map circle

This commit is contained in:
Garth Vander Houwen 2024-06-01 23:02:06 -07:00
parent 79e23d561e
commit 187acc7466
4 changed files with 28 additions and 1 deletions

View file

@ -383,11 +383,23 @@ struct GeoChat {
/// Clears the value of `to`. Subsequent reads from it will return its default value.
mutating func clearTo() {self._to = nil}
///
/// Callsign of the recipient for the message
var toCallsign: String {
get {return _toCallsign ?? String()}
set {_toCallsign = newValue}
}
/// Returns true if `toCallsign` has been explicitly set.
var hasToCallsign: Bool {return self._toCallsign != nil}
/// Clears the value of `toCallsign`. Subsequent reads from it will return its default value.
mutating func clearToCallsign() {self._toCallsign = nil}
var unknownFields = SwiftProtobuf.UnknownStorage()
init() {}
fileprivate var _to: String? = nil
fileprivate var _toCallsign: String? = nil
}
///
@ -633,6 +645,7 @@ extension GeoChat: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1: .same(proto: "message"),
2: .same(proto: "to"),
3: .standard(proto: "to_callsign"),
]
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
@ -643,6 +656,7 @@ extension GeoChat: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
switch fieldNumber {
case 1: try { try decoder.decodeSingularStringField(value: &self.message) }()
case 2: try { try decoder.decodeSingularStringField(value: &self._to) }()
case 3: try { try decoder.decodeSingularStringField(value: &self._toCallsign) }()
default: break
}
}
@ -659,12 +673,16 @@ extension GeoChat: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
try { if let v = self._to {
try visitor.visitSingularStringField(value: v, fieldNumber: 2)
} }()
try { if let v = self._toCallsign {
try visitor.visitSingularStringField(value: v, fieldNumber: 3)
} }()
try unknownFields.traverse(visitor: &visitor)
}
static func ==(lhs: GeoChat, rhs: GeoChat) -> Bool {
if lhs.message != rhs.message {return false}
if lhs._to != rhs._to {return false}
if lhs._toCallsign != rhs._toCallsign {return false}
if lhs.unknownFields != rhs.unknownFields {return false}
return true
}

View file

@ -116,6 +116,10 @@ enum TelemetrySensorType: SwiftProtobuf.Enum {
///
/// AMS TSL25911FN RGB Light Sensor
case tsl25911Fn // = 22
///
/// AHT10 Integrated temperature and humidity sensor
case aht10 // = 23
case UNRECOGNIZED(Int)
init() {
@ -147,6 +151,7 @@ enum TelemetrySensorType: SwiftProtobuf.Enum {
case 20: self = .opt3001
case 21: self = .ltr390Uv
case 22: self = .tsl25911Fn
case 23: self = .aht10
default: self = .UNRECOGNIZED(rawValue)
}
}
@ -176,6 +181,7 @@ enum TelemetrySensorType: SwiftProtobuf.Enum {
case .opt3001: return 20
case .ltr390Uv: return 21
case .tsl25911Fn: return 22
case .aht10: return 23
case .UNRECOGNIZED(let i): return i
}
}
@ -210,6 +216,7 @@ extension TelemetrySensorType: CaseIterable {
.opt3001,
.ltr390Uv,
.tsl25911Fn,
.aht10,
]
}
@ -535,6 +542,7 @@ extension TelemetrySensorType: SwiftProtobuf._ProtoNameProviding {
20: .same(proto: "OPT3001"),
21: .same(proto: "LTR390UV"),
22: .same(proto: "TSL25911FN"),
23: .same(proto: "AHT10"),
]
}

View file

@ -137,6 +137,7 @@ struct MeshMapContent: MapContent {
MapCircle(center: position.coordinate, radius: radius)
.foregroundStyle(Color(nodeColor).opacity(0.25))
.stroke(.white, lineWidth: 2)
.tag(position.nodePosition?.num ?? 0)
}
}
}

@ -1 +1 @@
Subproject commit dd7d64cc038a6365c119ec7508762cc45f405948
Subproject commit a45a6154d0721027bf63f85cfc5abd9f6fab2422