Changeset 654b7d4 in pyramid

Timestamp:

10/24/13 20:53:04 (7 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master

Children:

e704a9e

Parents:

33c578b

Message:

• setColor() added for USB Serial mode
• parseColorWheel() added for USB Serial mode

File:

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

firmware/Puzzlebox_Pyramid/Puzzlebox_Pyramid.ino

@@ -307 +307 @@
                 modeSerial = true;
                 Serial.println("INFO: Serial input command received, setting modeSerial");
+                setColorWheel(255, 128, 0);
         }
         
@@ -902 +903 @@
 // ################################################################
 
+void setColor() {
+        
+        char inByte=0;
+        
+        int position=0;
+        
+        int p1=0;
+        int p2=0;
+        
+        int red=0;
+        int blue=0;
+        int green=0;
+        
+        int r1=0;
+        int r2=0;
+        int r3=0;
+
+        int g1=0;
+        int g2=0;
+        int g3=0;
+
+        int b1=0;
+        int b2=0;
+        int b3=0;
+        
+        
+        while (Serial.available() == 0);
+        p1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        p2 = Serial.read() - '0';
+        
+        while (Serial.available() == 0);
+        r1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        r2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        r3 = Serial.read() - '0';
+        
+        while (Serial.available() == 0);
+        g1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        g2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        g3 = Serial.read() - '0';
+        
+        while (Serial.available() == 0);
+        b1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        b2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        b3 = Serial.read() - '0';
+        
+        
+        position = (p1 * 10) + p2;
+        
+        red = (r1 * 100) + (r2 * 10) + r3;
+        green = (g1 * 100) + (g2 * 10) + g3;
+        blue = (b1 * 100) + (b2 * 10) + b3;
+        
+        
+        RGB_Panel[position][0]=red;
+        RGB_Panel[position][1]=green;
+        RGB_Panel[position][2]=blue;
+        
+        sendFrame(0);
+        
+        
+        Serial.print("Color(");
+        Serial.print(red);
+        Serial.print(",");
+        Serial.print(green);
+        Serial.print(",");
+        Serial.print(blue);
+        Serial.print(") - Position[");
+        Serial.print(position);
+        Serial.println("]");
+
+
+} // setColor()
+
+
+// ################################################################
+
+void parseColorWheel() {
+        
+        char inByte=0;
+        
+        int red=0;
+        int blue=0;
+        int green=0;
+        
+        int r1=0;
+        int r2=0;
+        int r3=0;
+
+        int g1=0;
+        int g2=0;
+        int g3=0;
+
+        int b1=0;
+        int b2=0;
+        int b3=0;
+        
+        
+        while (Serial.available() == 0);
+        r1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        r2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        r3 = Serial.read() - '0';
+        
+        while (Serial.available() == 0);
+        g1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        g2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        g3 = Serial.read() - '0';
+        
+        while (Serial.available() == 0);
+        b1 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        b2 = Serial.read() - '0';
+        while (Serial.available() == 0);
+        b3 = Serial.read() - '0';
+        
+        
+        red = (r1 * 100) + (r2 * 10) + r3;
+        green = (g1 * 100) + (g2 * 10) + g3;
+        blue = (b1 * 100) + (b2 * 10) + b3;
+        
+        
+        setColorWheel(red,green,blue);
+        
+        
+        Serial.print("ColorWheel(");
+        Serial.print(red);
+        Serial.print(",");
+        Serial.print(green);
+        Serial.print(",");
+        Serial.print(blue);
+        Serial.println(")");
+
+
+} // parseColorWheel()
+
+
+// ################################################################
+
 void setColorWheel(int red, int green, int blue) {
         
@@ -966 +1115 @@
         if (Serial.available() > 0)  {
                 
-                if (! modeSerial)
+                if (! modeSerial) {
                         Serial.println("INFO: Serial input command received, setting modeSerial");
+                        setColorWheel(255, 255, 0);
                         modeSerial = true;
                         
@@ -973 +1123 @@
                         modeBluetooth = false;
                         modeADK = false;
-                
-                
-                setColorWheel(255, 128, 0);
-                
+                }
                 
                 _command = Serial.read();
@@ -1000 +1147 @@
                         case 'y':  setYaw(); break;
                         case 'x':  setThrottle(); break;
+                        case 'c':  setColor(); break;
+                        case 'Y':  setColorWheel(255, 255, 0); break;
+                        case 'w':  parseColorWheel(); break;
                 }
         }
@@ -1226 +1376 @@
 
 
+
+
+
+
+
+
+