Diff: main/format.cpp

Revision:

6:80c2f4fce2eb

Parent:

5:d666b328c093

Child:

7:22d0c4a400c4

--- a/main/format.cpp	Thu Mar 03 04:17:06 2016 +0000
+++ b/main/format.cpp	Thu Mar 03 05:24:45 2016 +0000
@@ -86,7 +86,7 @@
                 ((0xC000)&(ir_key<<14))                 |//1100000000000000
                 ((0x3800)&(ir_val_phase[IR_LONG]<<11))  |//0011100000000000
                 ((0x0700)&(ir_val_phase[IR_SHORT]<<8))  |//0000011100000000
-                ((0x00E0)&(ir_dif_phase[IR_LONG]<<5))    |//0000000011100000
+                ((0x00E0)&(ir_dif_phase[IR_LONG]<<5))   |//0000000011100000
                 ((0x001F)&(ir_place<<0))                 //0000000000011111
             )&0xFFFF;
             
@@ -148,7 +148,7 @@
     
     
     static uint16_t const ir_dif_range[2][8]={
-        {0, 500,   750,   1000,   1250,   1500,   1750,   2000,   },//IR_SHORT 0
+        {0, 500,   750,   1000,   1250,   1500,   1600,   1800,   },//IR_SHORT 0
         {0, 500,   600,   650,   700,   800,   900,   1000,   },//IR_LONG 1
     };
     
@@ -323,15 +323,15 @@
         
         //ir_place
         if(ir_val_phase[IR_SHORT] >= DIS_7){
-            ir_place = ir_position[IR_SHORT]+7;
+            ir_place = ir_position[IR_LONG]-1;
         }
         else{
-            ir_place = ir_position[IR_LONG]-1;
+            ir_place = ir_position[IR_SHORT]+7;
         }
         
         //デバッグ用のTeraTermへの出力
         
-        
+        /*
         pc.printf("val_short:%d\t", ir_val_short[11]);//最小検出値(近)
         pc.printf("val_long(AVE):%d\t", ir_val_long[7]);//最小検出値(遠)
         //pc.printf("val_long:%d\t", ir_val_long_plus);//最小検出値(遠)...平均なし
@@ -344,9 +344,11 @@
         pc.printf("ir_val_phase[IR_LONG]:%d\t", ir_val_phase[IR_LONG]);//判定されたボールの距離の段階(遠)
         //pc.printf("notice:%d\t", ir_notice);//判定されたボールの状況
         
+        pc.printf("ir_place:%d\t", ir_place);
+        
         
         pc.printf("\r\n");
-        
+        */
         
         /*
         pc.printf("%Value is ");