Skip to content

Commit b9f81aa

Browse files
committed
Revert "Increase search speed"
This reverts commit 54b090f.
1 parent 0925bff commit b9f81aa

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 int32_t current_cell_start_micrometers;
@@ -197,11 +197,11 @@ void turn_left(void)
197197
{
198198
uint32_t starting_time = get_clock_ticks();
199199

200-
set_target_angular_speed(-8 * PI);
201-
while (get_clock_ticks() - starting_time <= 88)
200+
set_target_angular_speed(-4 * PI);
201+
while (get_clock_ticks() - starting_time <= 125)
202202
;
203203
set_target_angular_speed(0);
204-
while (get_clock_ticks() - starting_time <= 176)
204+
while (get_clock_ticks() - starting_time <= 250)
205205
;
206206
}
207207

@@ -212,11 +212,11 @@ void turn_right(void)
212212
{
213213
uint32_t starting_time = get_clock_ticks();
214214

215-
set_target_angular_speed(8 * PI);
216-
while (get_clock_ticks() - starting_time <= 88)
215+
set_target_angular_speed(4 * PI);
216+
while (get_clock_ticks() - starting_time <= 125)
217217
;
218218
set_target_angular_speed(0);
219-
while (get_clock_ticks() - starting_time <= 176)
219+
while (get_clock_ticks() - starting_time <= 250)
220220
;
221221
}
222222

@@ -236,11 +236,11 @@ void move_front(void)
236236
void move_left(void)
237237
{
238238
enable_walls_control();
239-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
239+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
240240
disable_walls_control();
241241
turn_left();
242242
enable_walls_control();
243-
accelerate(get_encoder_average_micrometers(), 0.02);
243+
accelerate(get_encoder_average_micrometers(), 0.03);
244244
entered_next_cell();
245245
}
246246

@@ -250,11 +250,11 @@ void move_left(void)
250250
void move_right(void)
251251
{
252252
enable_walls_control();
253-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
253+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
254254
disable_walls_control();
255255
turn_right();
256256
enable_walls_control();
257-
accelerate(get_encoder_average_micrometers(), 0.02);
257+
accelerate(get_encoder_average_micrometers(), 0.03);
258258
entered_next_cell();
259259
}
260260

0 commit comments

Comments
 (0)