1 files changed, 46 insertions, 15 deletions

diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 53c6f00..4c700bb 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -1,5 +1,14 @@
 %% INIT
-% TODO init display
+% INIT DISPLAY
+addpath display/ClientServerApp/Release
+cd display/ClientServerApp/Release
+!startServer
+cd ../../..
+
+global display_data;
+display_data = {};
+display_data = {display_data clear_display()};
+pause(1);
 
 disp('Startar bilbanan. Avsluta med q.')
 hf=figure('position',[0 0 eps eps],'menubar','none');
@@ -28,6 +37,7 @@ tocs = [];
 
 %% MAIN LOOP
 while 1
+    tic;
     %% PRE-LOOP
     if strcmp(get(hf,'currentcharacter'),'q')
         close(hf)
@@ -45,19 +55,28 @@ 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);
         end
         car1.segment = car1.segment + 1;
-    elseif car1.new_lap == true
-        % beep;
+        car1.seg_tic = tic;
+    end
+    if car1.new_lap == true
         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
+        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;
+
+        display_data = {display_data, put_text(100, 32, 'L', strjoin({num2str(car1.lap), get_time_as_string(round(car1.lap_times(car1.lap) * 1000))}, ' '))};
+        
         car1.segment = 1;
         car1.lap = car1.lap + 1;
     end
@@ -66,19 +85,30 @@ 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);
         end
         car2.segment = car2.segment + 1;
-    elseif car2.new_lap == true
-        % beep;
+        car2.seg_tic = tic;
+    end
+    if car2.new_lap == true
         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;
+            disp('continuing');
             continue;
         end
-        car2.seg_times(car2.lap, car2.segment) = -1;  % TODO
-        car2.lap_times(car2.lap) = -1;  % TODO
+        beep;
+        
+        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;
+
+        display_data = {display_data, put_text(100, 48, 'L', strjoin({num2str(car2.lap), get_time_as_string(round(car2.lap_times(car2.lap) * 1000))}, ' '))};
+        
         car2.segment = 1;
         car2.lap = car2.lap + 1;
     end
@@ -102,11 +132,11 @@ while 1
     %% DISPLAY
     
     %% END OF LOOP
-    tocs(end + 1) = toc;
     pause(0.1)
-    tic;    
+    tocs(end + 1) = toc;
+    send_data_to_display();
 end
-
+ 
 %% END OF PROGRAM
 disp(tocs);
 disp(car1);
@@ -114,4 +144,5 @@ disp(car2);
 
 terminate(1);
 terminate(2);
-% TODO terminate display
\ No newline at end of file
+
+matlabclient(3);