Merge branch 'freeze_gustav' into freeze

# Conflicts:
#	Kod/bilbana/yc4/main.m

9 files changed, 141 insertions, 59 deletions

diff --git a/Kod/bilbana/yc4/display/clear_display.m b/Kod/bilbana/yc4/display/clear_display.m
new file mode 100644
index 0000000..32fdac1
--- /dev/null
+++ b/Kod/bilbana/yc4/display/clear_display.m
@@ -0,0 +1,3 @@
+function pkg = clear_display()
+	pkg = get_package('DL', [])
+end
diff --git a/Kod/bilbana/yc4/display/draw_single_line.m b/Kod/bilbana/yc4/display/draw_single_line.m
new file mode 100644
index 0000000..ca13293
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_single_line.m
@@ -0,0 +1,4 @@
+function pkg = draw_single_line(x1, y1, x2, y2)
+	arg = [mod(x1, 255), fix(x1 / 255), y1, 0, mod(x2, 255), fix(x2 / 255), y2, 0];
+	pkg = get_package('GD', arg);
+end
diff --git a/Kod/bilbana/yc4/display/get_package.m b/Kod/bilbana/yc4/display/get_package.m
new file mode 100644
index 0000000..7c3a01e
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_package.m
@@ -0,0 +1,10 @@
+function [pkg] = get_package(code, args)
+	DC1 = 17;
+	ESC = 27;
+
+	data = [ESC, double(code), args];
+	len = length(data);
+	initStr = [DC1, len, data];
+	bcc = mod(sum(initStr), 256);
+	pkg = [initStr, bcc];
+end
diff --git a/Kod/bilbana/yc4/display/put_text.m b/Kod/bilbana/yc4/display/put_text.m
new file mode 100644
index 0000000..5b80192
--- /dev/null
+++ b/Kod/bilbana/yc4/display/put_text.m
@@ -0,0 +1,9 @@
+function [pkg] = put_text(x, y, justification, text)
+	code = double(strjoin({'Z', justification}, ''));
+
+	arg1 = [x, 0, y, 0];
+	arg2 = text;
+	arg3 = 0;
+
+	pkg = get_package(code, [arg1 double(arg2) arg3]);
+end
diff --git a/Kod/bilbana/yc4/display/send_data_to_display.m b/Kod/bilbana/yc4/display/send_data_to_display.m
new file mode 100644
index 0000000..8df03f7
--- /dev/null
+++ b/Kod/bilbana/yc4/display/send_data_to_display.m
@@ -0,0 +1,28 @@
+function [] = send_data_to_display()
+%SEND_DATA_TO_DISPLAY sends available data to display if last send was
+%                     more than 0.5 seconds ago.
+    persistent last_send;
+    global display_data;
+    
+    if isempty(display_data)
+        return
+    end
+    disp(last_send);
+    disp(clock);
+    if isempty(last_send)  % first send
+        %% SEND DATA
+        disp('sending data');
+        disp(display_data)
+        matlabclient(1, display_data{1});
+        last_send = clock;
+        display_data(1) = [];
+    elseif (etime(clock, last_send) >= 0.5)
+        %% SEND DATA
+        disp('sending data');
+        disp(display_data)
+        matlabclient(1, display_data{1});
+        last_send = clock;
+        display_data(1) = [];
+    end
+end
+
diff --git a/Kod/bilbana/yc4/display/set_text_font.m b/Kod/bilbana/yc4/display/set_text_font.m
new file mode 100644
index 0000000..768d16b
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_text_font.m
@@ -0,0 +1,3 @@
+function pkg = set_text_font(font_num)
+	pkg = get_package('ZF', [font_num])
+end
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 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);
diff --git a/Kod/display/display_exempel.m b/Kod/display/display_exempel.m
index c920087..5ac7cb0 100644
--- a/Kod/display/display_exempel.m
+++ b/Kod/display/display_exempel.m
@@ -10,24 +10,24 @@ cd ClientServerApp\Release
 !startServer

 cd ../..

 %% Diagonal linje

