diff options
| author | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-16 12:30:59 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-16 12:33:23 +0100 |
| commit | c0c94aa155dd626343beb883f5223d7c59202ff0 (patch) | |
| tree | db3adee69ba1293ffaa9db4f1fd377ab13266f2b /Kod/bilbana | |
| parent | aa20fb4b9545fa6e4bef944c9deb10d1f3fbe38d (diff) | |
| download | tfyy51-c0c94aa155dd626343beb883f5223d7c59202ff0.tar.gz | |
Correct dimensions and move check
Diffstat (limited to 'Kod/bilbana')
| -rw-r--r-- | Kod/bilbana/yc4/do_car.m | 16 | ||||
| -rw-r--r-- | 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 |