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

Bump version

Browse source
This commit is contained in:
Garth Vander Houwen 2022-10-13 07:45:23 -07:00
parent 8aa94f5e0f
commit acd7d4e279
4 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meshtastic.xcodeproj/project.pbxproj
View file

@ -964,7 +964,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.43;
MARKETING_VERSION = 1.3.44;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@ -996,7 +996,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.43;
MARKETING_VERSION = 1.3.44;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;

55
Meshtastic/Enums/CannedMessagesConfigEnums.swift
View file

@ -10,9 +10,8 @@ enum ConfigPresets : Int, CaseIterable, Identifiable {
case unset = 0
case rakRotaryEncoder = 1
case tbeamThreeButtonScreen = 2
case cardKB = 3
case facesKB = 4
case cardKB = 2
case facesKB = 3
var id: Int { self.rawValue }
var description: String {
@ -23,8 +22,6 @@ enum ConfigPresets : Int, CaseIterable, Identifiable {
return "Manual Configuration"
case .rakRotaryEncoder:
return "RAK Rotary Encoder Module"
case .tbeamThreeButtonScreen:
return "TBEAM 3 Button OLED Screen"
case .cardKB:
return "M5 Stack Card KeyBoard"
case .facesKB:
@ -37,35 +34,35 @@ enum ConfigPresets : Int, CaseIterable, Identifiable {
// Default of 0 is off
enum InputEventChars: Int, CaseIterable, Identifiable {
case keyNone = 0
case keyUp = 17
case keyDown = 18
case keyLeft = 19
case keyRight = 20
case keySelect = 10
case keyBack = 27
case keyCancel = 24
case none = 0
case up = 17
case down = 18
case left = 19
case right = 20
case select = 10
case back = 27
case cancel = 24
var id: Int { self.rawValue }
var description: String {
get {
switch self {
case .keyNone:
case .none:
return "None"
case .keyUp:
case .up:
return "Up"
case .keyDown:
case .down:
return "Down"
case .keyLeft:
case .left:
return "Left"
case .keyRight:
case .right:
return "Right"
case .keySelect:
case .select:
return "Select"
case .keyBack:
case .back:
return "Back"
case .keyCancel:
case .cancel:
return "Cancel"
}
}
@ -74,21 +71,21 @@ enum InputEventChars: Int, CaseIterable, Identifiable {
switch self {
case .keyNone:
case .none:
return ModuleConfig.CannedMessageConfig.InputEventChar.none
case .keyUp:
case .up:
return ModuleConfig.CannedMessageConfig.InputEventChar.up
case .keyDown:
case .down:
return ModuleConfig.CannedMessageConfig.InputEventChar.down
case .keyLeft:
case .left:
return ModuleConfig.CannedMessageConfig.InputEventChar.left
case .keyRight:
case .right:
return ModuleConfig.CannedMessageConfig.InputEventChar.right
case .keySelect:
case .select:
return ModuleConfig.CannedMessageConfig.InputEventChar.select
case .keyBack:
case .back:
return ModuleConfig.CannedMessageConfig.InputEventChar.back
case .keyCancel:
case .cancel:
return ModuleConfig.CannedMessageConfig.InputEventChar.cancel
}
}

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

@ -244,7 +244,7 @@ struct CannedMessagesConfig: View {
} else if updown1Enabled {
cmc.allowInputSource = "upDownEnc1"
cmc.allowInputSource = "_any"
} else {
@ -313,12 +313,12 @@ struct CannedMessagesConfig: View {
// RAK Rotary Encoder
updown1Enabled = false
rotary1Enabled = false
inputbrokerPinA = 32
inputbrokerPinB = 38
inputbrokerPinPress = 37
inputbrokerEventCw = InputEventChars.keyUp.rawValue
inputbrokerEventCcw = InputEventChars.keyDown.rawValue
inputbrokerEventPress = InputEventChars.keySelect.rawValue
inputbrokerPinA = 4
inputbrokerPinB = 10
inputbrokerPinPress = 9
inputbrokerEventCw = InputEventChars.down.rawValue
inputbrokerEventCcw = InputEventChars.up.rawValue
inputbrokerEventPress = InputEventChars.select.rawValue
} else if newPreset == 2 {
@ -328,9 +328,9 @@ struct CannedMessagesConfig: View {
inputbrokerPinA = 25
inputbrokerPinB = 39
inputbrokerPinPress = 36
inputbrokerEventCw = InputEventChars.keyUp.rawValue
inputbrokerEventCcw = InputEventChars.keyDown.rawValue
inputbrokerEventPress = InputEventChars.keySelect.rawValue
inputbrokerEventCw = InputEventChars.up.rawValue
inputbrokerEventCcw = InputEventChars.down.rawValue
inputbrokerEventPress = InputEventChars.select.rawValue
}
hasChanges = true

17
Meshtastic/Views/Settings/SaveChannelQRCode.swift
View file

@ -13,10 +13,25 @@ struct SaveChannelQRCode: View {
VStack {
Text("Save Channel Settings?")
.font(.title)
Text("These settings will replace the current LoRa Config and Channel Settings on your radio.")
Text("These settings will replace the current LoRa Config and Channel Settings on your radio. After everything saves your device will reboot.")
.foregroundColor(.gray)
.font(.callout)
.padding()
Text(channelHash)
.font(.caption2)
.foregroundColor(.gray)
.padding()
Button {
} label: {
Label("Save", systemImage: "square.and.arrow.down")
}
.buttonStyle(.bordered)
.buttonBorderShape(.capsule)
.controlSize(.large)
.padding()
}
.onChange(of: channelHash) { newSettings in
var decodedString = newSettings.base64urlToBase64()