Changeset 77a80d3 in pyramid

Timestamp:

10/16/13 19:39:18 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

dbfae54

Parents:

f5d44ec

Message:

• Bluetooth and USB modes should be production ready

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -38 +38 @@
 
 // ADK
-// #include <Max3421e.h>
-// #include <Usb.h>
-// #include <AndroidAccessory.h>
+#include <Max3421e.h>
+#include <Usb.h>
+#include <AndroidAccessory.h>
 
 
@@ -77 +77 @@
 boolean modeSerial = false;
 boolean modeADK = false;
+
+// Android ADK
+// AndroidAccessory acc(
+//      "puzzlebox",
+//      "PuzzleboxPyramid",
+//      "Puzzlebox Pyramid",
+//      "1.2",
+//      "http://pyramid.puzzlebox.info",
+//      "0000000012345678"
+// );
+
+AndroidAccessory acc(
+        "puzzlebox",
+        "TriggerRemote",
+        "DemoKit Arduino Board",
+        "1.0",
+        "http://www.android.com",
+        "0000000012345678"
+);
+
+byte msg[2];
+byte led;
 
 // MindWave Mobile Protocol
@@ -134 +156 @@
         pinMode(13, OUTPUT);  
         Serial.begin(115200);
-
+        
         // Android ADK
 //      delay(500);
 //      acc.powerOn();
-
+        
         
         ////////Orbit Flight///////////
         // initialize all timers except for 0, to save time keeping functions
         InitTimersSafe(); 
-
+        
         // sets the IR_frequency for the specified pin
         bool success = SetPinFrequencySafe(IR, IR_frequency);
-
+        
         // if the pin IR_frequency was set successfully, turn pin 13 on
         if(success) {
                 Serial.println("INFO: PWM pin frequency set");  
         }
-
+        
         /////////////RGB////////////////
         Wire.begin(); // join i2c bus as master (address optional for master)
-
+        
         
         setStartScreen();
+        delay(1000); // Take a second after startup to receive any USB Serial input
         
         
@@ -168 +191 @@
         //////////Bluetooth///////////
         
-        if (! modeADK) {
+        if ( (! modeADK) & (! Serial.available()) ) {
                 
 //              delay(500);
-        
+                
                 setupBlueToothConnection();
-                // wait 1s and flush the serial buffer
+                
+                // wait 1s and flush the Bluetooth serial buffer
                 delay(1000);
-//              Serial.flush(); //delete?
                 Serial1.flush();
         
@@ -211 +234 @@
         }
         else {
-                RGB_Panel[11][0]=0;
-                RGB_Panel[11][1]=0;
-                RGB_Panel[11][2]=0;
+//              RGB_Panel[11][0]=0;
+//              RGB_Panel[11][1]=0;
+//              RGB_Panel[11][2]=0;
                 digitalWrite(13,LOW);
         }
@@ -362 +385 @@
                                         
                                         
-                                        if (poorQuality == 200)
+//                                      if (poorQuality == 200)
+                                        if (poorQuality != 0)
                                                 setColorWheel(0,255,0); // Green
+//                                              return;
                                         
                                         
                                         // Update RGB Panel when received data from MindWave Mobile
                                         int att, med;
-                                        if(attention==0) att=0;
-                                                else att=(attention-1)/20+1;
-                                        if(meditation==0) med=0;
-                                                else med=(meditation-1)/20+1;
+                                        if (attention==0)
+                                                att=0;
+                                        else
+                                                att=(attention-1)/20+1;
+                                        
+                                        if (meditation==0)
+                                                med=0;
+                                        else
+                                                med=(meditation-1)/20+1;
                                         
                                         att_buff=attention;
@@ -380 +410 @@
                                                 RGB_Panel[11][2]=128;
                                         }
