Changeset f45b70a in orbit

Timestamp:

12/31/13 11:03:34 (6 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

c3d6d63

Parents:

af91708

Message:

• Core Motion disabled for tutorial expansion

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• Orbit/controllers/AdvancedViewController.h (modified) (2 diffs)
• Orbit/controllers/AdvancedViewController.m (modified) (2 diffs)
• Orbit/controllers/FlightViewController.m (modified) (4 diffs)

iOS/Orbit/Orbit/controllers/AdvancedViewController.h

@@ -11 +11 @@
 
 #import <UIKit/UIKit.h>
-#import <CoreMotion/CoreMotion.h>
+
+//#define __CORE_MOTION__
+
+#ifdef __CORE_MOTION__
+   #import <CoreMotion/CoreMotion.h>
+   Boolean CORE_MOTION = true;
+#else
+   Boolean CORE_MOTION = false;
+#endif
 
 double defaultControlThrottle = 0.8;
@@ -57 +65 @@
 - (IBAction) changeSwitchTiltSensorControlThrottle:(id)sender;
 
-@property (strong, nonatomic) CMMotionManager *motionManager;
-
+#ifdef __CORE_MOTION__
+   @property (strong, nonatomic) CMMotionManager *motionManager;
+#endif
 
 @end

iOS/Orbit/Orbit/controllers/AdvancedViewController.m

@@ -14 +14 @@
 #import "AppDelegate.h"
 
+
 @implementation AdvancedViewController {
    SignalConverter *signalConverter;
@@ -29 +30 @@
    //   [alert show];
    
-   self.motionManager = [[CMMotionManager alloc] init];
-   self.motionManager.accelerometerUpdateInterval = .2;
-   self.motionManager.gyroUpdateInterval = .2;
-   //   self.motionManager.accelerometerUpdateInterval = .1;
-   //   self.motionManager.gyroUpdateInterval = .1;
-   
-   [self.motionManager startAccelerometerUpdatesToQueue:[NSOperationQueue currentQueue]
-                                            withHandler:^(CMAccelerometerData *accelerometerData, NSError *error) {
-                                               [self outputAccelertionData:accelerometerData.acceleration];
-                                               if(error){
-                                                  NSLog(@"%@", error);
-                                               }
-                                            }];
-   
-   [self.motionManager startGyroUpdatesToQueue:[NSOperationQueue currentQueue]
-                                   withHandler:^(CMGyroData *gyroData, NSError *error) {
-                                      [self outputRotationData:gyroData.rotationRate];
-                                   }];
+   // Core Motion
+   //   self.motionManager = [[CMMotionManager alloc] init];
+   //   self.motionManager.accelerometerUpdateInterval = .2;
+   //   self.motionManager.gyroUpdateInterval = .2;
+   //   //   self.motionManager.accelerometerUpdateInterval = .1;
+   //   //   self.motionManager.gyroUpdateInterval = .1;
+   //
+   //   [self.motionManager startAccelerometerUpdatesToQueue:[NSOperationQueue currentQueue]
+   //                                            withHandler:^(CMAccelerometerData *accelerometerData, NSError *error) {
+   //                                               [self outputAccelertionData:accelerometerData.acceleration];
+   //                                               if(error){
+   //                                                  NSLog(@"%@", error);
+   //                                               }
+   //                                            }];
+   //
+   //   [self.motionManager startGyroUpdatesToQueue:[NSOperationQueue currentQueue]
+   //                                   withHandler:^(CMGyroData *gyroData, NSError *error) {
+   //                                      [self outputRotationData:gyroData.rotationRate];
+   //                                   }];
    
 }

iOS/Orbit/Orbit/controllers/FlightViewController.m

@@ -206 +206 @@
 {
    
-   //   /**
-   //    * Score points based on target slider levels
-   //    * If you pass your goal with either Attention or Meditation
-   //    * the higher target of the two will counts as points per second.
-   //    *
-   //    * Minimum threshold for points is set as "minimumScoreTarget"
-   //    *
-   //    * For example, assume minimumScoreTarget is 40%.
-   //    * If your target Attention is 60% and you go past to reach 80%
-   //    * you will receive 20 points per second (60-40). If your
-   //    * target is 80% and you reach 80% you will receive 40
-   //    * points per second (80-40).
-   //    *
-   //    * You can set both Attention and Meditation targets at the
-   //    * same time. Reaching either will fly the helicopter but you
-   //    * will only receive points for the higher-scoring target of
-   //    * the two.
-   //    *
-   //    */
+   /**
+    * Score points based on target slider levels
+    * If you pass your goal with either Attention or Meditation
+    * the higher target of the two will counts as points per second.
+    *
+    * Minimum threshold for points is set as "minimumScoreTarget"
+    *
+    * For example, assume minimumScoreTarget is 40%.
+    * If your target Attention is 60% and you go past to reach 80%
+    * you will receive 20 points per second (60-40). If your
+    * target is 80% and you reach 80% you will receive 40
+    * points per second (80-40).
+    *
+    * You can set both Attention and Meditation targets at the
+    * same time. Reaching either will fly the helicopter but you
+    * will only receive points for the higher-scoring target of
+    * the two.
+    *
+    */
    
    int eegAttentionScore = 0;
@@ -275 +275 @@
    [self displayScore];
    
-   
-} // updateScore
-
-
-// ################################################################
+}
 
 - (void) displayScore
@@ -285 +281 @@
    self.scoresDisplay.text = [NSString stringWithFormat:@"Scores        Current: %i    Last: %i    High: %i", (int)scoreCurrent, (int)scoreLast, (int)scoreHigh];
 }
-
-// ################################################################
 
 - (void) resetCurrentScore
@@ -295 +289 @@
    scoreCurrent = 0;
    
-} // resetCurrentScore
+}
 
 @end