Changeset 9015b1e in orbit

Timestamp:

07/19/13 15:59:47 (9 years ago)

Author:

Jonathon Horsman <jonathon@…>

Branches:

master, RawEEG, Servo, Tab_Interface, pyramid

Children:

ce0a7ee, c61115c

Parents:

ab9d63b

Message:

UI working with headset correctly now.
Check Bluetooth enabled and volume at full

Location:

iOS/Orbit

Files:

• Orbit/AppDelegate.m (modified) (4 diffs)
• Orbit/SignalConverter.h (modified) (1 diff)
• Orbit/SignalConverter.m (modified) (6 diffs)
• Orbit/SignalConverterDelegate.h (modified) (1 diff)
• Orbit/controllers/FlightViewController.m (modified) (7 diffs)
• Orbit/en.lproj/MainStoryboard.storyboard (modified) (1 diff)
• orbit.xcodeproj/project.pbxproj (modified) (4 diffs)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/jonathon.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• orbit.xcodeproj/xcuserdata/jonathon.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist (added)

iOS/Orbit/Orbit/AppDelegate.m

@@ -21 +21 @@
 {
     // Override point for customization after application launch.
+    NSLog(@"didFinsihLaunching - signal convertor init");
     signalConverter = [[SignalConverter alloc] init];
 //    [[TGAccessoryManager sharedTGAccessoryManager] setupManagerWithInterval:0.05];
@@ -33 +34 @@
 //    ViewController *rootController = (ViewController *)self.window.rootViewController;
 //    [rootController appClosed];
+    [signalConverter appStopped];
+    NSLog(@"Application will resign active - appClosed");
 }
 
@@ -49 +52 @@
 {
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-//    ViewController *rootController = (ViewController *)self.window.rootViewController;
-//    [rootController appForegrounded];
 }
 
@@ -56 +57 @@
 {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    NSLog(@"Application will terminate - teardownManager");
     [[TGAccessoryManager sharedTGAccessoryManager] teardownManager];
 }

iOS/Orbit/Orbit/SignalConverter.h

@@ -25 +25 @@
 - (void) setValuesForAttention:(float) attention meditation:(float) meditation;
 - (void) prepare;
-- (void) startProcessing;
+- (BOOL) startProcessing;
 - (void) stopProcessing;
-- (void) appClosed;
+- (void) appStopped;
+- (BOOL) isBluetoothReady;
+- (BOOL) isVolumeMax;
 
 @end

iOS/Orbit/Orbit/SignalConverter.m

@@ -13 +13 @@
 #define ATTENTION_KEY @"eSenseAttention"
 #define MEDITATION_KEY @"eSenseMeditation"
+
+#define CHANNEL_A 1
 
 // Converts signals received from the EEG headset to the audio played to fly the helicopter.
@@ -29 +31 @@
 @synthesize attentionThreshold, meditationThreshold, running;
 
+
+- (id) init
+{
+    self = [super init];
+    if (self)
+    {
+        [[TGAccessoryManager sharedTGAccessoryManager] setupManagerWithInterval:0.05];
+        [[TGAccessoryManager sharedTGAccessoryManager] setDelegate:self];
+    }
+    return self;
+}
+
 - (void) setValuesForAttention:(float) attention meditation:(float) meditation
 {
@@ -45 +59 @@
 }
 
