Changeset 08d64cc in orbit

Timestamp:

11/15/12 10:11:08 (9 years ago)

Author:

AzureViolin <zhanghaotz@…>

Branches:

master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid

Children:

8c73fb4, 8e852bb

Parents:

30bc659 (diff), 4af2eca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Arduino Code for Uno published for instructables

Files:

• arduino/puzzlebox_orbit_Uno_V3/puzzlebox_orbit_Uno_V3.ino (modified) (2 diffs)
• arduino/puzzlebox_orbit_mindwave/puzzlebox_orbit_mindwave.ino (added)
• Electronics/FrontPanelRGBLED-cache.lib (added)
• Electronics/FrontPanelRGBLED.000 (added)
• Electronics/FrontPanelRGBLED.bak (added)
• Electronics/FrontPanelRGBLED.brd (added)
• Electronics/FrontPanelRGBLED.cmp (added)
• Electronics/FrontPanelRGBLED.dsn (added)
• Electronics/FrontPanelRGBLED.net (added)
• Electronics/FrontPanelRGBLED.pro (added)
• Electronics/FrontPanelRGBLED.sch (added)

arduino/puzzlebox_orbit_Uno_V3/puzzlebox_orbit_Uno_V3.ino

@@ -107 +107 @@
 }
 
+void setThrottle() {
+  
+  char inByte=0;
+  int a=0;
+  int b=0;
+  int c=0;
+  int newThrottle=0;
+  
+  while (Serial.available() == 0);
+  inByte = Serial.read() - '0';
+  //Serial.println(inByte);
+  a = inByte;
+  
+  while (Serial.available() == 0);
+  inByte = Serial.read() - '0';
+  //Serial.println(inByte);
+  b = inByte;
+  
+  while (Serial.available() == 0);
+  inByte = Serial.read() - '0';
+  //Serial.println(inByte);
+  c = inByte;
+  
+  newThrottle = (a * 100) + (b * 10) + c;
+  
+  if (newThrottle < 0)
+    newThrottle=0;
+  
+  if (newThrottle > 100)
+    newThrottle=100;
+    
+  _throttle=newThrottle;
+  
+  Serial.print("_throttle=");
+  Serial.println(int(_throttle));
+  
+}
+
 void loop()
 {int i;
@@ -122 +160 @@
       case 'F':  _pitch+=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break;
       case 'B':  _pitch-=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break;
+<<<<<<< HEAD
       case '1':  _channel='A';  Serial.println("_channel=A"); break;
       case '2':  _channel='B';  Serial.println("_channel=B"); break;
       case '3':  _channel='C';  Serial.println("_channel=C"); break;
+=======
+      case '1':  _channel='A';  Serial.print("_channel=A"); break;
+      case '2':  _channel='B';  Serial.print("_throttle=B"); break;
+      case '3':  _channel='C';  Serial.print("_throttle=C"); break;
+      case 'x':  setThrottle(); break;
+>>>>>>> 4af2eca0d67b030ccd9d3fa1d0caa07e6c6aa26e
     }
   }