Changeset d249b65 in orbit for iOS/Orbit

Timestamp:

08/27/13 02:28:13 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo, Tab_Interface, pyramid

Children:

ad80ed2

Parents:

6bdfe8d

Message:

Orbit:

• Signal bar now updating correctly

Tutorial:

• additional text added to step 6

Location:

iOS/Orbit

Files:

• Orbit/SignalConverter.m (modified) (8 diffs)
• Orbit/controllers/FlightViewController.m (modified) (1 diff)
• orbit.xcodeproj/project.xcworkspace/xcuserdata/sc.xcuserdatad/UserInterfaceState.xcuserstate (modified) (previous)
• tutorial/step06-1.html (modified) (1 diff)

iOS/Orbit/Orbit/SignalConverter.m

@@ -82 +82 @@
 }
 
-// Updated signal received from the EEG headset. 
+// Updated signal received from the EEG headset.
 - (void) updatedSignalReceived:(id) data
 {
@@ -90 +90 @@
     {
         [_delegate updatedValuesForSignal: signalStrength
-                                    attention: (float)attentionLevel / 100
-                                   meditation: (float)meditationLevel / 100
-                                        power: [self currentPowerLevel]];
+                                attention: (float)attentionLevel / 100
+                               meditation: (float)meditationLevel / 100
+                                    power: [self currentPowerLevel]];
     }
     [self playAudio];
@@ -101 +101 @@
     [self setSignalStrength:(NSNumber *)[data valueForKey:POOR_SIGNAL_KEY]];
     [self setAttentionLevel:(NSNumber *)[data valueForKey:ATTENTION_KEY]];
-    [self setMeditationLevel:(NSNumber *)[data valueForKey:MEDITATION_KEY]];    
+    [self setMeditationLevel:(NSNumber *)[data valueForKey:MEDITATION_KEY]];
 }
 
@@ -107 +107 @@
 {
     if (value != nil) {
-        signalStrength = (200.0 - [value intValue]) / 200.0;
+        
+//        NSLog(@"value: %i", [value intValue]);
+        
+        if ([value intValue] == 0) {
+            signalStrength = 100;
+        }
+        
+        else if ([value intValue] == 200) {
+            signalStrength = 0;
+        }
+        
+        else {
+            signalStrength = [value intValue];
+        }
+        
+//        NSLog(@"signalStrength: %i", signalStrength);
+        
     }
 }
@@ -162 +178 @@
     // 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);
@@ -184 +200 @@
      kAudioSessionOutputRoute_AirPlay
      */
-
+    
     return CFStringCompare(output, kAudioSessionOutputRoute_Headphones, 0) == kCFCompareEqualTo;
 }
@@ -231 +247 @@
 - (float) currentPowerLevel
 {
-   
+    
     float attentionScore = attentionPower[attentionLevel];
     float meditationScore = meditationPower[meditationLevel];
@@ -242 +258 @@
         meditationScore = 0;
     }
-
+    
     float powerLevel = attentionScore + meditationScore;
     if (powerLevel > 1) {

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -85 +85 @@
                           power: (float)powerLevel
 {
-    self.signal.progress = signalStrength;
-    self.signalPercent.text = [NSString stringWithFormat:@"%i%%", (int)(signalStrength * 100)];
+   
+//   self.signal.progress = (int)(signalStrength);
+    self.signal.progress = signalStrength / 100;
+//    NSLog(@"Setting self.signal.progress: %f", signalStrength / 100);
+   
+    self.signalPercent.text = [NSString stringWithFormat:@"%i%%", (int)(signalStrength)];
     self.attention.progress = attentionLevel;
     self.attentionPercent.text = [NSString stringWithFormat:@"%i%%", (int)(attentionLevel * 100)];

iOS/Orbit/tutorial/step06-1.html

@@ -20 +20 @@
       </center>
       
+      <ul>
+         <li>This is how the EEG headset should look when worn properly</li>
+      </ul>
+      
       <a class='prev button' onclick="parent.changePage('step05-3.html');">&nbsp;&nbsp; &larr; &nbsp;&nbsp;</a>
       <a class='contents button' onclick="parent.changePage('contents.html');">&nbsp;&nbsp; &uarr; &nbsp;&nbsp;</a>