Diff: Global.cpp

Revision:

38:18ac0f8628bf

Parent:

36:ad6b2b81bb89

Child:

41:013df90be273

--- a/Global.cpp	Tue Mar 21 05:50:52 2017 +0000
+++ b/Global.cpp	Wed Mar 22 06:59:44 2017 +0000
@@ -69,13 +69,13 @@
 
 //----------------どこからでも使えるled,スイッチ,タイマーの一括管理-----------------------------
 Timer Global::timer;
-DigitalOut Global::led(LED2);
+//DigitalOut Global::led(LED2);
 
 //ここでINIT.csvファイルが読み込まれる
 void Global::initialize(){
     timer.start();
     memory.reset();
-    //fileread();
+    fileread();
 }
 
 //INITファイルの読み込み
@@ -84,8 +84,8 @@
     
     /************************************************************/
    
-   vector<double> param(17);
-   param = memory.readdouble(0x0,17);
+   vector<double> param = memory.readdouble(0x0,17);
+   pc.printf("read\n");
    
    setneutralpitch(param[0]);
    setmaxpitch(param[1]);
@@ -112,7 +112,7 @@
 void Global::filewrite(){
    // pc.printf("push");
     vector<double> param;
-    /*
+    
     param.push_back(getneutralpitch());
     param.push_back(getmaxpitch());
     param.push_back(getminpitch());
@@ -132,10 +132,10 @@
     param.push_back(getmaxyawplayratio());
     param.push_back(getminyawplayratio());
     param.push_back(gettrimpitchrate());
-    */
+    /*
     for(int i=0;i<17;i++){
         param.push_back(i*0.1);
-    }
+    }*/
     memory.writedouble(0x0,param);
     pc.printf("written\n");
 }