From b61d81b92dfb6515138fad71accb40fe3bba4c39 Mon Sep 17 00:00:00 2001
From: alex <aletu130@student.liu.se>
Date: Fri, 22 Nov 2019 12:53:15 +0100
Subject: =?UTF-8?q?F=C3=B6rs=C3=B6ker=20komma=20runt=20trasiga=20givare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kod/scripts/test_givare.m | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'Kod/scripts')

diff --git a/Kod/scripts/test_givare.m b/Kod/scripts/test_givare.m
index 204d501..5ad8afd 100644
--- a/Kod/scripts/test_givare.m
+++ b/Kod/scripts/test_givare.m
@@ -26,8 +26,33 @@ while 1
     [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;
+    if car1.new_check_point
+        beep;
+        disp('car 1 cp')
+    end
+    if car2.new_check_point
+        beep;
+        disp('car 2 cp')
+    end
+    if car1.new_lap
+        beep;
+        disp('car 1 lap')
+    end
+    if car2.new_lap
+        beep;
+        disp('car 2 lap')
+    end
+    % KOMPENSERA FÖR TRASIG BANA
+    if car1.new_lap && car2.new_check_point
+        car2.new_lap = 0;
+    end
+    pause(0.1)
+    
+    if car2.new_lap
+       disp('NEW LAP CAR 2!')
+    end
+    if car2.new_check_point
+        disp('NEW CHECKPOINT CAR 2!')
     end
     
     pause(0.1)
-- 
cgit v1.2.1


From 4e4073b4c12370d162b489757e51977eeab08b8a Mon Sep 17 00:00:00 2001
From: alex <aletu130@student.liu.se>
Date: Fri, 22 Nov 2019 15:31:21 +0100
Subject: =?UTF-8?q?Lade=20till=20testscript=20kompenserat=20f=C3=B6r=20tra?=
 =?UTF-8?q?siga=20givare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kod/scripts/test_givare_kompenserad.m | 79 +++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 Kod/scripts/test_givare_kompenserad.m

(limited to 'Kod/scripts')

diff --git a/Kod/scripts/test_givare_kompenserad.m b/Kod/scripts/test_givare_kompenserad.m
new file mode 100644
index 0000000..2ac0841
--- /dev/null
+++ b/Kod/scripts/test_givare_kompenserad.m
@@ -0,0 +1,79 @@
+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 || car1.new_check_point == true || car2.new_lap == true || car2.new_check_point == true
+       disp('###')
+    end
+    
+    if car1.new_check_point
+        beep;
+        disp('car 1 cp')
+    end
+    if car2.new_check_point
+        beep;
+        disp('car 2 cp')
+    end
+    if car1.new_lap
+        beep;
+        disp('car 1 lap')
+    end
+    if car2.new_lap
+        beep;
+        disp('car 2 lap')
+    end
+    % KOMPENSERA FÖR TRASIG BANA
+    if car1.new_lap && (car2.new_check_point || car1.new_check_point)
+        car2.new_lap = 0;
+    elseif car1.new_lap
+        car2.new_lap = 1;
+    end
+    pause(0.1)
+    
+    if car1.new_lap || car1.new_check_point == true || car2.new_lap == true || car2.new_check_point == true
+       disp('---')
+    end
+    
+    if car1.new_lap
+        disp('New lap car 1')
+    end
+    if car1.new_check_point
+        disp('New checkpoint car 1')
+    end
+    if car2.new_lap
+       disp('NEW LAP CAR 2!')
+    end
+    if car2.new_check_point
+        disp('NEW CHECKPOINT CAR 2!')
+    end
+    
+    pause(0.1)
+end
+
+%%
+terminate(1)
+terminate(2)
\ No newline at end of file
-- 
cgit v1.2.1