Skip to content

Commit 2575e31

Browse files
cwbrairsquared
andauthored
Added new iPhone and iPad models (#361)
Co-authored-by: airsquared <[email protected]>
1 parent d707b9f commit 2575e31

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

src/main/java/airsquared/blobsaver/app/Devices.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ public final class Devices {
4040
"iPhone XS Max (China) (iPhone11,4)", "iPhone XS Max (iPhone11,6)", "iPhone XR (iPhone11,8)",
4141
"iPhone 11 (iPhone12,1)", "iPhone 11 Pro (iPhone12,3)", "iPhone 11 Pro Max (iPhone12,5)",
4242
"iPhone SE 2 (iPhone12,8)", "iPhone 12 mini (iPhone13,1)", "iPhone 12 (iPhone13,2)",
43-
"iPhone 12 Pro (iPhone13,3)", "iPhone 12 Pro Max (iPhone13,4)"};
43+
"iPhone 12 Pro (iPhone13,3)", "iPhone 12 Pro Max (iPhone13,4)",
44+
"iPhone 13 Pro (iPhone14,2)", "iPhone 13 Pro Max (iPhone14,3)",
45+
"iPhone 13 mini (iPhone14,4)", "iPhone 13 (iPhone14,5)"};
4446
private static final String[] iPads = {"iPad 1", "iPad 2 (WiFi)", "iPad 2 (GSM)",
4547
"iPad 2 (CDMA)", "iPad 2 (Mid 2012)", "iPad Mini (Wifi)", "iPad Mini (GSM)", "iPad Mini (Global)",
4648
"iPad 3 (WiFi)", "iPad 3 (CDMA)", "iPad 3 (GSM)", "iPad 4 (WiFi)", "iPad 4 (GSM)", "iPad 4 (Global)",
@@ -57,11 +59,13 @@ public final class Devices {
5759
"iPad Pro 4 11' (Cellular)(iPad8,10)", "iPad Pro 4 12.9' (WiFi)(iPad8,11)",
5860
"iPad Pro 4 12.9' (Cellular)(iPad8,12)", "iPad Mini 5 (WiFi)(iPad11,1)", "iPad Mini 5 (Cellular)(iPad11,2)",
5961
"iPad Air 3 (WiFi)(iPad11,3)", "iPad Air 3 (Cellular)(iPad11,4)", "iPad 8 (WiFi) (iPad11,6)",
60-
"iPad 8 (Cellular) (iPad11,7)", "iPad Air 4 (WiFi) (iPad13,1)", "iPad Air 4 (Cellular) (iPad13,2)",
62+
"iPad 8 (Cellular) (iPad11,7)", "iPad 9 (WiFi) (iPad12,1)", "iPad 9 (Cellular) (iPad12,2)",
63+
"iPad Air 4 (WiFi) (iPad13,1)", "iPad Air 4 (Cellular) (iPad13,2)",
6164
"iPad Pro 11' (3rd gen) (WiFi) (iPad13,4)", "iPad Pro 11' (3rd gen) (WiFi) (iPad13,5)",
6265
"iPad Pro 11' (3rd gen) (Cellular) (iPad13,6)", "iPad Pro 11' (3rd gen) (Cellular) (iPad13,7)",
6366
"iPad Pro 12.9' (5th gen) (WiFi) (iPad13,8)", "iPad Pro 12.9' (5th gen) (WiFi) (iPad13,9)",
64-
"iPad Pro 12.9' (5th gen) (Cellular) (iPad13,10)", "iPad Pro 12.9' (5th gen) (Cellular) (iPad13,11)"};
67+
"iPad Pro 12.9' (5th gen) (Cellular) (iPad13,10)", "iPad Pro 12.9' (5th gen) (Cellular) (iPad13,11)",
68+
"iPad Mini 6 (WiFi) (iPad14,1)", "iPad Mini 6 (Cellular) (iPad14,2)"};
6569

