Skip to content

Commit 30c5d97

Browse files
committed
Revert "Increase search speed"
This reverts commit 54b090f.
1 parent c87ae60 commit 30c5d97

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/control.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
*/
1010
static volatile float linear_acceleration = 5.;
1111
static volatile float linear_deceleration = 5.;
12-
static volatile float angular_acceleration = 64. * PI;
12+
static volatile float angular_acceleration = 32. * PI;
1313

1414
static volatile float target_linear_speed;
1515
static volatile float target_angular_speed;
1616
static volatile float ideal_linear_speed;
1717
static volatile float ideal_angular_speed;
1818

19-
static volatile float kp_linear = 800.;
19+
static volatile float kp_linear = 1600.;
2020
static volatile float kd_linear = 100.;
2121
static volatile float kp_angular = 60.;
2222
static volatile float kd_angular = 50.;

src/target/move.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "move.h"
22

3-
static volatile float max_linear_speed = .8;
3+
static volatile float max_linear_speed = .6;
44

55
/* Assume the mouse tail is initially touching a wall */
66
static float cell_shift = WALL_WIDTH / 2 + MOUSE_TAIL;
@@ -201,11 +201,11 @@ void turn_left(void)
201201
{
202202
uint32_t starting_time = get_clock_ticks();
203203

204-
set_target_angular_speed(-8 * PI);
205-
while (get_clock_ticks() - starting_time <= 88)
204+
set_target_angular_speed(-4 * PI);
205+
while (get_clock_ticks() - starting_time <= 125)
206206
;
207207
set_target_angular_speed(0);
208-
while (get_clock_ticks() - starting_time <= 176)
208+
while (get_clock_ticks() - starting_time <= 250)
209209
;
210210
}
211211

@@ -216,11 +216,11 @@ void turn_right(void)
216216
{
217217
uint32_t starting_time = get_clock_ticks();
218218

219-
set_target_angular_speed(8 * PI);
220-
while (get_clock_ticks() - starting_time <= 88)
219+
set_target_angular_speed(4 * PI);
220+
while (get_clock_ticks() - starting_time <= 125)
221221
;
222222
set_target_angular_speed(0);
223-
while (get_clock_ticks() - starting_time <= 176)
223+
while (get_clock_ticks() - starting_time <= 250)
224224
;
225225
}
226226

@@ -257,11 +257,11 @@ void move_front(void)
257257
void move_left(void)
258258
{
259259
enable_walls_control();
260-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
260+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
261261
disable_walls_control();
262262
turn_left();
263263
enable_walls_control();
264-
accelerate(get_encoder_average_micrometers(), 0.02);
264+
accelerate(get_encoder_average_micrometers(), 0.03);
265265
entered_next_cell();
266266
}
267267

@@ -271,11 +271,11 @@ void move_left(void)
271271
void move_right(void)
272272
{
273273
enable_walls_control();
274-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
274+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
275275
disable_walls_control();
276276
turn_right();
277277
enable_walls_control();
278-
accelerate(get_encoder_average_micrometers(), 0.02);
278+
accelerate(get_encoder_average_micrometers(), 0.03);
279279
entered_next_cell();
280280
}
281281

0 commit comments

Comments
 (0)