Changeset 16249e0 in orbit for iOS/Orbit/Orbit/controllers


Ignore:
Timestamp:
12/31/13 02:59:14 (9 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
b5aa714
Parents:
b094d6c
Message:
  • Updated version numbers
  • Trimmed debug output
  • Whitespace and comment cleanup
Location:
iOS/Orbit/Orbit/controllers
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.h

    rb094d6c r16249e0  
    1212#import <UIKit/UIKit.h> 
    1313#import <CoreMotion/CoreMotion.h> 
    14  
    15 //double defaultControlThrottle = 0.5; 
    16 //double defaultControlYaw = 0.5; 
    17 //double defaultControlPitch = 0.5; 
    1814 
    1915double defaultControlThrottle = 0.8; 
     
    5854- (IBAction) rightButtonPressed:(id)sender; 
    5955 
    60 - (IBAction)changeSwitchTiltSensorControl:(id)sender; 
    61 - (IBAction)changeSwitchTiltSensorControlThrottle:(id)sender; 
     56- (IBAction) changeSwitchTiltSensorControl:(id)sender; 
     57- (IBAction) changeSwitchTiltSensorControlThrottle:(id)sender; 
    6258 
    6359@property (strong, nonatomic) CMMotionManager *motionManager; 
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.m

    rb094d6c r16249e0  
    1313#import "SignalConverter.h" 
    1414#import "AppDelegate.h" 
    15  
    16 //@interface AdvancedViewController () 
    17 // 
    18 //@end 
    1915 
    2016@implementation AdvancedViewController { 
     
    149145    
    150146   if([sender isOn]){ 
    151       NSLog(@"DEBUG: Tilt Sensor Enabled"); 
     147      //      NSLog(@"DEBUG: Tilt Sensor Enabled"); 
    152148      [_switchTiltSensorControlThrottle setEnabled:YES]; 
    153149   } else{ 
    154       NSLog(@"DEBUG: Tilt Sensor Disabled"); 
     150      //      NSLog(@"DEBUG: Tilt Sensor Disabled"); 
    155151      [_switchTiltSensorControlThrottle setOn:NO animated:YES]; 
    156152      [_switchTiltSensorControlThrottle setEnabled:NO]; 
     
    164160    
    165161   if([sender isOn]){ 
    166       NSLog(@"DEBUG: Throttle Tilt Sensor Enabled"); 
     162      //      NSLog(@"DEBUG: Throttle Tilt Sensor Enabled"); 
    167163      referenceTiltY = 0; 
    168164   } else{ 
    169       NSLog(@"DEBUG: Throttle Tilt Sensor Disabled"); 
     165      //      NSLog(@"DEBUG: Throttle Tilt Sensor Disabled"); 
    170166      referenceTiltX = 0; 
    171167                referenceTiltY = 0; 
     
    178174   // With thanks to NSCookbook 
    179175   // http://nscookbook.com/2013/03/ios-programming-recipe-19-using-core-motion-to-access-gyro-and-accelerometer/ 
    180     
    181     
    182     
    183    // TODO Add routing to smooth out changes 
    184    // Abrupt movements is breaking signal transmission 
    185     
    186176    
    187177    
Note: See TracChangeset for help on using the changeset viewer.