Changeset f5452ab in pyramid

Timestamp:

10/16/13 22:02:27 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

5d7bb94

Parents:

dbfae54

Message:

• ADK visual processing corrected

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -769 +769 @@
         checkSum=(16-checkSum) & B1111;// 16-sum is the formula of this helicopter
 
-        mainCode= (mainCode << 5) | (checkSum << 1); //get the last 4 digit of CheckSum
+        mainCode= (mainCode << 5) | (checkSum << 1); // get the last 4 digit of CheckSum
 
         bitWrite(mainCode,0,1);  // finish code
@@ -1076 +1076 @@
 void updateFrameADK() {
 
-        // update RGB_Panel[][] here to set next Frame you want to send
-        // For Example:
-        // RGB_Panel[0][0]=0;
-        // RGB_Panel[0][1]=0;
-        // RGB_Panel[0][2]=255;
-        // will update the LED on 1 o'clock position to be blue.
-
-        // This following code simulates when you wear a headset.
-//      RGB_Panel[5][0]=0;
-//      RGB_Panel[5][1]=255;
-//      RGB_Panel[5][2]=0;
-
-//      int attention=random(0,7); //generates 0~6
-//      int meditation=random(0,7);
-
+        Serial.print("updateFrameADK(): ");
+        Serial.print("eegSignal: ");
+        Serial.print(eegSignal, DEC);
+        Serial.print(" | eegAttention: ");
+        Serial.print(eegAttention, DEC);
+        Serial.print(" | eegMeditation: ");
+        Serial.println(eegMeditation, DEC);
+        
+        
+        setColorWheel(0, 0, 0); // black
+        
+        
+        // if the signal is good enough, light 6:00 LED in green.
+        if (eegSignal == 100) {
+                RGB_Panel[5][0]=0;
+                RGB_Panel[5][1]=255;
+                RGB_Panel[5][2]=0;
+        } else {
+                setColorWheel(255, 0, 0); // red
+//              RGB_Panel[5][0]=0;
+//              RGB_Panel[5][1]=0;
+//              RGB_Panel[5][2]=0;
+                return;
+        }
 
         int attention = calculateMeter(eegAttention);
@@ -1096 +1105 @@
 
 
-        for(int i=6; i<=6+attention; i++){
+//      for(int i=6; i<=6+attention; i++){
+//              RGB_Panel[i][0]=255;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=0;
+//      }
+// 
+//      if (meditation==6){
+//              RGB_Panel[11][0]=0;
+//              RGB_Panel[11][1]=0;
+//              RGB_Panel[11][2]=255;
+//      }
+//              
+//      for(int i=4; i>=4-meditation; i--){
+//              RGB_Panel[i][0]=0;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=255;
+//      }
+// 
+//      if (attention==6) 
+//              RGB_Panel[11][0]=255;
+//              
+//      for(int i=6+attention; i<=11; i++){
+//              RGB_Panel[i][0]=0;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=0;
+//      }
+// 
+//      for(int i=4-meditation; i>=0; i--){
+//              RGB_Panel[i][0]=0;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=0;
+//      }
+        
+        
+                //light up & dim red LED according to attention level
+        for(int i=6; i<6+attention; i++) {
                 RGB_Panel[i][0]=255;
                 RGB_Panel[i][1]=0;
                 RGB_Panel[i][2]=0;
         }
-
-        if (meditation==6){
-                RGB_Panel[11][0]=0;
-                RGB_Panel[11][1]=0;
-                RGB_Panel[11][2]=255;
-        }
-                
-        for(int i=4; i>=4-meditation; i--){
+//      for(int i=6+attention; i<11; i++) {
+//              RGB_Panel[i][0]=0;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=0;
+//      }
+
+        //light up & dim blue LED according to meditation level
+        for(int i=4; i>4-meditation; i--) {
                 RGB_Panel[i][0]=0;
                 RGB_Panel[i][1]=0;
                 RGB_Panel[i][2]=255;
         }
-
-        if (attention==6) 
-                RGB_Panel[11][0]=255;
-                
-        for(int i=6+attention; i<=11; i++){
-                RGB_Panel[i][0]=0;
-                RGB_Panel[i][1]=0;
-                RGB_Panel[i][2]=0;
-        }
-
-        for(int i=4-meditation; i>=0; i--){
-                RGB_Panel[i][0]=0;
-                RGB_Panel[i][1]=0;
-                RGB_Panel[i][2]=0;
-        }
-
-
-} // updateFrame
+//      for(int i=4-meditation; i>-1; i--) {
+//              RGB_Panel[i][0]=0;
+//              RGB_Panel[i][1]=0;
+//              RGB_Panel[i][2]=0;
+//      }
+
+
+} // updateFrameADK()
 
 
@@ -1143 +1177 @@
         sendCode(formCode(_throttle,_yaw,_pitch));
         delay(80); // originally 36, 51, 66, 80
-} // setOrbitThrottle
+        
+} // setOrbitThrottle()
 
 
@@ -1158 +1193 @@
                 if (! modeADK) {
                         modeADK = true;
+                        modeBluetooth = false;
+                        modeSerial = false;
                         Serial1.end();
                         Serial.println("INFO: parseADK connection detected, setting modeADK");
@@ -1167 +1204 @@
                 if (len > 0) {
                         
-                        setColorWheel(255,255,255); // White
+//                      setColorWheel(255,255,255); // White
                         
                         if (msg[0] == 0x1) {
@@ -1288 +1325 @@
                         }
                         
-                        setColorWheel(255,0,0); // Red
+//                      setColorWheel(255,0,0); // Red
                 
                 } // len
@@ -1303 +1340 @@
 
 
-
-
-
-
-
-