Changeset 3434fbc in orbit for iOS


Ignore:
Timestamp:
08/29/13 11:05:13 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo, Tab_Interface, pyramid
Children:
2d817de
Parents:
e37a889
Message:

Orbit:

  • Test warning message updated
Location:
iOS/Orbit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/SignalConverter.m

    re37a889 r3434fbc  
    279279} 
    280280 
    281 //- (void) playAudio 
    282 //{ 
    283 //    if ([self currentPowerLevel] > 0) { 
    284 //        // Generate Signal 
    285 //        [audioPlayer playWithThrottle:throttle yaw:yaw pitch:pitch]; 
    286 //    } else { 
    287 //        [audioPlayer stop]; 
    288 // 
    289 //    } 
    290 //} 
    291  
    292281 
    293282- (void) playAudio 
    294283{ 
    295      
    296     NSLog(@"currentPowerLevel: %f", [self currentPowerLevel]); 
    297      
    298 //    [self prepareAudio]; 
    299 //    [audioPlayer play]; 
    300 //     
    301 //    return; 
    302284     
    303285    //   audioPlayer.volume = [self currentPowerLevel]; 
  • iOS/Orbit/Orbit/controllers/FlightViewController.m

    re37a889 r3434fbc  
    3838   self.meditationThreshold.minimumTrackTintColor = [UIColor grayColor]; 
    3939   self.meditationThreshold.value = 0; 
    40     
    41 //   [signalConverter prepareAudio]; 
    4240    
    4341   AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; 
     
    180178   [signalConverter isAudioJackPlugged]; 
    181179   if (signalConverter.running) { 
    182       UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Stop test sound" message:@"Press Stop first to end the test" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil]; 
     180      UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Signal Processing Active" message:@"Please press the Disconnect button before sending a Test signal" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil]; 
    183181      [alert show]; 
    184182   } else { 
Note: See TracChangeset for help on using the changeset viewer.