diff options
| author | Albin <albwa833@student.liu.se> | 2019-11-29 12:33:18 +0100 |
|---|---|---|
| committer | Albin <albwa833@student.liu.se> | 2019-11-29 12:33:35 +0100 |
| commit | 9df0df8ccae5b350713c9d3e254aeea69b1146c8 (patch) | |
| tree | fbae4643f205a696bf22a8193b8ebaa2dbd37d9d /Kod | |
| parent | 060917e858887792b74fa9c50491de70976ff84a (diff) | |
| download | tfyy51-9df0df8ccae5b350713c9d3e254aeea69b1146c8.tar.gz | |
final changes
Diffstat (limited to 'Kod')
| -rw-r--r-- | Kod/bilbana/files/Bana.mat | bin | 1175 -> 1178 bytes | |||
| -rw-r--r-- | Kod/bilbana/yc4/do_car.m | 2 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/get_aprox_v.m | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Kod/bilbana/files/Bana.mat b/Kod/bilbana/files/Bana.mat Binary files differindex 38918a6..06d467d 100644 --- a/Kod/bilbana/files/Bana.mat +++ b/Kod/bilbana/files/Bana.mat diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m index 92e4f8d..85a2114 100644 --- a/Kod/bilbana/yc4/do_car.m +++ b/Kod/bilbana/yc4/do_car.m @@ -199,7 +199,7 @@ end %% EXECUTE if car.running == true && car.automatic == true - disp(strjoin({num2str(car.num), num2str(car.u), num2str(car.position)})) + % disp(strjoin({num2str(car.num), num2str(car.u), num2str(car.position)})) if not(boot.status) set_car_speed(car.num, max(car.u, 16)); else diff --git a/Kod/bilbana/yc4/get_aprox_v.m b/Kod/bilbana/yc4/get_aprox_v.m index 5b6808b..a70e18a 100644 --- a/Kod/bilbana/yc4/get_aprox_v.m +++ b/Kod/bilbana/yc4/get_aprox_v.m @@ -12,7 +12,7 @@ if cur_seg > 9 end %% Kompensera för väldigt långsamt segment 1 första varvet if cur_seg == 1 && lap == 2 - v = car.seg_len(1)/(1.5*car.seg_times(1,9)); + v = car.seg_len(1)/(1.4*car.seg_times(1,9)); return end %% Sätt v |