Changeset 8dc32b3 in pyramid

Timestamp:

10/24/13 16:25:34 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

a0ef241

Parents:

5d7bb94

Message:

• receving entire eegPower value as single byte

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -89 +89 @@
 //);
 
- AndroidAccessory acc(
-        "puzzlebox",
-        "TriggerRemote",
-        "DemoKit Arduino Board",
-        "1.0",
-        "http://www.android.com",
-        "0000000012345678"
- );
+AndroidAccessory acc(
+        "puzzlebox",
+        "TriggerRemote",
+        "DemoKit Arduino Board",
+        "1.0",
+        "http://www.android.com",
+        "0000000012345678"
+);
 
 byte msg[2];
@@ -196 +196 @@
 //              delay(500);
                 
-                setupBlueToothConnection();
+//              setupBlueToothConnection();
                 
                 // wait 1s and flush the Bluetooth serial buffer
@@ -1052 +1052 @@
 
 int calculateMeter(int value) {
-  
+
         int result = 0;
 
@@ -1069 +1069 @@
 
         return(result);
-  
+
 } // calculateMeter
 
@@ -1316 +1316 @@
                         
                         // EEG Power
+//                      else if (msg[0] == 0x7) {
+//                              Serial.println("0x7");
+//                              eegPower = 0;
+//                              if (msg[1] == 0x1) {
+//                                      eegPower = 10;
+//                              } else if (msg[1] == 0x2) {
+//                                      eegPower = 20;
+//                              } else if (msg[1] == 0x3) {
+//                                      eegPower = 30;
+//                              } else if (msg[1] == 0x4) {
+//                                      eegPower = 40;
+//                              } else if (msg[1] == 0x5) {
+//                                      eegPower = 50;
+//                              } else if (msg[1] == 0x6) {
+//                                      eegPower = 60;
+//                              } else if (msg[1] == 0x7) {
+//                                      eegPower = 70;
+//                              } else if (msg[1] == 0x8) {
+//                                      eegPower = 80;
+//                              } else if (msg[1] == 0x9) {
+//                                      eegPower = 90;
+//                              } else {
+//                                      eegPower = 100;
+//                                      Serial.println("0xa");
+//                              }
+//                      }
+
+
                         else if (msg[0] == 0x7) {
                                 Serial.println("0x7");
-                                eegPower = 0;
-                                if (msg[1] == 0x1) {
-                                        eegPower = 10;
-                                } else if (msg[1] == 0x2) {
-                                        eegPower = 20;
-                                } else if (msg[1] == 0x3) {
-                                        eegPower = 30;
-                                } else if (msg[1] == 0x4) {
-                                        eegPower = 40;
-                                } else if (msg[1] == 0x5) {
-                                        eegPower = 50;
-                                } else if (msg[1] == 0x6) {
-                                        eegPower = 60;
-                                } else if (msg[1] == 0x7) {
-                                        eegPower = 70;
-                                } else if (msg[1] == 0x8) {
-                                        eegPower = 80;
-                                } else if (msg[1] == 0x9) {
-                                        eegPower = 90;
-                                } else {
-                                        eegPower = 100;
-                                        Serial.println("0xa");
-                                }
+//                              eegPower = 0;
+//                              if (msg[1] == 0x1) {
+                                        eegPower = (int)msg[1];
+                                        Serial.print("eegPower ");
+                                        Serial.println(eegPower);
+//                              }
                         }
-                        
-                        
-// //                   updateFrame(eegAttention, eegMeditation, eegSignal);
-//                      updateFrameADK();
-                        
-                        
+
                         
                         
@@ -1353 +1359 @@
                         else if (msg[0] == 0x8) {
                                 
-                                Serial.println(" (msg[0] == 0x8) ");
+//                              Serial.println(" (msg[0] == 0x8) ");
                                 
                                 if (msg[1] == 0x1) {
                                         setColorWheel(255,255,255); // White
                                         _throttle = _throttle_hover;
-                                        Serial.println(" (msg[1] == 0x1) ");
+//                                      Serial.println(" (msg[1] == 0x1) ");
                                 }
                                 else if (msg[1] == 0x0) {
                                         setColorWheel(255,0,0); // Red
-                                        Serial.println(" (msg[1] == 0x0) ");
+//                                      Serial.println(" (msg[1] == 0x0) ");
                                         _throttle = 0;
                                 }
@@ -1368 +1374 @@
                         } // (msg[0] == 0x8)
                 
+                
+// //                   updateFrame(eegAttention, eegMeditation, eegSignal);
+//                      updateFrameADK();
+                
+                
                 } // len
                 
@@ -1380 +1391 @@
 
 
+
+