Changeset f1b827c in pyramid

Timestamp:

10/11/13 13:06:13 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

5202e8d

Parents:

94b751c

Message:

• ADK processing began

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -28 +28 @@
 Original Author: Hao Zhang <hz@puzzlebox.info>
 
-Last Modified 2013-10-09
+Last Modified 2013-10-10
 by Steve Castellotti <sc@puzzlebox.info>
 
@@ -36 +36 @@
 #include <PWM.h> //For sending 38kHz Infrared to fly Orbit helicopter
 
-
-#define DEBUG_OUTPUT 0 // 1 for debug, 2 for verbose
-
-
-byte _IR_period = 40;
-
-
-#define BUTTON_PIN 4
-/////////////Orbit Flight///////////// 
+// ADK
+#include <Max3421e.h>
+#include <Usb.h>
+#include <AndroidAccessory.h>
+
+
+#define DEBUG_OUTPUT 0 // 1 for debug
+
+
+// Orbit Flight
 #define IR 6   
 #define ON 128
 #define OFF 0
 
-//PWM IR_frequency (in Hz) required by IR
+// Push Button
+#define BUTTON_PIN 4
+
+// PWM IR_frequency (in Hz) required by IR
 #define IR_frequency 38400 
-
-//Global variables for controlling Orbit helicopter
-//variables start with "_" means global variable 
+byte _IR_period = 40;
+
+// Global variables for controlling Orbit helicopter
+// variables start with "_" means global variable 
 char _throttle=0; //32~127, default 0
 char _pitch=31; //0~63, default 31
@@ -66 +71 @@
 boolean modeADK = false;
 
-///////////////MindWave Mobile Protocol///////////
+// Android ADK
+// AndroidAccessory acc(
+//      "puzzlebox",
+// //   "PuzzleboxPyramid",
+// //   "Puzzlebox Pyramid",
+// //   "1.2",
+// //   "http://pyramid.puzzlebox.info",
+// //   "0000000012345678"
+//      "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];
+byte led;
+
+// MindWave Mobile Protocol
 #define BAUDRATE 57600
 #define DEBUGOUTPUT 0
 #define powercontrol 10
 
-// checksum variables
+// Checksum variables
 byte generatedChecksum = 0;
 byte checksum = 0; 
 int payloadLength = 0;
-byte payloadData[64] = {
-        0
-};
+byte payloadData[64] = { 0 };
 byte poorQuality = 0;
 byte attention = 0;
@@ -83 +113 @@
 byte meditation = 0;
 
-// system variables
+// System variables
 long lastReceivedPacket = 0;
 long lastLoop = 0;
@@ -89 +119 @@
 boolean bigPacket = false;
 
-///////////////Bluetooth Connection with MindWave Mobile/////////////
+// Bluetooth Connection with MindWave Mobile
 String retSymb = "+RTINQ=";//start symble when there's any return
 String slaveName = ";MindWave Mobile";// caution that ';'must be included, and make sure the slave name is right.
 int nameIndex = 0;
 int addrIndex = 0;
-
 String recvBuf;
 String slaveAddr;
-
 String connectCmd = "\r\n+CONN=";
 
-////////////RGB Panel//////////////
+// RGB Panel
 byte RGB_Panel[12][3] = {
         {0,0,0},
@@ -123 +151 @@
 /////////
 void setup() {
+        
         pinMode(13, OUTPUT);  
         Serial.begin(115200);
+
+
+        // Android ADK
+        delay(500);
+        acc.powerOn();
+        delay(2000);
+
+        if (acc.isConnected()) {
+                modeADK = true;
+                Serial.println("INFO: ADK connection detected, setting modeADK");
+        }
 
         ////////Orbit Flight///////////
@@ -140 +180 @@
         /////////////RGB////////////////
         Wire.begin(); // join i2c bus as master (address optional for master)
-
+                
+        
         //////////Bluetooth///////////
-        setupBlueToothConnection();
-        //wait 1s and flush the serial buffer
-        delay(1000);
-        Serial.flush();//delete?
-        Serial1.flush();
+        if (! modeADK) {
+                setupBlueToothConnection();
+                
+                //wait 1s and flush the serial buffer
+                setColorWheel(0,0,255);
+                delay(1000);
+                Serial.flush(); //delete?
+                Serial1.flush();
+        }
         
         
@@ -167 +212 @@
         else if (modeSerial)
                 parseSerialInput();
+        
+        else if (modeADK)
+                parseADK();
         
         
@@ -187 +235 @@
                 
                 if(att_buff>_attention_threshold) {
+                        
+                        // If detected Attention level is above the target threshold
+                        // then send the control command to fly the helicopter.
+                        // Otherwise send no control frames, which cause the helicopter
+                        // to land.
+                        
                         _throttle=85;
                         
@@ -195 +249 @@
                         
                         Serial1.flush();
-                        
+                
                 }
                 
@@ -207 +261 @@
                         Serial.println(thisLoop);
                 #endif
-                        
+                
                 lastLoop = millis();
         
         } // if (millis()-lastLoop>_IR_period)
 
-}// Main loop
+
+} // Main loop
 
 
@@ -221 +276 @@
         // Determine method for Pyramid control
         
