Skip to content

Commit 2cf0e6e

Browse files
committed
Revert "Increase search speed"
This reverts commit 54b090f.
1 parent aa6bdba commit 2cf0e6e

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

201-
set_target_angular_speed(-8 * PI);
202-
while (get_clock_ticks() - starting_time <= 88)
201+
set_target_angular_speed(-4 * PI);
202+
while (get_clock_ticks() - starting_time <= 125)
203203
;
204204
set_target_angular_speed(0);
205-
while (get_clock_ticks() - starting_time <= 176)
205+
while (get_clock_ticks() - starting_time <= 250)
206206
;
207207
}
208208

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

216-
set_target_angular_speed(8 * PI);
217-
while (get_clock_ticks() - starting_time <= 88)
216+
set_target_angular_speed(4 * PI);
217+
while (get_clock_ticks() - starting_time <= 125)
218218
;
219219
set_target_angular_speed(0);
220-
while (get_clock_ticks() - starting_time <= 176)
220+
while (get_clock_ticks() - starting_time <= 250)
221221
;
222222
}
223223

@@ -237,11 +237,11 @@ void move_front(void)
237237
void move_left(void)
238238
{
239239
enable_walls_control();
240-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
240+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
241241
disable_walls_control();
242242
turn_left();
243243
enable_walls_control();
244-
accelerate(get_encoder_average_micrometers(), 0.02);
244+
accelerate(get_encoder_average_micrometers(), 0.03);
245245
entered_next_cell();
246246
}
247247

@@ -251,11 +251,11 @@ void move_left(void)
251251
void move_right(void)
252252
{
253253
enable_walls_control();
254-
decelerate(current_cell_start_micrometers, 0.02, 0.666);
254+
decelerate(current_cell_start_micrometers, 0.03, 0.404);
255255
disable_walls_control();
256256
turn_right();
257257
enable_walls_control();
258-
accelerate(get_encoder_average_micrometers(), 0.02);
258+
accelerate(get_encoder_average_micrometers(), 0.03);
259259
entered_next_cell();
260260
}
261261

0 commit comments

Comments
 (0)