From beb0792f35d52cb1f95ecb7c3c4342740b6bc53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gusso230@student.liu.se>
Date: Wed, 20 Nov 2019 15:10:56 +0100
Subject: Rename conflicting function-names

---
 Kod/bilbana/yc4/display/clear.m          | 3 ---
 Kod/bilbana/yc4/display/clear_disp.m     | 3 +++
 Kod/bilbana/yc4/display/draw_line.m      | 4 ++++
 Kod/bilbana/yc4/display/draw_rectangle.m | 4 ++++
 Kod/bilbana/yc4/display/line.m           | 4 ----
 Kod/bilbana/yc4/display/put_text.m       | 7 +++++++
 Kod/bilbana/yc4/display/rectangle.m      | 4 ----
 Kod/bilbana/yc4/display/text.m           | 7 -------
 8 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 Kod/bilbana/yc4/display/clear.m
 create mode 100644 Kod/bilbana/yc4/display/clear_disp.m
 create mode 100644 Kod/bilbana/yc4/display/draw_line.m
 create mode 100644 Kod/bilbana/yc4/display/draw_rectangle.m
 delete mode 100644 Kod/bilbana/yc4/display/line.m
 create mode 100644 Kod/bilbana/yc4/display/put_text.m
 delete mode 100644 Kod/bilbana/yc4/display/rectangle.m
 delete mode 100644 Kod/bilbana/yc4/display/text.m

(limited to 'Kod/bilbana')

diff --git a/Kod/bilbana/yc4/display/clear.m b/Kod/bilbana/yc4/display/clear.m
deleted file mode 100644
index f921d9c..0000000
--- a/Kod/bilbana/yc4/display/clear.m
+++ /dev/null
@@ -1,3 +0,0 @@
-function pkg = clear()
-pkg = get_package('DL', []);
-end
diff --git a/Kod/bilbana/yc4/display/clear_disp.m b/Kod/bilbana/yc4/display/clear_disp.m
new file mode 100644
index 0000000..70f66c3
--- /dev/null
+++ b/Kod/bilbana/yc4/display/clear_disp.m
@@ -0,0 +1,3 @@
+function pkg = clear_disp()
+pkg = get_package('DL', []);
+end
diff --git a/Kod/bilbana/yc4/display/draw_line.m b/Kod/bilbana/yc4/display/draw_line.m
new file mode 100644
index 0000000..0a43ef7
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_line.m
@@ -0,0 +1,4 @@
+function pkg = draw_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_rectangle.m b/Kod/bilbana/yc4/display/draw_rectangle.m
new file mode 100644
index 0000000..3edff7c
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_rectangle.m
@@ -0,0 +1,4 @@
+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/line.m b/Kod/bilbana/yc4/display/line.m
deleted file mode 100644
index f04adaf..0000000
--- a/Kod/bilbana/yc4/display/line.m
+++ /dev/null
@@ -1,4 +0,0 @@
-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/put_text.m b/Kod/bilbana/yc4/display/put_text.m
new file mode 100644
index 0000000..8157a65
--- /dev/null
+++ b/Kod/bilbana/yc4/display/put_text.m
@@ -0,0 +1,7 @@
+function [pkg] = put_text(x, y, justification, text)
+arg1 = [get_bytes(x), get_bytes(y)];
+arg2 = text;
+arg3 = 0;
+
+pkg = get_package(strjoin({'Z', justification}, ''),  [arg1 double(arg2) arg3]);
+end
diff --git a/Kod/bilbana/yc4/display/rectangle.m b/Kod/bilbana/yc4/display/rectangle.m
deleted file mode 100644
index 595b7b7..0000000
--- a/Kod/bilbana/yc4/display/rectangle.m
+++ /dev/null
@@ -1,4 +0,0 @@
-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/text.m b/Kod/bilbana/yc4/display/text.m
deleted file mode 100644
index 8157a65..0000000
--- a/Kod/bilbana/yc4/display/text.m
+++ /dev/null
@@ -1,7 +0,0 @@
-function [pkg] = put_text(x, y, justification, text)
-arg1 = [get_bytes(x), get_bytes(y)];
-arg2 = text;
-arg3 = 0;
-
-pkg = get_package(strjoin({'Z', justification}, ''),  [arg1 double(arg2) arg3]);
-end
-- 
cgit v1.2.1