atria-soft/ios-deploy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #243 from trigger-corp/master

Browse Source 
Add missing iPad Air and iPad Mini models, and fixes #244 - ios-deploy will exit when the detection timeout ends even if the device has been detected
This commit is contained in:
Shazron Abdullah 2016-08-08 19:52:55 -07:00 committed by GitHub
commit 7a808cb6b4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ios-deploy/ios-deploy.m
View File

@ -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, "P101AP", "iPad 4")
GET_FRIENDLY_MODEL_NAME(model, "P102AP", "iPad 4 (GSM)") GET_FRIENDLY_MODEL_NAME(model, "P102AP", "iPad 4 (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "P103AP", "iPad 4 (CDMA)") 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 // iPad Mini
GET_FRIENDLY_MODEL_NAME(model, "P105AP", "iPad mini") GET_FRIENDLY_MODEL_NAME(model, "P105AP", "iPad mini")
GET_FRIENDLY_MODEL_NAME(model, "P106AP", "iPad mini (GSM)") GET_FRIENDLY_MODEL_NAME(model, "P106AP", "iPad mini (GSM)")
GET_FRIENDLY_MODEL_NAME(model, "P107AP", "iPad mini (CDMA)") 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 // Apple TV
@ -1696,7 +1708,9 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
} }
void timeout_callback(CFRunLoopTimerRef timer, void *info) { 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) { if(best_device_match != NULL) {
NSLogVerbose(@"Handling best device match."); NSLogVerbose(@"Handling best device match.");
handle_device(best_device_match); handle_device(best_device_match);