From c99ec1964c71f4a1e69874498e4f91be99755ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 14 Nov 2019 22:49:32 +0100 Subject: Add bar graph functions --- Kod/bilbana/yc4/display/define_bar_graph.m | 18 ++++++++++++++++++ Kod/bilbana/yc4/display/delete_bar_graph.m | 7 +++++++ Kod/bilbana/yc4/display/redraw_bar_graph.m | 3 +++ Kod/bilbana/yc4/display/request_bar_graph_value.m | 3 +++ Kod/bilbana/yc4/display/update_bar_graph.m | 3 +++ 5 files changed, 34 insertions(+) create mode 100644 Kod/bilbana/yc4/display/define_bar_graph.m create mode 100644 Kod/bilbana/yc4/display/delete_bar_graph.m create mode 100644 Kod/bilbana/yc4/display/redraw_bar_graph.m create mode 100644 Kod/bilbana/yc4/display/request_bar_graph_value.m create mode 100644 Kod/bilbana/yc4/display/update_bar_graph.m (limited to 'Kod/bilbana') diff --git a/Kod/bilbana/yc4/display/define_bar_graph.m b/Kod/bilbana/yc4/display/define_bar_graph.m new file mode 100644 index 0000000..c9a5999 --- /dev/null +++ b/Kod/bilbana/yc4/display/define_bar_graph.m @@ -0,0 +1,18 @@ +function pkg = define_bar_graph(direction, no, x1, y1, x2, y2, start_value, end_value, type, pattern) +pkg = [] +if direction == 'left' + direction = 'L' +elseif direction == 'right' + direction = 'R' +elseif direction == 'up' + direction == 'O' +elseif direction == 'down' + direction = 'U' +else + return + +args = [no, get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)] +args = [args, start_value, end_value, type, pattern] %TODO get_bytes or no ? + +pkg = get_package(strjoin({'B', direction}, ''), args) +end diff --git a/Kod/bilbana/yc4/display/delete_bar_graph.m b/Kod/bilbana/yc4/display/delete_bar_graph.m new file mode 100644 index 0000000..093cb2b --- /dev/null +++ b/Kod/bilbana/yc4/display/delete_bar_graph.m @@ -0,0 +1,7 @@ +function pkg = define_bar_graph(num, keep_visible) +if keep_visible + keep_visible = 1 +else + keep_visible = 0 +pkg = get_package('BD', [num, keep_visible]) +end diff --git a/Kod/bilbana/yc4/display/redraw_bar_graph.m b/Kod/bilbana/yc4/display/redraw_bar_graph.m new file mode 100644 index 0000000..5541dff --- /dev/null +++ b/Kod/bilbana/yc4/display/redraw_bar_graph.m @@ -0,0 +1,3 @@ +function pkg = redraw_bar_graph(num) +pkg = get_package('BZ', [num]) +end diff --git a/Kod/bilbana/yc4/display/request_bar_graph_value.m b/Kod/bilbana/yc4/display/request_bar_graph_value.m new file mode 100644 index 0000000..d3cad11 --- /dev/null +++ b/Kod/bilbana/yc4/display/request_bar_graph_value.m @@ -0,0 +1,3 @@ +function pkg = request_bar_graph_value(num) +pkg = get_package('BS', [num]) +end diff --git a/Kod/bilbana/yc4/display/update_bar_graph.m b/Kod/bilbana/yc4/display/update_bar_graph.m new file mode 100644 index 0000000..ffca923 --- /dev/null +++ b/Kod/bilbana/yc4/display/update_bar_graph.m @@ -0,0 +1,3 @@ +function pkg = update_bar_graph(num, val) +pkg = get_package('BA', [num, val]) +end -- cgit v1.2.1 From 56924e518a63d94326a2ea20c13daa0ca3a2cd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 14 Nov 2019 22:59:21 +0100 Subject: Add functions for setting text params --- Kod/bilbana/yc4/display/set_add_line_spacing.m | 3 +++ Kod/bilbana/yc4/display/set_text_zoom.m | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 Kod/bilbana/yc4/display/set_add_line_spacing.m create mode 100644 Kod/bilbana/yc4/display/set_text_zoom.m (limited to 'Kod/bilbana') diff --git a/Kod/bilbana/yc4/display/set_add_line_spacing.m b/Kod/bilbana/yc4/display/set_add_line_spacing.m new file mode 100644 index 0000000..33a0b4a --- /dev/null +++ b/Kod/bilbana/yc4/display/set_add_line_spacing.m @@ -0,0 +1,3 @@ +function pkg = set_add_line_spacing(val) +pkg = get_package('ZY', [val]) +end diff --git a/Kod/bilbana/yc4/display/set_text_zoom.m b/Kod/bilbana/yc4/display/set_text_zoom.m new file mode 100644 index 0000000..90c6eec --- /dev/null +++ b/Kod/bilbana/yc4/display/set_text_zoom.m @@ -0,0 +1,3 @@ +function pkg = set_text_zoom(x_scale, y_scale) +pkg = get_package('ZZ', [x_scale, y_scale]) +end -- cgit v1.2.1 From 04fe16356917c94fc0dafea83b50e380bb3bdaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 11:42:37 +0100 Subject: remove if-else-bs --- Kod/bilbana/yc4/display/define_bar_graph.m | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'Kod/bilbana') diff --git a/Kod/bilbana/yc4/display/define_bar_graph.m b/Kod/bilbana/yc4/display/define_bar_graph.m index c9a5999..d915cf1 100644 --- a/Kod/bilbana/yc4/display/define_bar_graph.m +++ b/Kod/bilbana/yc4/display/define_bar_graph.m @@ -1,16 +1,5 @@ function pkg = define_bar_graph(direction, no, x1, y1, x2, y2, start_value, end_value, type, pattern) pkg = [] -if direction == 'left' - direction = 'L' -elseif direction == 'right' - direction = 'R' -elseif direction == 'up' - direction == 'O' -elseif direction == 'down' - direction = 'U' -else - return - args = [no, get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)] args = [args, start_value, end_value, type, pattern] %TODO get_bytes or no ? -- cgit v1.2.1 From d86e80be733c5081d72bbecd76aeb2b796d2e74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 11:50:49 +0100 Subject: Draw bar instead of printing num --- Kod/bilbana/yc4/main.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 8ee18b2..cad395a 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -96,6 +96,9 @@ elseif not(isreal(ref_time)) end %} ref_time = 13; + +matlabclient(1, get_smallpackage([define_bar_graph('O', 2, 266, 30, 290, 210, 0, 64, 1, 1)])); + %% MAIN LOOP while 1 readTime = tic; @@ -127,10 +130,11 @@ while 1 if toc(display.last_send) > display.send_interval % queue control signal if car1.running && car1.automatic - display.data = [display.data, put_text(20, 16 + (16 * 1), 'L', num2str(car1.u))]; + % display.data = [display.data, put_text(20, 16 + (16 * 1), 'L', num2str(car1.u))]; end if car2.running && car2.automatic - display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))]; + % display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))]; + display.data = [display.data, update_bar_graph(2, car2.u)]; end % send all queued data -- cgit v1.2.1