ジャパンオープン用のLPC824専用プログラム
Dependencies: mbed-src Ping SDFileSystem
Diff: main/format.cpp
- Revision:
- 3:8ef3afcf4ade
- Parent:
- 2:83b8bf9f0ea1
- Child:
- 4:a0755903bd6e
diff -r 83b8bf9f0ea1 -r 8ef3afcf4ade main/format.cpp --- a/main/format.cpp Wed Mar 02 08:11:47 2016 +0000 +++ b/main/format.cpp Wed Mar 02 09:18:11 2016 +0000 @@ -117,9 +117,9 @@ static uint8_t const ch_num[3]={8, 8, 4}; static uint16_t const ir_dis_range[2][8]={ - {3900, 3000, 2750, 2500, 2250, 2000, 1500, 0, },//IR_SHORT 0 - {2000, 1750, 1500, 1250, 1000, 750, 500, 0, },//IR_LONG 1 - } + {0, 1500, 2000, 2250, 2500, 2750, 3000, 3900, },//IR_SHORT 0 + {0, 500, 750, 1000, 1250, 1500, 1750, 2000, },//IR_LONG 1 + }; nucleo.format(16, 3); nucleo.frequency(1000000); @@ -236,7 +236,7 @@ ir_val_phase[IR_LONG] = DIS_0; } - + /* //old ir_notice = IR_NOTE_NONE;//none @@ -261,24 +261,6 @@ else{ ir_notice = IR_NOTE_CLOSE;//short_data } - } - - - /*ir_notice = IR_NOTE_NONE;//none - if((DIS_MORE_CLOSE<=ir_val_diff)&&(1)){ - ir_notice = IR_NOTE_CLOSER;//short_data - } - else if((DIS_CLOSE<=ir_val_diff)&&(ir_val_diff<DIS_MORE_CLOSE)){ - ir_notice = IR_NOTE_CLOSE;//short_data - } - else if((DIS_FAR<=ir_val_diff)&&(ir_val_diff<DIS_CLOSE)){ - ir_notice = IR_NOTE_FAR;//long_data - } - else if((1)&&(ir_val_diff<DIS_FAR)){ - ir_notice = IR_NOTE_NONE;//none - if(((ir_val_long[0]-ir_val_long[7])>900)&&1){ - ir_notice = IR_NOTE_FAR;//long_data - } }*/ //デバッグ用のTeraTermへの出力