From c0c94aa155dd626343beb883f5223d7c59202ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 16 Nov 2019 12:30:59 +0100 Subject: Correct dimensions and move check --- Kod/bilbana/yc4/do_car.m | 16 +++++++--------- Kod/bilbana/yc4/main.m | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m index 8aa87db..9120526 100644 --- a/Kod/bilbana/yc4/do_car.m +++ b/Kod/bilbana/yc4/do_car.m @@ -118,21 +118,19 @@ if car.running == true car.seg_tic = tic; car.lap_tic = tic; else - if car.lap == 1 - % TODO test - if size(car.seg_times, 1) < 9 - disp('FEL: För få segment!!') - car.stopped = true - other_car.stopped = true - return - end - end car.seg_times(car.lap, car.segment) = toc(car.seg_tic); car.seg_tic = tic; car.lap_times(car.lap) = toc(car.lap_tic); car.lap_tic = tic; car.position = 0; + if car.lap == 1 && size(car.seg_times, 2) < 9 + disp('FEL: För få segment!!') + car.stopped = true; + other_car.stopped = true; + return + end + display_data = [display_data, put_text(100, 16 + (16 * car.num), 'L', strjoin({num2str(car.lap), get_time_as_string(round(car.lap_times(car.lap) * 1000))}, ' '))]; car.segment = 1; diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index d15cace..74badfd 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -119,7 +119,7 @@ while 1 [car1, car1.stop, display.data] = do_car(car1, t, display.data); [car2, car2.stop, display.data] = do_car(car2, t, display.data); - if car1.stop == true + if car1.stop == true disp('stopped by car 1'); break; end -- cgit v1.2.1