diff options
| author | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-20 15:10:56 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gusso230@student.liu.se> | 2019-11-20 15:10:56 +0100 |
| commit | beb0792f35d52cb1f95ecb7c3c4342740b6bc53e (patch) | |
| tree | e988a35a86e7006895fde9b7a721ec118fbf21e4 | |
| parent | b5fb0790fd8c2820eae6c153bf7cd88beeaa0aa6 (diff) | |
| download | tfyy51-beb0792f35d52cb1f95ecb7c3c4342740b6bc53e.tar.gz | |
Rename conflicting function-names
| -rw-r--r-- | Kod/bilbana/yc4/display/clear_disp.m (renamed from Kod/bilbana/yc4/display/clear.m) | 2 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/draw_line.m (renamed from Kod/bilbana/yc4/display/line.m) | 2 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/draw_rectangle.m (renamed from Kod/bilbana/yc4/display/rectangle.m) | 2 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/display/put_text.m (renamed from Kod/bilbana/yc4/display/text.m) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Kod/bilbana/yc4/display/clear.m b/Kod/bilbana/yc4/display/clear_disp.m index f921d9c..70f66c3 100644 --- a/Kod/bilbana/yc4/display/clear.m +++ b/Kod/bilbana/yc4/display/clear_disp.m @@ -1,3 +1,3 @@ -function pkg = clear() +function pkg = clear_disp() pkg = get_package('DL', []); end diff --git a/Kod/bilbana/yc4/display/line.m b/Kod/bilbana/yc4/display/draw_line.m index f04adaf..0a43ef7 100644 --- a/Kod/bilbana/yc4/display/line.m +++ b/Kod/bilbana/yc4/display/draw_line.m @@ -1,4 +1,4 @@ -function pkg = line(x1, y1, x2, y2) +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/rectangle.m b/Kod/bilbana/yc4/display/draw_rectangle.m index 595b7b7..3edff7c 100644 --- a/Kod/bilbana/yc4/display/rectangle.m +++ b/Kod/bilbana/yc4/display/draw_rectangle.m @@ -1,4 +1,4 @@ -function pkg = rectangle(x1, y1, x2, y2) +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/text.m b/Kod/bilbana/yc4/display/put_text.m index 8157a65..8157a65 100644 --- a/Kod/bilbana/yc4/display/text.m +++ b/Kod/bilbana/yc4/display/put_text.m |