-DC1 = 17;

-ESC = 27;

-Code = 'GD';

-

-% x1, y1, x2, y2, (320 x 240 pixlar)

-% minst signifikanta bitar till vänster

-% mest signifikanta bitar till höger

-arg = [0, 0, 0, 0, 63, 1, 239, 0];

-

-% Save the 'small package' as a string

-data = [ESC, double(Code), arg];

-len = length(data);

-initStr = [DC1, len, data];

-bcc = mod(sum(initStr), 256);

-str = [initStr, bcc];

-

-% Skriv

-matlabclient(1, str')

+% DC1 = 17;

+% ESC = 27;

+% Code = 'GD';

+% 

+% % x1, y1, x2, y2, (320 x 240 pixlar)

+% % minst signifikanta bitar till vänster

+% % mest signifikanta bitar till höger

+% arg = [0, 0, 0, 0, 63, 1, 239, 0];

+% 

+% % Save the 'small package' as a string

+% data = [ESC, double(Code), arg];

+% len = length(data);

+% initStr = [DC1, len, data];

+% bcc = mod(sum(initStr), 256);

+% str = [initStr, bcc];

+% 

+% % Skriv

+% matlabclient(1, str')

 

 %% Rita en rektangel som är fylld med mönster

 DC1 = 17;

@@ -53,30 +53,30 @@ str = [initStr, bcc];
 matlabclient(1, str')

 

 %% Skriv en Test-sträng

-DC1 = 17;

-ESC = 27;

-Code = double('ZL');

-

-% x1, y1, (320 x 240 pixlar)

-% minst signifikanta bitar till vänster

-% mest signifikanta bitar till höger

-arg1 = [117, 0, 32, 0];

-

-% Textsträng

-%arg2 = 'Test';

-

-arg2 = 'DISPLAY!!!!!';

-

-% Null

-arg3 = 0;

-

-

-% Save the 'small package' as a string

-data = [ESC, double(Code), arg1, double(arg2), arg3];

-len = length(data);

-initStr = [DC1, len, data];

-bcc = mod(sum(initStr), 256);

-str = [initStr, bcc];

+% DC1 = 17;

+% ESC = 27;

+% Code = double('ZL');

+% 

+% % x1, y1, (320 x 240 pixlar)

+% % minst signifikanta bitar till vänster

+% % mest signifikanta bitar till höger

+% arg1 = [117, 0, 32, 0];

+% 

+% % Textsträng

+% %arg2 = 'Test';

+% 

+% arg2 = 'DISPLAY!!!!!';

+% 

+% % Null

+% arg3 = 0;

+% 

+% 

+% % Save the 'small package' as a string

+% data = [ESC, double(Code), arg1, double(arg2), arg3];

+% len = length(data);

+% initStr = [DC1, len, data];

+% bcc = mod(sum(initStr), 256);

+% str = [initStr, bcc];

 

 % Skriv

 matlabclient(1, str')

@@ -142,20 +142,20 @@ matlabclient(1, str')
 %fwrite(lcd, str)

 

 %% Radera Displayen

-DC1 = 17;

-ESC = 27;

-Code = 'DL';

-

-% Save the 'small package' as a string

-data = [ESC, double(Code)];

-len = length(data);

-initStr = [DC1, len, data];

-bcc = mod(sum(initStr), 256);

-str = [initStr, bcc];

-

-% Skriv

-matlabclient(1, str')

-%fwrite(lcd, str)

+% DC1 = 17;

+% ESC = 27;

+% Code = 'DL';

+% 

+% % Save the 'small package' as a string

+% data = [ESC, double(Code)];

+% len = length(data);

+% initStr = [DC1, len, data];

+% bcc = mod(sum(initStr), 256);

+% str = [initStr, bcc];

+% 

+% % Skriv

+% matlabclient(1, str')

+% %fwrite(lcd, str)

 

 %% Avsluta kommunikation med display

-matlabclient(3);
\ No newline at end of file
+matlabclient(3);