From aa75fc7efb7faa767d28936657a0e4a011a94a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 12 Nov 2019 15:58:24 +0100 Subject: Fungerande merge --- Kod/bilbana/yc4/get_aprox_v.m | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana/yc4/get_aprox_v.m') diff --git a/Kod/bilbana/yc4/get_aprox_v.m b/Kod/bilbana/yc4/get_aprox_v.m index d9c4644..1867565 100644 --- a/Kod/bilbana/yc4/get_aprox_v.m +++ b/Kod/bilbana/yc4/get_aprox_v.m @@ -8,7 +8,13 @@ last_seg_times: 1x9 vektor med f�rra varvets segmenttider seg_len1 = [2.53 0.53 1.68 2.92 1.2 2.01 3.83 2.89 1.99]; seg_len2 = [2.53 0.53 1.87 2.68 1.24 1.81 4.03 3.09 2.19]; -seg_len = (track == 1 : seg_len1 : seg_len2); +% seg_len = []; + +if track == 1 + seg_len = seg_len1; +else + seg_len = seg_len2; +end if cur_seg > 9 cur_seg = cur_seg - 9; @@ -17,7 +23,7 @@ end while lap > 0 lap = lap - 1; if seg_times(lap, cur_seg) ~= 0 - v = seg_len(cur_seg)/seg_times(lap, cur_seg); + v = seg_len(cur_seg) / seg_times(lap, cur_seg); return end end -- cgit v1.2.1