From c899eb8386e3e976260c7769bdcd65e034959f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Sun, 27 Oct 2019 14:09:36 +0100
Subject: First wave of function

---
 Kod/bilbana/yc4/display/continue_line.m                     | 5 +++++
 Kod/bilbana/yc4/display/define_flashing_area.m              | 5 +++++
 Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m | 5 +++++
 Kod/bilbana/yc4/display/delete_area.m                       | 5 +++++
 Kod/bilbana/yc4/display/draw_box.m                          | 5 +++++
 Kod/bilbana/yc4/display/draw_frame.m                        | 5 +++++
 Kod/bilbana/yc4/display/draw_frame_box.m                    | 5 +++++
 Kod/bilbana/yc4/display/draw_point.m                        | 5 +++++
 Kod/bilbana/yc4/display/draw_rectangle.m                    | 5 +++++
 Kod/bilbana/yc4/display/fill_area.m                         | 5 +++++
 Kod/bilbana/yc4/display/fill_area_with_pattern.m            | 5 +++++
 Kod/bilbana/yc4/display/fill_display.m                      | 3 +++
 Kod/bilbana/yc4/display/get_bytes.m                         | 3 +++
 Kod/bilbana/yc4/display/invert_area.m                       | 5 +++++
 Kod/bilbana/yc4/display/invert_display.m                    | 3 +++
 Kod/bilbana/yc4/display/put_text.m                          | 4 ++--
 Kod/bilbana/yc4/display/remove_flashing_area.m              | 5 +++++
 Kod/bilbana/yc4/display/restore_display_from_clipboard.m    | 3 +++
 Kod/bilbana/yc4/display/save_area_to_clipboard.m            | 5 +++++
 Kod/bilbana/yc4/display/save_display_to_clipboard.m         | 3 +++
 Kod/bilbana/yc4/display/set_display_visible.m               | 7 +++++++
 Kod/bilbana/yc4/display/set_drawing_mode.m                  | 5 +++++
 Kod/bilbana/yc4/display/set_flashing_time.m                 | 3 +++
 Kod/bilbana/yc4/display/set_pattern.m                       | 5 +++++
 Kod/bilbana/yc4/display/set_point_size.m                    | 5 +++++
 25 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 Kod/bilbana/yc4/display/continue_line.m
 create mode 100644 Kod/bilbana/yc4/display/define_flashing_area.m
 create mode 100644 Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m
 create mode 100644 Kod/bilbana/yc4/display/delete_area.m
 create mode 100644 Kod/bilbana/yc4/display/draw_box.m
 create mode 100644 Kod/bilbana/yc4/display/draw_frame.m
 create mode 100644 Kod/bilbana/yc4/display/draw_frame_box.m
 create mode 100644 Kod/bilbana/yc4/display/draw_point.m
 create mode 100644 Kod/bilbana/yc4/display/draw_rectangle.m
 create mode 100644 Kod/bilbana/yc4/display/fill_area.m
 create mode 100644 Kod/bilbana/yc4/display/fill_area_with_pattern.m
 create mode 100644 Kod/bilbana/yc4/display/fill_display.m
 create mode 100644 Kod/bilbana/yc4/display/get_bytes.m
 create mode 100644 Kod/bilbana/yc4/display/invert_area.m
 create mode 100644 Kod/bilbana/yc4/display/invert_display.m
 create mode 100644 Kod/bilbana/yc4/display/remove_flashing_area.m
 create mode 100644 Kod/bilbana/yc4/display/restore_display_from_clipboard.m
 create mode 100644 Kod/bilbana/yc4/display/save_area_to_clipboard.m
 create mode 100644 Kod/bilbana/yc4/display/save_display_to_clipboard.m
 create mode 100644 Kod/bilbana/yc4/display/set_display_visible.m
 create mode 100644 Kod/bilbana/yc4/display/set_drawing_mode.m
 create mode 100644 Kod/bilbana/yc4/display/set_flashing_time.m
 create mode 100644 Kod/bilbana/yc4/display/set_pattern.m
 create mode 100644 Kod/bilbana/yc4/display/set_point_size.m

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/continue_line.m b/Kod/bilbana/yc4/display/continue_line.m
new file mode 100644
index 0000000..9734201
--- /dev/null
+++ b/Kod/bilbana/yc4/display/continue_line.m
@@ -0,0 +1,5 @@
+function pkg = continue_line(x2, y2)
+	arg = [get_bytes(x2), get_bytes(y2)];
+	
+	pkg = get_package('GW', arg)
+end
diff --git a/Kod/bilbana/yc4/display/define_flashing_area.m b/Kod/bilbana/yc4/display/define_flashing_area.m
new file mode 100644
index 0000000..11d6cf3
--- /dev/null
+++ b/Kod/bilbana/yc4/display/define_flashing_area.m
@@ -0,0 +1,5 @@
+function pkg = define_flashing_area(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('QI', arg);
+end
diff --git a/Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m b/Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m
new file mode 100644
index 0000000..eb13e90
--- /dev/null
+++ b/Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m
@@ -0,0 +1,5 @@
+function pkg = define_flashing_area_with_pattern(x1, y1, x2, y2, n1)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2), n1];
+
+	pkg = get_package('QM', arg);
+end
diff --git a/Kod/bilbana/yc4/display/delete_area.m b/Kod/bilbana/yc4/display/delete_area.m
new file mode 100644
index 0000000..44953b7
--- /dev/null
+++ b/Kod/bilbana/yc4/display/delete_area.m
@@ -0,0 +1,5 @@
+function pkg = delete_area(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('RL', arg);
+end
diff --git a/Kod/bilbana/yc4/display/draw_box.m b/Kod/bilbana/yc4/display/draw_box.m
new file mode 100644
index 0000000..b9eb5be
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_box.m
@@ -0,0 +1,5 @@
+function pkg = draw_box(x1, y1, x2, y2, n1)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2), n1];
+
+	pkg = get_package('RO', arg);
+end
diff --git a/Kod/bilbana/yc4/display/draw_frame.m b/Kod/bilbana/yc4/display/draw_frame.m
new file mode 100644
index 0000000..7b97adb
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_frame.m
@@ -0,0 +1,5 @@
+function pkg = draw_frame(x1, y1, x2, y2, n1)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('RR', arg);
+end
diff --git a/Kod/bilbana/yc4/display/draw_frame_box.m b/Kod/bilbana/yc4/display/draw_frame_box.m
new file mode 100644
index 0000000..9b57c7c
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_frame_box.m
@@ -0,0 +1,5 @@
+function pkg = draw_frame_box(x1, y1, x2, y2, n1)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2), n1];
+
+	pkg = get_package('RT', arg);
+end
diff --git a/Kod/bilbana/yc4/display/draw_point.m b/Kod/bilbana/yc4/display/draw_point.m
new file mode 100644
index 0000000..b81d8cb
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_point.m
@@ -0,0 +1,5 @@
+function pkg = draw_point(x1, y1)
+	arg = [get_bytes(x1), get_bytes(y2)];
+
+	pkg = get_package('GP', arg);
+end
diff --git a/Kod/bilbana/yc4/display/draw_rectangle.m b/Kod/bilbana/yc4/display/draw_rectangle.m
new file mode 100644
index 0000000..9e92cad
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_rectangle.m
@@ -0,0 +1,5 @@
+function pkg = draw_rectangle(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+	
+	pkg = get_package('GR', arg);
+end
diff --git a/Kod/bilbana/yc4/display/fill_area.m b/Kod/bilbana/yc4/display/fill_area.m
new file mode 100644
index 0000000..4d64463
--- /dev/null
+++ b/Kod/bilbana/yc4/display/fill_area.m
@@ -0,0 +1,5 @@
+function pkg = fill_area(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('RS', arg);
+end
diff --git a/Kod/bilbana/yc4/display/fill_area_with_pattern.m b/Kod/bilbana/yc4/display/fill_area_with_pattern.m
new file mode 100644
index 0000000..4815f5b
--- /dev/null
+++ b/Kod/bilbana/yc4/display/fill_area_with_pattern.m
@@ -0,0 +1,5 @@
+function pkg = fill_area_with_pattern(x1, y1, x2, y2, n1)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2), n1];
+
+	pkg = get_package('RM', arg);
+end
diff --git a/Kod/bilbana/yc4/display/fill_display.m b/Kod/bilbana/yc4/display/fill_display.m
new file mode 100644
index 0000000..e5fc1d2
--- /dev/null
+++ b/Kod/bilbana/yc4/display/fill_display.m
@@ -0,0 +1,3 @@
+function pkg = fill_display()
+	pkg = get_package('DS', []);
+end
diff --git a/Kod/bilbana/yc4/display/get_bytes.m b/Kod/bilbana/yc4/display/get_bytes.m
new file mode 100644
index 0000000..76efc9c
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_bytes.m
@@ -0,0 +1,3 @@
+function bytes = get_bytes(num):
+	bytes = [mod(num, 256), num ./ 256];
+end
diff --git a/Kod/bilbana/yc4/display/invert_area.m b/Kod/bilbana/yc4/display/invert_area.m
new file mode 100644
index 0000000..39db3c2
--- /dev/null
+++ b/Kod/bilbana/yc4/display/invert_area.m
@@ -0,0 +1,5 @@
+function pkg = invert_area(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('RI', arg);
+end
diff --git a/Kod/bilbana/yc4/display/invert_display.m b/Kod/bilbana/yc4/display/invert_display.m
new file mode 100644
index 0000000..ab2ddad
--- /dev/null
+++ b/Kod/bilbana/yc4/display/invert_display.m
@@ -0,0 +1,3 @@
+function pkg = invert_display()
+	pkg = get_package('DI', []);
+end
diff --git a/Kod/bilbana/yc4/display/put_text.m b/Kod/bilbana/yc4/display/put_text.m
index 5b80192..22871e3 100644
--- a/Kod/bilbana/yc4/display/put_text.m
+++ b/Kod/bilbana/yc4/display/put_text.m
@@ -1,7 +1,7 @@
 function [pkg] = put_text(x, y, justification, text)
-	code = double(strjoin({'Z', justification}, ''));
+	code = strjoin({'Z', justification}, '');
 
-	arg1 = [x, 0, y, 0];
+	arg1 = [mod(x, 256), x ./ 256, mod(y, 256), y ./ 256];
 	arg2 = text;
 	arg3 = 0;
 
diff --git a/Kod/bilbana/yc4/display/remove_flashing_area.m b/Kod/bilbana/yc4/display/remove_flashing_area.m
new file mode 100644
index 0000000..701402b
--- /dev/null
+++ b/Kod/bilbana/yc4/display/remove_flashing_area.m
@@ -0,0 +1,5 @@
+function pkg = remove_flashing_area(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('QL', arg);
+end
diff --git a/Kod/bilbana/yc4/display/restore_display_from_clipboard.m b/Kod/bilbana/yc4/display/restore_display_from_clipboard.m
new file mode 100644
index 0000000..9542851
--- /dev/null
+++ b/Kod/bilbana/yc4/display/restore_display_from_clipboard.m
@@ -0,0 +1,3 @@
+function pkg = restore_display_from_clipboard()
+	pkg = get_package('CR', []);
+end
diff --git a/Kod/bilbana/yc4/display/save_area_to_clipboard.m b/Kod/bilbana/yc4/display/save_area_to_clipboard.m
new file mode 100644
index 0000000..8098b06
--- /dev/null
+++ b/Kod/bilbana/yc4/display/save_area_to_clipboard.m
@@ -0,0 +1,5 @@
+function pkg = save_area_to_clipboard(x1, y1, x2, y2)
+	arg = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+
+	pkg = get_package('CS', arg);
+end
diff --git a/Kod/bilbana/yc4/display/save_display_to_clipboard.m b/Kod/bilbana/yc4/display/save_display_to_clipboard.m
new file mode 100644
index 0000000..f8cd0bd
--- /dev/null
+++ b/Kod/bilbana/yc4/display/save_display_to_clipboard.m
@@ -0,0 +1,3 @@
+function pkg = save_display_to_clipboard()
+	pkg = get_package('CB', []);
+end
diff --git a/Kod/bilbana/yc4/display/set_display_visible.m b/Kod/bilbana/yc4/display/set_display_visible.m
new file mode 100644
index 0000000..12fa3b3
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_display_visible.m
@@ -0,0 +1,7 @@
+function pkg = set_display_visible(visible)
+	if visible == true
+		pkg = get_package('DE', []);
+	else
+		pkg = get_package('DA', []);
+	end
+end
diff --git a/Kod/bilbana/yc4/display/set_drawing_mode.m b/Kod/bilbana/yc4/display/set_drawing_mode.m
new file mode 100644
index 0000000..c8ecf07
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_drawing_mode.m
@@ -0,0 +1,5 @@
+function pkg = set_drawing_mode(n1)
+	arg = [n1];
+
+	pkg = get_package('GV', arg);
+end
diff --git a/Kod/bilbana/yc4/display/set_flashing_time.m b/Kod/bilbana/yc4/display/set_flashing_time.m
new file mode 100644
index 0000000..e4f056d
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_flashing_time.m
@@ -0,0 +1,3 @@
+function pkg = set_flashing_time(n1)
+	pkg = get_package('QZ', [n1]);
+end
diff --git a/Kod/bilbana/yc4/display/set_pattern.m b/Kod/bilbana/yc4/display/set_pattern.m
new file mode 100644
index 0000000..5ec583e
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_pattern.m
@@ -0,0 +1,5 @@
+function pkg = set_pattern(n1)
+	arg = [n1];
+
+	pkg = get_package('GM', n1);
+end
diff --git a/Kod/bilbana/yc4/display/set_point_size.m b/Kod/bilbana/yc4/display/set_point_size.m
new file mode 100644
index 0000000..750b172
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_point_size.m
@@ -0,0 +1,5 @@
+function pkg = set_point_size(n1, n2)
+	arg = [n1 n2];
+	
+	pkg = get_package('GZ', arg);
+end
-- 
cgit v1.2.1


From 0d761ebf3811ae20d74bbce8f4988c3a7ab8349d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Sun, 27 Oct 2019 14:26:09 +0100
Subject: Second wave

---
 Kod/bilbana/yc4/display/define_touch_key.m                        | 7 +++++++
 Kod/bilbana/yc4/display/define_touch_switch.m                     | 7 +++++++
 Kod/bilbana/yc4/display/restore_display_from_clipboard_to_point.m | 5 +++++
 Kod/bilbana/yc4/display/set_touch_sound_response.m                | 7 +++++++
 4 files changed, 26 insertions(+)
 create mode 100644 Kod/bilbana/yc4/display/define_touch_key.m
 create mode 100644 Kod/bilbana/yc4/display/define_touch_switch.m
 create mode 100644 Kod/bilbana/yc4/display/restore_display_from_clipboard_to_point.m
 create mode 100644 Kod/bilbana/yc4/display/set_touch_sound_response.m

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/define_touch_key.m b/Kod/bilbana/yc4/display/define_touch_key.m
new file mode 100644
index 0000000..14ee5ee
--- /dev/null
+++ b/Kod/bilbana/yc4/display/define_touch_key.m
@@ -0,0 +1,7 @@
+function pkg = define_touch_key(x1, y1, x2, y2, down_code, up_code, just, text)
+	arg_location = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+	arg_text = double(strjoin({just; text}, ''));
+	arg_null = 0;
+
+	pkg = get_package('AT', [arg_location, down_code, up_code, arg_text, arg_null]);
+end
diff --git a/Kod/bilbana/yc4/display/define_touch_switch.m b/Kod/bilbana/yc4/display/define_touch_switch.m
new file mode 100644
index 0000000..47d3cd9
--- /dev/null
+++ b/Kod/bilbana/yc4/display/define_touch_switch.m
@@ -0,0 +1,7 @@
+function pkg = define_touch_key(x1, y1, x2, y2, down_code, up_code, just, text)
+	arg_location = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
+	arg_text = double(strjoin({just; text}, ''));
+	arg_null = 0;
+
+	pkg = get_package('AK', [arg_location, down_code, up_code, arg_text, arg_null]);
+end
diff --git a/Kod/bilbana/yc4/display/restore_display_from_clipboard_to_point.m b/Kod/bilbana/yc4/display/restore_display_from_clipboard_to_point.m
new file mode 100644
index 0000000..2c9e1aa
--- /dev/null
+++ b/Kod/bilbana/yc4/display/restore_display_from_clipboard_to_point.m
@@ -0,0 +1,5 @@
+function pkg = restore_display_from_clipboard_to_point(x1, y1)
+	arg = [get_bytes(x1), get_bytes(y1)];
+
+	pkg = get_package('CK', arg);
+end
diff --git a/Kod/bilbana/yc4/display/set_touch_sound_response.m b/Kod/bilbana/yc4/display/set_touch_sound_response.m
new file mode 100644
index 0000000..851eaf2
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_touch_sound_response.m
@@ -0,0 +1,7 @@
+function pkg = set_touch_sound_response(state)
+	if state == true
+		pkg = get_package('AS', [1]);
+	else
+		pkg = get_package('AS', [0]);
+	end
+end
-- 
cgit v1.2.1


From ca01e2e6e69fd702ed2f4cf56d6323593bea3278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Tue, 12 Nov 2019 12:34:14 +0100
Subject: Add test IO

---
 Kod/bilbana/yc4/display/get_package.m          | 10 ++------
 Kod/bilbana/yc4/display/get_response.m         | 34 ++++++++++++++++++++++++++
 Kod/bilbana/yc4/display/get_smallpackage.m     |  8 ++++++
 Kod/bilbana/yc4/display/send_data_to_display.m |  4 +++
 4 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 Kod/bilbana/yc4/display/get_response.m
 create mode 100644 Kod/bilbana/yc4/display/get_smallpackage.m

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/get_package.m b/Kod/bilbana/yc4/display/get_package.m
index 7c3a01e..efaf311 100644
--- a/Kod/bilbana/yc4/display/get_package.m
+++ b/Kod/bilbana/yc4/display/get_package.m
@@ -1,10 +1,4 @@
-function [pkg] = get_package(code, args)
-	DC1 = 17;
+function pkg = get_package(code, args)
 	ESC = 27;
-
-	data = [ESC, double(code), args];
-	len = length(data);
-	initStr = [DC1, len, data];
-	bcc = mod(sum(initStr), 256);
-	pkg = [initStr, bcc];
+	pkg = [ESC, double(code), args];
 end
diff --git a/Kod/bilbana/yc4/display/get_response.m b/Kod/bilbana/yc4/display/get_response.m
new file mode 100644
index 0000000..9714a43
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_response.m
@@ -0,0 +1,34 @@
+function [ack, start_code, data] get_response(display_data)
+% GET RESPONSE
+%	In-depth explanation
+%	[flag, display_data] = matlabclient(2)
+
+ack = false;
+start_code = '';
+data = [];
+
+len = -1;
+
+if display_data[0] == 6
+	ack = true;
+else
+	return
+end
+
+display_data[0] = [];
+
+if display_data[0] == 17
+	start_code = 'DC1';
+elseif display_data[0] == 18
+	start_code = 'DC2';
+end
+
+display_data[0] = [];
+
+len = display_data[0];
+
+while len > 0
+	
+end
+
+end
diff --git a/Kod/bilbana/yc4/display/get_smallpackage.m b/Kod/bilbana/yc4/display/get_smallpackage.m
new file mode 100644
index 0000000..1c0835c
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_smallpackage.m
@@ -0,0 +1,8 @@
+function pkg = get_smallpackage(data)
+	DC1 = 17;
+
+	len = length(data);
+	initStr = [DC1, len, data];
+	bcc = mod(sum(initStr), 256);
+	pkg = [initStr, bcc];
+end
diff --git a/Kod/bilbana/yc4/display/send_data_to_display.m b/Kod/bilbana/yc4/display/send_data_to_display.m
index c5d70c7..50af84f 100644
--- a/Kod/bilbana/yc4/display/send_data_to_display.m
+++ b/Kod/bilbana/yc4/display/send_data_to_display.m
@@ -20,6 +20,10 @@ function [] = send_data_to_display()
         %% SEND DATA
         % disp('sending data');
         % disp(display_data)
+		
+		data = [];
+		
+
         matlabclient(1, display_data{1});
         last_send = clock;
         display_data(1) = [];
-- 
cgit v1.2.1


From f735459829046e9e2a9911d8cf31546a5bebefee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Tue, 12 Nov 2019 12:34:58 +0100
Subject: fix func name

---
 Kod/bilbana/yc4/display/define_touch_switch.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/define_touch_switch.m b/Kod/bilbana/yc4/display/define_touch_switch.m
index 47d3cd9..4dfc764 100644
--- a/Kod/bilbana/yc4/display/define_touch_switch.m
+++ b/Kod/bilbana/yc4/display/define_touch_switch.m
@@ -1,4 +1,4 @@
-function pkg = define_touch_key(x1, y1, x2, y2, down_code, up_code, just, text)
+function pkg = define_touch_switch(x1, y1, x2, y2, down_code, up_code, just, text)
 	arg_location = [get_bytes(x1), get_bytes(y1), get_bytes(x2), get_bytes(y2)];
 	arg_text = double(strjoin({just; text}, ''));
 	arg_null = 0;
-- 
cgit v1.2.1


From 83c1ee0a3f2d57d887d38fafb74f4967271c4a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Thor=C3=A9n?= <davth346@student.liu.se>
Date: Wed, 13 Nov 2019 12:32:01 +0100
Subject: Add function to convert bytes -> num

---
 Kod/bilbana/yc4/display/get_num.m | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Kod/bilbana/yc4/display/get_num.m

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/get_num.m b/Kod/bilbana/yc4/display/get_num.m
new file mode 100644
index 0000000..e90e0c7
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_num.m
@@ -0,0 +1,3 @@
+function num = get_num(bytes)
+num = bytes(1) + bytes(2) * 256;
+end
\ No newline at end of file
-- 
cgit v1.2.1


From 2f0a6f442b8103a95839f0e37d5689ca9cf0fe71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Thor=C3=A9n?= <davth346@student.liu.se>
Date: Wed, 13 Nov 2019 12:32:46 +0100
Subject: Working communication from display

---
 Kod/bilbana/yc4/display/get_response.m | 47 +++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 15 deletions(-)

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/get_response.m b/Kod/bilbana/yc4/display/get_response.m
index 9714a43..1e3e6af 100644
--- a/Kod/bilbana/yc4/display/get_response.m
+++ b/Kod/bilbana/yc4/display/get_response.m
@@ -1,34 +1,51 @@
-function [ack, start_code, data] get_response(display_data)
+function [ack, start_code, responses] = get_response(display_data)
 % GET RESPONSE
 %	In-depth explanation
 %	[flag, display_data] = matlabclient(2)
 
 ack = false;
 start_code = '';
-data = [];
+bcc = display_data(length(display_data));
+responses = [];
 
-len = -1;
+pointer = 1;
 
-if display_data[0] == 6
+if display_data(pointer) == 6
 	ack = true;
 else
 	return
 end
 
-display_data[0] = [];
+if pointer > length(display_data)
+    return 
+end
 
-if display_data[0] == 17
+pointer = pointer + 1;
+if display_data(1) == 17
 	start_code = 'DC1';
-elseif display_data[0] == 18
+elseif display_data(1) == 18
 	start_code = 'DC2';
 end
 
-display_data[0] = [];
-
-len = display_data[0];
-
-while len > 0
-	
-end
-
+pointer = pointer + 1;
+% total length
+
+data = struct;
+while pointer < length(display_data) - 1  % last value is bcc
+    pointer = pointer + 1;
+    if display_data(pointer) ~= 27
+        % TODO: no ESC?
+    end
+    pointer = pointer + 1;
+    data.id = char(display_data(pointer));
+    
+    pointer = pointer + 1;
+    data.length = display_data(pointer);
+    if data.id == 'A'
+        pointer = pointer + 1;
+        data.data = display_data(pointer);
+    else
+        pointer = pointer + data.length;
+    end
+    responses = [responses, data];
 end
-- 
cgit v1.2.1


From c2ce165db06ac1e39221b5a8d788c0b49998111e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Thor=C3=A9n?= <davth346@student.liu.se>
Date: Wed, 13 Nov 2019 12:52:41 +0100
Subject: Add working display-code

---
 Kod/bilbana/yc4/display/get_response.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Kod/bilbana/yc4/display')

diff --git a/Kod/bilbana/yc4/display/get_response.m b/Kod/bilbana/yc4/display/get_response.m
index 1e3e6af..0c77a00 100644
--- a/Kod/bilbana/yc4/display/get_response.m
+++ b/Kod/bilbana/yc4/display/get_response.m
@@ -5,9 +5,14 @@ function [ack, start_code, responses] = get_response(display_data)
 
 ack = false;
 start_code = '';
-bcc = display_data(length(display_data));
 responses = [];
 
+if isempty(display_data)
+    return
+end
+bcc = display_data(length(display_data));
+
+
 pointer = 1;
 
 if display_data(pointer) == 6
-- 
cgit v1.2.1