Changeset 8e852bb in orbit


Ignore:
Timestamp:
11/15/12 16:29:06 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
Children:
f323fb4, 321bdc1
Parents:
08d64cc
Message:
  • fixed diff error from last checkin
File:
1 edited

Legend:

Unmodified
Added
Removed
  • arduino/puzzlebox_orbit_Uno_V3/puzzlebox_orbit_Uno_V3.ino

    r08d64cc r8e852bb  
    160160      case 'F':  _pitch+=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
    161161      case 'B':  _pitch-=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
    162 <<<<<<< HEAD 
    163162      case '1':  _channel='A';  Serial.println("_channel=A"); break; 
    164163      case '2':  _channel='B';  Serial.println("_channel=B"); break; 
    165164      case '3':  _channel='C';  Serial.println("_channel=C"); break; 
    166 ======= 
    167165      case '1':  _channel='A';  Serial.print("_channel=A"); break; 
    168166      case '2':  _channel='B';  Serial.print("_throttle=B"); break; 
    169167      case '3':  _channel='C';  Serial.print("_throttle=C"); break; 
    170168      case 'x':  setThrottle(); break; 
    171 >>>>>>> 4af2eca0d67b030ccd9d3fa1d0caa07e6c6aa26e 
    172169    } 
    173170  } 
Note: See TracChangeset for help on using the changeset viewer.