From 28f73daf8ded62734f9cdbb9db3fcc20d4183cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 15:22:20 +0100 Subject: Add test for drawing display graphs --- Kod/scripts/display_graphs.m | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 Kod/scripts/display_graphs.m (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_graphs.m b/Kod/scripts/display_graphs.m new file mode 100644 index 0000000..e579422 --- /dev/null +++ b/Kod/scripts/display_graphs.m @@ -0,0 +1,69 @@ +addpath display/ClientServerApp/Release +cd display/ClientServerApp/Release +!startServer +cd ../../.. + +display = struct; +display.data = []; +display.out = 0; +display.shm = 0; +display.shm_interp = struct; +display.shm_interp.ack = 0; +display.shm_interp.start_code = ''; +display.shm_interp.data = []; +display.last_send = tic; +display.send_interval = 0.5; + +graphs = struct; +graphs.car1 = struct; +graphs.car2 = struct; +graphs.car1.lap_times = []; % Nx1 +graphs.car1.lap_deviation = std(graphs.car1.lap_times) +graphs.car1.seg_times = []; % 9xM +graphs.car2.lap_times = []; % Nx1 +graphs.car2.lap_deviation = std(graphs.car2.lap_times) +graphs.car2.seg_times = []; % 9xM +graphs.laps = max(length(graphs.car1.lap_times), length(graphs.car2.lap_times)) + +disp('Drawing frame'); +input(); +matlabclient(1, get_smallpackage([ ... + draw_single_line(32, 32, 32, 192), ... + continue_line(298, 192), ... + draw_single_line(28, 40, 32, 32), ... + continue_line(36, 40), ... + draw_single_line(298, 188, 298, 196) ... +])); +pause(0.2); + +disp('Drawing additional frames'); +input(); +matlabclient(1, get_smallpackage([ ... + draw_single_line(220, 0, 220, 80), ... + continue_line(0, 80), ... + draw_single_line(0, 208, 320, 208) ... +])); +pause(0.2); + +disp('Putting text'); +input(); +matlabclient(1, get_smallpackage([ + put_text(304, 20, 'R', 'std: 0.15s'), ... + put_text(304, 40, 'R', 'mean: 12.4s'), ... + put_text(304, 60, 'R', 'target: 12.5s') ... +])); +pause(0.2); + +disp('Drawing buttons'); +input(); +matlabclient(1, get_smallpackage([ ... + define_touch_key(0 , 208, 107, 240, 51, 61, 'C', 'Knapp 1'), ... + define_touch_key(107, 208, 213, 240, 52, 62, 'C', 'Knapp 2'), ... + define_touch_key(213, 208, 320, 240, 53, 63, 'C', 'Knapp 3') ... +])) +pause(0.2); + +disp(''); +input(); +matlabclient(1, get_smallpackage([])) +pause(0.2); -- cgit v1.2.1 From 1aee59b208ea55561d49d4fc1338fd89b51fdceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 16 Nov 2019 14:12:35 +0100 Subject: test and fix example --- Kod/scripts/display_graphs.m | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_graphs.m b/Kod/scripts/display_graphs.m index e579422..3c8e4de 100644 --- a/Kod/scripts/display_graphs.m +++ b/Kod/scripts/display_graphs.m @@ -3,6 +3,8 @@ cd display/ClientServerApp/Release !startServer cd ../../.. +pause(1); + display = struct; display.data = []; display.out = 0; @@ -18,15 +20,15 @@ graphs = struct; graphs.car1 = struct; graphs.car2 = struct; graphs.car1.lap_times = []; % Nx1 -graphs.car1.lap_deviation = std(graphs.car1.lap_times) +graphs.car1.lap_deviation = std(graphs.car1.lap_times); graphs.car1.seg_times = []; % 9xM graphs.car2.lap_times = []; % Nx1 -graphs.car2.lap_deviation = std(graphs.car2.lap_times) +graphs.car2.lap_deviation = std(graphs.car2.lap_times); graphs.car2.seg_times = []; % 9xM -graphs.laps = max(length(graphs.car1.lap_times), length(graphs.car2.lap_times)) +graphs.laps = max(length(graphs.car1.lap_times), length(graphs.car2.lap_times)); disp('Drawing frame'); -input(); +% input(''); matlabclient(1, get_smallpackage([ ... draw_single_line(32, 32, 32, 192), ... continue_line(298, 192), ... @@ -37,25 +39,24 @@ matlabclient(1, get_smallpackage([ ... pause(0.2); disp('Drawing additional frames'); -input(); +% input(''); matlabclient(1, get_smallpackage([ ... - draw_single_line(220, 0, 220, 80), ... - continue_line(0, 80), ... - draw_single_line(0, 208, 320, 208) ... + draw_single_line(190, 0, 190, 70), ... + continue_line(320, 70) ... ])); pause(0.2); disp('Putting text'); -input(); +% input(''); matlabclient(1, get_smallpackage([ - put_text(304, 20, 'R', 'std: 0.15s'), ... - put_text(304, 40, 'R', 'mean: 12.4s'), ... - put_text(304, 60, 'R', 'target: 12.5s') ... + put_text(304, 10, 'R', 'std: 0.15s'), ... + put_text(304, 30, 'R', 'mean: 12.4s'), ... + put_text(304, 50, 'R', 'target: 12.5s') ... ])); pause(0.2); disp('Drawing buttons'); -input(); +% input(''); matlabclient(1, get_smallpackage([ ... define_touch_key(0 , 208, 107, 240, 51, 61, 'C', 'Knapp 1'), ... define_touch_key(107, 208, 213, 240, 52, 62, 'C', 'Knapp 2'), ... @@ -64,6 +65,5 @@ matlabclient(1, get_smallpackage([ ... pause(0.2); disp(''); -input(); -matlabclient(1, get_smallpackage([])) -pause(0.2); +% input(''); +matlabclient(3); \ No newline at end of file -- cgit v1.2.1 From 104874810c6cdfbd33e63ea465ea4360a0848fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sun, 17 Nov 2019 21:53:48 +0100 Subject: rename functions skladkfb --- Kod/scripts/display_graphs.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_graphs.m b/Kod/scripts/display_graphs.m index 3c8e4de..95cdee5 100644 --- a/Kod/scripts/display_graphs.m +++ b/Kod/scripts/display_graphs.m @@ -30,18 +30,18 @@ graphs.laps = max(length(graphs.car1.lap_times), length(graphs.car2.lap_times)); disp('Drawing frame'); % input(''); matlabclient(1, get_smallpackage([ ... - draw_single_line(32, 32, 32, 192), ... + line(32, 32, 32, 192), ... continue_line(298, 192), ... - draw_single_line(28, 40, 32, 32), ... + line(28, 40, 32, 32), ... continue_line(36, 40), ... - draw_single_line(298, 188, 298, 196) ... + line(298, 188, 298, 196) ... ])); pause(0.2); disp('Drawing additional frames'); % input(''); matlabclient(1, get_smallpackage([ ... - draw_single_line(190, 0, 190, 70), ... + line(190, 0, 190, 70), ... continue_line(320, 70) ... ])); pause(0.2); @@ -49,21 +49,21 @@ pause(0.2); disp('Putting text'); % input(''); matlabclient(1, get_smallpackage([ - put_text(304, 10, 'R', 'std: 0.15s'), ... - put_text(304, 30, 'R', 'mean: 12.4s'), ... - put_text(304, 50, 'R', 'target: 12.5s') ... + text(304, 10, 'R', 'std: 0.15s'), ... + text(304, 30, 'R', 'mean: 12.4s'), ... + text(304, 50, 'R', 'target: 12.5s') ... ])); pause(0.2); disp('Drawing buttons'); % input(''); matlabclient(1, get_smallpackage([ ... - define_touch_key(0 , 208, 107, 240, 51, 61, 'C', 'Knapp 1'), ... - define_touch_key(107, 208, 213, 240, 52, 62, 'C', 'Knapp 2'), ... - define_touch_key(213, 208, 320, 240, 53, 63, 'C', 'Knapp 3') ... + key(0 , 208, 107, 240, 51, 61, 'C', 'Knapp 1'), ... + key(107, 208, 213, 240, 52, 62, 'C', 'Knapp 2'), ... + key(213, 208, 320, 240, 53, 63, 'C', 'Knapp 3') ... ])) pause(0.2); disp(''); % input(''); -matlabclient(3); \ No newline at end of file +matlabclient(3); -- cgit v1.2.1 From 6f8e706ee7a4aa59e6da22c1bb1008e94813a9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 19 Nov 2019 12:54:50 +0100 Subject: Add comments --- Kod/scripts/display_graphs.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_graphs.m b/Kod/scripts/display_graphs.m index 95cdee5..e749075 100644 --- a/Kod/scripts/display_graphs.m +++ b/Kod/scripts/display_graphs.m @@ -30,11 +30,11 @@ graphs.laps = max(length(graphs.car1.lap_times), length(graphs.car2.lap_times)); disp('Drawing frame'); % input(''); matlabclient(1, get_smallpackage([ ... - line(32, 32, 32, 192), ... - continue_line(298, 192), ... - line(28, 40, 32, 32), ... - continue_line(36, 40), ... - line(298, 188, 298, 196) ... + line(32, 32, 32, 192), ... % y-axis + continue_line(298, 192), ... % x-axis + line(28, 40, 32, 32), ... % arrow on y + continue_line(36, 40), ... % arrow on y + line(298, 188, 298, 196) ... % line on x ])); pause(0.2); -- cgit v1.2.1 From e1ee4a1d66e7576f9d2bb6c659c9d5e79f90921f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Tue, 19 Nov 2019 12:55:00 +0100 Subject: Smaller buttons --- Kod/scripts/display_graphs.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_graphs.m b/Kod/scripts/display_graphs.m index e749075..a6e8f1c 100644 --- a/Kod/scripts/display_graphs.m +++ b/Kod/scripts/display_graphs.m @@ -58,9 +58,9 @@ pause(0.2); disp('Drawing buttons'); % input(''); matlabclient(1, get_smallpackage([ ... - key(0 , 208, 107, 240, 51, 61, 'C', 'Knapp 1'), ... - key(107, 208, 213, 240, 52, 62, 'C', 'Knapp 2'), ... - key(213, 208, 320, 240, 53, 63, 'C', 'Knapp 3') ... + key(0 , 216, 107, 240, 51, 61, 'C', 'Knapp 1'), ... + key(107, 216, 213, 240, 52, 62, 'C', 'Knapp 2'), ... + key(213, 216, 320, 240, 53, 63, 'C', 'Knapp 3') ... ])) pause(0.2); -- cgit v1.2.1 From a16acaf17caf06c53c2fc4e7f424f84f7ac4778a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Nov 2019 18:10:28 +0100 Subject: remove todo --- Kod/scripts/display_bars.m | 63 ++++++++++++++++++++++++++++++++++ Kod/scripts/display_post_race_graphs.m | 58 +++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 Kod/scripts/display_bars.m create mode 100644 Kod/scripts/display_post_race_graphs.m (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_bars.m b/Kod/scripts/display_bars.m new file mode 100644 index 0000000..2f3fbe8 --- /dev/null +++ b/Kod/scripts/display_bars.m @@ -0,0 +1,63 @@ +addpath display/ClientServerApp/Release +cd display/ClientServerApp/Release +!startServer +cd ../../.. + +pause(1); + +% values1 = [1 1 2 3 4 5 6 7 8]; +values1 = []; +values2 = [1 1.5 2 2.5 3 3.5 4 4.5 5]; + +matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Genomsnittlig tid per segment'))) +pause(0.2); + +% input(''); +matlabclient(1, get_smallpackage([ ... + toggle(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + toggle(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + toggle(213, 216, 320, 240, 53, 63, 'C', 'Knapp 3'), ... + get_package('AP', [52 1]) ... +])); +pause(0.2); + +matlabclient(1, get_smallpackage([ ... + draw_line(20, 24, 20, 200), ... % y-axis + continue_line(304, 200), ... % x-axis + draw_line(16, 32, 20, 24), ... % arrow on y, left part + continue_line(24, 32), ... % arrow on y, right part + draw_line(304, 196, 304, 204) ... % line on x +])); +pause(0.2); + +[bars, max_val, min_y, max_height] = get_bars_from_values(values1, values2); + +for bar = bars + matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); + pause(0.2); +end + +matlabclient(1, get_smallpackage(put_text(9, 25, 'C', 's'))); +pause(0.2); + +% matlabclient(1, get_smallpackage(set_line_pattern(2))) +% pause(0.2); +for i = 1:floor(max_val) + x = 20; + y = 200 - round(max_height * (i/max_val)); + matlabclient(1, get_smallpackage([draw_line(x, y, 300, y), ... + put_text(x-6, y-2, 'C', num2str(i))])) + pause(0.2); +end +% matlabclient(1, get_smallpackage(set_line_pattern(1))) +% pause(0.2); + +for i = 0:8 + x = 16+13 + 10 + 30*i; + matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); + pause(0.2); +end + +pause(0.8); + +matlabclient(3) \ No newline at end of file diff --git a/Kod/scripts/display_post_race_graphs.m b/Kod/scripts/display_post_race_graphs.m new file mode 100644 index 0000000..58145ee --- /dev/null +++ b/Kod/scripts/display_post_race_graphs.m @@ -0,0 +1,58 @@ +addpath display/ClientServerApp/Release +cd display/ClientServerApp/Release +!startServer +cd ../../.. + +pause(1); + +matlabclient(1, get_smallpackage([ ... + key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... +])); +pause(0.2); + +%% CHECK DISPLAY BUTTONS +display.last_check = tic; +done = false; +while 1 + pause(0.1); + if toc(display.last_check) > 0.4 + display.last_check = tic; + + % read internal mem from last send + [display.out, display.shm] = matlabclient(2); + [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); + + % request internal mem + matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); + if isempty(display.shm_interp.data) + continue + end + update_ref_time = false; + for i = 1:length(display.shm_interp.data) + disp(num2str(length(display.shm_interp.data))) + data = display.shm_interp.data(i); + if data.data == 51 + draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13); + elseif data.data == 52 + draw_segment_bars([1 2 3 4 5 6 7 8 9], []); + elseif data.data == 53 + pause(0.2); + matlabclient(1, get_smallpackage(clear_display())); + pause(0.2); + done = true; + end + end + if done == true + break + end + if update_ref_time == true + pause(0.4); + matlabclient(1, get_smallpackage(put_text(160, 120, 'C', num2str(ref_time, '%.1f')))); + end + display.last_check = tic; + end +end + +matlabclient(3); \ No newline at end of file -- cgit v1.2.1 From 76e3773693e00ff69d5c6385f0301b9a0cb962b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Nov 2019 18:13:05 +0100 Subject: Add script to showcase scenes --- Kod/scripts/display_bars.m | 63 ---------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 Kod/scripts/display_bars.m (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_bars.m b/Kod/scripts/display_bars.m deleted file mode 100644 index 2f3fbe8..0000000 --- a/Kod/scripts/display_bars.m +++ /dev/null @@ -1,63 +0,0 @@ -addpath display/ClientServerApp/Release -cd display/ClientServerApp/Release -!startServer -cd ../../.. - -pause(1); - -% values1 = [1 1 2 3 4 5 6 7 8]; -values1 = []; -values2 = [1 1.5 2 2.5 3 3.5 4 4.5 5]; - -matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Genomsnittlig tid per segment'))) -pause(0.2); - -% input(''); -matlabclient(1, get_smallpackage([ ... - toggle(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... - toggle(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... - toggle(213, 216, 320, 240, 53, 63, 'C', 'Knapp 3'), ... - get_package('AP', [52 1]) ... -])); -pause(0.2); - -matlabclient(1, get_smallpackage([ ... - draw_line(20, 24, 20, 200), ... % y-axis - continue_line(304, 200), ... % x-axis - draw_line(16, 32, 20, 24), ... % arrow on y, left part - continue_line(24, 32), ... % arrow on y, right part - draw_line(304, 196, 304, 204) ... % line on x -])); -pause(0.2); - -[bars, max_val, min_y, max_height] = get_bars_from_values(values1, values2); - -for bar = bars - matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); - pause(0.2); -end - -matlabclient(1, get_smallpackage(put_text(9, 25, 'C', 's'))); -pause(0.2); - -% matlabclient(1, get_smallpackage(set_line_pattern(2))) -% pause(0.2); -for i = 1:floor(max_val) - x = 20; - y = 200 - round(max_height * (i/max_val)); - matlabclient(1, get_smallpackage([draw_line(x, y, 300, y), ... - put_text(x-6, y-2, 'C', num2str(i))])) - pause(0.2); -end -% matlabclient(1, get_smallpackage(set_line_pattern(1))) -% pause(0.2); - -for i = 0:8 - x = 16+13 + 10 + 30*i; - matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); - pause(0.2); -end - -pause(0.8); - -matlabclient(3) \ No newline at end of file -- cgit v1.2.1 From 7ac5ec97bb9278f6e4c1fdd0d5bebc4bc49150a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Nov 2019 18:13:27 +0100 Subject: Add script to showcase bars --- Kod/scripts/display_bars.m | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 Kod/scripts/display_bars.m (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_bars.m b/Kod/scripts/display_bars.m new file mode 100644 index 0000000..2f3fbe8 --- /dev/null +++ b/Kod/scripts/display_bars.m @@ -0,0 +1,63 @@ +addpath display/ClientServerApp/Release +cd display/ClientServerApp/Release +!startServer +cd ../../.. + +pause(1); + +% values1 = [1 1 2 3 4 5 6 7 8]; +values1 = []; +values2 = [1 1.5 2 2.5 3 3.5 4 4.5 5]; + +matlabclient(1, get_smallpackage(put_text(160, 8, 'C', 'Genomsnittlig tid per segment'))) +pause(0.2); + +% input(''); +matlabclient(1, get_smallpackage([ ... + toggle(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + toggle(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + toggle(213, 216, 320, 240, 53, 63, 'C', 'Knapp 3'), ... + get_package('AP', [52 1]) ... +])); +pause(0.2); + +matlabclient(1, get_smallpackage([ ... + draw_line(20, 24, 20, 200), ... % y-axis + continue_line(304, 200), ... % x-axis + draw_line(16, 32, 20, 24), ... % arrow on y, left part + continue_line(24, 32), ... % arrow on y, right part + draw_line(304, 196, 304, 204) ... % line on x +])); +pause(0.2); + +[bars, max_val, min_y, max_height] = get_bars_from_values(values1, values2); + +for bar = bars + matlabclient(1, get_smallpackage(fill_area(bar.x_lo, bar.y_lo, bar.x_hi, bar.y_hi))); + pause(0.2); +end + +matlabclient(1, get_smallpackage(put_text(9, 25, 'C', 's'))); +pause(0.2); + +% matlabclient(1, get_smallpackage(set_line_pattern(2))) +% pause(0.2); +for i = 1:floor(max_val) + x = 20; + y = 200 - round(max_height * (i/max_val)); + matlabclient(1, get_smallpackage([draw_line(x, y, 300, y), ... + put_text(x-6, y-2, 'C', num2str(i))])) + pause(0.2); +end +% matlabclient(1, get_smallpackage(set_line_pattern(1))) +% pause(0.2); + +for i = 0:8 + x = 16+13 + 10 + 30*i; + matlabclient(1, get_smallpackage(put_text(x, 204, 'C', num2str(i + 1)))); + pause(0.2); +end + +pause(0.8); + +matlabclient(3) \ No newline at end of file -- cgit v1.2.1 From d195a43eef3817d6a1f926725eeaba6770345c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 23 Nov 2019 23:05:05 +0100 Subject: more work --- Kod/scripts/display_post_race_graphs.m | 36 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_post_race_graphs.m b/Kod/scripts/display_post_race_graphs.m index 58145ee..4db9ffb 100644 --- a/Kod/scripts/display_post_race_graphs.m +++ b/Kod/scripts/display_post_race_graphs.m @@ -6,9 +6,9 @@ cd ../../.. pause(1); matlabclient(1, get_smallpackage([ ... - key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... - key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... - key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... + key(0 , 216, 107, 240, 51, 61, 'C', 'Varv'), ... + key(107, 216, 213, 240, 52, 62, 'C', 'Segment'), ... + key(213, 216, 320, 240, 53, 63, 'C', 'Avsluta') ... ])); pause(0.2); @@ -18,8 +18,8 @@ done = false; while 1 pause(0.1); if toc(display.last_check) > 0.4 - display.last_check = tic; - + display.last_check = tic; + % read internal mem from last send [display.out, display.shm] = matlabclient(2); [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); @@ -27,22 +27,24 @@ while 1 % request internal mem matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); if isempty(display.shm_interp.data) - continue + continue; end update_ref_time = false; for i = 1:length(display.shm_interp.data) disp(num2str(length(display.shm_interp.data))) data = display.shm_interp.data(i); - if data.data == 51 - draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13); - elseif data.data == 52 - draw_segment_bars([1 2 3 4 5 6 7 8 9], []); - elseif data.data == 53 - pause(0.2); - matlabclient(1, get_smallpackage(clear_display())); - pause(0.2); - done = true; - end + if data.data == 51 + draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13, false); + elseif data.data == 52 + draw_segment_bars([1 2 3 4 5 6 7 8 9], []); + elseif data.data == 53 + pause(0.2); + matlabclient(1, get_smallpackage(clear_display())); + pause(0.2); + done = true; + elseif data.data == 70 + draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13, true); + end end if done == true break @@ -55,4 +57,4 @@ while 1 end end -matlabclient(3); \ No newline at end of file +matlabclient(3); -- cgit v1.2.1 From 2246ff7466c252dff4e22ed894dee3f152f0f4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 25 Nov 2019 12:34:32 +0100 Subject: Changes - Add semicolons - Fix clamp - Fix syntax - Make testing (somewhat) modular --- Kod/scripts/display_post_race_graphs.m | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Kod/scripts') diff --git a/Kod/scripts/display_post_race_graphs.m b/Kod/scripts/display_post_race_graphs.m index 4db9ffb..77336ce 100644 --- a/Kod/scripts/display_post_race_graphs.m +++ b/Kod/scripts/display_post_race_graphs.m @@ -1,3 +1,5 @@ +clear all; + addpath display/ClientServerApp/Release cd display/ClientServerApp/Release !startServer @@ -15,6 +17,10 @@ pause(0.2); %% CHECK DISPLAY BUTTONS display.last_check = tic; done = false; + +laptime_1 = [12 12.1 12.2 12.3 12.4 12.5 12.6 12.7 12.8 12.9 13]; +laptime_2 = [11 11.2 11.4 11.6 11.8 12 12.5 13 13.5 14 14.2 14.6 14.8 15]; + while 1 pause(0.1); if toc(display.last_check) > 0.4 @@ -34,16 +40,16 @@ while 1 disp(num2str(length(display.shm_interp.data))) data = display.shm_interp.data(i); if data.data == 51 - draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13, false); + draw_lap_graph(laptime_1, laptime_2, 13, false); elseif data.data == 52 - draw_segment_bars([1 2 3 4 5 6 7 8 9], []); + draw_segment_bars([1 2 3 4 5 6 7 8 9], [9 8 7 6 5 4 3 2 1]); elseif data.data == 53 pause(0.2); matlabclient(1, get_smallpackage(clear_display())); pause(0.2); done = true; elseif data.data == 70 - draw_lap_graph([13 13 13.2 13.1 13 12.9 12.75], [], 13, true); + draw_lap_graph(laptime_1, laptime_2, 13, true); end end if done == true -- cgit v1.2.1