summaryrefslogtreecommitdiffstats
path: root/Kod
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-11-17 21:31:54 +0100
committerGustav Sörnäs <gusso230@student.liu.se>2019-11-17 21:31:54 +0100
commit488707a834899a2aee23532e55bd662c9d3b5fd6 (patch)
tree6695c1fc246de06189a90c4dfc858437db8e412d /Kod
parentd86e80be733c5081d72bbecd76aeb2b796d2e74b (diff)
downloadtfyy51-488707a834899a2aee23532e55bd662c9d3b5fd6.tar.gz
rename some functions
Diffstat (limited to 'Kod')
-rw-r--r--Kod/bilbana/yc4/display/bar_graph.m (renamed from Kod/bilbana/yc4/display/define_bar_graph.m)2
-rw-r--r--Kod/bilbana/yc4/display/box.m (renamed from Kod/bilbana/yc4/display/draw_box.m)2
-rw-r--r--Kod/bilbana/yc4/display/clear.m (renamed from Kod/bilbana/yc4/display/clear_display.m)2
-rw-r--r--Kod/bilbana/yc4/display/delete_bar_graph.m7
-rw-r--r--Kod/bilbana/yc4/display/flashing_area.m (renamed from Kod/bilbana/yc4/display/define_flashing_area.m)2
-rw-r--r--Kod/bilbana/yc4/display/flashing_area_with_pattern.m (renamed from Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m)2
-rw-r--r--Kod/bilbana/yc4/display/frame.m (renamed from Kod/bilbana/yc4/display/draw_frame.m)2
-rw-r--r--Kod/bilbana/yc4/display/frame_box.m (renamed from Kod/bilbana/yc4/display/draw_frame_box.m)2
-rw-r--r--Kod/bilbana/yc4/display/key.m (renamed from Kod/bilbana/yc4/display/define_touch_key.m)2
-rw-r--r--Kod/bilbana/yc4/display/line.m (renamed from Kod/bilbana/yc4/display/draw_single_line.m)2
-rw-r--r--Kod/bilbana/yc4/display/point.m (renamed from Kod/bilbana/yc4/display/draw_point.m)2
-rw-r--r--Kod/bilbana/yc4/display/rectangle.m (renamed from Kod/bilbana/yc4/display/draw_rectangle.m)2
-rw-r--r--Kod/bilbana/yc4/display/set_add_line_spacing.m3
-rw-r--r--Kod/bilbana/yc4/display/set_line_spacing.m3
-rw-r--r--Kod/bilbana/yc4/display/switch.m (renamed from Kod/bilbana/yc4/display/define_touch_switch.m)0
-rw-r--r--Kod/bilbana/yc4/display/text.m (renamed from Kod/bilbana/yc4/display/put_text.m)2
-rw-r--r--Kod/bilbana/yc4/display/toggle.m7
17 files changed, 22 insertions, 22 deletions
diff --git a/Kod/bilbana/yc4/display/define_bar_graph.m b/Kod/bilbana/yc4/display/bar_graph.m
index d915cf1..e7c4b2c 100644
--- a/Kod/bilbana/yc4/display/define_bar_graph.m
+++ b/Kod/bilbana/yc4/display/bar_graph.m
@@ -1,4 +1,4 @@
-function pkg = define_bar_graph(direction, no, x1, y1, x2, y2, start_value, end_value, type, pattern)
+function pkg = 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 ?
diff --git a/Kod/bilbana/yc4/display/draw_box.m b/Kod/bilbana/yc4/display/box.m
index 7ac4b70..786f95e 100644
--- a/Kod/bilbana/yc4/display/draw_box.m
+++ b/Kod/bilbana/yc4/display/box.m
@@ -1,4 +1,4 @@
-function pkg = draw_box(x1, y1, x2, y2, n1)
+function pkg = 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/clear_display.m b/Kod/bilbana/yc4/display/clear.m
index 45f1680..f921d9c 100644
--- a/Kod/bilbana/yc4/display/clear_display.m
+++ b/Kod/bilbana/yc4/display/clear.m
@@ -1,3 +1,3 @@
-function pkg = clear_display()
+function pkg = clear()
pkg = get_package('DL', []);
end
diff --git a/Kod/bilbana/yc4/display/delete_bar_graph.m b/Kod/bilbana/yc4/display/delete_bar_graph.m
deleted file mode 100644
index 093cb2b..0000000
--- a/Kod/bilbana/yc4/display/delete_bar_graph.m
+++ /dev/null
@@ -1,7 +0,0 @@
-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/define_flashing_area.m b/Kod/bilbana/yc4/display/flashing_area.m
index 3e581ea..e3ba624 100644
--- a/Kod/bilbana/yc4/display/define_flashing_area.m
+++ b/Kod/bilbana/yc4/display/flashing_area.m
@@ -1,4 +1,4 @@
-function pkg = define_flashing_area(x1, y1, x2, y2)
+function pkg = 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/flashing_area_with_pattern.m
index c5c190f..e6dd61b 100644
--- a/Kod/bilbana/yc4/display/define_flashing_area_with_pattern.m
+++ b/Kod/bilbana/yc4/display/flashing_area_with_pattern.m
@@ -1,4 +1,4 @@
-function pkg = define_flashing_area_with_pattern(x1, y1, x2, y2, n1)
+function pkg = 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/draw_frame.m b/Kod/bilbana/yc4/display/frame.m
index 1a6ce3b..093d6b5 100644
--- a/Kod/bilbana/yc4/display/draw_frame.m
+++ b/Kod/bilbana/yc4/display/frame.m
@@ -1,4 +1,4 @@
-function pkg = draw_frame(x1, y1, x2, y2, n1)
+function pkg = 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/frame_box.m
index f2a247e..b28c61d 100644
--- a/Kod/bilbana/yc4/display/draw_frame_box.m
+++ b/Kod/bilbana/yc4/display/frame_box.m
@@ -1,4 +1,4 @@
-function pkg = draw_frame_box(x1, y1, x2, y2, n1)
+function pkg = 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/define_touch_key.m b/Kod/bilbana/yc4/display/key.m
index 69ed130..0187755 100644
--- a/Kod/bilbana/yc4/display/define_touch_key.m
+++ b/Kod/bilbana/yc4/display/key.m
@@ -1,4 +1,4 @@
-function pkg = define_touch_key(x1, y1, x2, y2, down_code, up_code, just, text)
+function pkg = 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;
diff --git a/Kod/bilbana/yc4/display/draw_single_line.m b/Kod/bilbana/yc4/display/line.m
index c1da8ab..f04adaf 100644
--- a/Kod/bilbana/yc4/display/draw_single_line.m
+++ b/Kod/bilbana/yc4/display/line.m
@@ -1,4 +1,4 @@
-function pkg = draw_single_line(x1, y1, x2, y2)
+function pkg = line(x1, y1, x2, y2)
arg = [mod(x1, 255), fix(x1 / 255), y1, 0, mod(x2, 255), fix(x2 / 255), y2, 0];
pkg = get_package('GD', arg);
end
diff --git a/Kod/bilbana/yc4/display/draw_point.m b/Kod/bilbana/yc4/display/point.m
index 34ba683..cfb6b34 100644
--- a/Kod/bilbana/yc4/display/draw_point.m
+++ b/Kod/bilbana/yc4/display/point.m
@@ -1,4 +1,4 @@
-function pkg = draw_point(x1, y1)
+function pkg = point(x1, y1)
arg = [get_bytes(x1), get_bytes(y1)];
pkg = get_package('GP', arg);
end
diff --git a/Kod/bilbana/yc4/display/draw_rectangle.m b/Kod/bilbana/yc4/display/rectangle.m
index 3edff7c..595b7b7 100644
--- a/Kod/bilbana/yc4/display/draw_rectangle.m
+++ b/Kod/bilbana/yc4/display/rectangle.m
@@ -1,4 +1,4 @@
-function pkg = draw_rectangle(x1, y1, x2, y2)
+function pkg = 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/set_add_line_spacing.m b/Kod/bilbana/yc4/display/set_add_line_spacing.m
deleted file mode 100644
index 33a0b4a..0000000
--- a/Kod/bilbana/yc4/display/set_add_line_spacing.m
+++ /dev/null
@@ -1,3 +0,0 @@
-function pkg = set_add_line_spacing(val)
-pkg = get_package('ZY', [val])
-end
diff --git a/Kod/bilbana/yc4/display/set_line_spacing.m b/Kod/bilbana/yc4/display/set_line_spacing.m
new file mode 100644
index 0000000..95bfc49
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_line_spacing.m
@@ -0,0 +1,3 @@
+function pkg = set_line_spacing(val)
+pkg = get_package('ZY', [val])
+end
diff --git a/Kod/bilbana/yc4/display/define_touch_switch.m b/Kod/bilbana/yc4/display/switch.m
index e45f512..e45f512 100644
--- a/Kod/bilbana/yc4/display/define_touch_switch.m
+++ b/Kod/bilbana/yc4/display/switch.m
diff --git a/Kod/bilbana/yc4/display/put_text.m b/Kod/bilbana/yc4/display/text.m
index 8455c83..e31ecc3 100644
--- a/Kod/bilbana/yc4/display/put_text.m
+++ b/Kod/bilbana/yc4/display/text.m
@@ -1,4 +1,4 @@
-function [pkg] = put_text(x, y, justification, text)
+function [pkg] = text(x, y, justification, text)
arg1 = [mod(x, 256), x ./ 256, mod(y, 256), y ./ 256];
arg2 = text;
arg3 = 0;
diff --git a/Kod/bilbana/yc4/display/toggle.m b/Kod/bilbana/yc4/display/toggle.m
new file mode 100644
index 0000000..9dc42b0
--- /dev/null
+++ b/Kod/bilbana/yc4/display/toggle.m
@@ -0,0 +1,7 @@
+function pkg = toggle(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