diff --git a/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d528f9854..b43b5af70 100644 --- a/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "2d0b85469585b0d6079eac292d63864096062c24848a49380b9d9727f0ceb96c", + "originHash" : "45e732eb19679edeb7e37b23f33aa84a3618d66ed0e84bba85bf373dee1dd3ca", "pins" : [ { "identity" : "cocoamqtt", diff --git a/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme b/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme index 880339bcd..decd8381b 100644 --- a/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme +++ b/Meshtastic.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme @@ -89,6 +89,7 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" + askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> diff --git a/Meshtastic/Assets.xcassets/BANDITNANO.imageset/BanditNano900mhz.png b/Meshtastic/Assets.xcassets/BANDITNANO.imageset/BanditNano900mhz.png new file mode 100644 index 000000000..1ee2b31bc Binary files /dev/null and b/Meshtastic/Assets.xcassets/BANDITNANO.imageset/BanditNano900mhz.png differ diff --git a/Meshtastic/Assets.xcassets/BANDITNANO.imageset/Contents.json b/Meshtastic/Assets.xcassets/BANDITNANO.imageset/Contents.json new file mode 100644 index 000000000..3e234e66a --- /dev/null +++ b/Meshtastic/Assets.xcassets/BANDITNANO.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "BanditNano900mhz.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/CANARYONE.imageset/CanaryOne.png b/Meshtastic/Assets.xcassets/CANARYONE.imageset/CanaryOne.png new file mode 100644 index 000000000..9b813e412 Binary files /dev/null and b/Meshtastic/Assets.xcassets/CANARYONE.imageset/CanaryOne.png differ diff --git a/Meshtastic/Assets.xcassets/CANARYONE.imageset/Contents.json b/Meshtastic/Assets.xcassets/CANARYONE.imageset/Contents.json new file mode 100644 index 000000000..e147dda6a --- /dev/null +++ b/Meshtastic/Assets.xcassets/CANARYONE.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "CanaryOne.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/HYDRA.imageset/Contents.json b/Meshtastic/Assets.xcassets/HYDRA.imageset/Contents.json new file mode 100644 index 000000000..55a989607 --- /dev/null +++ b/Meshtastic/Assets.xcassets/HYDRA.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Hydra PCB.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/HYDRA.imageset/Hydra PCB.png b/Meshtastic/Assets.xcassets/HYDRA.imageset/Hydra PCB.png new file mode 100644 index 000000000..e180a2508 Binary files /dev/null and b/Meshtastic/Assets.xcassets/HYDRA.imageset/Hydra PCB.png differ diff --git a/Meshtastic/Assets.xcassets/LINUX.imageset/Contents.json b/Meshtastic/Assets.xcassets/LINUX.imageset/Contents.json new file mode 100644 index 000000000..bf896c341 --- /dev/null +++ b/Meshtastic/Assets.xcassets/LINUX.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Linux logo.svg.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/LINUX.imageset/Linux logo.svg.png b/Meshtastic/Assets.xcassets/LINUX.imageset/Linux logo.svg.png new file mode 100644 index 000000000..8bb2d2adf Binary files /dev/null and b/Meshtastic/Assets.xcassets/LINUX.imageset/Linux logo.svg.png differ diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json index 2f0743816..2b10c37f9 100644 --- a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "nano_g2_ultra_product_image.jpg", + "filename" : "NanoG2Ultra.png", "idiom" : "universal" } ], diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/NanoG2Ultra.png b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/NanoG2Ultra.png new file mode 100644 index 000000000..d5ac8ca55 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/NanoG2Ultra.png differ diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image.jpg b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image.jpg deleted file mode 100644 index 18f2b472b..000000000 Binary files a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json index ed6c2585c..ffce7040a 100644 --- a/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "RAK_DEV_KIT-2.jpg", + "filename" : "Rak11200 progressive.png", "idiom" : "universal" } ], diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg deleted file mode 100644 index 9300bed02..000000000 Binary files a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/Rak11200 progressive.png b/Meshtastic/Assets.xcassets/RAK11200.imageset/Rak11200 progressive.png new file mode 100644 index 000000000..6dbb90d1b Binary files /dev/null and b/Meshtastic/Assets.xcassets/RAK11200.imageset/Rak11200 progressive.png differ diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json index feb2e6c01..5300352e0 100644 --- a/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "RAK 4.png", + "filename" : "rak4631 front.png", "idiom" : "universal" } ], diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 4.png b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 4.png deleted file mode 100644 index e34322b89..000000000 Binary files a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/rak4631 front.png b/Meshtastic/Assets.xcassets/RAK4631.imageset/rak4631 front.png new file mode 100644 index 000000000..33f7350fb Binary files /dev/null and b/Meshtastic/Assets.xcassets/RAK4631.imageset/rak4631 front.png differ diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json b/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json new file mode 100644 index 000000000..a45c2fc36 --- /dev/null +++ b/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Pico Hero Transparent.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/Pico Hero Transparent.png b/Meshtastic/Assets.xcassets/RPIPICO.imageset/Pico Hero Transparent.png new file mode 100644 index 000000000..174440be6 Binary files /dev/null and b/Meshtastic/Assets.xcassets/RPIPICO.imageset/Pico Hero Transparent.png differ diff --git a/Meshtastic/Assets.xcassets/T1000E.imageset/Contents.json b/Meshtastic/Assets.xcassets/T1000E.imageset/Contents.json new file mode 100644 index 000000000..a18c85024 --- /dev/null +++ b/Meshtastic/Assets.xcassets/T1000E.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "TrackerT000E.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/T1000E.imageset/TrackerT000E.png b/Meshtastic/Assets.xcassets/T1000E.imageset/TrackerT000E.png new file mode 100644 index 000000000..21512d81e Binary files /dev/null and b/Meshtastic/Assets.xcassets/T1000E.imageset/TrackerT000E.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json index 64a09f223..1ada538fd 100644 --- a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "tbeam.png", + "filename" : "TBEAM.png", "idiom" : "universal" } ], diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/TBEAM.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/TBEAM.png new file mode 100644 index 000000000..bf5913158 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TBEAM.imageset/TBEAM.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png deleted file mode 100644 index 75fec7be7..000000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDECK.imageset/Contents.json b/Meshtastic/Assets.xcassets/TDECK.imageset/Contents.json new file mode 100644 index 000000000..8a4c48aea --- /dev/null +++ b/Meshtastic/Assets.xcassets/TDECK.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "T-Deck.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/TDECK.imageset/T-Deck.png b/Meshtastic/Assets.xcassets/TDECK.imageset/T-Deck.png new file mode 100644 index 000000000..479b5ef63 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TDECK.imageset/T-Deck.png differ diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json index 093c722dd..7f91944f0 100644 --- a/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "TLORA_olive 1.png", + "filename" : "TloraV1.png", "idiom" : "universal" } ], diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 1.png b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 1.png deleted file mode 100644 index e8980a2cc..000000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TloraV1.png b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TloraV1.png new file mode 100644 index 000000000..6496b18d5 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TloraV1.png differ diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json new file mode 100644 index 000000000..b7e43dd66 --- /dev/null +++ b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "TWatchS3.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/TWatchS3.png b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/TWatchS3.png new file mode 100644 index 000000000..e831edeec Binary files /dev/null and b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/TWatchS3.png differ diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/Contents.json b/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/Contents.json new file mode 100644 index 000000000..baf4fec27 --- /dev/null +++ b/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "E213.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/E213.png b/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/E213.png new file mode 100644 index 000000000..ea3242dba Binary files /dev/null and b/Meshtastic/Assets.xcassets/VISIONMASTERE213.imageset/E213.png differ diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Contents.json b/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Contents.json new file mode 100644 index 000000000..ebb64586b --- /dev/null +++ b/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Vision Master E290 back.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Vision Master E290 back.png b/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Vision Master E290 back.png new file mode 100644 index 000000000..6a8b3131b Binary files /dev/null and b/Meshtastic/Assets.xcassets/VISIONMASTERE290.imageset/Vision Master E290 back.png differ diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/Contents.json b/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/Contents.json new file mode 100644 index 000000000..c4dfb8c0a --- /dev/null +++ b/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "HELTEC Vision T190.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/HELTEC Vision T190.png b/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/HELTEC Vision T190.png new file mode 100644 index 000000000..898f3d4e7 Binary files /dev/null and b/Meshtastic/Assets.xcassets/VISIONMASTERT190.imageset/HELTEC Vision T190.png differ diff --git a/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Contents.json b/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Contents.json new file mode 100644 index 000000000..7a57afd38 --- /dev/null +++ b/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Wio Tracker 1110 Dev Board- the Tracker Prototype for Indoor and Outdoor Positioning - Seeed Studio.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Wio Tracker 1110 Dev Board- the Tracker Prototype for Indoor and Outdoor Positioning - Seeed Studio.png b/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Wio Tracker 1110 Dev Board- the Tracker Prototype for Indoor and Outdoor Positioning - Seeed Studio.png new file mode 100644 index 000000000..58498f6bd Binary files /dev/null and b/Meshtastic/Assets.xcassets/WIOWM1110.imageset/Wio Tracker 1110 Dev Board- the Tracker Prototype for Indoor and Outdoor Positioning - Seeed Studio.png differ diff --git a/Meshtastic/Extensions/CoreData/UserEntityExtension.swift b/Meshtastic/Extensions/CoreData/UserEntityExtension.swift index 8c49b3229..f143569e7 100644 --- a/Meshtastic/Extensions/CoreData/UserEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/UserEntityExtension.swift @@ -45,7 +45,7 @@ extension UserEntity { return "HELTECWIRELESSTRACKER" case "HELTECWSLV3": return "HELTECWSLV3" - case "LILYGOTBEAMSCORE": + case "LILYGOTBEAMS3CORE": return "LILYGOTBEAMS3CORE" case "NANOG1", "NANOG1EXPLORER": return "NANOG1" @@ -57,10 +57,10 @@ extension UserEntity { return "RAK11200" case "SOLAR_NODE": return "SOLAR_NODE" - case "STATIONG1": + case "STATIONG1", "STATIONG2": return "STATIONG1" - case "ТВЕАМ", "TBEAMVOP7": - return "ТВЕАМ" + case "TBEAM", "TBEAMVOP7": + return "TBEAM" case "TECHO": return "TECHO" case "TLORAV1", "TLORAV11P3": @@ -69,6 +69,30 @@ extension UserEntity { return "TLORABOARD" case "UNPHONE": return "UNPHONE" + case "RPIPICO", "PICOMPUTERS3": + return "RPIPICO" + case "HELTECVISIONMASTERE290": + return "VISIONMASTERE290" + case "RADIOMASTER900BANDITNANO": + return "BANDITNANO" + case "TRACKER_T1000_E": + return "T1000E" + case "HELTECVISIONMASTERE213": + return "VISIONMASTERE290" + case "HELTECVISIONMASTERT190": + return "VISIONMASTERT190" + case "TDECK": + return "TDECK" + case "TWATCHS3": + return "TWATCHS3" + case "PORTDUINO": + return "LINUX" + case "CANARYONE": + return "CANARYONE" + case "HYDRA": + return "HYDRA" + case "WIOWM1110": + return "WIOWM1110" default: return "UNSET" }