Diff: main.cpp

Revision:

3:21fb6b67bb54

Parent:

2:5d86b09dd7d8

Child:

4:10a3b9d4d219

--- a/main.cpp	Thu Oct 19 08:41:21 2017 +0000
+++ b/main.cpp	Thu Oct 19 13:41:29 2017 +0000
@@ -72,17 +72,25 @@
 InLPF ArmSense2[4] = {InLPF(LP),InLPF(LP),InLPF(LP),InLPF(LP)};
 #if !CALIB
 //1号機
+
+uint16_t MinimumRangeR[4] = {1280,41414,15872,34304};
+uint16_t MaxmumRangeR[4] = {45312,52242,54272,11776};
+uint16_t MinimumRangeL[4] = {23040,18432,24576,58112};
+uint16_t MaxmumRangeL[4] = {45312,58112,59392,30976};
+
 /*
-uint16_t MinimumRangeR[4] = {25700,39300,21760,53000};
-uint16_t MaxmumRangeR[4] = {44000,52600,54270,27600};
-uint16_t MinimumRangeL[4] = {20600,28500,2114,33300};
-uint16_t MaxmumRangeL[4] = {44000,43300,58900,6021};
+uint16_t MinimumRangeR[4] = {1280,42240,36096,17152};
+uint16_t MaxmumRangeR[4] = {45312,52992,58624,41216};
+uint16_t MinimumRangeL[4] = {23040,18432,24576,58112};
+uint16_t MaxmumRangeL[4] = {45312,58112,59392,30976};
+*/
 //2号機
-*/
+/*
 uint16_t MinimumRangeR[4] = {19900,38656,36096,17152};
 uint16_t MaxmumRangeR[4] = {43260,53760,58624,41216};
 uint16_t MinimumRangeL[4] = {21500,19400,8448,57088};
 uint16_t MaxmumRangeL[4] = {43520,38900,38400,30208};
+*/
 #endif
 #if CALIB
 uint16_t MinimumRangeR[4] = {0,0,0,0};
@@ -196,23 +204,23 @@
         
         //送信データを送る
         //SerialData = tmp;
-        if(count > 20 && send == true){
+        if(count > 25 && send == true){
             /*for(int j = 0; j < 2 ; j++){
                 for(int i = 0 ; i < dataNum ; i++){
                     //if(!DEBUG)sbdbt.printf("%3d ",SerialData[j][i]);
                     //if(!DEBUG)sbdbt.putc(SerialData[j][i]);
                 }
             }*/
-            /*
+            
             sbdbt.printf("R:");
             for(int i = 4 ; i < 12 ; i+=2)print(i,SerialData[R]);
             sbdbt.printf("L:");
             for(int i = 4 ; i < 12 ; i+=2)print(i,SerialData[L]);
-            */
+            
             for(int j = 0; j < 2 ; j++){
                 for(int i = 0 ; i < dataNum ; i++){
                     //sbdbt.printf("%3d ",SerialData[j][i]);
-                    if(!DEBUG)sbdbt.putc(SerialData[j][i]);
+                    //if(!DEBUG)sbdbt.putc(SerialData[j][i]);
                 }
             }
             count = 0;