Changeset 359a504 in orbit for iOS/Orbit/Orbit/controllers/FlightViewController.m

Timestamp:

08/07/13 13:49:25 (9 years ago)

Author:

Jonathon Horsman <jonathon@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

7945ecb

Parents:

6fc29d0

Message:

Add check for headphones being plugged in

File:

• iOS/Orbit/Orbit/controllers/FlightViewController.m (modified) (1 diff)

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];