Diff: main.cpp

Revision:

7:7ba672b401ca

Parent:

6:2c32373e7628

Child:

8:19d636daf453

--- a/main.cpp	Mon Feb 13 13:17:37 2017 +0000
+++ b/main.cpp	Sat Feb 25 08:04:29 2017 +0000
@@ -10,14 +10,14 @@
 #define OFF     (0)
 
 #define SAMPLING_RATE   (0.001)     /* A/D sampling rate (1kHz) */
-#define MAINCYCLE 100               /* [us] */
+#define MAINCYCLE 2000               /* [us] */
 
 #define INT16_MAX     (32767)
 #define INT16_MIN     (-32768)
 /*
 #define DEBUG
+#define TESTCOM
 */
-#define TESTCOM
 union u64_dataType_g
 {
     double DData;
@@ -98,9 +98,8 @@
     #ifdef TESTCOM_
     pc.printf("send: %d,%lf\t\r\n", i,InputData);
     #endif
-
-    InputData = 3.25;
             __disable_irq(); // 禁止
+            //aout= InputData / 3.3;
             sendData = Communicaion(InputData,1);
             __enable_irq(); // 許可
             /* フラグリセット */
@@ -168,9 +167,8 @@
     
     int i;
     u64_dataType_g sendData;    
-    // sendData.DData = data;
-    sendData.DData = 3.25;
-
+    sendData.DData = data;
+    
     LPC_PINCON->PINSEL0 &= ~(3 << 4);
     LPC_PINCON->PINSEL0 |= (1 << 4);    //  TXD0 (01)
  
@@ -204,6 +202,7 @@
    double Result = 0;
    
    Result = (double)wave_in.read()*3.3;
+   /*aout= Result / 3.3;*/
    
    return Result;
 }