-                                        else{
-                                                RGB_Panel[11][0]=0;
-                                                RGB_Panel[11][1]=0;
-                                                RGB_Panel[11][2]=0;
+                                        else {
+                                                if (poorQuality == 0) {
+                                                        RGB_Panel[11][0]=0;
+                                                        RGB_Panel[11][1]=0;
+                                                        RGB_Panel[11][2]=0;
+                                                }
                                         }
                                         
@@ -529 +561 @@
                 Serial1.print("\r\n+STAUTO=1\r\n");// Permit Auto-connection 
                 //update bottom RGB LED to blue
+                setColorWheel(0,0,0); // Black
                 RGB_Panel[5][0]=0;
                 RGB_Panel[5][1]=0;
@@ -539 +572 @@
         //If Bluetooth connection is established, top LED blue.
         // Otherwise top LED red.
-        if(digitalRead(5)){//D5 for Pyramid Shield, A1 for testing
-                RGB_Panel[11][0]=0;
-                RGB_Panel[11][1]=0;
-                RGB_Panel[11][2]=255;
-                sendFrame(0);
-        }
-        else{
-                RGB_Panel[11][0]=255;
-                RGB_Panel[11][1]=0;
-                RGB_Panel[11][2]=0;
-                sendFrame(0);
-        }
+//      if(digitalRead(5)){//D5 for Pyramid Shield, A1 for testing
+//              RGB_Panel[11][0]=0;
+//              RGB_Panel[11][1]=0;
+//              RGB_Panel[11][2]=255;
+//              sendFrame(0);
+//      }
+//      else{
+//              RGB_Panel[11][0]=255;
+//              RGB_Panel[11][1]=0;
+//              RGB_Panel[11][2]=0;
+//              sendFrame(0);
+//      }
         
 }
@@ -574 +607 @@
                 RGB_Panel[5][1]=255;
                 RGB_Panel[5][2]=0;
-        }
-        else {
-                RGB_Panel[5][0]=0;
-                RGB_Panel[5][1]=0;
-                RGB_Panel[5][2]=0;
-                
-                //Make top LED green, indicating valid bluetooth connection
-                RGB_Panel[11][0]=0;
-                RGB_Panel[11][1]=255;
-                RGB_Panel[11][2]=0;
-        }
+        } else
+                return;
+//      else {
+//              RGB_Panel[5][0]=0;
+//              RGB_Panel[5][1]=0;
+//              RGB_Panel[5][2]=0;
+//              
+//              //Make top LED green, indicating valid bluetooth connection
+//              RGB_Panel[11][0]=0;
+//              RGB_Panel[11][1]=255;
+//              RGB_Panel[11][2]=0;
+//      }
 
 
@@ -703 +737 @@
                 bitWrite(mainCode,15,0); //this digit equals 0 in channel A or B
 
-        for (n=6; n>=0; n--)  bitWrite(mainCode,8+n,bitRead(yaw,n));//yaw
+        for (n=6; n>=0; n--)
+                bitWrite(mainCode,8+n,bitRead(yaw,n));//yaw
 
         //channel selection second half
@@ -726 +761 @@
 
         bitWrite(mainCode,0,1);  // finish code
+        
         return mainCode; // mainCode is a 29 bit binary number
+        
 } // formCode
 
@@ -994 +1031 @@
         }
         
