summaryrefslogtreecommitdiffstats
path: root/Kod/bilbana/yc4/main.m
diff options
context:
space:
mode:
Diffstat (limited to 'Kod/bilbana/yc4/main.m')
-rw-r--r--Kod/bilbana/yc4/main.m19
1 files changed, 17 insertions, 2 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 2512faf..baf1914 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');
@@ -64,6 +71,9 @@ while 1
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(car1.lap_times(car1.lap))}, ' '))];
+
car1.segment = 1;
car1.lap = car1.lap + 1;
end
@@ -90,6 +100,9 @@ while 1
car2.seg_tic = tic;
car2.lap_times(car2.lap) = toc(car2.lap_tic);
car2.lap_tic = tic;
+
+ 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
@@ -115,6 +128,7 @@ while 1
%% END OF LOOP
pause(0.1)
tocs(end + 1) = toc;
+ send_data_to_display();
end
%% END OF PROGRAM
@@ -124,4 +138,5 @@ disp(car2);
terminate(1);
terminate(2);
-% TODO terminate display \ No newline at end of file
+
+matlabclient(3);