tim008 tim008
/
projekatRadar
Sumejja Porča Almir Husić
Diff: main.cpp
- Revision:
- 1:d3ca3671067a
- Parent:
- 0:9464a1d8de8d
- Child:
- 2:0daf6588a802
--- a/main.cpp Mon May 26 00:06:51 2014 +0000 +++ b/main.cpp Mon May 26 10:34:46 2014 +0000 @@ -20,7 +20,8 @@ float distances[13] = {15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 55.0, 60.0, 65.0, 70.0, 75.0}; float voltages[13] = {0.78, 0.72, 0.63, 0.55, 0.47, 0.43, 0.39, 0.36, 0.34, 0.33, 0.32, 0.311, 0.31}; float value; -float angle(0.0); +int angle(0); +float scale (1 / (numstep/360.0)); string ToString(float num) { @@ -35,8 +36,8 @@ void MoveMotor() { - motor.step(int(numstep / 360.0 * (angle - (angle / 360)* 360.0) + 0.5), direction, step_speed); // number of steps, direction, speed - angle += 1.2; + motor.step(int(numstep / 360.0 * scale * (angle % 360) + 0.5), direction, step_speed); // number of steps, direction, speed + angle += 2; index++; index = index % buffer_size; }