diff options
| author | David <davth346@student.liu.se> | 2019-10-18 17:10:29 +0200 |
|---|---|---|
| committer | David <davth346@student.liu.se> | 2019-10-18 17:10:29 +0200 |
| commit | 7ce378120ce6817b1383a51fe645d3deb76654e6 (patch) | |
| tree | adadf5d43f89ca791a07b9d6015ee979763dd17d /Kod | |
| parent | 6e68e4311dc36cacafa874f632f9f11d94a752b4 (diff) | |
| download | tfyy51-7ce378120ce6817b1383a51fe645d3deb76654e6.tar.gz | |
Fix function calls and broken code
Diffstat (limited to 'Kod')
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 5ad0a6d..c8e1218 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -44,13 +44,16 @@ while 1 %% CHECK LAP AND CHECKPOINT (CAR 1) if car1.new_check_point == true % beep; - car1.seg_times(car1.lap, car1.segment) = -1; % TODO - car1.segment = car.segment + 1; + if car1.lap ~= 0 + car1.seg_times(car1.lap, car1.segment) = -1; % TODO + end + car1.segment = car1.segment + 1; elseif car1.new_lap == true - beep; + % beep; if car1.lap == 0 % dont save time for first lap car1.segment = 1; + car1.lap = car1.lap + 1; continue; end car1.seg_times(car1.lap, car1.segment) = -1; % TODO @@ -62,13 +65,16 @@ while 1 %% CHECK LAP AND CHECKPOINT (CAR 2) if car2.new_check_point == true % beep; - car2.seg_times(car2.lap, car2.segment) = -1; % TODO - car2.segment = car.segment + 1; + if car2.lap ~= 0 + car2.seg_times(car2.lap, car2.segment) = -1; % TODO + end + car2.segment = car2.segment + 1; elseif car2.new_lap == true - beep; + % beep; if car2.lap == 0 % dont save time for first lap car2.segment = 1; + car2.lap = car2.lap + 1; continue; end car2.seg_times(car2.lap, car2.segment) = -1; % TODO @@ -78,13 +84,13 @@ while 1 end %% CALCULATE (CAR 1) - car1.car_constant = get_car_constant(); + car1.car_constant = get_car_constant(1); car1.v = get_new_v(car1.segment); car1.track_u_constant = get_track_u_constant(); car1.u = get_new_u(car1.v, car1.car_constant, car1.track_u_constant); %% CALCULATE (CAR 2) - car2.car_constant = get_car_constant(); + car2.car_constant = get_car_constant(2); car2.v = get_new_v(car2.segment); car2.track_u_constant = get_track_u_constant(); car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant); |