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

Merge branch 'main'

Browse source 
Conflicts:
	Meshtastic.xcodeproj/project.pbxproj
	Meshtastic/Helpers/MeshPackets.swift
This commit is contained in:
Garth Vander Houwen 2022-09-20 21:07:20 -07:00
commit a55e54febc
4 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Meshtastic.xcodeproj/project.pbxproj
View file

@ -513,7 +513,6 @@
DDC2E18D26CE25CB0042C5E4 /* Helpers */ = {
isa = PBXGroup;
children = (
DD2160AC28C5019400C17253 /* Messages */,
DD47E3D526F17ED900029299 /* CircleText.swift */,
DD47E3D826F3093800029299 /* MessageBubble.swift */,
DD90860B26F684AF00DC5189 /* BatteryIcon.swift */,

28
Meshtastic/Enums/SerialConfigEnums.swift
View file

@ -107,20 +107,23 @@ enum SerialBaudRates: Int, CaseIterable, Identifiable {
enum SerialModeTypes: Int, CaseIterable, Identifiable {
case modeDefault = 0
case modeSimple = 1
case modeProto = 2
case `default` = 0
case simple = 1
case proto = 2
case txtmsg = 3
var id: Int { self.rawValue }
var description: String {
get {
switch self {
case .modeDefault:
case .default:
return "Default"
case .modeSimple:
case .simple:
return "Simple"
case .modeProto:
case .proto:
return "Protobufs"
case .txtmsg:
return "Text Message"
}
}
}
@ -128,12 +131,14 @@ enum SerialModeTypes: Int, CaseIterable, Identifiable {
switch self {
case .modeDefault:
case .default:
return ModuleConfig.SerialConfig.Serial_Mode.default
case .modeSimple:
case .simple:
return ModuleConfig.SerialConfig.Serial_Mode.simple
case .modeProto:
case .proto:
return ModuleConfig.SerialConfig.Serial_Mode.proto
case .txtmsg:
return ModuleConfig.SerialConfig.Serial_Mode.textmsg
}
}
}
@ -141,6 +146,7 @@ enum SerialModeTypes: Int, CaseIterable, Identifiable {
enum SerialTimeoutIntervals: Int, CaseIterable, Identifiable {
case unset = 0
case oneSecond = 1
case fiveSeconds = 5
case tenSeconds = 10
case fifteenSeconds = 15
@ -154,6 +160,8 @@ enum SerialTimeoutIntervals: Int, CaseIterable, Identifiable {
switch self {
case .unset:
return "Unset"
case .oneSecond:
return "One Second"
case .fiveSeconds:
return "Five Seconds"
case .tenSeconds:

2
Meshtastic/Views/Bluetooth/Connect.swift
View file

@ -20,7 +20,7 @@ struct Connect: View {
@State var isPreferredRadio: Bool = false
@State var firmwareVersion = "0.0.0"
@State var minimumVersion = "1.3.40"
@State var minimumVersion = "1.3.41"
@State var invalidVersion = false
var body: some View {

8
Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file

@ -310,11 +310,11 @@ struct CannedMessagesConfig: View {
if newPreset == 1 {
// RAK Rotary Encoder
updown1Enabled = true
updown1Enabled = false
rotary1Enabled = false
inputbrokerPinA = 4
inputbrokerPinB = 10
inputbrokerPinPress = 3
inputbrokerPinA = 32
inputbrokerPinB = 38
inputbrokerPinPress = 37
inputbrokerEventCw = InputEventChars.keyUp.rawValue
inputbrokerEventCcw = InputEventChars.keyDown.rawValue
inputbrokerEventPress = InputEventChars.keySelect.rawValue