nebel/2014-git-work
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

コメントの書き方を変更

Browse source
This commit is contained in:
Nebel 2012-09-15 12:21:53 +09:00
parent 22207c5064
commit 8dbdddaaea
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arduino/hanzo2_1/hanzo2_1.ino
View file

@ -238,30 +238,29 @@ void setup() {
} }
void loop(){ void loop(){
//センサーを見る /* センサーを見る */
byte sensor = 0; byte sensor = 0;
#ifdef LINE_BLACK //黒ライン #ifdef LINE_BLACK //黒ライン
sensor = sensorRead(); sensor = sensorRead();
#else #else
sensor = ~sensorRead(); sensor = ~sensorRead();
#endif #endif
//ロータリーエンコーダーの変化を見る count(); //ロータリーエンコーダーの変化を見る
count(); /* 全体の動作を決定する */
//全体の動作を決定する
switch(mode){ switch(mode){
case MODE_TARGET_RIGHT_VERTICAL: //右垂直標的 case MODE_TARGET_RIGHT_VERTICAL: //右垂直標的
lance(LANCE_ANGLE4); lance(LANCE_ANGLE4);
mode = MODE_TRACE; mode = MODE_TRACE;
break; break;
case MODE_TARGET_LEFT_VERTICAL: //左垂直標的 case MODE_TARGET_LEFT_VERTICAL: //左垂直標的
lance(LANCE_ANGLE3); lance(LANCE_ANGLE3);
mode = MODE_TRACE; mode = MODE_TRACE;
break; break;
case MODE_TARGET_PARALLEL1: //平行標的1 case MODE_TARGET_PARALLEL1: //平行標的1
lance(LANCE_ANGLE1); lance(LANCE_ANGLE1);
mode = MODE_TRACE; mode = MODE_TRACE;
break; break;
case MODE_TARGET_PARALLEL2: //平行標的2 case MODE_TARGET_PARALLEL2: //平行標的2
lance(LANCE_ANGLE2); lance(LANCE_ANGLE2);
mode = MODE_TRACE; mode = MODE_TRACE;
break; break;
@ -294,7 +293,7 @@ void loop(){
motorR.mode(STOP); motorR.mode(STOP);
break; break;
} }
//平行標的を狙う時は、ランスをぷるぷるする /* 平行標的を狙う時は、ランスをぷるぷるする */
static unsigned long millis_lance = 0; static unsigned long millis_lance = 0;
if(millis() - millis_lance > LANCE_INTERVAL){ if(millis() - millis_lance > LANCE_INTERVAL){
millis_lance = millis(); millis_lance = millis();