+//      sendCode(formCode(_throttle,_yaw,_pitch));
+//      delay(80); // originally 36, 51, 66, 80
+
+} // parseSerialInput()
+
+
+// ################################################################
+
+int calculateMeter(int value) {
+  
+        int result = 0;
+
+        if (value == 0)
+                result = 0;
+        else if (value <= 20)
+                result = 1;
+        else if (value <= 40)
+                result = 2;
+        else if (value <= 60)
+                result = 3;
+        else if (value <= 80)
+                result = 4;
+        else if (value <= 100)
+                result = 5;
+
+        return(result);
+  
+} // calculateMeter
+
+
+// ################################################################
+
+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);
+
+
+        int attention = calculateMeter(eegAttention);
+        int meditation = calculateMeter(eegMeditation);
+
+
+        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;
+        }
+
+
+} // updateFrame
+
+
+// ################################################################
+
+void setOrbitThrottle(int throttle) {
+        
+        setColorWheel(255,255,0); // Yellow
+        
+        _throttle=throttle;
+        setThrottle();
         sendCode(formCode(_throttle,_yaw,_pitch));
         delay(80); // originally 36, 51, 66, 80
-
-} // parseSerialInput()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // setOrbitThrottle
+
+
+// ################################################################
+
+void parseADK() {
+        
+        // Android ADK
+        
+        if (acc.isConnected()) {
+                
+                int len = acc.read(msg, sizeof(msg), 1);
+                
+                if (! modeADK) {
+                        Serial.println("INFO: ADK connection detected, setting modeADK");
+                        modeADK = true;
+                }
+                
+                // Action taken by Arduino is tied to the message it receives from Android
+                
+                if (len > 0) {
+                        
+                        setColorWheel(255,255,255); // White
+                        
+                        if (msg[0] == 0x1) {
+                                // Reserved
+                        }
+                        else if(msg[0] == 0x2) {
+                                // Reserved
+                        }
+                        else if (msg[0] == 0x3) {
+                                // Reserved
+                        }
+                        
+                        // EEG Signal
+                        else if (msg[0] == 0x4) {
+                                eegSignal = 0;
+                                if (msg[1] == 0x1) {
+                                        eegSignal = 10;
+                                } else if (msg[1] == 0x2) {
+                                        eegSignal = 20;
+                                } else if (msg[1] == 0x3) {
+                                        eegSignal = 30;
+                                } else if (msg[1] == 0x4) {
+                                        eegSignal = 40;
+                                } else if (msg[1] == 0x5) {
+                                        eegSignal = 50;
+                                } else if (msg[1] == 0x6) {
+                                        eegSignal = 60;
+                                } else if (msg[1] == 0x7) {
+                                        eegSignal = 70;
+                                } else if (msg[1] == 0x8) {
+                                        eegSignal = 80;
+                                } else if (msg[1] == 0x9) {
+                                        eegSignal = 90;
+                                } else {
+                                        eegSignal = 100;
+                                }
+                        }
+                        
+                        
+                        // EEG Attention
+                        else if (msg[0] == 0x5) {
+                                eegAttention = 0;
+                                if (msg[1] == 0x1) {
+                                        eegAttention = 10;
+                                } else if (msg[1] == 0x2) {
+                                        eegAttention = 20;
+                                } else if (msg[1] == 0x3) {
+                                        eegAttention = 30;
+                                } else if (msg[1] == 0x4) {
+                                        eegAttention = 40;
+                                } else if (msg[1] == 0x5) {
+                                        eegAttention = 50;
+                                } else if (msg[1] == 0x6) {
+                                        eegAttention = 60;
+                                } else if (msg[1] == 0x7) {
+                                        eegAttention = 70;
+                                } else if (msg[1] == 0x8) {
+                                        eegAttention = 80;
+                                } else if (msg[1] == 0x9) {
+                                        eegAttention = 90;
+                                } else {
+                                        eegAttention = 100;
+                                }
+                        }
+                        
+                        
+                        // EEG Meditation
+                        else if (msg[0] == 0x6) {
+                                eegMeditation = 0;
+                                if (msg[1] == 0x1) {
+                                        eegMeditation = 10;
+                                } else if (msg[1] == 0x2) {
+                                        eegMeditation = 20;
+                                } else if (msg[1] == 0x3) {
+                                        eegMeditation = 30;
+                                } else if (msg[1] == 0x4) {
+                                        eegMeditation = 40;
+                                } else if (msg[1] == 0x5) {
+                                        eegMeditation = 50;
+                                } else if (msg[1] == 0x6) {
+                                        eegMeditation = 60;
+                                } else if (msg[1] == 0x7) {
+                                        eegMeditation = 70;
+                                } else if (msg[1] == 0x8) {
+                                        eegMeditation = 80;
+                                } else if (msg[1] == 0x9) {
+                                        eegMeditation = 90;
+                                } else {
+                                        eegMeditation = 100;
+                                }
+                        }
+                        
+                        
+//                      updateFrame(eegAttention, eegMeditation, eegSignal);
+                        updateFrameADK();
+                        
+                        
+                        // Orbit Throttle
+                        if (msg[0] == 0x7) {
+                                
+                                Serial.println(" (msg[0] == 0x7) ");
+                                
+                                int throttle = 0;
+                                
+                                if (msg[1] == 0x1) {
+                                        throttle = _throttle_hover;
+                                        Serial.println(" (msg[1] == 0x1) ");
+}
+                                else if (msg[1] == 0x0)
+                                        Serial.println(" (msg[1] == 0x0) ");
+                                
+                                setOrbitThrottle(throttle);
+                        
+                        } else {
+                                
+//                              sendFrame(1000);
+                                sendFrame(0);
+                                sendCode(formCode(_throttle,_yaw,_pitch));
+                                delay(80); //cycle();
+                        }
+                        
+                        setColorWheel(255,0,0); // Red
+                
+                } // len
+                else {
+//                      setColorWheel(255, 0, 0); // red
+                        delay(80); //cycle();
+                }
+        } // if acc.isConnected()
+
+
+} // parseADK
+
+