From 398bf8c88e9f5cbcb3d73c766985d1ac22f55c42 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 17 Mar 2023 23:30:01 -0700 Subject: [PATCH] Clean up platform enum --- Meshtastic/Enums/HardwareModels.swift | 64 ++++++++++++------------ Meshtastic/Views/Settings/Firmware.swift | 4 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Meshtastic/Enums/HardwareModels.swift b/Meshtastic/Enums/HardwareModels.swift index b857fd1f..59cbc30c 100644 --- a/Meshtastic/Enums/HardwareModels.swift +++ b/Meshtastic/Enums/HardwareModels.swift @@ -138,49 +138,49 @@ enum HardwareModels: String, CaseIterable, Identifiable { switch self { case .UNSET: - return HardwarePlatforms.NONE + return HardwarePlatforms.none case .TLORAV2: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TLORAV1: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TLORAV211P6: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TBEAM: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .HELTECV20: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TBEAMV0P7: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TECHO: - return HardwarePlatforms.NRF52 + return HardwarePlatforms.nrf52 case .TLORAV11P3: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .RAK4631: - return HardwarePlatforms.NRF52 + return HardwarePlatforms.nrf52 case .HELTECV21: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .HELTECV1: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .LILYGOTBEAMS3CORE: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .RAK11200: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .NANOG1: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TLORAV211P8: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .TLORAT3S3: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .NANOG1EXPLORER: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .STATIONG1: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .M5STACK: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .HELTECV3: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 case .HELTECWSLV3: - return HardwarePlatforms.ESP32 + return HardwarePlatforms.esp32 } } func protoEnumValue() -> HardwareModel { @@ -238,24 +238,24 @@ enum HardwareModels: String, CaseIterable, Identifiable { enum HardwarePlatforms: String, CaseIterable, Identifiable { - case NONE - case ESP32 - case NRF52 - case STM32 - case PIPICO + case none + case esp32 + case nrf52 + case stm32 + case piPico var id: String { self.rawValue } var description: String { switch self { - case .NONE: + case .none: return "None" - case .ESP32: + case .esp32: return "Expressif ESP 32" - case .NRF52: + case .nrf52: return "Nordic NRF52" - case .STM32: + case .stm32: return "ARM STM 32" - case .PIPICO: + case .piPico: return "Raspberrry Pi Pico" } } diff --git a/Meshtastic/Views/Settings/Firmware.swift b/Meshtastic/Views/Settings/Firmware.swift index 6d7a7a64..4ccc253e 100644 --- a/Meshtastic/Views/Settings/Firmware.swift +++ b/Meshtastic/Views/Settings/Firmware.swift @@ -44,7 +44,7 @@ struct Firmware: View { } .padding(.bottom) - if hwModel.platform() == HardwarePlatforms.NRF52 { + if hwModel.platform() == HardwarePlatforms.nrf52 { VStack(alignment: .leading) { if hwModel == HardwareModels.RAK4631 { Text("nRF OTA Device Firmware Update App") @@ -60,7 +60,7 @@ struct Firmware: View { .font(.callout) } } - } else if hwModel.platform() == HardwarePlatforms.ESP32 { + } else if hwModel.platform() == HardwarePlatforms.esp32 { VStack(alignment: .leading) { Text("ESP32 Device Firmware Update") .font(.title3)