diff options
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 60 | ||||
| -rw-r--r-- | Kod/scripts/test_givare.m | 38 |
2 files changed, 66 insertions, 32 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index e2f223e..221caea 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -106,7 +106,6 @@ while 1 %% CHECK LAP AND CHECKPOINT (CAR 1) if car1.running == true - %% CALC POSITION (CAR 1) if car1.lap > 1 last_seg_times1 = car1.seg_times(car1.lap - 1, 1:9); @@ -170,48 +169,45 @@ while 1 end %{ - TODO 1 -> 2 - - %% CHECK LAP AND CHECKPOINT (CAR 1) - if car1.running == true - - %% CALC POSITION (CAR 1) - if car1.lap ~= 0 - if car1.lap > 1 - last_seg_times1 = car1.seg_times(car1.lap - 1, 1:9); - aprox_v = get_aprox_v(car1.segment, last_seg_times1); - car1.position = get_position(aprox_v, car1.position, delta_t); + %% CHECK LAP AND CHECKPOINT (CAR 2) + if car2.running == true + %% CALC POSITION (CAR 2) + if car2.lap ~= 0 + if car2.lap > 1 + last_seg_times1 = car2.seg_times(car2.lap - 1, 1:9); + aprox_v = get_aprox_v(car2.segment, last_seg_times2); %TODO ?? + car2.position = get_position(aprox_v, car2.position, delta_t); end end - if car1.new_check_point == true + if car2.new_check_point == true % beep; - if car1.lap ~= 0 - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); + if car2.lap ~= 0 + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); end - car1.segment = car1.segment + 1; - car1.seg_tic = tic; - car1.position = car1.seg_len(car1.segment); + car2.segment = car2.segment + 1; + car2.seg_tic = tic; + car2.position = car2.seg_len(car2.segment); end - if car1.new_lap == true - if car1.lap == 0 + if car2.new_lap == true + if car2.lap == 0 % dont save time for first lap - car1.segment = 1; - car1.lap = car1.lap + 1; - car1.seg_tic = tic; - car1.lap_tic = tic; + car2.segment = 1; + car2.lap = car2.lap + 1; + car2.seg_tic = tic; + car2.lap_tic = tic; continue; end beep; - car1.seg_times(car1.lap, car1.segment) = toc(car1.seg_tic); - car1.seg_tic = tic; - car1.lap_times(car1.lap) = toc(car1.lap_tic); - car1.lap_tic = tic; - car1.position = 0; + car2.seg_times(car2.lap, car2.segment) = toc(car2.seg_tic); + car2.seg_tic = tic; + car2.lap_times(car2.lap) = toc(car2.lap_tic); + car2.lap_tic = tic; + car2.position = 0; - display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))}; + display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))}; - car1.segment = 1; - car1.lap = car1.lap + 1; + car2.segment = 1; + car2.lap = car2.lap + 1; end end %} diff --git a/Kod/scripts/test_givare.m b/Kod/scripts/test_givare.m new file mode 100644 index 0000000..204d501 --- /dev/null +++ b/Kod/scripts/test_givare.m @@ -0,0 +1,38 @@ +disp('Startar bilbanan. Avsluta med q.') +hf=figure('position',[0 0 eps eps],'menubar','none'); + +initialize_counters(1) +initialize_counters(2) + +start_race(1) +start_race(2) + +config_IOs + +car1 = struct; +car2 = struct; + +while 1 + %% PRE-LOOP + if strcmp(get(hf,'currentcharacter'),'q') + close(hf) + break + end + + figure(hf) + drawnow + + %% READ + [car1.new_lap, car1.new_check_point, car1.time] = get_car_position(1); + [car2.new_lap, car2.new_check_point, car2.time] = get_car_position(2); + + if car1.new_lap == true || car1.new_check_point == true || car2.new_lap == true || car2.new_check_point == true + beep; + end + + pause(0.1) +end + +%% +terminate(1) +terminate(2)
\ No newline at end of file |