diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json b/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/Contents.json rename to Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/ANDROIDSIM.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/ANDROID_SIM.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/DIYV.imageset/Contents.json b/Meshtastic/Assets.xcassets/DIY_V1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/DIYV.imageset/Contents.json rename to Meshtastic/Assets.xcassets/DIY_V1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/DIYV.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/DIY_V1.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/DR_DEV.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/LORARELAYV1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/DR_DEV.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/LORARELAYV1.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/DR_DEV.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV20.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-1.jpg diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq-2.jpg diff --git a/Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV20.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V1.imageset/Heltec_turq.jpg diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV21.imageset/Contents.json rename to Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg b/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-1.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-1.jpg diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg b/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq-2.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq-2.jpg diff --git a/Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg b/Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/HELTECV21.imageset/Heltec_turq.jpg rename to Meshtastic/Assets.xcassets/HELTEC_V2_1.imageset/Heltec_turq.jpg diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json b/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/Contents.json rename to Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-2.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-2.png rename to Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-2.png diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-3.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-3.png rename to Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-3.png diff --git a/Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-4.png similarity index 100% rename from Meshtastic/Assets.xcassets/NRF52UNKNOWN.imageset/play_store_icon_114px-4.png rename to Meshtastic/Assets.xcassets/LILYGO_TBEAM_S3_CORE.imageset/play_store_icon_114px-4.png diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/Contents.json b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/LORA_RELAY_V1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/LORA_RELAY_V1.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json b/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/M5STACK.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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 new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-2.png 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 new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-3.png 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 new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/M5STACK.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/Contents.json b/Meshtastic/Assets.xcassets/NANO_G1.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/NANO_G1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/NANO_G1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NANO_G1.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/Contents.json b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/NRF52840_PCA10059.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/NRF52840_PCA10059.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/Contents.json b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/PRIVATE_HW.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/PRIVATE_HW.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json new file mode 100644 index 00000000..f231e71f --- /dev/null +++ b/Meshtastic/Assets.xcassets/RAK11200.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "RAK_DEV_KIT.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" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg new file mode 100644 index 00000000..9300bed0 Binary files /dev/null and b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-1.jpg differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg new file mode 100644 index 00000000..9300bed0 Binary files /dev/null and b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT-2.jpg differ diff --git a/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT.jpg b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT.jpg new file mode 100644 index 00000000..9300bed0 Binary files /dev/null and b/Meshtastic/Assets.xcassets/RAK11200.imageset/RAK_DEV_KIT.jpg differ diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/Contents.json b/Meshtastic/Assets.xcassets/STATION_G1.imageset/Contents.json new file mode 100644 index 00000000..06ebbbb1 --- /dev/null +++ b/Meshtastic/Assets.xcassets/STATION_G1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/STATION_G1.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-2.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-2.png differ diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-3.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-3.png differ diff --git a/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-4.png new file mode 100644 index 00000000..79cf0e00 Binary files /dev/null and b/Meshtastic/Assets.xcassets/STATION_G1.imageset/play_store_icon_114px-4.png differ diff --git a/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/Contents.json b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TBEAM0P7.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-1.jpg rename to Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-1.jpg diff --git a/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam-2.jpg rename to Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam-2.jpg diff --git a/Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg b/Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TBEAM0P7.imageset/tbeam.jpg rename to Meshtastic/Assets.xcassets/TBEAM_V0P7.imageset/tbeam.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORA_V1.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV1.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORA_V1.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray-1.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg b/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_gray.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_gray.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_olive.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV1.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1.imageset/TLORA_olive.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV11P3.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg b/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-1.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-1.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg b/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_gray-2.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_gray-2.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg b/Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_olive.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV11P3.imageset/TLORA_olive.jpg rename to Meshtastic/Assets.xcassets/TLORA_V1_1P3.imageset/TLORA_olive.jpg diff --git a/Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORA_V2.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV2.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORA_V2.imageset/Contents.json 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/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg similarity index 100% rename from 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 rename to Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg 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/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg similarity index 100% rename from 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 rename to Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg 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/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg similarity index 100% rename from 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 rename to Meshtastic/Assets.xcassets/TLORA_V2.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TLORAV211P6.imageset/Contents.json rename to Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/Contents.json 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.jpeg b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg similarity index 100% rename from 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.jpeg rename to Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg 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.jpeg b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg similarity index 100% rename from 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.jpeg rename to Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg 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.jpeg b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg similarity index 100% rename from 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.jpeg rename to Meshtastic/Assets.xcassets/TLORA_V2_1_1P6.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/Contents.json b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/Contents.json new file mode 100644 index 00000000..38e3dcb7 --- /dev/null +++ b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "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/TLORA_V2_1_1P8.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/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg new file mode 100644 index 00000000..211ca924 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-1.jpeg differ diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.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/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg new file mode 100644 index 00000000..211ca924 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp-2.jpeg differ diff --git a/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.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/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg new file mode 100644 index 00000000..211ca924 Binary files /dev/null and b/Meshtastic/Assets.xcassets/TLORA_V2_1_1P8.imageset/LILYGO-TTGO-LoRa32-V2-1-1-6-Version-433-868-915Mhz-ESP32-LoRa-OLED-0-96.jpg_Q90.jpg_.webp.jpeg differ diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json b/Meshtastic/Assets.xcassets/T_ECHO.imageset/Contents.json similarity index 100% rename from Meshtastic/Assets.xcassets/TECHO.imageset/Contents.json rename to Meshtastic/Assets.xcassets/T_ECHO.imageset/Contents.json diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/techo-1.jpg b/Meshtastic/Assets.xcassets/T_ECHO.imageset/techo-1.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TECHO.imageset/techo-1.jpg rename to Meshtastic/Assets.xcassets/T_ECHO.imageset/techo-1.jpg diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/techo-2.jpg b/Meshtastic/Assets.xcassets/T_ECHO.imageset/techo-2.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TECHO.imageset/techo-2.jpg rename to Meshtastic/Assets.xcassets/T_ECHO.imageset/techo-2.jpg diff --git a/Meshtastic/Assets.xcassets/TECHO.imageset/techo.jpg b/Meshtastic/Assets.xcassets/T_ECHO.imageset/techo.jpg similarity index 100% rename from Meshtastic/Assets.xcassets/TECHO.imageset/techo.jpg rename to Meshtastic/Assets.xcassets/T_ECHO.imageset/techo.jpg diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 8246453e..c495c295 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -587,10 +587,13 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph MeshLogger.log("ℹ️ MESH PACKET received for ATAK Forwarder App UNHANDLED \(try! decodedInfo.packet.jsonString())") case .simulatorApp: MeshLogger.log("ℹ️ MESH PACKET received for Simulator App UNHANDLED \(try! decodedInfo.packet.jsonString())") + case .audioApp: + MeshLogger.log("ℹ️ MESH PACKET received for Audio App UNHANDLED \(try! decodedInfo.packet.jsonString())") case .UNRECOGNIZED(_): MeshLogger.log("ℹ️ MESH PACKET received for Other App UNHANDLED \(try! decodedInfo.packet.jsonString())") case .max: print("MAX PORT NUM OF 511") + } // MARK: Check for an All / Broadcast User and delete it as a transition to multi channel diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index 1ccecd4b..4567bcd5 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -112,7 +112,7 @@ struct TelemetryConfig: View { Section(header: Text("Sensor Options")) { - Text("Supported I2C Connected sensors will be detected automatically, sensors are BMP280, BME280, BME680, MCP9808, INA219 and INA260.") + Text("Supported I2C Connected sensors will be detected automatically, sensors are BMP280, BME280, BME680, MCP9808, INA219, INA260, LPS22 and SHTC3.") .font(.caption) Toggle(isOn: $environmentMeasurementEnabled) {