6670
private static final ObservableList<String> iPhoneList = FXCollections.observableArrayList(iPhones);
6771
private static final ObservableList<String> iPadList = FXCollections.observableArrayList(iPads);
@@ -183,8 +187,9 @@ public static boolean doesRequireBoardConfig(String deviceIdentifier) {
183187

184188
public static boolean doesRequireApnonce(String deviceIdentifier) {
185189
return deviceIdentifier.startsWith("iPhone11,") || deviceIdentifier.startsWith("iPhone12,") ||
186-
deviceIdentifier.startsWith("iPhone13,") || deviceIdentifier.startsWith("iPad8,") ||
187-
deviceIdentifier.startsWith("iPad11,");
190+
deviceIdentifier.startsWith("iPhone13,") || deviceIdentifier.startsWith("iPhone14,") ||
191+
deviceIdentifier.startsWith("iPad8,") || deviceIdentifier.startsWith("iPad9,")||
192+
deviceIdentifier.startsWith("iPad11,") || deviceIdentifier.startsWith("iPad14,");
188193
}
189194

190195
@SafeVarargs

src/main/resources/airsquared/blobsaver/app/boardconfigs.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ iPhone13,1=d52gap
5454
iPhone13,2=d53gap
5555
iPhone13,3=d53pap
5656
iPhone13,4=d54pap
57+
iPhone14,2=d63ap
58+
iPhone14,3=d64ap
59+
iPhone14,4=d16ap
60+
iPhone14,5=d17ap
5761
iPod3,1=n18ap
5862
iPod4,1=n81ap
5963
iPod5,1=n78ap
@@ -123,6 +127,8 @@ iPad11,3=j217ap
123127
iPad11,4=j218ap
124128
iPad11,6=j171aap
125129
iPad11,7=j172aap
130+
iPad12,1=j181ap
131+
iPad12,2=j182ap
126132
iPad13,1=j307ap
127133
iPad13,2=j308ap
128134
iPad13,4=j517ap
@@ -133,3 +139,5 @@ iPad13,8=j522ap
133139
iPad13,9=j522xap
134140
iPad13,10=j523ap
135141
iPad13,11=j523xap
142+
iPad14,1=j310ap
143+
iPad14,2=j311ap

src/main/resources/airsquared/blobsaver/app/devicemodels.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ iPhone\ 12\ mini\ (iPhone13,1)=iPhone13,1
5353
iPhone\ 12\ (iPhone13,2)=iPhone13,2
5454
iPhone\ 12\ Pro\ (iPhone13,3)=iPhone13,3
5555
iPhone\ 12\ Pro\ Max\ (iPhone13,4)=iPhone13,4
56+
iPhone\ 13\ Pro\ (iPhone14,2)=iPhone14,2
57+
iPhone\ 13\ Pro\ Max\ (iPhone14,3)=iPhone14,3
58+
iPhone\ 13\ mini\ (iPhone14,4)=iPhone14,4
59+
iPhone\ 13\ (iPhone14,5)=iPhone14,5
5660
iPod\ Touch\ 3=iPod3,1
5761
iPod\ Touch\ 4=iPod4,1
5862
iPod\ Touch\ 5=iPod5,1
@@ -122,6 +126,8 @@ iPad\ Air\ 3\ (WiFi)(iPad11,3)=iPad11,3
122126
iPad\ Air\ 3\ (Cellular)(iPad11,4)=iPad11,4
123127
iPad\ 8\ (WiFi)\ (iPad11,6)=iPad11,6
124128
iPad\ 8\ (Cellular)\ (iPad11,7)=iPad11,7
129+
iPad\ 9\ (WiFi)\ (iPad12,1)=iPad12,1
130+
iPad\ 9\ (Cellular)\ (iPad12,2)=iPad12,2
125131
iPad\ Air\ 4\ (WiFi)\ (iPad13,1)=iPad13,1
126132
iPad\ Air\ 4\ (Cellular)\ (iPad13,2)=iPad13,2
127133
iPad\ Pro\ 11'\ (3rd\ gen)\ (WiFi)\ (iPad13,4)=iPad13,4
@@ -132,3 +138,5 @@ iPad\ Pro\ 12.9'\ (5th\ gen)\ (WiFi)\ (iPad13,8)=iPad13,8
132138
iPad\ Pro\ 12.9'\ (5th\ gen)\ (WiFi)\ (iPad13,9)=iPad13,9
133139
iPad\ Pro\ 12.9'\ (5th\ gen)\ (Cellular)\ (iPad13,10)=iPad13,10
134140
iPad\ Pro\ 12.9'\ (5th\ gen)\ (Cellular)\ (iPad13,11)=iPad13,11
141+
iPad\ Mini\ 6\ (WiFi)\ (iPad14,1)=iPad14,1
142+
iPad\ Mini\ 6\ (Cellular)\ (iPad14,2)=iPad14,2

0 commit comments

Comments
 (0)