From 9df0df8ccae5b350713c9d3e254aeea69b1146c8 Mon Sep 17 00:00:00 2001 From: Albin Date: Fri, 29 Nov 2019 12:33:18 +0100 Subject: final changes --- Kod/bilbana/files/Bana.mat | Bin 1175 -> 1178 bytes Kod/bilbana/yc4/do_car.m | 2 +- 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 index 38918a6..06d467d 100644 Binary files a/Kod/bilbana/files/Bana.mat and b/Kod/bilbana/files/Bana.mat differ 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 -- cgit v1.2.1