-        while ( (! Serial.available()) & (! Serial1.available()) );
-        
-                if (Serial.available())
-                        modeSerial = true;
-                else if (Serial1.available())
-                        modeBluetooth = true;
+        while ( (! Serial.available()) & (! Serial1.available()) & (! acc.isConnected()) );
+        
+        if (Serial.available()) {
+                modeSerial = true;
+                Serial.println("INFO: Serial input command received, setting modeSerial");
+        }
+        
+        else if (Serial1.available()) {
+//              modeBluetooth = true;
+                Serial.println("INFO: Bluetooth input received, setting modeBluetooth");
+        }
+        
+        else if (acc.isConnected()) {
+                modeADK = true;
+                Serial.println("INFO: ADK connection detected, setting modeADK");
+        }
+        
         
 } // selectInput
@@ -239 +305 @@
         if(ReadOneByte() == 170) {
                 
-                if (! modeBluetooth)
-                        Serial.println("INFO: Bluetooth input command received, setting modeBluetooth");
-                        modeBluetooth = true;
+//              if (! modeBluetooth)
+//                      Serial.println("INFO: Bluetooth input command received, setting modeBluetooth");
+//                      modeBluetooth = true;
                 
                 if(ReadOneByte() == 170) {
@@ -796 +862 @@
 // ################################################################
 
+void setColorWheel(int red, int green, int blue) {
+        
+        for (int hour=0; hour < 12; hour++) {
+        
+                RGB_Panel[hour][0]=red;
+                RGB_Panel[hour][1]=green;
+                RGB_Panel[hour][2]=blue;
+        
+        }
+        
+        sendFrame(1000);
+        
+}
+
+
+// ################################################################
+
 ///////////Serial Input///////////
 void parseSerialInput() {
@@ -801 +884 @@
         if (Serial.available() > 0)  {
                 
-                if (! modeSerial)
-                        Serial.println("INFO: Serial input command received, setting modeSerial");
-                        modeSerial = true;
+//              if (! modeSerial)
+//                      Serial.println("INFO: Serial input command received, setting modeSerial");
+//                      modeSerial = true;
+                
+                
+                setColorWheel(255, 128, 0);
+                
                 
 //              Serial.print("Serial.available(): ");
@@ -834 +921 @@
         
         sendCode(formCode(_throttle,_yaw,_pitch));
-        delay(80); //originally 36, 51, 66, 80
+        delay(80); // originally 36, 51, 66, 80
 
 } // parseSerialInput()
 
 
-
-
-
-
+// ################################################################
+
+void parseADK() {
+        
+        // Android ADK
+        
+        Serial.println("parseADK()");
+        
+        if (acc.isConnected()) {
+                
+                Serial.println("acc.isConnected()");
+                
+                int len = acc.read(msg, sizeof(msg), 1);
+                
+//              if (! modeADK)
+//                      Serial.println("INFO: ADK connection detected, setting modeADK");
+//                      modeADK = true;
+                
+                
+//              Serial.println("len: ", len);
+                
+                
+                // Action taken by Arduino is tied to the message it receives from Android
+                
+//              RGB_Panel[11][0]=255;
+//              RGB_Panel[11][1]=255;
+//              RGB_Panel[11][2]=128;
+//              
+//              RGB_Panel[0][0]=255;
+//              RGB_Panel[0][1]=255;
+//              RGB_Panel[0][2]=128;
+//              
+//              RGB_Panel[1][0]=255;
+//              RGB_Panel[1][1]=255;
+//              RGB_Panel[1][2]=128;
+                
+//              setColorWheel(255, 0, 255); // purple
+                setColorWheel(255, 0, 0); // red
+                
+                sendFrame(1000);
+        
+        } // if acc.isConnected()
+
+
+} // parseADK
+
+
+
+
+
+
+
+
+
+
+
+