Changeset 124e727 in pyramid

Timestamp:

10/24/13 17:31:41 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

faaefd5

Parents:

a0ef241

Message:

• Orbit Channel setting added

File:

• firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino (modified) (5 diffs)

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -68 +68 @@
 char _channel='A';
 char _command;
-byte _attention_threshold = 67; //treshold for launching Orbit helicopter
+byte _attention_threshold = 70; //treshold for launching Orbit helicopter
 int _throttle_hover=85;
 
@@ -1228 +1228 @@
                         }
                         
+                        else if (msg[0] == 0x8) {
+                                Serial.println("0x8");
+                                if (msg[1] == 0x1)
+                                        _channel = 'A';
+                                else if (msg[1] == 0x2)
+                                        _channel = 'B';
+                                else if (msg[1] == 0x3)
+                                        _channel = 'C';
+                                Serial.println(_channel);
+                        }
+                        
                         
                         // Orbit Hover
-                        else if (msg[0] == 0x8) {
-                                
-//                              Serial.println(" (msg[0] == 0x8) ");
+                        else if (msg[0] == 0x9) {
                                 
                                 if (msg[1] == 0x1) {
@@ -1239 +1248 @@
                                         _yaw = DEFAULT_YAW;
                                         _pitch = DEFAULT_PITCH;
-//                                      Serial.println(" (msg[1] == 0x1) ");
                                 }
                                 else if (msg[1] == 0x0) {
                                         setColorWheel(255,0,0); // Red
-//                                      Serial.println(" (msg[1] == 0x0) ");
-//                                      _throttle = 0;
                                         _throttle = DEFAULT_THROTTLE;
                                         _yaw = DEFAULT_YAW;
@@ -1250 +1256 @@
                                 }
                                 
-                        } // (msg[0] == 0x8)
+                        } // Hover
                 
                 
@@ -1268 +1274 @@
 } // parseADK
 
-
-
-
-
-