diff options
| author | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-15 13:35:55 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-15 13:37:03 +0100 |
| commit | 231a9e0963e8341cc7a27e1b61d1cd2ecc35f00a (patch) | |
| tree | 87586c7856a6ccf73f08a71919f6f1b64b944f0d /Kod/bilbana/yc4 | |
| parent | 0f95b8db3209e3cf802bf7f1af807faa9688d343 (diff) | |
| parent | d86e80be733c5081d72bbecd76aeb2b796d2e74b (diff) | |
| download | tfyy51-231a9e0963e8341cc7a27e1b61d1cd2ecc35f00a.tar.gz | |
Merge branch 'display-functions'
Diffstat (limited to 'Kod/bilbana/yc4')
| -rw-r--r-- | Kod/bilbana/yc4/display/define_bar_graph.m | 7 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/delete_bar_graph.m | 7 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/redraw_bar_graph.m | 3 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/request_bar_graph_value.m | 3 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/set_add_line_spacing.m | 3 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/set_text_zoom.m | 3 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/update_bar_graph.m | 3 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 5 |
8 files changed, 32 insertions, 2 deletions
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..d915cf1 --- /dev/null +++ b/Kod/bilbana/yc4/display/define_bar_graph.m @@ -0,0 +1,7 @@ +function pkg = define_bar_graph(direction, no, x1, y1, x2, y2, start_value, end_value, type, pattern) +pkg = [] +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/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 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 diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index fcff963..1f71a95 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -100,6 +100,7 @@ elseif not(isreal(ref_time)) end %} ref_time = 13; + %% MAIN LOOP while 1 readTime = tic; @@ -138,10 +139,10 @@ 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))]; end % send all queued data |
