Diff: main.cpp

Branch:

?????

Revision:

55:1db68795bccf

Parent:

53:947eff37d01d

Child:

56:b39ffd94aa54

--- a/main.cpp	Fri Jun 16 12:25:26 2017 +0000
+++ b/main.cpp	Fri Jun 30 06:30:49 2017 +0000
@@ -11,7 +11,7 @@
 #define THRESHOLD_OH_VALUE 0.14
 #define SAMPLE_INTERVAL 0.05
 
-#define PITCH_PER_ROLL 1.5//pitchがrollの何倍影響するかを示す値
+#define PITCH_PER_ROLL 1.0//pitchがrollの何倍影響するかを示す値
 #define AVE_NUM 100
 
 /*
@@ -19,17 +19,17 @@
 */
 
 //-----------------------------------(resetInterrupt def)
-extern "C" void mbed_reset();
-InterruptIn resetPin(p22);
-Timer resetTimeCount;
-void resetInterrupt()
-{
-    while(resetPin) {
-        resetTimeCount.start();
-        if(resetTimeCount.read()>3) mbed_reset();
-    }
-    resetTimeCount.reset();
-}
+//extern "C" void mbed_reset();
+//InterruptIn resetPin(p22);
+//Timer resetTimeCount;
+//void resetInterrupt()
+//{
+//    while(resetPin) {
+//        resetTimeCount.start();
+//        if(resetTimeCount.read()>3) mbed_reset();
+//    }
+//    resetTimeCount.reset();
+//}
 //-------------------------------------------------------
 
 CAN can_R(p30,p29);
@@ -101,7 +101,6 @@
     toKeikiSerial.putc(';');
     for(int i = 0; i < YOKUTAN_DATAS_NUM; i++) {
         toKeikiSerial.putc(yokutanDatas_R[i]);
-
     }
     for(int i = 0; i < YOKUTAN_DATAS_NUM; i++) {
         toKeikiSerial.putc(yokutanDatas_L[i]);
@@ -117,8 +116,8 @@
 void init()
 {
 //--------------------------------------(resetInterrupt init)
-    resetPin.rise(resetInterrupt);
-    resetPin.mode(PullDown);
+    //resetPin.rise(resetInterrupt);
+   // resetPin.mode(PullDown);
 //-----------------------------------------------------------
 //    sendDatasTicker.attach(SendDatas,SEND_DATAS_TIME);
     for(int i = 0; i < INPUT_DATAS_NUM; i++) {