diff options
| author | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-20 18:10:28 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-20 18:10:28 +0100 |
| commit | a16acaf17caf06c53c2fc4e7f424f84f7ac4778a (patch) | |
| tree | 1285256b9cfc6654683d64eb70e33519868fbce8 | |
| parent | beb0792f35d52cb1f95ecb7c3c4342740b6bc53e (diff) | |
| download | tfyy51-a16acaf17caf06c53c2fc4e7f424f84f7ac4778a.tar.gz | |
remove todo
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 1 | ||||
| -rw-r--r-- | Kod/scripts/display_bars.m | 63 | ||||
| -rw-r--r-- | Kod/scripts/display_post_race_graphs.m | 58 |
3 files changed, 121 insertions, 1 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index bfb18a2..0d0f5f1 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -72,7 +72,6 @@ matlabclient(1, get_smallpackage([ ... ])); pause(0.5); matlabclient(1, get_smallpackage([ ... - % TODO ????????????????????????????????????????? put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME define_touch_key( 98 , 110, 130, 140, 41, 42, 'C', '-'), ... % DECREASE REFERENCE TIME define_touch_key( 190, 110, 220, 140, 43, 44, 'C', '+'), ... % INCREASE REFERENCE TIME 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 |
