Add relevant output to display

2 files changed, 28 insertions, 3 deletions

diff --git a/Kod/bilbana/yc4/get_time_as_string.m b/Kod/bilbana/yc4/get_time_as_string.m
new file mode 100644
index 0000000..24b6bc5
--- /dev/null
+++ b/Kod/bilbana/yc4/get_time_as_string.m
@@ -0,0 +1,10 @@
+function num_as_str = get_time_as_string(millis)
+%GET_TIME_AS_STRING Number of milliseconds, formatted mm:ss.s and rounded
+%   Detailed explanation goes here
+minutes = num2str(fix(millis / (1000*60)));
+seconds = mod(millis, 1000*60);
+seconds_str = sprintf('%02d', fix(seconds / 1000));
+rest_str = num2str(round(mod(seconds, 1000), -2) / 100);
+num_as_str = strjoin({minutes, ':', seconds_str, '.', rest_str}, '');
+end
+
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 53c6f00..851681a 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -1,5 +1,12 @@
 %% INIT
-% TODO init display
+% INIT DISPLAY
+addpath display/ClientServerApp/Release
+cd display/ClientServerApp/Release
+!startServer
+cd ../../..
+
+global display_data;
+display_data = [];
 
 disp('Startar bilbanan. Avsluta med q.')
 hf=figure('position',[0 0 eps eps],'menubar','none');
@@ -58,6 +65,9 @@ while 1
         end
         car1.seg_times(car1.lap, car1.segment) = -1;  % TODO
         car1.lap_times(car1.lap) = -1;  % TODO
+	
+        display_data = [display_data, put_text(100, 32, L, strjoin({num2str(car1.lap), get_time_as_string(car1.lap_times(car1.lap))}, ' '))];
+
         car1.segment = 1;
         car1.lap = car1.lap + 1;
     end
@@ -79,6 +89,9 @@ while 1
         end
         car2.seg_times(car2.lap, car2.segment) = -1;  % TODO
         car2.lap_times(car2.lap) = -1;  % TODO
+
+        display_data = [display_data, put_text(120, 32, L, strjoin({num2str(car2.lap), get_time_as_string(car2.lap_times(car2.lap))}, ' '))];
+        
         car2.segment = 1;
         car2.lap = car2.lap + 1;
     end
@@ -104,7 +117,8 @@ while 1
     %% END OF LOOP
     tocs(end + 1) = toc;
     pause(0.1)
-    tic;    
+    tic;
+    send_data_to_display(); 
 end
 
 %% END OF PROGRAM
@@ -114,4 +128,5 @@ disp(car2);
 
 terminate(1);
 terminate(2);
-% TODO terminate display
\ No newline at end of file
+
+matlabclient(3);