Changeset 4010dcc in orbit

Timestamp:

12/22/12 16:16:44 (9 years ago)

Author:

Jonathon Horsman <jonathon@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

6fdeffc

Parents:

66477ef

Message:

Change the wav file
Tweak interface to start/stop stream when app is fore/backgrounded

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• Orbit.xcodeproj/project.pbxproj (modified) (6 diffs)
• Orbit.xcodeproj/project.xcworkspace/xcuserdata/jonathon.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• Orbit/ViewController.m (modified) (9 diffs)
• Orbit/throttle_hover_android_common.wav (deleted)
• Orbit/throttle_max_ios_common.wav (added)

iOS/Orbit/Orbit.xcodeproj/project.pbxproj

@@ -12 +12 @@
                 2815BC13167F48BB00F7E6DA /* libTGAccessory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2815BC10167F48A000F7E6DA /* libTGAccessory.a */; };
                 2815BC15167F496C00F7E6DA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2815BC14167F496C00F7E6DA /* QuartzCore.framework */; };
-                2815BC19167F54B600F7E6DA /* throttle_hover_android_common.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2815BC18167F54B500F7E6DA /* throttle_hover_android_common.wav */; };
                 28174C61167F2EA900104752 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28174C60167F2EA900104752 /* UIKit.framework */; };
                 28174C63167F2EA900104752 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28174C62167F2EA900104752 /* Foundation.framework */; };
@@ -27 +26 @@
                 282F2B331681D0FC00B9A99A /* ic_launcher-57x57.png in Resources */ = {isa = PBXBuildFile; fileRef = 282F2B321681D0FC00B9A99A /* ic_launcher-57x57.png */; };
                 282F2B361681D10200B9A99A /* ic_launcher-114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = 282F2B351681D10200B9A99A /* ic_launcher-114x114.png */; };
+                285D3D381685D9B1005A534D /* throttle_max_ios_common.wav in Resources */ = {isa = PBXBuildFile; fileRef = 285D3D371685D9B1005A534D /* throttle_max_ios_common.wav */; };
 /* End PBXBuildFile section */
 
@@ -36 +36 @@
                 2815BC12167F48A000F7E6DA /* TGAccessoryManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TGAccessoryManager.h; sourceTree = "<group>"; };
                 2815BC14167F496C00F7E6DA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-                2815BC18167F54B500F7E6DA /* throttle_hover_android_common.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_android_common.wav; sourceTree = "<group>"; };
                 28174C5C167F2EA900104752 /* Orbit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Orbit.app; sourceTree = BUILT_PRODUCTS_DIR; };
                 28174C60167F2EA900104752 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -56 +55 @@
                 282F2B321681D0FC00B9A99A /* ic_launcher-57x57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_launcher-57x57.png"; sourceTree = "<group>"; };
                 282F2B351681D10200B9A99A /* ic_launcher-114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_launcher-114x114.png"; sourceTree = "<group>"; };
+                285D3D371685D9B1005A534D /* throttle_max_ios_common.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_max_ios_common.wav; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -144 +144 @@
                                 28174C74167F2EA900104752 /* Default@2x.png */,
                                 28174C76167F2EA900104752 /* Default-568h@2x.png */,
-                                2815BC18167F54B500F7E6DA /* throttle_hover_android_common.wav */,
+                                285D3D371685D9B1005A534D /* throttle_max_ios_common.wav */,
                         );
                         name = "Supporting Files";
@@ -205 +205 @@
                                 28174C77167F2EA900104752 /* Default-568h@2x.png in Resources */,
                                 28174C7A167F2EAA00104752 /* MainStoryboard.storyboard in Resources */,
-                                2815BC19167F54B600F7E6DA /* throttle_hover_android_common.wav in Resources */,
                                 282F2B331681D0FC00B9A99A /* ic_launcher-57x57.png in Resources */,
                                 282F2B361681D10200B9A99A /* ic_launcher-114x114.png in Resources */,
