diff options
| author | Gustav Sörnäs <gusso230@student.liu.se> | 2019-10-20 14:18:10 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gusso230@student.liu.se> | 2019-10-20 14:18:10 +0200 |
| commit | 2e7e0e16cd6585a75f7c61272c000161ca3f0a0c (patch) | |
| tree | 0b7fdb771701914efdf1e3743e1e94482ece45ed /Kod/bilbana | |
| parent | 18d4a7ebf4b10fe70cd33fd490846736f561605b (diff) | |
| parent | d10749b7c4a36d4e88137ae7a8a299282c323056 (diff) | |
| download | tfyy51-2e7e0e16cd6585a75f7c61272c000161ca3f0a0c.tar.gz | |
Merge remote-tracking branch 'origin/freeze_david' into freeze
Diffstat (limited to 'Kod/bilbana')
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 53c6f00..be0e3e8 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -15,7 +15,9 @@ start_race(2) car1 = struct; car1.segment = 1; car1.lap = 0; + car1.lap_times = []; + car1.seg_times = []; car2 = struct; @@ -45,19 +47,24 @@ while 1 if car1.new_check_point == true % beep; if car1.lap ~= 0 - car1.seg_times(car1.lap, car1.segment) = -1; % TODO + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); % TODO end car1.segment = car1.segment + 1; + car1.seg_tic = tic; elseif car1.new_lap == true % beep; if car1.lap == 0 % dont save time for first lap car1.segment = 1; car1.lap = car1.lap + 1; + car1.seg_tic = tic; + car1.lap_tic = tic; continue; end - car1.seg_times(car1.lap, car1.segment) = -1; % TODO - car1.lap_times(car1.lap) = -1; % TODO + car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); % TODO + car1.seg_tic = tic; + car1.lap_times(car1.lap) = toc(car1.lap_tic); % TODO + car1.lap_tic = tic; car1.segment = 1; car1.lap = car1.lap + 1; end @@ -66,19 +73,24 @@ while 1 if car2.new_check_point == true % beep; if car2.lap ~= 0 - car2.seg_times(car2.lap, car2.segment) = -1; % TODO + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); % TODO end car2.segment = car2.segment + 1; + car2.seg_tic = tic; elseif car2.new_lap == true % beep; if car2.lap == 0 % dont save time for first lap car2.segment = 1; car2.lap = car2.lap + 1; + car2.seg_tic = tic; + car2.lap_tic = tic; continue; end - car2.seg_times(car2.lap, car2.segment) = -1; % TODO - car2.lap_times(car2.lap) = -1; % TODO + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); % TODO + car2.seg_tic = tic; + car2.lap_times(car2.lap) = toc(car2.lap_tic); % TODO + car2.lap_tic = tic; car2.segment = 1; car2.lap = car2.lap + 1; end |