From 4d0480a2e07c92b200fe3bb87e929d970f9e212b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 19 Oct 2019 16:16:21 +0200 Subject: Create basic functions for BP4a --- Kod/bilbana/yc4/display/clear_display.m | 3 +++ Kod/bilbana/yc4/display/draw_single_line.m | 5 +++++ Kod/bilbana/yc4/display/get_package.m | 10 ++++++++++ Kod/bilbana/yc4/display/put_text.m | 9 +++++++++ Kod/bilbana/yc4/display/set_text_font.m | 3 +++ 5 files changed, 30 insertions(+) create mode 100644 Kod/bilbana/yc4/display/clear_display.m create mode 100644 Kod/bilbana/yc4/display/draw_single_line.m create mode 100644 Kod/bilbana/yc4/display/get_package.m create mode 100644 Kod/bilbana/yc4/display/put_text.m create mode 100644 Kod/bilbana/yc4/display/set_text_font.m (limited to 'Kod/bilbana/yc4') 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..97cf1ae --- /dev/null +++ b/Kod/bilbana/yc4/display/draw_single_line.m @@ -0,0 +1,5 @@ +function [pkg] = draw_line(x1, y1, x2, y2) + arg = [x1, 0, y1, 0, x2, 1, y2, 0] % TODO nollor mellan värden? vad betyder ettan? + + 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..95dbb26 --- /dev/null +++ b/Kod/bilbana/yc4/display/put_text.m @@ -0,0 +1,9 @@ +function [pkg] = put_text(x, y, justification, text) + code = double(join('Z', justification)) + + arg1 = [x, 0, y, 0] + arg2 = text; + arg3 = 0; + + pkg = get_package(join('Z', justification), [arg1 arg2 arg3]) +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 -- cgit v1.2.1 From 347756aed1d5f378d4732811495ad47a2e8d667d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 19 Oct 2019 16:20:14 +0200 Subject: Add send_data-function --- Kod/bilbana/yc4/display/send_data_to_display.m | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Kod/bilbana/yc4/display/send_data_to_display.m (limited to 'Kod/bilbana/yc4') 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 + -- cgit v1.2.1 From 62619cdb00de22afe4382e35facdc9fb941a6de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 20 Oct 2019 00:19:50 +0200 Subject: Add relevant output to display --- Kod/bilbana/yc4/get_time_as_string.m | 10 ++++++++++ Kod/bilbana/yc4/main.m | 21 ++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 Kod/bilbana/yc4/get_time_as_string.m (limited to 'Kod/bilbana/yc4') 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); -- cgit v1.2.1 From fac231875693560adcbd6e3803592e27674dd2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 20 Oct 2019 13:57:56 +0200 Subject: Fix put_text - Prints in "formatting mode" instead of terminal mode - Correct argument formatting --- Kod/bilbana/yc4/display/put_text.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Kod/bilbana/yc4') diff --git a/Kod/bilbana/yc4/display/put_text.m b/Kod/bilbana/yc4/display/put_text.m index 95dbb26..5b80192 100644 --- a/Kod/bilbana/yc4/display/put_text.m +++ b/Kod/bilbana/yc4/display/put_text.m @@ -1,9 +1,9 @@ function [pkg] = put_text(x, y, justification, text) - code = double(join('Z', justification)) + code = double(strjoin({'Z', justification}, '')); - arg1 = [x, 0, y, 0] + arg1 = [x, 0, y, 0]; arg2 = text; arg3 = 0; - pkg = get_package(join('Z', justification), [arg1 arg2 arg3]) + pkg = get_package(code, [arg1 double(arg2) arg3]); end -- cgit v1.2.1 From c4033991d6363441bf4697608034edb39ff50fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 20 Oct 2019 14:11:47 +0200 Subject: Fix draw_single_line - Mod for x-values > 255 --- Kod/bilbana/yc4/display/draw_single_line.m | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Kod/bilbana/yc4') diff --git a/Kod/bilbana/yc4/display/draw_single_line.m b/Kod/bilbana/yc4/display/draw_single_line.m index 97cf1ae..ca13293 100644 --- a/Kod/bilbana/yc4/display/draw_single_line.m +++ b/Kod/bilbana/yc4/display/draw_single_line.m @@ -1,5 +1,4 @@ -function [pkg] = draw_line(x1, y1, x2, y2) - arg = [x1, 0, y1, 0, x2, 1, y2, 0] % TODO nollor mellan värden? vad betyder ettan? - - pkg = get_package('GD', arg) +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 -- cgit v1.2.1