Changeset d5f1a91 in orbit for iOS


Ignore:
Timestamp:
12/29/13 12:16:01 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
4a94f92
Parents:
d42b042
Message:
  • Tilt Control UISwitch controls Throttle Only UISwitch
Location:
iOS/Orbit/Orbit
Files:
2 edited

Legend:

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

    rd42b042 rd5f1a91  
    4040//   [switchTiltSensorControlThrottle addTarget:self action:@selector(changeSwitchTiltSensorControlThrottle:) forControlEvents:UIControlEventValueChanged]; 
    4141//   [self.view addSubview:switchTiltSensorControlThrottle]; 
     42    
     43   [_switchTiltSensorControlThrottle setOn:NO]; 
     44   [_switchTiltSensorControlThrottle setEnabled:NO]; 
    4245    
    4346} 
     
    121124   if([sender isOn]){ 
    122125      NSLog(@"DEBUG: Tilt Sensor Enabled"); 
     126      [_switchTiltSensorControlThrottle setEnabled:YES]; 
    123127   } else{ 
    124128      NSLog(@"DEBUG: Tilt Sensor Disabled"); 
     129      [_switchTiltSensorControlThrottle setOn:NO animated:YES]; 
     130      [_switchTiltSensorControlThrottle setEnabled:NO]; 
    125131   } 
    126132    
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    rd42b042 rd5f1a91  
    200200                                        <nil key="highlightedColor"/> 
    201201                                    </label> 
    202                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="JEY-La-U7l"> 
     202                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="JEY-La-U7l"> 
    203203                                        <rect key="frame" x="11" y="14" width="51" height="31"/> 
    204204                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
     
    207207                                        </connections> 
    208208                                    </switch> 
    209                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="RQl-ZZ-JJw"> 
     209                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="RQl-ZZ-JJw"> 
    210210                                        <rect key="frame" x="150" y="14" width="51" height="31"/> 
    211211                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
Note: See TracChangeset for help on using the changeset viewer.