X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=yue%2Fmain.cpp;h=150be36fd8ce0c1c93b356f99a62baa409ed72bf;hb=d79f24cc277e31d7848f9683bac599339348aa44;hp=218b27a9bbf8e96336ff8667e510d8c93f493063;hpb=fc3721b2f7f7acd9dae5340615b434f68b811b28;p=~andy%2Fcsm213a-hw

diff --git a/yue/main.cpp b/yue/main.cpp
index 218b27a..150be36 100644
--- a/yue/main.cpp
+++ b/yue/main.cpp
@@ -87,7 +87,13 @@ MMA8451Q   accSensor(PTE25, PTE24, MMA8451_I2C_ADDRESS);
 MAG3110    magSensor(PTE25, PTE24);
 TSISensor  tchSensor;
 AnalogIn   lgtSensor(PTE22);
-AnalogIn   a2dSensor(A0);
+
+AnalogIn   a2dSensor0(A0);
+AnalogIn   a2dSensor1(A1);
+AnalogIn   a2dSensor2(A2);
+AnalogIn   a2dSensor3(A3);
+AnalogIn   a2dSensor4(A4);
+AnalogIn   a2dSensor5(A5);
 
 AnalogOut  a2dOutput(PTE30);
 
@@ -220,7 +226,7 @@ void clock1_interrupt(void){
     static int ledCnt;
 
     // Write A2D output sine wave
-    a2dOutput.write(sin(a2dCnt * TIME_ACCURACY * (2*PI) * 0.1));
+    //a2dOutput.write(sin(a2dCnt * TIME_ACCURACY * (2*PI) * 0.1));
 
     // Send data through Serial
     if (accEnable && accCnt >= (int)(accTmr/TIME_ACCURACY+0.5)){
@@ -373,12 +379,12 @@ void sendTchInfo(void){
 
 void sendA2dInfo(void){
     float a2dData[6];
-    a2dData[0] = a2dSensor.read();
-    a2dData[1] = 0;
-    a2dData[2] = 0;
-    a2dData[3] = 0;
-    a2dData[4] = 0;
-    a2dData[5] = 0;
+    a2dData[0] = a2dSensor0.read();
+    a2dData[1] = a2dSensor1.read();
+    a2dData[2] = a2dSensor2.read();
+    a2dData[3] = a2dSensor3.read();
+    a2dData[4] = a2dSensor4.read();
+    a2dData[5] = a2dSensor5.read();
     int len = packToFrame(txFrame, SNS_A2D, TYP_F32, 6, a2dData);
 
     printStr("[A2D] data=%2.2f %2.2f %2.2f %2.2f %2.2f %2.2f\r\n",