Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing iPad Air and iPad Mini models #243

Merged
merged 2 commits into from
Aug 9, 2016
Merged

Add missing iPad Air and iPad Mini models #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
babe79f
Add missing iPad Air and iPad Mini models
antoinevg Aug 2, 2016
2558876
Fixed: ios-deploy will exit when the detection timeout ends even if t…
antoinevg Aug 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/ios-deploy/ios-deploy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,24 @@ const CFStringRef get_device_hardware_name(const AMDeviceRef device) {
GET_FRIENDLY_MODEL_NAME(model, "P101AP", "iPad 4")
GET_FRIENDLY_MODEL_NAME(model, "P102AP", "iPad 4 (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "P103AP", "iPad 4 (CDMA)")
GET_FRIENDLY_MODEL_NAME(model, "J71AP", "iPad Air")
GET_FRIENDLY_MODEL_NAME(model, "J72AP", "iPad Air (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "J73AP", "iPad Air (CDMA)")
GET_FRIENDLY_MODEL_NAME(model, "J81AP", "iPad Air 2")
GET_FRIENDLY_MODEL_NAME(model, "J82AP", "iPad Air 2 (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "J83AP", "iPad Air 2 (CDMA)")

// iPad Mini

GET_FRIENDLY_MODEL_NAME(model, "P105AP", "iPad mini")
GET_FRIENDLY_MODEL_NAME(model, "P106AP", "iPad mini (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "P107AP", "iPad mini (CDMA)")
GET_FRIENDLY_MODEL_NAME(model, "J85AP", "iPad mini 2")
GET_FRIENDLY_MODEL_NAME(model, "J86AP", "iPad mini 2 (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "J87AP", "iPad mini 2 (CDMA)")
GET_FRIENDLY_MODEL_NAME(model, "J85MAP", "iPad mini 3")
GET_FRIENDLY_MODEL_NAME(model, "J86MAP", "iPad mini 3 (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "J87MAP", "iPad mini 3 (CDMA)")

// Apple TV

Expand Down Expand Up @@ -1696,7 +1708,9 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
}

void timeout_callback(CFRunLoopTimerRef timer, void *info) {
if ((!found_device) && (!detect_only)) {
if (found_device && (!detect_only)) {
return;
} else if ((!found_device) && (!detect_only)) {
if(best_device_match != NULL) {
NSLogVerbose(@"Handling best device match.");
handle_device(best_device_match);
Expand Down