mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
This change modifies the process for generating and integrating the Meshtastic protobufs into the client application. * The generated Swift code is now in a local SPM package `MeshtasticProtobufs` * An Xcode Workspace file `Meshtastic.xcworkspace` was created to more easily manage the new build targets. * The code generation script for the protos was modified to generate the Swift code into the new location. * The README.md was updated to reflect these changes. NOTE: After merging this PR, do not open the project file `Meshtastic.xcodeproj`. You must use the workspace `Meshtastic.xcworkspace` Extracting out the generated protobuf code into its own library enables several opportunities for the project. This is just a first step, but with some more modularization, a standalone Apple Watch app or other targets starts to become a little bit more achievable to implement. After extracting the protobufs into a Swift package, I validate these changes by building and running the Meshtastic app to an iPhone 15 Pro Max, and tried changing some settings on a local node. I then messaged back and forth using two local nodes connected to two different iOS devices.
200 lines
4.3 KiB
Swift
200 lines
4.3 KiB
Swift
//
|
|
// ScreenIntervals.swift
|
|
// Meshtastic
|
|
//
|
|
// Copyright(c) Garth Vander Houwen 8/20/22.
|
|
//
|
|
|
|
import Foundation
|
|
import MeshtasticProtobufs
|
|
|
|
enum ScreenUnits: Int, CaseIterable, Identifiable {
|
|
|
|
case metric = 0
|
|
case imperial = 1
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .metric:
|
|
return "Metric"
|
|
case .imperial:
|
|
return "Imperial"
|
|
}
|
|
}
|
|
func protoEnumValue() -> Config.DisplayConfig.DisplayUnits {
|
|
|
|
switch self {
|
|
case .metric:
|
|
return Config.DisplayConfig.DisplayUnits.metric
|
|
case .imperial:
|
|
return Config.DisplayConfig.DisplayUnits.imperial
|
|
}
|
|
}
|
|
}
|
|
|
|
enum ScreenOnIntervals: Int, CaseIterable, Identifiable {
|
|
|
|
case fifteenSeconds = 15
|
|
case thirtySeconds = 30
|
|
case oneMinute = 60
|
|
case fiveMinutes = 300
|
|
case tenMinutes = 600
|
|
case fifteenMinutes = 900
|
|
case thirtyMinutes = 1800
|
|
case oneHour = 3600
|
|
case max = 31536000 // One Year
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .fifteenSeconds:
|
|
return "interval.fifteen.seconds".localized
|
|
case .thirtySeconds:
|
|
return "interval.thirty.seconds".localized
|
|
case .oneMinute:
|
|
return "interval.one.minute".localized
|
|
case .fiveMinutes:
|
|
return "interval.five.minutes".localized
|
|
case .tenMinutes:
|
|
return "interval.ten.minutes".localized
|
|
case .fifteenMinutes:
|
|
return "interval.fifteen.minutes".localized
|
|
case .thirtyMinutes:
|
|
return "interval.thirty.minutes".localized
|
|
case .oneHour:
|
|
return "interval.one.hour".localized
|
|
case .max:
|
|
return "always.on".localized
|
|
}
|
|
}
|
|
}
|
|
|
|
// Default of 0 is off
|
|
enum ScreenCarouselIntervals: Int, CaseIterable, Identifiable {
|
|
|
|
case off = 0
|
|
case fifteenSeconds = 15
|
|
case thirtySeconds = 30
|
|
case oneMinute = 60
|
|
case fiveMinutes = 300
|
|
case tenMinutes = 600
|
|
case fifteenMinutes = 900
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .off:
|
|
return "off".localized
|
|
case .fifteenSeconds:
|
|
return "interval.fifteen.seconds".localized
|
|
case .thirtySeconds:
|
|
return "interval.thirty.seconds".localized
|
|
case .oneMinute:
|
|
return "interval.one.minute".localized
|
|
case .fiveMinutes:
|
|
return "interval.five.minutes".localized
|
|
case .tenMinutes:
|
|
return "interval.ten.minutes".localized
|
|
case .fifteenMinutes:
|
|
return "interval.fifteen.minutes".localized
|
|
}
|
|
}
|
|
}
|
|
// Default of 0 is auto
|
|
enum OledTypes: Int, CaseIterable, Identifiable {
|
|
|
|
case auto = 0
|
|
case ssd1306 = 1
|
|
case sh1106 = 2
|
|
case sh1107 = 3
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .auto:
|
|
return "automatic.detection".localized
|
|
case .ssd1306:
|
|
return "SSD 1306"
|
|
case .sh1106:
|
|
return "SH 1106"
|
|
case .sh1107:
|
|
return "SH 1107"
|
|
}
|
|
}
|
|
func protoEnumValue() -> Config.DisplayConfig.OledType {
|
|
|
|
switch self {
|
|
case .auto:
|
|
return Config.DisplayConfig.OledType.oledAuto
|
|
case .ssd1306:
|
|
return Config.DisplayConfig.OledType.oledSsd1306
|
|
case .sh1106:
|
|
return Config.DisplayConfig.OledType.oledSh1106
|
|
case .sh1107:
|
|
return Config.DisplayConfig.OledType.oledSh1107
|
|
}
|
|
}
|
|
}
|
|
|
|
// Default of 0 is auto
|
|
enum DisplayModes: Int, CaseIterable, Identifiable {
|
|
|
|
case defaultMode = 0
|
|
case twoColor = 1
|
|
case inverted = 2
|
|
case color = 3
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .defaultMode:
|
|
return "Default 128x64 screen layout"
|
|
case .twoColor:
|
|
return "Optimized for 2 color displays"
|
|
case .inverted:
|
|
return "Inverted top bar for 2 Color display"
|
|
case .color:
|
|
return "TFT Full Color Displays"
|
|
}
|
|
}
|
|
func protoEnumValue() -> Config.DisplayConfig.DisplayMode {
|
|
|
|
switch self {
|
|
case .defaultMode:
|
|
return Config.DisplayConfig.DisplayMode.default
|
|
case .twoColor:
|
|
return Config.DisplayConfig.DisplayMode.twocolor
|
|
case .inverted:
|
|
return Config.DisplayConfig.DisplayMode.inverted
|
|
case .color:
|
|
return Config.DisplayConfig.DisplayMode.color
|
|
}
|
|
}
|
|
}
|
|
|
|
// Default of 0 is metric
|
|
enum Units: Int, CaseIterable, Identifiable {
|
|
|
|
case metric = 0
|
|
case imperial = 1
|
|
|
|
var id: Int { self.rawValue }
|
|
var description: String {
|
|
switch self {
|
|
case .metric:
|
|
return "Metric"
|
|
case .imperial:
|
|
return "Imperial"
|
|
}
|
|
}
|
|
func protoEnumValue() -> Config.DisplayConfig.DisplayUnits {
|
|
|
|
switch self {
|
|
case .metric:
|
|
return Config.DisplayConfig.DisplayUnits.metric
|
|
case .imperial:
|
|
return Config.DisplayConfig.DisplayUnits.imperial
|
|
}
|
|
}
|
|
}
|