summaryrefslogtreecommitdiffstats
path: root/Kod/bilbana/yc4/get_aprox_v.m
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-11-12 15:58:24 +0100
committerGustav Sörnäs <gusso230@student.liu.se>2019-11-12 15:58:24 +0100
commitaa75fc7efb7faa767d28936657a0e4a011a94a06 (patch)
treeb591ccb1800c9c737ed6e50a6bc0d6d1b4504286 /Kod/bilbana/yc4/get_aprox_v.m
parent7965f0663abff4d914d640df46184a9e40632946 (diff)
downloadtfyy51-aa75fc7efb7faa767d28936657a0e4a011a94a06.tar.gz
Fungerande merge
Diffstat (limited to 'Kod/bilbana/yc4/get_aprox_v.m')
-rw-r--r--Kod/bilbana/yc4/get_aprox_v.m10
1 files changed, 8 insertions, 2 deletions
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