Diff: main.cpp

Revision:

2:6f9b37d8b6aa

Parent:

1:adb918553885

--- a/main.cpp	Mon Feb 19 13:09:08 2018 +0000
+++ b/main.cpp	Fri May 25 20:33:16 2018 +0000
@@ -3,10 +3,14 @@
 Serial device2(p9,p10);  //tx,rx
 BusOut myleds(LED4, LED3, LED2, LED1);
 
-int buffer2[8];
+DigitalOut scope(p21);
+
+char buffer2[4];
 int temp2;
 
-char matrix2[2][2];
+char matrix2[144][96];
+char sensorData[36][48];
+char buttonTest[2][2];
 
 int led1;
 int led2;
@@ -18,41 +22,23 @@
 
     myleds = 0;
 
-    device2.baud(19200);
+    device2.baud(115200);
 
     while(1) {
+        
+        led2 = !led2;
         temp2 = device2.getc();
         if (temp2 == 1) {
-            for (int i=0; i<2; i++) {
-                for (int j=0; j<2; j++) {
+            for (int j=0; j<36; j++) {
+                for (int i=0; i<48; i++) {
 
-                    matrix2[i][j] = device2.getc();
-                    temp2 = matrix2[i][j];
-                    if ((temp2 == 1)&&(i == 0)&&(j == 0)) {
-                        led1 = 1;
-                    } else if ((i == 0)&&(j == 0)) {
-                        led1 = 0;
-                    }
-                    if ((temp2 == 1)&&(i == 0)&&(j == 1)) {
-                        led2 = 2;
-                    } else if ((i == 0)&&(j == 1)) {
-                        led2 = 0;
-                    }
-                    if ((temp2 == 1)&&(i == 1)&&(j == 0)) {
-                        led3 = 4;
-                    } else if ((i == 1)&&(j == 0)) {
-                        led3 = 0;
-                    }
-                    if ((temp2 == 1)&&(i == 1)&&(j == 1)) {
-                        led4 = 8;
-                    } else if ((i == 1)&&(j == 1)) {
-                        led4 = 0;
-                    }
+                    sensorData[i][j] = device2.getc();
 
                 }
             }
-            myleds = led1 + led2 + led3 + led4;
+            scope = !scope;
+            led1 = !led1;
+            temp2 = 0;
         }
     }
-
-}
\ No newline at end of file
+}