+                                285D3D381685D9B1005A534D /* throttle_max_ios_common.wav in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

iOS/Orbit/Orbit/ViewController.m

@@ -10 +10 @@
 #import <AVFoundation/AVFoundation.h>
 
-#define AUDIO_FILE_NAME @"throttle_hover_android_common.wav"
+#define LOGGING true // set to false to stop each received signal being logged
+
+#define AUDIO_FILE_NAME @"throttle_max_ios_common.wav"
 #define POOR_SIGNAL_KEY @"poorSignal"
 #define ATTENTION_KEY @"eSenseAttention"
@@ -45 +47 @@
 }
 
+// Start the data stream from the bluetooth headset if it's attached, and reset the display output
 - (void) appForegrounded
 {
-    if ([[TGAccessoryManager sharedTGAccessoryManager] accessory] != nil) {
+    EAAccessory *accessory = [[TGAccessoryManager sharedTGAccessoryManager] accessory];
+    if (accessory != nil) {
+        [self logMessage:[NSString stringWithFormat:@"App opened with %@ connected. Starting data stream", accessory.name]];
         [[TGAccessoryManager sharedTGAccessoryManager] startStream];
     }
-    [self resetViews];
-}
-
+    [self resetViews]; // just in case it didn't happen on close
+}
+
+// Set all levels back to zero and clear the log
 - (void) resetViews
+{
+    [self resetOutputToZero];
+    self.log.text = @"";
+}
+
+- (void) resetOutputToZero
 {
     [self showSignalStrength:[NSNumber numberWithInt:200]];
@@ -59 +71 @@
     [self setMeditationLevel:[NSNumber numberWithInt:0]];
     [self showPowerLevel];
-    self.log.text = @"";
 }
 
@@ -65 +76 @@
 {
     [self stopDemo];
+    [self resetViews];
     if ([[TGAccessoryManager sharedTGAccessoryManager] connected]) {
         [[TGAccessoryManager sharedTGAccessoryManager] stopStream];
@@ -77 +89 @@
     audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:audioFilePath error:&error];
     if (!audioPlayer) {
-        NSLog(@"Failed to initialize audio player: %@", [error debugDescription]);
+        [self logMessage:[NSString stringWithFormat:@"Failed to initialize audio player: %@", [error debugDescription]]];
     } else {
         [audioPlayer prepareToPlay];
@@ -86 +98 @@
 {
     log.text = [[NSString alloc] initWithFormat:@"%@\n%@", str, log.text];
+}
+
+- (void) logDataReceived:(NSDictionary *) data
+{
+    NSNumber *sig = [data valueForKey:POOR_SIGNAL_KEY];
+    if (sig != NULL) {
+        int val = (200 - [sig intValue]) / 2;
+        [self logMessage:[NSString stringWithFormat:@"Signal strength: %u%%, Attention: %@%%, Meditation: %@%%",
+                          val, [data valueForKey:ATTENTION_KEY], [data valueForKey:MEDITATION_KEY]]];
+    }
+
 }
 
@@ -96 +119 @@
 }
 
-- (void) updatedSignalReceived:(NSDictionary *) data
-{
+- (void) updatedSignalReceived:(id) data
+{
+    if (LOGGING) {
+        [self logDataReceived: data];
+    }
     [self showSignalStrength:(NSNumber *)[data valueForKey:POOR_SIGNAL_KEY]];
     [self setAttentionLevel:(NSNumber *)[data valueForKey:ATTENTION_KEY]];
@@ -105 +131 @@
 }
 
+// The headset was switched on, start the data stream
 - (void)accessoryDidConnect:(EAAccessory *)accessory {
-    [self logMessage:[NSString stringWithFormat:@"%@ was connected to this device.", [accessory name]]];
-}
-
+    [self logMessage:[NSString stringWithFormat:@"%@ was connected to this device. Starting data stream...", [accessory name]]];
+    if ([[TGAccessoryManager sharedTGAccessoryManager] accessory] != nil) {
+        [[TGAccessoryManager sharedTGAccessoryManager] startStream];
+    }
+}
+
+// The headset was switched off (or the Bluetooth signal was dropped).
+// Reset the outputs back to zero
 - (void)accessoryDidDisconnect {
     [self logMessage:@"An accessory was disconnected."];
+    [self resetOutputToZero];
 }
 
@@ -147 +180 @@
 {
     if (value != nil) {
-        self.signal.progress = (200 - [value intValue]) / 100;
+        self.signal.progress = (200.0 - [value intValue]) / 200.0;
     }
 }