Changeset dbfae54 in pyramid

Timestamp:

10/16/13 20:11:36 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

f5452ab

Parents:

77a80d3

Message:

• parseADK() re-enabled

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -79 +79 @@
 
 // Android ADK
+AndroidAccessory acc(
+        "puzzlebox",
+        "PuzzleboxPyramid",
+        "Puzzlebox Pyramid",
+        "1.2",
+        "http://pyramid.puzzlebox.info",
+        "0000000000000000"
+);
+
 // AndroidAccessory acc(
 //      "puzzlebox",
-//      "PuzzleboxPyramid",
-//      "Puzzlebox Pyramid",
-//      "1.2",
-//      "http://pyramid.puzzlebox.info",
+//      "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];
@@ -158 +158 @@
         
         // Android ADK
-//      delay(500);
-//      acc.powerOn();
+        delay(500);
+        acc.powerOn();
         
         
@@ -182 +182 @@
         
         
-//      if (acc.isConnected()) {
-//              modeADK = true;
-//              Serial.println("INFO: ADK connection detected, setting modeADK");
-//              setColorWheel(255, 0, 0); // red
-//      }
+        if (acc.isConnected()) {
+                modeADK = true;
+                Serial.println("INFO: ADK connection detected, setting modeADK");
+                setColorWheel(255, 0, 0); // red
+        }
         
         
@@ -216 +216 @@
 void loop() {
         
-        if (modeBluetooth)
-                parseBluetooth();
+//      if (acc.isConnected()) {
+//              modeADK = true;
+//              Serial1.end();
+//              Serial.println("INFO: [LOOP] ADK connection detected, setting modeADK");
+//              setColorWheel(255, 0, 0); // red
+//      }
+        
+//      if (modeADK)
+        if (acc.isConnected())
+                parseADK();
         
         else if (modeSerial)
                 parseSerialInput();
+        
+        else if (modeBluetooth)
+                parseBluetooth();
         
 //      else if (modeADK)
@@ -273 +284 @@
         // Determine method for Pyramid control
         
-        while ( (! Serial.available()) & (! Serial1.available()) );
-        
-                if (Serial.available()) {
-                        modeSerial = true;
-                        Serial.println("INFO: Serial input command received, setting modeSerial");
-                }
-                
-                else if (Serial1.available()) {
-                        modeBluetooth = true;
-                        setColorWheel(0,0,255); // Blue
-                        Serial.println("INFO: Bluetooth input received, setting modeBluetooth");
-                }
-        
-        
-//      while ( (! Serial.available()) & (! Serial1.available()) & (! acc.isConnected()) );
+//      while ( (! Serial.available()) & (! Serial1.available()) );
 //      
-//      if (Serial.available()) {
-//              modeSerial = true;
-//              Serial.println("INFO: Serial input command received, setting modeSerial");
-//      }
-//      
-//      else if (acc.isConnected()) {
-//              modeADK = true;
-//              Serial1.end();
-//              Serial.println("INFO: ADK connection detected, setting modeADK");
-//              setColorWheel(255, 0, 0); // red
-//      }
-//      
-//      else if (Serial1.available()) {
-//              modeBluetooth = true;
-//              Serial.println("INFO: Bluetooth input received, setting modeBluetooth");
-//      }
+//              if (Serial.available()) {
+//                      modeSerial = true;
+//                      Serial.println("INFO: Serial input command received, setting modeSerial");
+//              }
+//              
+//              else if (Serial1.available()) {
+//                      modeBluetooth = true;
+//                      setColorWheel(0,0,255); // Blue
+//                      Serial.println("INFO: Bluetooth input received, setting modeBluetooth");
+//              }
+        
+        
+        while ( (! Serial.available()) & (! Serial1.available()) & (! acc.isConnected()) );
+        
+        if (Serial.available()) {
+                modeSerial = true;
+                Serial.println("INFO: Serial input command received, setting modeSerial");
+        }
+        
+        else if (acc.isConnected()) {
+                modeADK = true;
+                Serial1.end();
+                Serial.println("INFO: ADK connection detected, setting modeADK");
+                setColorWheel(255, 0, 0); // red
+        }
+        
+        else if (Serial1.available()) {
+                modeBluetooth = true;
+                Serial.println("INFO: Bluetooth input received, setting modeBluetooth");
+        }
         
         
@@ -1146 +1157 @@
                 
                 if (! modeADK) {
-                        Serial.println("INFO: ADK connection detected, setting modeADK");
                         modeADK = true;
+                        Serial1.end();
+                        Serial.println("INFO: parseADK connection detected, setting modeADK");
+                        setColorWheel(255, 0, 0); // red
                 }
                 
@@ -1288 +1301 @@
 
 
+
+
+
+
+
+
+
+