Changeset c6276be in orbit for iOS/Orbit

Timestamp:

08/09/13 12:34:37 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

28bce14

Parents:

ac33039 (diff), 7945ecb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin'

Location:

iOS/Orbit

Files:

• Orbit/SignalConverter.h (modified) (1 diff)
• Orbit/SignalConverter.m (modified) (3 diffs)
• Orbit/controllers/FlightViewController.m (modified) (1 diff)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/jonathon.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/sc.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)

iOS/Orbit/Orbit/SignalConverter.h

@@ -32 +32 @@
 - (BOOL) isBluetoothReady;
 - (BOOL) isVolumeMax;
+- (BOOL) isAudioJackPlugged;
 - (void) setYaw:(int)y throttle:(int)t pitch:(int)p;
 - (void) playTestSound;

iOS/Orbit/Orbit/SignalConverter.m

@@ -46 +46 @@
         yaw = 78;
         pitch = 31;
+        
+        // initialise the audio session - this should only be done once
+        AudioSessionInitialize(NULL, NULL, NULL, NULL);
+        AudioSessionSetActive(YES);
     }
     return self;
@@ -67 +71 @@
         [_delegate appStopped];
     }
+    AudioSessionSetActive(NO);
 }
 
@@ -139 +144 @@
 - (BOOL) isVolumeMax
 {
-    AudioSessionSetActive(YES);
-    return 1.0 == [[AVAudioSession sharedInstance] outputVolume];
+    Float32 volume;
+    UInt32 dataSize;
+    AudioSessionGetPropertySize(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize);
+    AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize, &volume);
+    NSLog(@"Volume is %f", volume);
+    return 1.0 == volume;
+}
+
+- (BOOL) isAudioJackPlugged
+{
+    UInt32 routeSize;
+    
+    // oddly, without calling this method caused an error.
+    AudioSessionGetPropertySize(kAudioSessionProperty_AudioRouteDescription, &routeSize);
+    CFDictionaryRef desc; // this is the dictionary to contain descriptions
+    
+    // make the call to get the audio description and populate the desc dictionary
+    AudioSessionGetProperty(kAudioSessionProperty_AudioRouteDescription, &routeSize, &desc);
+
+    // the dictionary contains 2 keys, for input and output. Get output array
+    CFArrayRef outputs = CFDictionaryGetValue(desc, kAudioSession_AudioRouteKey_Outputs);
+    
+    // the output array contains 1 element - a dictionary
+    CFDictionaryRef dict = CFArrayGetValueAtIndex(outputs, 0);
+    
+    // get the output description from the dictionary
+    CFStringRef output = CFDictionaryGetValue(dict, kAudioSession_AudioRouteKey_Type);
+    
+    /**
+     These are the possible output types:
+     kAudioSessionOutputRoute_LineOut
+     kAudioSessionOutputRoute_Headphones
+     kAudioSessionOutputRoute_BluetoothHFP
+     kAudioSessionOutputRoute_BluetoothA2DP
+     kAudioSessionOutputRoute_BuiltInReceiver
+     kAudioSessionOutputRoute_BuiltInSpeaker
+     kAudioSessionOutputRoute_USBAudio
+     kAudioSessionOutputRoute_HDMI
+     kAudioSessionOutputRoute_AirPlay
+     */
+
+    NSLog(@"Output: %@ is %@", output, kAudioSessionOutputRoute_Headphones);
+    return CFStringCompare(output, kAudioSessionOutputRoute_Headphones, 0) == kCFCompareEqualTo;
 }
 

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -142 +142 @@
         [signalConverter stopProcessing];
         [self resetViews];
-    } else if (!signalConverter.isVolumeMax) {
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Turn Up The Volume" message:@"Your device volume must be at the maximum for proper operation" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
-        [alert show];
-    } else if (!signalConverter.isBluetoothReady) {
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Device not found" message:@"No Bluetooth device detected. Ensure Bluetooth is on and the Mindwave headset is paired" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
-        [alert show];
-    } else if ([signalConverter startProcessing]) {
-        [self logMessage:@"Searching for device"];
-        connectButton.title = @"Disconnect";
     } else {
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Failed to connect" message:@"Check the device is correctly paired on Bluetooth" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
-        [alert show];
+        BOOL volumeMax  = [signalConverter isVolumeMax];
+        BOOL headphones = [signalConverter isAudioJackPlugged];
+        
+        if (!volumeMax && !headphones) {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Check Volume & Transmitter" message:@"Ensure the volume is at max and the transmitter is plugged into the headphones" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
+            [alert show];
+        } else if (!volumeMax) {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Turn Up The Volume" message:@"Your device volume must be at the maximum for proper operation" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
+            [alert show];
+        } else if (!headphones) {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Plug In The Transmitter" message:@"Ensure the infrared transmitter is plugged into the headphone jack" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
+            [alert show];
+        } else if (!signalConverter.isBluetoothReady) {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Device not found" message:@"No Bluetooth device detected. Ensure Bluetooth is on and the Mindwave headset is paired" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
+            [alert show];
+        } else if ([signalConverter startProcessing]) {
+            [self logMessage:@"Searching for device"];
+            connectButton.title = @"Disconnect";
+        } else {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Failed to connect" message:@"Check the device is correctly paired on Bluetooth" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
+            [alert show];
+        }
     }
 }
 
 - (IBAction) testButtonPressed:(id) sender {
+    [signalConverter isAudioJackPlugged];
     if (signalConverter.running) {
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Stop test sound" message:@"Press Stop first to end the test" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];