-- (void) appClosed
-{
-    if ([[TGAccessoryManager sharedTGAccessoryManager] connected]) {
+- (void) appStopped
+{
+    running = NO;
+    if ([TGAccessoryManager sharedTGAccessoryManager].accessory != nil) {
         [[TGAccessoryManager sharedTGAccessoryManager] stopStream];
+    }
+    [audioPlayer stop];
+    if (_delegate != nil) {
+        [_delegate appStopped];
     }
 }
@@ -105 +124 @@
 // The headset was switched on, start the data stream
 - (void)accessoryDidConnect:(EAAccessory *)accessory {
-    if (_delegate != nil)
-    {
-        [_delegate notifyHeadsetConnect];
-    }
-    if ([[TGAccessoryManager sharedTGAccessoryManager] accessory] != nil) {
-        [[TGAccessoryManager sharedTGAccessoryManager] startStream];
-    }
 }
 
@@ -122 +134 @@
 }
 
+- (BOOL) isBluetoothReady
+{
+    return [[TGAccessoryManager sharedTGAccessoryManager] accessory] != NULL;
+}
+
+- (BOOL) isVolumeMax
+{
+    float volume = [[AVAudioSession sharedInstance] outputVolume];
+//    Float32 volume;
+//    UInt32 dataSize = sizeof(Float32);
+//    
+//    AudioSessionGetProperty (
+//                             kAudioSessionProperty_CurrentHardwareOutputVolume,
+//                             &dataSize,
+//                             &volume
+//                             );
+    return volume == 1.0;
+}
+
 #pragma mark start / stop methods
 
-- (void) startProcessing
-{
-    running = YES;
+- (BOOL) startProcessing
+{
     EAAccessory *accessory = [[TGAccessoryManager sharedTGAccessoryManager] accessory];
     if (accessory != nil) {
-        if (_delegate != nil)
-        {
+        running = YES;
+        if (_delegate != nil) {
             [_delegate notifyDeviceConnected: accessory.name];
         }
         [[TGAccessoryManager sharedTGAccessoryManager] startStream];
     }
+    return running;
 }
 
 - (void) stopProcessing
 {
-    running = NO;
-    if ([[TGAccessoryManager sharedTGAccessoryManager] connected]) {
-        [[TGAccessoryManager sharedTGAccessoryManager] stopStream];
-    }
-    [audioPlayer stop];
+    [self appStopped];
     [self prepare];    
 }
@@ -202 +229 @@
 }
 
+// calculate the checksum for the generated code used to generate the WAV array
+- (int) codeChecksum:(int)code
+{
+    int checksum = 0;
+    for (int i = 0; i < 7; i++) {
+        checksum += (code >> 4*i) & 15;
+    }
+    return 16 - (checksum & 15);
+}
+
+// Generate the code used to create the WAV file based on the given throttle, yaw and pitch.
+// Copied from AudioService.java in the Android app
+// throttle: 0~127, nothing will happen if this value is below 30.
+// yaw: 0~127, normally 78 will keep orbit from rotating.
+// pitch: 0~63, normally 31 will stop the top propeller.
+// channel: 1=Channel A, 0=Channel B 2= Channel C, depend on which channel you want to pair to the orbit. You can fly at most 3 orbit in a same room.
+- (int) generateCodeFromThrottle: (int)throttle yaw: (int)yaw pitch: (int)pitch channel: (int)channel
+{
+    int code = (throttle << 21) + 1048576 + (yaw << 12) + (pitch << 4) + (((channel >> 1) & 1) << 19) + ((channel & 1) << 11);
+    return code;// + codeChecksum(code);
+}
+
 @end

iOS/Orbit/Orbit/SignalConverterDelegate.h

@@ -19 +19 @@
 - (void) notifyHeadsetDisconnect;
 - (void) notifyDeviceConnected:(NSString *)name;
+- (void) appStopped;
 @end

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -23 +23 @@
 @implementation FlightViewController {
     SignalConverter *signalConverter;
+    int deviceStatus;
 }
 
-@synthesize status, attention, meditation, signal, power, attentionThreshold, meditationThreshold, connectButton, statusImage;
+@synthesize status, attention, meditation, signal, power, attentionThreshold, meditationThreshold, connectButton, statusImage, signalPercent, attentionPercent, meditationPercent, powerPercent;
 
 - (void)viewDidLoad
@@ -39 +40 @@
 }
 
-// Start the data stream from the bluetooth headset if it's attached, and reset the display output
-- (void) appForegrounded
-{
-    [self resetViews]; // just in case it didn't happen on close
-}
-
 #pragma mark view updates
 
@@ -51 +46 @@
 {
     signal.progress = 0;
+    signalPercent.text = @"0%";
     attention.progress = 0;
+    attentionPercent.text = @"0%";
     meditation.progress = 0;
+    meditationPercent.text = @"0%";
     power.progress = 0;
+    powerPercent.text = @"0%";
     [self logMessage:@"Disconnected"];
+    [self updateStatusImage:STATUS_DEFAULT];
+    connectButton.title = @"Connect";
 }
 
 - (void) updateStatusImage:(int) statusNo
 {
-    [statusImage setImage: [UIImage imageNamed:[NSString stringWithFormat:@"status_%u", statusNo]]];
+    if (statusNo != deviceStatus) {
+        [statusImage setImage: [UIImage imageNamed:[NSString stringWithFormat:@"status_%u", statusNo]]];
+        deviceStatus = statusNo;
+        if (statusNo == STATUS_CONNECTED) {
+            [self logMessage:@"Check headset fitted properly"];
+        } else if (statusNo == STATUS_PROCESSING) {
+            [self logMessage:@"Increase your concentration"];
+        } else if (statusNo == STATUS_ACTIVE) {
+            [self logMessage:@"Flying!"];
+        }
+    }
 }
 
@@ -65 +76 @@
 {
     [signalConverter setValuesForAttention:attentionThreshold.value meditation:meditationThreshold.value];
-//    
-//    if (attentionThreshold.value < 0.2) {
-//        [self updateStatusImage:STATUS_DEFAULT];
-//    } else if (attentionThreshold.value < 0.4) {
-//        [self updateStatusImage:STATUS_CONNECTING];
-//    } else if (attentionThreshold.value < 0.6) {
-//        [self updateStatusImage:STATUS_CONNECTED];
-//    } else if (attentionThreshold.value < 0.8) {
-//        [self updateStatusImage:STATUS_PROCESSING];
-//    } else {
-//        [self updateStatusImage:STATUS_ACTIVE];
-//    }
 }
 
@@ -99 +98 @@
     self.power.progress = powerLevel;
     self.powerPercent.text = [NSString stringWithFormat:@"%i%%", (int)(powerLevel * 100)];
+    [self updateStatusImage:[self statusFromSignal:signalStrength power:powerLevel]];
+}
+
+- (int) statusFromSignal: (float)signalLevel power:(float)powerLevel
+{
+    if (signalLevel < 0.9) { // weak signal
+        return STATUS_CONNECTED;
+    } else if (powerLevel == 0.0) { // strong signal but thresholds not met
+        return STATUS_PROCESSING;
+    } else { // flight command sent to orbit
+        return STATUS_ACTIVE;
+    }
 }
 
 - (void) notifyHeadsetConnect
 {
-    [self logMessage:@"Headet connected"];
+    [self logMessage:@"Headset connected"];
+    [self updateStatusImage:STATUS_CONNECTING];
 }
 
