diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 31db48de..7e0e3951 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -191,6 +191,9 @@ }, "8" : { + }, + "10% Airtime" : { + }, "25" : { @@ -672,6 +675,9 @@ } } } + }, + "Airtime" : { + }, "AirTm" : { @@ -1406,6 +1412,9 @@ }, "Backup Database" : { + }, + "Bad" : { + }, "Bandwidth" : { @@ -8264,13 +8273,13 @@ "How long the screen remains on after the user button is pressed or messages are received." : { }, - "How often device metrics are sent out over the mesh. Default is 15 minutes." : { + "How often device metrics are sent out over the mesh. Default is 30 minutes." : { }, - "How often power metrics are sent out over the mesh. Default is 15 minutes." : { + "How often power metrics are sent out over the mesh. Default is 30 minutes." : { }, - "How often sensor metrics are sent out over the mesh. Default is 15 minutes." : { + "How often sensor metrics are sent out over the mesh. Default is 30 minutes." : { }, "How often should we try to get a GPS position." : { @@ -10843,9 +10852,6 @@ }, "Licensed Operator" : { - }, - "Limit" : { - }, "Limit all periodic broadcast intervals especially telemetry and position. If you need to increase hops, do it on nodes at the edges, not the ones in the middle. MQTT is not advised when you are duty cycle restricted because the gateway node is then doing all the work." : { @@ -15225,6 +15231,12 @@ } } } + }, + "Network Status Orange" : { + + }, + "Network Status Red" : { + }, "network.config" : { "localizations" : { diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index ecece1bb..6c090d2f 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ 25A978BA2C13F8ED0003AAE7 /* MeshtasticProtobufs in Frameworks */ = {isa = PBXBuildFile; productRef = 25A978B92C13F8ED0003AAE7 /* MeshtasticProtobufs */; }; 25A978BC2C13F90D0003AAE7 /* MeshtasticProtobufs in Frameworks */ = {isa = PBXBuildFile; productRef = 25A978BB2C13F90D0003AAE7 /* MeshtasticProtobufs */; }; 25AECD4F2C2F723200862C8E /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 25AECD4E2C2F723200862C8E /* Localizable.xcstrings */; }; + 25C49D902C471AEA0024FBD1 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C49D8F2C471AEA0024FBD1 /* Constants.swift */; }; 25F26B1E2C2F610D00C9CD9D /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD5BB0C2C285F00007E03CA /* Logger.swift */; }; 25F26B1F2C2F611300C9CD9D /* AppData.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD5BB152C28B1E4007E03CA /* AppData.swift */; }; 25F5D5BE2C3F6D87008036E3 /* NavigationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25F5D5BD2C3F6D87008036E3 /* NavigationState.swift */; }; @@ -252,6 +253,7 @@ 25F5D5C12C3F6E4B008036E3 /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = ""; }; 25F5D5C72C4375A8008036E3 /* MeshtasticTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 25F5D5D02C4375DF008036E3 /* RouterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterTests.swift; sourceTree = ""; }; + 25C49D8F2C471AEA0024FBD1 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; 6D825E612C34786C008DBEE4 /* CommonRegex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonRegex.swift; sourceTree = ""; }; 6DA39D8D2A92DC52007E311C /* MeshtasticAppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppDelegate.swift; sourceTree = ""; }; 6DEDA5592A957B8E00321D2E /* DetectionSensorLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetectionSensorLog.swift; sourceTree = ""; }; @@ -961,6 +963,7 @@ DDDB444529F8A96500EE2349 /* Character.swift */, DDDB444929F8AA3A00EE2349 /* CLLocationCoordinate2D.swift */, DDDB444B29F8AAA600EE2349 /* Color.swift */, + 25C49D8F2C471AEA0024FBD1 /* Constants.swift */, DDDB445329F8AD1600EE2349 /* Data.swift */, DDDB445129F8ACF900EE2349 /* Date.swift */, DDDB444129F8A88700EE2349 /* Double.swift */, @@ -1271,6 +1274,7 @@ DD3619152B1EF9F900C41C8C /* LocationsHandler.swift in Sources */, 25F5D5C02C3F6DA6008036E3 /* Router.swift in Sources */, DDDB444A29F8AA3A00EE2349 /* CLLocationCoordinate2D.swift in Sources */, + 25C49D902C471AEA0024FBD1 /* Constants.swift in Sources */, DD41582628582E9B009B0E59 /* DeviceConfig.swift in Sources */, DDF45C372BC46A5A005ED5F2 /* TimeZone.swift in Sources */, DD007BAE2AA4E91200F5FA12 /* MyInfoEntityExtension.swift in Sources */, diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json index 06ebbbb1..1482d0f8 100644 --- a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CANARY1.imageset/Contents.json b/Meshtastic/Assets.xcassets/CANARY1.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/CANARY1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CANARY1.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/Contents.json b/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CDEBYTEEORAS3.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CHATTER2.imageset/Contents.json b/Meshtastic/Assets.xcassets/CHATTER2.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/CHATTER2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/CHATTER2.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DIYV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/DIYV1.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/DIYV1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DIYV1.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DRDEV.imageset/Contents.json b/Meshtastic/Assets.xcassets/DRDEV.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/DRDEV.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/DRDEV.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/Contents.json b/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/EBYTEESP32S3.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/Contents.json b/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/ESP32S3PICO.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/GENIEBLOCKS.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECHT62.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECHT62.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Contents.json deleted file mode 100644 index 3055cd51..00000000 --- a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Heltec_turq.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Heltec_turq 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Heltec_turq 2.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 1.png b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 1.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 2.png b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 2.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq.png b/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV1.imageset/Heltec_turq.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json deleted file mode 100644 index a02a95fb..00000000 --- a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Heltec_turq 1.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Heltec_turq 2.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Heltec_turq.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 1.png b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 1.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 2.png b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 2.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.png b/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json deleted file mode 100644 index a02a95fb..00000000 --- a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Heltec_turq 1.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Heltec_turq 2.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Heltec_turq.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 1.png b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 1.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 2.png b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 2.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.png b/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json index a02a95fb..98595042 100644 --- a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "Heltec_turq 1.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Heltec_turq 2.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "Heltec_turq.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png b/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png deleted file mode 100644 index c4454bcc..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECV3.imageset/Heltec_turq 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Contents.json index d363b690..1a8d07dc 100644 --- a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "Paper-Meshtastic-2 copy.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Paper-Meshtastic-2 copy 1.jpg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Paper-Meshtastic-2 copy 2.jpg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 1.jpg b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 1.jpg deleted file mode 100644 index 36692599..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 2.jpg b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 2.jpg deleted file mode 100644 index 36692599..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPER.imageset/Paper-Meshtastic-2 copy 2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Contents.json deleted file mode 100644 index d363b690..00000000 --- a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Paper-Meshtastic-2 copy.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Paper-Meshtastic-2 copy 1.jpg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Paper-Meshtastic-2 copy 2.jpg", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 1.jpg b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 1.jpg deleted file mode 100644 index 36692599..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 2.jpg b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 2.jpg deleted file mode 100644 index 36692599..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy 2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy.jpg b/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy.jpg deleted file mode 100644 index 36692599..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSPAPERV10.imageset/Paper-Meshtastic-2 copy.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/Contents.json index 0a33483b..3b6b227c 100644 --- a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ { - "filename" : "images.jpeg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "images 1.jpeg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "images 2.jpeg", - "idiom" : "universal", - "scale" : "3x" + "filename" : "images.png", + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 1.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 1.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 1.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 2.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 2.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images 2.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.png b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.png new file mode 100644 index 00000000..4e9336c5 Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKER.imageset/images.png differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/Contents.json deleted file mode 100644 index 0a33483b..00000000 --- a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "images.jpeg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "images 1.jpeg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "images 2.jpeg", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 1.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 1.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 1.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 2.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 2.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images 2.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images.jpeg b/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images.jpeg deleted file mode 100644 index adbb512c..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWIRELESSTRACKERV10.imageset/images.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json index 7f0651c4..aed717e4 100644 --- a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "heltecwsl 2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "heltecwsl 1.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "heltecwsl.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png deleted file mode 100644 index 63ecd895..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png deleted file mode 100644 index 63ecd895..00000000 Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png index 63ecd895..8881d0e1 100644 Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png differ diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json index dc52568b..892d20eb 100644 --- a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ { - "filename" : "tbeam_supreme 2.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tbeam_supreme 1.jpg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tbeam_supreme.jpg", - "idiom" : "universal", - "scale" : "3x" + "filename" : "tbeam_supreme.png", + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg deleted file mode 100644 index 47fa5964..00000000 Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg deleted file mode 100644 index 47fa5964..00000000 Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg deleted file mode 100644 index 47fa5964..00000000 Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.png new file mode 100644 index 00000000..6a618653 Binary files /dev/null and b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.png differ diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LORATYPE.imageset/Contents.json b/Meshtastic/Assets.xcassets/LORATYPE.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/LORATYPE.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/LORATYPE.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json b/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png b/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png deleted file mode 100644 index 7c5895c3..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png b/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png deleted file mode 100644 index 7c5895c3..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG1.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json index dab7c834..e8161263 100644 --- a/Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/NANOG1.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.png b/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.png deleted file mode 100644 index 7c5895c3..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png b/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png deleted file mode 100644 index 7c5895c3..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png b/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png deleted file mode 100644 index 7c5895c3..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/Contents.json deleted file mode 100644 index dab7c834..00000000 --- a/Meshtastic/Assets.xcassets/NANOG1EXPLORER.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 3.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 2.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "2022-04-01T18-01-04.120Z-meshtastic_mesh_device_nano_edition_G1_P1 1.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json index 736a3f97..2f074381 100644 --- a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "nano_g2_ultra_product_image.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "nano_g2_ultra_product_image 1.jpg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "nano_g2_ultra_product_image 2.jpg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 1.jpg b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 1.jpg deleted file mode 100644 index 18f2b472..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 2.jpg b/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 2.jpg deleted file mode 100644 index 18f2b472..00000000 Binary files a/Meshtastic/Assets.xcassets/NANOG2ULTRA.imageset/nano_g2_ultra_product_image 2.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840DK.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52840PCA10059.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/Contents.json b/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PICOMPUTERS3.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/Contents.json b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PORTDUINO.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PPR.imageset/Contents.json b/Meshtastic/Assets.xcassets/PPR.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/PPR.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PPR.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/Contents.json b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/PRIVATEHW.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json index 0038d1c1..ed6c2585 100644 --- a/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "RAK_DEV_KIT-2 1.jpg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "RAK_DEV_KIT-1.jpg", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "RAK_DEV_KIT-2.jpg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg deleted file mode 100644 index 9300bed0..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2 1.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2 1.jpg deleted file mode 100644 index 9300bed0..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2 1.jpg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11310.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK11310.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/RAK11310.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK11310.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json index 52e85275..feb2e6c0 100644 --- a/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/RAK4631.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "RAK 6.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "RAK 5.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "RAK 4.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 5.png b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 5.png deleted file mode 100644 index e34322b8..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 5.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 6.png b/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 6.png deleted file mode 100644 index e34322b8..00000000 Binary files a/Meshtastic/Assets.xcassets/RAK4631.imageset/RAK 6.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json b/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/RPIPICO.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/RPIPICO.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/Contents.json b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/Contents.json index af90d4b0..f8a70d36 100644 --- a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ { - "filename" : "solarnode.jpeg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "solarnode 1.jpeg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "solar_node.jpeg", - "idiom" : "universal", - "scale" : "3x" + "filename" : "solar_node.png", + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.jpeg b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.jpeg deleted file mode 100644 index bb84f38f..00000000 Binary files a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.png b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.png new file mode 100644 index 00000000..fae3ea0d Binary files /dev/null and b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solar_node.png differ diff --git a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode 1.jpeg b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode 1.jpeg deleted file mode 100644 index 547de73b..00000000 Binary files a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode 1.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode.jpeg b/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode.jpeg deleted file mode 100644 index 547de73b..00000000 Binary files a/Meshtastic/Assets.xcassets/SOLAR_NODE.imageset/solarnode.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json b/Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json index 59d1fc69..d72dfe5f 100644 --- a/Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/STATIONG1.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "meshtastic_mesh_device_station_edition_overview 1.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "meshtastic_mesh_device_station_edition_overview 2.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "meshtastic_mesh_device_station_edition_overview 3.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 2.png b/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 2.png deleted file mode 100644 index a8b03e02..00000000 Binary files a/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 3.png b/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 3.png deleted file mode 100644 index a8b03e02..00000000 Binary files a/Meshtastic/Assets.xcassets/STATIONG1.imageset/meshtastic_mesh_device_station_edition_overview 3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json index 382e42da..64a09f22 100644 --- a/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TBEAM.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "tbeam 2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tbeam 1.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "tbeam.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png deleted file mode 100644 index 75fec7be..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png b/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png deleted file mode 100644 index 75fec7be..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAM.imageset/tbeam 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json deleted file mode 100644 index 382e42da..00000000 --- a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "tbeam 2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "tbeam 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "tbeam.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png deleted file mode 100644 index 75fec7be..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png deleted file mode 100644 index 75fec7be..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam.png b/Meshtastic/Assets.xcassets/TBEAMV0P7.imageset/tbeam.png deleted file mode 100644 index 75fec7be..00000000 Binary files a/Meshtastic/Assets.xcassets/TBEAMV0P7.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 deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/TDECK.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDECK.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDLORAC.imageset/Contents.json b/Meshtastic/Assets.xcassets/TDLORAC.imageset/Contents.json deleted file mode 100644 index 05b5d301..00000000 --- a/Meshtastic/Assets.xcassets/TDLORAC.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-2 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-2 2.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 1.png b/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 1.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 2.png b/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TDLORAC.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json b/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json index 4d28850d..f380b7af 100644 --- a/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.png b/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.png deleted file mode 100644 index 7b2f9f96..00000000 Binary files a/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.png b/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.png deleted file mode 100644 index 7b2f9f96..00000000 Binary files a/Meshtastic/Assets.xcassets/TECHO.imageset/LILYGO-TTGO-SoftRF-T-Echo-NRF52840-LoRa-SX1262-433-868-915MHz-Wireless-Module-L76K-GPS-1 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORABOARD.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORABOARD.imageset/Contents.json new file mode 100644 index 00000000..f8356864 --- /dev/null +++ b/Meshtastic/Assets.xcassets/TLORABOARD.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/TLORABOARD.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png b/Meshtastic/Assets.xcassets/TLORABOARD.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png new file mode 100644 index 00000000..ff3da639 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TLORABOARD.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png differ diff --git a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/Contents.json deleted file mode 100644 index 75ee9d5f..00000000 --- a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png b/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png b/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png b/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAT3S3.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json index 6ead5861..093c722d 100644 --- a/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "TLORA_olive 2.png", - "idiom" : "universal", - "scale" : "1x" - }, { "filename" : "TLORA_olive 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "TLORA_olive 3.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 2.png b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 2.png deleted file mode 100644 index e8980a2c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 3.png b/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 3.png deleted file mode 100644 index e8980a2c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive 3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json deleted file mode 100644 index 41f74464..00000000 --- a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "TLORA_olive 5.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "TLORA_olive 3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "TLORA_olive 4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 3.png b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 3.png deleted file mode 100644 index e8980a2c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 4.png b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 4.png deleted file mode 100644 index e8980a2c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 5.png b/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 5.png deleted file mode 100644 index e8980a2c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive 5.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json deleted file mode 100644 index 38e3dcb7..00000000 --- a/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg deleted file mode 100644 index 211ca924..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg deleted file mode 100644 index 211ca924..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg b/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg deleted file mode 100644 index 211ca924..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json deleted file mode 100644 index 0e7bd231..00000000 --- a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png b/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/Contents.json deleted file mode 100644 index 75ee9d5f..00000000 --- a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 1.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp 2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png b/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png deleted file mode 100644 index fd25f87c..00000000 Binary files a/Meshtastic/Assets.xcassets/TLORAV211P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWATCHS3.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/Contents.json b/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/TWCMESHV4.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/UNPHONE.imageset/Contents.json b/Meshtastic/Assets.xcassets/UNPHONE.imageset/Contents.json index 9781e82b..32acad21 100644 --- a/Meshtastic/Assets.xcassets/UNPHONE.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/UNPHONE.imageset/Contents.json @@ -2,18 +2,7 @@ "images" : [ { "filename" : "UNPHONE.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "UNPHONE@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "UNPHONE@3x.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@2x.png b/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@2x.png deleted file mode 100644 index 06a38558..00000000 Binary files a/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@2x.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@3x.png b/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@3x.png deleted file mode 100644 index 06a38558..00000000 Binary files a/Meshtastic/Assets.xcassets/UNPHONE.imageset/UNPHONE@3x.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json b/Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json index c36a508f..04be44d5 100644 --- a/Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/UNSET.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, { "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/UNSET.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/WIPHONE.imageset/Contents.json b/Meshtastic/Assets.xcassets/WIPHONE.imageset/Contents.json deleted file mode 100644 index 06ebbbb1..00000000 --- a/Meshtastic/Assets.xcassets/WIPHONE.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "play_store_icon_114px-2.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "play_store_icon_114px-3.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "play_store_icon_114px-4.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-2.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-2.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-3.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-3.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-4.png deleted file mode 100644 index 79cf0e00..00000000 Binary files a/Meshtastic/Assets.xcassets/WIPHONE.imageset/play_store_icon_114px-4.png and /dev/null differ diff --git a/Meshtastic/Assets.xcassets/logo-black.imageset/Contents.json b/Meshtastic/Assets.xcassets/logo-black.imageset/Contents.json index 5ef35f53..41877b9d 100644 --- a/Meshtastic/Assets.xcassets/logo-black.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/logo-black.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "Mesh_Logo_Black_Small.svg", - "idiom" : "universal", - "scale" : "1x" - }, { "filename" : "Mesh_Logo_Black.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mesh_Logo_Black_Large.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Large.svg b/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Large.svg deleted file mode 100644 index a3eec0a0..00000000 --- a/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Large.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Small.svg b/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Small.svg deleted file mode 100644 index b13ff954..00000000 --- a/Meshtastic/Assets.xcassets/logo-black.imageset/Mesh_Logo_Black_Small.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Meshtastic/Assets.xcassets/logo-white.imageset/Contents.json b/Meshtastic/Assets.xcassets/logo-white.imageset/Contents.json index c2d1f573..c4481011 100644 --- a/Meshtastic/Assets.xcassets/logo-white.imageset/Contents.json +++ b/Meshtastic/Assets.xcassets/logo-white.imageset/Contents.json @@ -1,19 +1,8 @@ { "images" : [ - { - "filename" : "Mesh_Logo_White_Small.svg", - "idiom" : "universal", - "scale" : "1x" - }, { "filename" : "Mesh_Logo_White.svg", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Mesh_Logo_White_Large.svg", - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Large.svg b/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Large.svg deleted file mode 100644 index 517dd23d..00000000 --- a/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Large.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Small.svg b/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Small.svg deleted file mode 100644 index fab02c18..00000000 --- a/Meshtastic/Assets.xcassets/logo-white.imageset/Mesh_Logo_White_Small.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Meshtastic/Extensions/Constants.swift b/Meshtastic/Extensions/Constants.swift new file mode 100644 index 00000000..03a3cc31 --- /dev/null +++ b/Meshtastic/Extensions/Constants.swift @@ -0,0 +1,11 @@ +import Foundation + +enum Constants { + /// `UInt32.max` or FFFF,FFFF in hex is used to identify messages that are being + /// sent to a channel and are not a DM to an individual user. This is used + /// in the `to` field of some mesh packets. + static let maximumNodeNum = UInt32.max + /// Based on the NUM_RESERVED from the firmware. + /// https://github.com/meshtastic/firmware/blob/46d7b82ac1a4292ba52ca690e1a433d3a501a9e5/src/mesh/NodeDB.cpp#L522 + static let minimumNodeNum = 4 +} diff --git a/Meshtastic/Extensions/CoreData/ExternalNotificationConfigEntityExtension.swift b/Meshtastic/Extensions/CoreData/ExternalNotificationConfigEntityExtension.swift index 72853b43..5fa8589c 100644 --- a/Meshtastic/Extensions/CoreData/ExternalNotificationConfigEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/ExternalNotificationConfigEntityExtension.swift @@ -23,7 +23,7 @@ extension ExternalNotificationConfigEntity { self.nagTimeout = Int32(config.nagTimeout) self.useI2SAsBuzzer = config.useI2SAsBuzzer } - + func update(with config: ModuleConfig.ExternalNotificationConfig) { enabled = config.enabled usePWM = config.usePwm diff --git a/Meshtastic/Extensions/CoreData/UserEntityExtension.swift b/Meshtastic/Extensions/CoreData/UserEntityExtension.swift index 0595e752..a702fb6d 100644 --- a/Meshtastic/Extensions/CoreData/UserEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/UserEntityExtension.swift @@ -23,6 +23,46 @@ extension UserEntity { let unreadMessages = messageList.filter { ($0 as AnyObject).read == false } return unreadMessages.count } + + var hardwareImage: String? { + guard let hwModel else { return nil } + switch hwModel { + case "HELTECV1", "HELTECV3", "HELTECV20", "HELTECV21": + return "HELTECV3" + case "HELTECWIRELESSPAPER", "HELTECWIRELESSPAPERV10": + return "HELTECWIRELESSPAPER" + case "HELTECWIRELESSTRACKER", "HELTECWIRELESSTRACKERV10": + return "HELTECWIRELESSTRACKER" + case "HELTECWSLV3": + return "HELTECWSLV3" + case "LILYGOTBEAMSCORE": + return "LILYGOTBEAMS3CORE" + case "NANOG1", "NANOG1EXPLORER": + return "NANOG1" + case "NANOG2ULTRA": + return "NANOG2ULTRA" + case "RAK4631": + return "RAK4631" + case "RAK11200": + return "RAK11200" + case "SOLAR_NODE": + return "SOLAR_NODE" + case "STATIONG1": + return "STATIONG1" + case "ТВЕАМ", "TBEAMVOP7": + return "ТВЕАМ" + case "TECHO": + return "TECHO" + case "TLORAV1", "TLORAV11P3": + return "TLORAV1" + case "TLORAV2", "TLORAT3S3", "TLORAV211P6", "TLORAV211P8": + return "TLORABOARD" + case "UNPHONE": + return "UNPHONE" + default: + return "UNSET" + } + } } public func createUser(num: Int64, context: NSManagedObjectContext) -> UserEntity { diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 2ab6c6a2..e6a7f0cb 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -35,7 +35,6 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate var timeoutTimer: Timer? var timeoutTimerCount = 0 var positionTimer: Timer? - static let emptyNodeNum: UInt32 = 4294967295 let mqttManager = MqttClientProxyManager.shared var wantRangeTestPackets = false var wantStoreAndForwardPackets = false @@ -567,7 +566,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate Logger.radio.debug("📟 \(log, privacy: .public)") } } - + func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { if let error { @@ -608,8 +607,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate message = "DEBUG | \(message)" } handleRadioLog(radioLog: message) - } - catch { + } catch { // Ignore fail to parse as LogRecord } @@ -1028,7 +1026,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate if toUserNum > 0 { meshPacket.to = UInt32(toUserNum) } else { - meshPacket.to = Self.emptyNodeNum + meshPacket.to = Constants.maximumNodeNum } meshPacket.channel = UInt32(channel) meshPacket.from = UInt32(fromUserNum) @@ -1076,7 +1074,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate var success = false let fromNodeNum = UInt32(connectedPeripheral.num) var meshPacket = MeshPacket() - meshPacket.to = Self.emptyNodeNum + meshPacket.to = Constants.maximumNodeNum meshPacket.from = fromNodeNum meshPacket.wantAck = true var dataMessage = DataMessage() diff --git a/Meshtastic/Helpers/CommonRegex.swift b/Meshtastic/Helpers/CommonRegex.swift index 683f8fd7..3cc788d1 100644 --- a/Meshtastic/Helpers/CommonRegex.swift +++ b/Meshtastic/Helpers/CommonRegex.swift @@ -8,8 +8,7 @@ import Foundation import RegexBuilder -class CommonRegex -{ +class CommonRegex { static let COORDS_REGEX = Regex { Capture { Regex { diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index 26fc9742..a789ad3b 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -290,7 +290,7 @@ func nodeInfoPacket (nodeInfo: NodeInfo, channel: UInt32, context: NSManagedObje newUser.isLicensed = nodeInfo.user.isLicensed newUser.role = Int32(nodeInfo.user.role.rawValue) newNode.user = newUser - } else if nodeInfo.num > Int16.max { + } else if nodeInfo.num > Constants.minimumNodeNum { let newUser = createUser(num: Int64(nodeInfo.num), context: context) newNode.user = newUser } @@ -355,7 +355,7 @@ func nodeInfoPacket (nodeInfo: NodeInfo, channel: UInt32, context: NSManagedObje fetchedNode[0].user!.role = Int32(nodeInfo.user.role.rawValue) fetchedNode[0].user!.hwModel = String(describing: nodeInfo.user.hwModel).uppercased() } else { - if fetchedNode[0].user == nil && nodeInfo.num > Int16.max { + if fetchedNode[0].user == nil && nodeInfo.num > Constants.minimumNodeNum { let newUser = createUser(num: Int64(nodeInfo.num), context: context) fetchedNode[0].user = newUser @@ -682,6 +682,10 @@ func telemetryPacket(packet: MeshPacket, connectedNode: Int64, context: NSManage telemetry.windLull = telemetryMessage.environmentMetrics.windLull telemetry.windDirection = Int32(truncatingIfNeeded: telemetryMessage.environmentMetrics.windDirection) telemetry.metricsType = 1 + } else { + + /// Other unhandled telemetry packets + return } telemetry.snr = packet.rxSnr telemetry.rssi = packet.rxRssi @@ -806,7 +810,7 @@ func textMessageAppPacket( newMessage.replyID = Int64(packet.decoded.replyID) } - if fetchedUsers.first(where: { $0.num == packet.to }) != nil && packet.to != 4294967295 { + if fetchedUsers.first(where: { $0.num == packet.to }) != nil && packet.to != Constants.maximumNodeNum { if !storeForwardBroadcast { newMessage.toUser = fetchedUsers.first(where: { $0.num == packet.to }) } @@ -819,7 +823,7 @@ func textMessageAppPacket( } newMessage.messagePayload = messageText newMessage.messagePayloadMarkdown = generateMessageMarkdown(message: messageText!) - if packet.to != 4294967295 && newMessage.fromUser != nil { + if packet.to != Constants.maximumNodeNum && newMessage.fromUser != nil { newMessage.fromUser?.lastMessage = Date() } var messageSaved = false diff --git a/Meshtastic/Persistence/Persistence.swift b/Meshtastic/Persistence/Persistence.swift index 25f9a3e2..96808c73 100644 --- a/Meshtastic/Persistence/Persistence.swift +++ b/Meshtastic/Persistence/Persistence.swift @@ -142,11 +142,11 @@ extension NSPersistentContainer { /// - Parameter backupURL: A file URL containing backup copies of all currently loaded persistent stores. /// - Throws: `CopyPersistentStoreError` in various situations. /// - Returns: Nothing. If no errors are thrown, the restore is complete. - func restorePersistentStore(from backupURL: URL) throws -> Void { + func restorePersistentStore(from backupURL: URL) throws { guard backupURL.isFileURL else { throw CopyPersistentStoreErrors.invalidSource("Backup URL must be a file URL") } - + var isDirectory: ObjCBool = false if FileManager.default.fileExists(atPath: backupURL.path, isDirectory: &isDirectory) { if !isDirectory.boolValue { @@ -185,7 +185,7 @@ extension NSPersistentContainer { /// - overwriting: If `true`, any existing copies of the persistent store will be replaced or updated. If `false`, existing copies will not be changed or remoted. When this is `false`, the destination persistent store file must not already exist. /// - Throws: `CopyPersistentStoreError` /// - Returns: Nothing. If no errors are thrown, all loaded persistent stores will be copied to the destination directory. - func copyPersistentStores(to destinationURL: URL, overwriting: Bool = false) throws -> Void { + func copyPersistentStores(to destinationURL: URL, overwriting: Bool = false) throws { guard !destinationURL.relativeString.contains("/0/") else { throw CopyPersistentStoreErrors.invalidDestination("Invalid 0 Node Id") diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index e6605d48..ab3cdf47 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -153,7 +153,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) newNode.rssi = packet.rxRssi newNode.viaMqtt = packet.viaMqtt - if packet.to == 4294967295 || packet.to == UserDefaults.preferredPeripheralNum { + if packet.to == Constants.maximumNodeNum || packet.to == UserDefaults.preferredPeripheralNum { newNode.channel = Int32(packet.channel) } if let nodeInfoMessage = try? NodeInfo(serializedData: packet.decoded.payload) { @@ -164,7 +164,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) if let newUserMessage = try? User(serializedData: packet.decoded.payload) { if newUserMessage.id.isEmpty { - if packet.from > Int16.max { + if packet.from > Constants.minimumNodeNum { let newUser = createUser(num: Int64(packet.from), context: context) newNode.user = newUser } @@ -195,13 +195,13 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) } } } else { - if packet.from > Int16.max { + if packet.from > Constants.minimumNodeNum { let newUser = createUser(num: Int64(packet.from), context: context) newNode.user = newUser } } - if newNode.user == nil && packet.from > Int16.max { + if newNode.user == nil && packet.from > Constants.minimumNodeNum { newNode.user = createUser(num: Int64(packet.from), context: context) } @@ -231,7 +231,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) fetchedNode[0].snr = packet.rxSnr fetchedNode[0].rssi = packet.rxRssi fetchedNode[0].viaMqtt = packet.viaMqtt - if packet.to == 4294967295 || packet.to == UserDefaults.preferredPeripheralNum { + if packet.to == Constants.maximumNodeNum || packet.to == UserDefaults.preferredPeripheralNum { fetchedNode[0].channel = Int32(packet.channel) } @@ -264,7 +264,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) if fetchedNode[0].user == nil { let newUser = createUser(num: Int64(truncatingIfNeeded: packet.from), context: context) fetchedNode[0].user! = newUser - + } do { try context.save() diff --git a/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift b/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift index 7ae0fb84..469e57a4 100644 --- a/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift +++ b/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift @@ -126,7 +126,7 @@ private extension MessageDestination { var positionDestNum: Int64 { switch self { case let .user(user): return user.num - case .channel: return Int64(BLEManager.emptyNodeNum) + case .channel: return Int64(Constants.maximumNodeNum) } } diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index 1a4b0dfa..bbabf31e 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -18,7 +18,7 @@ struct DeviceMetricsLog: View { @State var exportString = "" @State private var batteryChartColor: Color = .blue - @State private var airtimeChartColor: Color = .orange + @State private var airtimeChartColor: Color = .yellow @State private var channelUtilizationChartColor: Color = .green @ObservedObject var node: NodeInfoEntity @@ -57,9 +57,17 @@ struct DeviceMetricsLog: View { .accessibilityValue("X: \(point.time!), Y: \(point.channelUtilization)") .foregroundStyle(channelUtilizationChartColor) - RuleMark(y: .value("Limit", 10)) + RuleMark(y: .value("10% Airtime", 10)) .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) - .foregroundStyle(airtimeChartColor) + .foregroundStyle(.yellow) + + RuleMark(y: .value("Network Status Orange", 25)) + .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) + .foregroundStyle(.orange) + + RuleMark(y: .value("Network Status Red", 50)) + .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) + .foregroundStyle(.red) Plot { PointMark( @@ -79,9 +87,9 @@ struct DeviceMetricsLog: View { .chartXAxis(.automatic) .chartYScale(domain: 0...100) .chartForegroundStyleScale([ - "Battery Level": .blue, - "Channel Utilization": .green, - "Airtime": .orange + "Battery Level": batteryChartColor, + "Channel Utilization": channelUtilizationChartColor, + "Airtime": airtimeChartColor ]) .chartLegend(position: .automatic, alignment: .bottom) } diff --git a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift index b8fb4f4f..edfec3be 100644 --- a/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift +++ b/Meshtastic/Views/Nodes/Helpers/Map/MapContent/MeshMapContent.swift @@ -75,7 +75,7 @@ struct MeshMapContent: MapContent { } } } - .onTapGesture { location in + .onTapGesture { _ in selectedPosition = (selectedPosition == position ? nil : position) } } diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift index 41ccf866..e1626b6b 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift @@ -29,7 +29,7 @@ struct NodeInfoItem: View { if let user = node.user { VStack(alignment: .center) { if user.hwModel != "UNSET" { - Image(user.hwModel ?? "unset".localized) + Image(user.hardwareImage ?? "UNSET") .resizable() .aspectRatio(contentMode: .fit) .frame(width: 75, height: 75) diff --git a/Meshtastic/Views/Settings/Config/Module/PaxCounterConfig.swift b/Meshtastic/Views/Settings/Config/Module/PaxCounterConfig.swift index 252c5985..d7670a7c 100644 --- a/Meshtastic/Views/Settings/Config/Module/PaxCounterConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/PaxCounterConfig.swift @@ -106,6 +106,6 @@ struct PaxCounterConfig: View { private func setPaxValues() { enabled = node?.paxCounterConfig?.enabled ?? enabled - paxcounterUpdateInterval = Int(node?.paxCounterConfig?.updateInterval ?? 900) + paxcounterUpdateInterval = Int(node?.paxCounterConfig?.updateInterval ?? 1800) } } diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index 24880484..a1f827b7 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -42,7 +42,7 @@ struct TelemetryConfig: View { } .pickerStyle(DefaultPickerStyle()) .listRowSeparator(.hidden) - Text("How often device metrics are sent out over the mesh. Default is 15 minutes.") + Text("How often device metrics are sent out over the mesh. Default is 30 minutes.") .foregroundColor(.gray) .font(.callout) .listRowSeparator(.visible) @@ -55,7 +55,7 @@ struct TelemetryConfig: View { } .pickerStyle(DefaultPickerStyle()) .listRowSeparator(.hidden) - Text("How often sensor metrics are sent out over the mesh. Default is 15 minutes.") + Text("How often sensor metrics are sent out over the mesh. Default is 30 minutes.") .foregroundColor(.gray) .font(.callout) } @@ -91,7 +91,7 @@ struct TelemetryConfig: View { } .pickerStyle(DefaultPickerStyle()) .listRowSeparator(.hidden) - Text("How often power metrics are sent out over the mesh. Default is 15 minutes.") + Text("How often power metrics are sent out over the mesh. Default is 30 minutes.") .foregroundColor(.gray) .font(.callout) .listRowSeparator(.visible) @@ -183,13 +183,13 @@ struct TelemetryConfig: View { } } func setTelemetryValues() { - self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 900) - self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 900) + self.deviceUpdateInterval = Int(node?.telemetryConfig?.deviceUpdateInterval ?? 1800) + self.environmentUpdateInterval = Int(node?.telemetryConfig?.environmentUpdateInterval ?? 1800) self.environmentMeasurementEnabled = node?.telemetryConfig?.environmentMeasurementEnabled ?? false self.environmentScreenEnabled = node?.telemetryConfig?.environmentScreenEnabled ?? false self.environmentDisplayFahrenheit = node?.telemetryConfig?.environmentDisplayFahrenheit ?? false self.powerMeasurementEnabled = node?.telemetryConfig?.powerMeasurementEnabled ?? false - self.powerUpdateInterval = Int(node?.telemetryConfig?.powerUpdateInterval ?? 900) + self.powerUpdateInterval = Int(node?.telemetryConfig?.powerUpdateInterval ?? 1800) self.powerScreenEnabled = node?.telemetryConfig?.powerScreenEnabled ?? false self.hasChanges = false } diff --git a/README.md b/README.md index 1b8bed5a..f9fbbd5e 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,14 @@ SwiftUI client applications for iOS, iPadOS and macOS. This project is currently using **Xcode 15.4**. 1. Clone the repo. +2. Set up git hooks to automatically lint the project when you commit changes. 2. Open `Meshtastic.xcworkspace` 2. Build and run the `Meshtastic` target. ```sh git clone git@github.com:meshtastic/Meshtastic-Apple.git cd Meshtastic-Apple +./scripts/setup-hooks.sh open Meshtastic.xcworkspace ``` diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit new file mode 100644 index 00000000..ac55cf77 --- /dev/null +++ b/scripts/hooks/pre-commit @@ -0,0 +1,3 @@ +#!/bin/bash + +./scripts/lint/lint-fix-changes.sh \ No newline at end of file diff --git a/scripts/lint/lint-fix-changes.sh b/scripts/lint/lint-fix-changes.sh new file mode 100755 index 00000000..e4dae8d0 --- /dev/null +++ b/scripts/lint/lint-fix-changes.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +# Path to swiftlint +SWIFT_LINT=$(which swiftlint) + +# Check if SwiftLint is installed +if [[ -e "${SWIFT_LINT}" ]]; then + count=0 + for file_path in $(git ls-files -m --exclude-from=.gitignore | grep ".swift$"); do + export SCRIPT_INPUT_FILE_$count=$file_path + count=$((count + 1)) + done + + ##### Check for modified files in unstaged/Staged area ##### + for file_path in $(git diff --name-only --cached | grep ".swift$"); do + export SCRIPT_INPUT_FILE_$count=$file_path + count=$((count + 1)) + done + + ##### Make the count available as global variable ##### + export SCRIPT_INPUT_FILE_COUNT=$count + + ##### Fix files or exit if no files found for fixing ##### + if [ "$count" -ne 0 ]; then + echo "Found files to fix! Running swiftLint --fix..." + + # Run SwiftLint --fix on each file + for ((i = 0; i < count; i++)); do + file_var="SCRIPT_INPUT_FILE_$i" + file_path=${!file_var} + echo "Fixing $file_path" + $SWIFT_LINT --fix --path "$file_path" + done + + # Add the fixed files back to staging + for ((i = 0; i < count; i++)); do + file_var="SCRIPT_INPUT_FILE_$i" + file_path=${!file_var} + git add "$file_path" + done + + echo "swiftLint --fix completed and files re-staged." + + # Optionally lint the fixed files + echo "Linting fixed files..." + $SWIFT_LINT lint --use-script-input-files + else + exit 0 + fi + + RESULT=$? + + if [ $RESULT -eq 0 ]; then + exit 0 + else + echo "" + echo "⛔️ Violation found of the type ERROR! Please fix these issues before continuing!" + fi + exit $RESULT + +else + echo "SwiftLint not installed. Please install from https://github.com/realm/SwiftLint" + exit -1 +fi \ No newline at end of file diff --git a/scripts/setup-hooks.sh b/scripts/setup-hooks.sh new file mode 100755 index 00000000..3d50cf41 --- /dev/null +++ b/scripts/setup-hooks.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e + +# Define the source and destination paths +SOURCE_PATH="./scripts/hooks/pre-commit" +HOOKS_DIR=".git/hooks" +DEST_PATH="$HOOKS_DIR/pre-commit" + +# Check if the hooks directory exists +if [ ! -d "$HOOKS_DIR" ]; then + echo "Error: .git/hooks directory not found. Make sure you're in the root of a Git repository." + exit 1 +fi + +# Copy the script to the hooks directory +cp "$SOURCE_PATH" "$DEST_PATH" + +# Make the hook script executable +chmod +x "$DEST_PATH" + +echo "Pre-commit hooks have been set up successfully."