diff options
| author | David <davth346@student.liu.se> | 2019-10-18 17:28:11 +0200 |
|---|---|---|
| committer | David <davth346@student.liu.se> | 2019-10-18 17:28:11 +0200 |
| commit | 174b985c8edcb850775f3eb637b88aa730c6c125 (patch) | |
| tree | 7b2f444d5cb2301db08d51d32ac9b48ff7d9e3fe /Kod | |
| parent | 5578258c973c9997a3dff72e34fa817ffcebd432 (diff) | |
| download | tfyy51-174b985c8edcb850775f3eb637b88aa730c6c125.tar.gz | |
Removed unneccesarry files
Diffstat (limited to 'Kod')
| -rw-r--r-- | Kod/bilbana/yc4/main_2.asv | 120 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main_2.m | 121 |
2 files changed, 0 insertions, 241 deletions
diff --git a/Kod/bilbana/yc4/main_2.asv b/Kod/bilbana/yc4/main_2.asv deleted file mode 100644 index 24af4ce..0000000 --- a/Kod/bilbana/yc4/main_2.asv +++ /dev/null @@ -1,120 +0,0 @@ -%% INIT -% TODO init display - -disp('Startar bilbanan. Avsluta med q.') -hf=figure('position',[0 0 eps eps],'menubar','none'); - -initialize_counters(1) -initialize_counters(2) - -config_IOs - -start_race(1) -start_race(2) - -car1 = struct; -car1.segment = 1; -car1.lap = 0; -car1.lap_times = []; -car1.seg_times = []; - -car2 = struct; -car2.segment = 1; -car2.lap = 0; -car2.lap_times = []; -car2.seg_times = []; - -tocs = []; - -%% MAIN LOOP -while 1 - tic; - %% 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); - - disp(car1); - disp(car2); - - %% 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; - elseif car1.new_lap == true - 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 - car1.lap_times(car1.lap) = -1; % TODO - car1.segment = 1; - car1.lap = car1.lap + 1; - %disp('car 1'); - %disp(car1); - end - - %% 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; - elseif car2.new_lap == true - 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 - car2.lap_times(car2.lap) = -1; % TODO - car2.segment = 1; - car2.lap = car2.lap + 1; - %disp('car 2'); - %disp(car2); - end - - %% CALCULATE (CAR 1) - 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(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); - - %% EXECUTE - set_car_speed(1, car1.u); - set_car_speed(2, car2.u); - - %% DISPLAY - - %% END OF LOOP - pause(0.1) - % tocs(end + 1) = toc; -end - -%% END OF PROGRAM -disp(tocs); -disp(car1); -disp(car2); - -terminate(1); -terminate(2); -% TODO terminate display
\ No newline at end of file diff --git a/Kod/bilbana/yc4/main_2.m b/Kod/bilbana/yc4/main_2.m deleted file mode 100644 index 97b809c..0000000 --- a/Kod/bilbana/yc4/main_2.m +++ /dev/null @@ -1,121 +0,0 @@ -%% INIT -% TODO init display - -disp('Startar bilbanan. Avsluta med q.') -hf=figure('position',[0 0 eps eps],'menubar','none'); - -initialize_counters(1) -initialize_counters(2) - -config_IOs - -start_race(1) -start_race(2) - -car1 = struct; -car1.segment = 1; -car1.lap = 0; -car1.lap_times = []; -car1.seg_times = []; - -car2 = struct; -car2.segment = 1; -car2.lap = 0; -car2.lap_times = []; -car2.seg_times = []; - -tocs = []; - -%% MAIN LOOP -while 1 - %tic; - %% PRE-LOOP - if strcmp(get(hf,'currentcharacter'),'q') - beep; - 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); - - - %% CHECK LAP AND CHECKPOINT (CAR 1) - if car1.new_check_point == true - disp('car 1') - disp(car1.lap); - disp(car1.segment); - car1.seg_times(car1.lap, car1.segment) = -1; % TODO - car1.segment = car1.segment + 1; - elseif car1.new_lap == true - 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 - car1.lap_times(car1.lap) = -1; % TODO - car1.segment = 1; - car1.lap = car1.lap + 1; - end - - %% CHECK LAP AND CHECKPOINT (CAR 2) - if car2.new_check_point == true - disp('car 2') - disp(car2.lap); - disp(car2.segment); - car2.seg_times(car2.lap, car2.segment) = -1; % TODO - car2.segment = car2.segment + 1; - elseif car2.new_lap == true - 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 - car2.lap_times(car2.lap) = -1; % TODO - car2.segment = 1; - car2.lap = car2.lap + 1; - %disp('car 2'); - %disp(car2); - end - - %% CALCULATE (CAR 1) - 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(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); - - %% EXECUTE - set_car_speed(1, car1.u); - set_car_speed(2, car2.u); - - %% DISPLAY - - %% END OF LOOP - pause(0.1) - % tocs(end + 1) = toc; -end - -%% END OF PROGRAM -disp(tocs); -disp(car1); -disp(car2); - - -terminate(1); -terminate(2); -% TODO terminate display
\ No newline at end of file |
