Changeset f05ba79 in orbit for iOS

Timestamp:

12/31/13 13:13:15 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

06bdb03

Parents:

99de425

Message:

• Core Motion re-enabled for deployment

Location:

iOS/Orbit

Files:

• .DS_Store (modified) (previous)
• Orbit/controllers/AdvancedViewController.h (modified) (1 diff)
• Orbit/controllers/AdvancedViewController.m (modified) (1 diff)

iOS/Orbit/Orbit/controllers/AdvancedViewController.h

@@ -12 +12 @@
 #import <UIKit/UIKit.h>
 
-//#define __CORE_MOTION__
+#define __CORE_MOTION__
 
 #ifdef __CORE_MOTION__

iOS/Orbit/Orbit/controllers/AdvancedViewController.m

@@ -31 +31 @@
    
    // 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];
-   //                                   }];
+   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];
+                                   }];
    
 }