Voili voilou
Dependencies: RoboClaw StepperMotor mbed
Fork of Robot2016_2-0 by
Diff: Map/Map.cpp
- Revision:
- 39:309f38d1e49c
- Parent:
- 36:2d7357a385bc
- Child:
- 41:b5a2fbc20beb
diff -r da3a2c781672 -r 309f38d1e49c Map/Map.cpp --- a/Map/Map.cpp Sat Feb 06 10:11:28 2016 +0000 +++ b/Map/Map.cpp Tue Apr 05 15:02:12 2016 +0000 @@ -68,9 +68,9 @@ obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P13,1750,3000-90,30));// P13 obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P14,1850,3000-90,30));// P14 obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,1770,3000-1100,30));// P15*/ - obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P16,700,1000,30));// P16 - obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,1100,600,30));// P16 - obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,900,800,50));// P16 + obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P16,700,1000,100));// P16 + obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,1100,600,100));// P16 + obstacles.push_back(new Obs_circle(ROBOTRADIUS,IDO_P15,1100,1000,100));// P16 } int Map::getHeight(float x, float y)