@@ -110 +122 @@
     // Reset the outputs back to zero
     [self resetViews];
-    [self logMessage:@"Headet disconnected"];    
 }
 
 - (void) notifyDeviceConnected:(NSString *)name
 {
-    [self logMessage:[NSString stringWithFormat:@"EEG device %@ connected", name]];    
+    [self logMessage:[NSString stringWithFormat:@"EEG device %@ connected", name]];
+    [self updateStatusImage:STATUS_CONNECTING];
+    connectButton.title = @"Disconnect";
+}
+
+- (void) appStopped
+{
+    [self resetViews]; // just in case it didn't happen on close
 }
 
@@ -124 +142 @@
     if (signalConverter.running) {
         [signalConverter stopProcessing];
-        connectButton.title = @"Connect";
         [self resetViews];
+    } 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.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 startProcessing]) {
+        [self logMessage:@"Searching for device"];
+//        [self updateStatusImage:STATUS_CONNECTING];
+        connectButton.title = @"Disconnect";
     } else {
-        [self logMessage:@"Searching for device"];
-        [signalConverter startProcessing];
-        connectButton.title = @"Disconnect";
+        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];
     }
 }

iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

@@ -385 +385 @@
                     <navigationItem key="navigationItem" id="iTN-dz-EXc"/>
                     <connections>
+                        <outlet property="attention" destination="Dly-NW-R1i" id="XDF-jJ-Fgu"/>
                         <outlet property="attentionPercent" destination="bZn-rG-svm" id="1Ap-Cq-hIM"/>
                         <outlet property="attentionThreshold" destination="ym8-zN-dSb" id="baB-wY-lJS"/>
                         <outlet property="connectButton" destination="Lwp-ZU-iKO" id="zdp-si-XhL"/>
+                        <outlet property="meditation" destination="tsc-gq-wnT" id="y0Z-Xa-LgD"/>
                         <outlet property="meditationPercent" destination="Rhw-9S-ZP1" id="Wws-f9-lVM"/>
                         <outlet property="meditationThreshold" destination="LJj-vt-JUw" id="UKy-Vg-8gL"/>
+                        <outlet property="power" destination="KeR-cO-90u" id="wwM-U5-g6n"/>
                         <outlet property="powerPercent" destination="ah9-c0-kCb" id="IF6-xV-7Xf"/>
+                        <outlet property="signal" destination="AuD-cU-2pt" id="uuu-hc-E2e"/>
                         <outlet property="signalPercent" destination="yYn-76-IoI" id="4Ei-JM-jZ1"/>
                         <outlet property="status" destination="BOS-Js-1rx" id="fDM-Of-lza"/>

iOS/Orbit/orbit.xcodeproj/project.pbxproj

@@ -38 +38 @@
                 28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; };
                 28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; };
+                28F901301799436F003FB5ED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F9012F1799436F003FB5ED /* CoreBluetooth.framework */; };
                 52922BA817004D1400A39146 /* libCorePlot-CocoaTouch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52922BA717004D1400A39146 /* libCorePlot-CocoaTouch.a */; };
                 52FA364416899B5D004C280A /* ic_launcher-57x57.png in Resources */ = {isa = PBXBuildFile; fileRef = 52FA364316899B5D004C280A /* ic_launcher-57x57.png */; };
@@ -88 +89 @@
                 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; };
                 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; };
+                28F9012F1799436F003FB5ED /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; };
                 52922BA717004D1400A39146 /* libCorePlot-CocoaTouch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libCorePlot-CocoaTouch.a"; sourceTree = "<group>"; };
                 52922BA917004D4400A39146 /* CorePlot-CocoaTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CorePlot-CocoaTouch.h"; sourceTree = "<group>"; };
@@ -174 +176 @@
                         buildActionMask = 2147483647;
                         files = (
+                                28F901301799436F003FB5ED /* CoreBluetooth.framework in Frameworks */,
                                 52922BA817004D1400A39146 /* libCorePlot-CocoaTouch.a in Frameworks */,
                                 2815BC15167F496C00F7E6DA /* QuartzCore.framework in Frameworks */,
@@ -205 +208 @@
                         isa = PBXGroup;
                         children = (
+                                28F9012F1799436F003FB5ED /* CoreBluetooth.framework */,
                                 289C7D0F178D7A21005C08EC /* Images */,
                                 52FA364716899C63004C280A /* Default-568h@2x.png */,