Changeset 16249e0 in orbit for iOS


Ignore:
Timestamp:
12/31/13 02:59:14 (7 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
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/Orbit-Info.plist

    r53a64a0 r16249e0  
    4646        <string>APPL</string> 
    4747        <key>CFBundleShortVersionString</key> 
    48         <string>1.4.3</string> 
     48        <string>1.4.7</string> 
    4949        <key>CFBundleSignature</key> 
    5050        <string>????</string> 
    5151        <key>CFBundleVersion</key> 
    52         <string>1.4.3.1</string> 
     52        <string>1.4.7.1</string> 
    5353        <key>LSRequiresIPhoneOS</key> 
    5454        <true/> 
  • iOS/Orbit/Orbit/SignalConverter.m

    rb094d6c r16249e0  
    172172    AudioSessionGetPropertySize(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize); 
    173173    AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputVolume, &dataSize, &volume); 
    174 //    NSLog(@"Volume is %f", volume); 
     174    //    NSLog(@"Volume is %f", volume); 
    175175    return 1.0 == volume; 
    176176} 
     
    278278     
    279279    // For now just set Power to 100% if helicopter should be flying 
    280 //    if (powerLevel > 1) { 
     280    //    if (powerLevel > 1) { 
    281281    if (powerLevel > 0) { 
    282282        return 1.0; 
     
    288288{ 
    289289     
    290     NSLog(@"DEBUG: Signal Converter: throttle:%d yaw:%d pitch:%d", t, y, p); 
     290    //    NSLog(@"DEBUG: Signal Converter: throttle:%d yaw:%d pitch:%d", t, y, p); 
    291291     
    292292    throttle = t; 
     
    312312#else 
    313313        audioPlayer.volume = 1.0; 
    314  
     314         
    315315        // Play WAV 
    316316        [self prepareAudio]; 
  • 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.