summaryrefslogtreecommitdiffstats
path: root/Kod
diff options
context:
space:
mode:
Diffstat (limited to 'Kod')
-rw-r--r--Kod/bilbana/yc4/display/clear_display.m3
-rw-r--r--Kod/bilbana/yc4/display/draw_single_line.m5
-rw-r--r--Kod/bilbana/yc4/display/get_package.m10
-rw-r--r--Kod/bilbana/yc4/display/put_text.m9
-rw-r--r--Kod/bilbana/yc4/display/set_text_font.m3
-rw-r--r--Kod/display/display_exempel.m114
6 files changed, 87 insertions, 57 deletions
diff --git a/Kod/bilbana/yc4/display/clear_display.m b/Kod/bilbana/yc4/display/clear_display.m
new file mode 100644
index 0000000..32fdac1
--- /dev/null
+++ b/Kod/bilbana/yc4/display/clear_display.m
@@ -0,0 +1,3 @@
+function pkg = clear_display()
+ pkg = get_package('DL', [])
+end
diff --git a/Kod/bilbana/yc4/display/draw_single_line.m b/Kod/bilbana/yc4/display/draw_single_line.m
new file mode 100644
index 0000000..97cf1ae
--- /dev/null
+++ b/Kod/bilbana/yc4/display/draw_single_line.m
@@ -0,0 +1,5 @@
+function [pkg] = draw_line(x1, y1, x2, y2)
+ arg = [x1, 0, y1, 0, x2, 1, y2, 0] % TODO nollor mellan värden? vad betyder ettan?
+
+ pkg = get_package('GD', arg)
+end
diff --git a/Kod/bilbana/yc4/display/get_package.m b/Kod/bilbana/yc4/display/get_package.m
new file mode 100644
index 0000000..7c3a01e
--- /dev/null
+++ b/Kod/bilbana/yc4/display/get_package.m
@@ -0,0 +1,10 @@
+function [pkg] = get_package(code, args)
+ DC1 = 17;
+ ESC = 27;
+
+ data = [ESC, double(code), args];
+ len = length(data);
+ initStr = [DC1, len, data];
+ bcc = mod(sum(initStr), 256);
+ pkg = [initStr, bcc];
+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..95dbb26
--- /dev/null
+++ b/Kod/bilbana/yc4/display/put_text.m
@@ -0,0 +1,9 @@
+function [pkg] = put_text(x, y, justification, text)
+ code = double(join('Z', justification))
+
+ arg1 = [x, 0, y, 0]
+ arg2 = text;
+ arg3 = 0;
+
+ pkg = get_package(join('Z', justification), [arg1 arg2 arg3])
+end
diff --git a/Kod/bilbana/yc4/display/set_text_font.m b/Kod/bilbana/yc4/display/set_text_font.m
new file mode 100644
index 0000000..768d16b
--- /dev/null
+++ b/Kod/bilbana/yc4/display/set_text_font.m
@@ -0,0 +1,3 @@
+function pkg = set_text_font(font_num)
+ pkg = get_package('ZF', [font_num])
+end
diff --git a/Kod/display/display_exempel.m b/Kod/display/display_exempel.m
index c920087..5ac7cb0 100644
--- a/Kod/display/display_exempel.m
+++ b/Kod/display/display_exempel.m
@@ -10,24 +10,24 @@ cd ClientServerApp\Release
!startServer
cd ../..
%% Diagonal linje
-DC1 = 17;
-ESC = 27;
-Code = 'GD';
-
-% x1, y1, x2, y2, (320 x 240 pixlar)
-% minst signifikanta bitar till vänster
-% mest signifikanta bitar till höger
-arg = [0, 0, 0, 0, 63, 1, 239, 0];
-
-% Save the 'small package' as a string
-data = [ESC, double(Code), arg];
-len = length(data);
-initStr = [DC1, len, data];
-bcc = mod(sum(initStr), 256);
-str = [initStr, bcc];
-
-% Skriv
-matlabclient(1, str')
+% DC1 = 17;
+% ESC = 27;
+% Code = 'GD';
+%
+% % x1, y1, x2, y2, (320 x 240 pixlar)
+% % minst signifikanta bitar till vänster
+% % mest signifikanta bitar till höger
+% arg = [0, 0, 0, 0, 63, 1, 239, 0];
+%
+% % Save the 'small package' as a string
+% data = [ESC, double(Code), arg];
+% len = length(data);
+% initStr = [DC1, len, data];
+% bcc = mod(sum(initStr), 256);
+% str = [initStr, bcc];
+%
+% % Skriv
+% matlabclient(1, str')
%% Rita en rektangel som är fylld med mönster
DC1 = 17;
@@ -53,30 +53,30 @@ str = [initStr, bcc];
matlabclient(1, str')
%% Skriv en Test-sträng
-DC1 = 17;
-ESC = 27;
-Code = double('ZL');
-
-% x1, y1, (320 x 240 pixlar)
-% minst signifikanta bitar till vänster
-% mest signifikanta bitar till höger
-arg1 = [117, 0, 32, 0];
-
-% Textsträng
-%arg2 = 'Test';
-
-arg2 = 'DISPLAY!!!!!';
-
-% Null
-arg3 = 0;
-
-
-% Save the 'small package' as a string
-data = [ESC, double(Code), arg1, double(arg2), arg3];
-len = length(data);
-initStr = [DC1, len, data];
-bcc = mod(sum(initStr), 256);
-str = [initStr, bcc];
+% DC1 = 17;
+% ESC = 27;
+% Code = double('ZL');
+%
+% % x1, y1, (320 x 240 pixlar)
+% % minst signifikanta bitar till vänster
+% % mest signifikanta bitar till höger
+% arg1 = [117, 0, 32, 0];
+%
+% % Textsträng
+% %arg2 = 'Test';
+%
+% arg2 = 'DISPLAY!!!!!';
+%
+% % Null
+% arg3 = 0;
+%
+%
+% % Save the 'small package' as a string
+% data = [ESC, double(Code), arg1, double(arg2), arg3];
+% len = length(data);
+% initStr = [DC1, len, data];
+% bcc = mod(sum(initStr), 256);
+% str = [initStr, bcc];
% Skriv
matlabclient(1, str')
@@ -142,20 +142,20 @@ matlabclient(1, str')
%fwrite(lcd, str)
%% Radera Displayen
-DC1 = 17;
-ESC = 27;
-Code = 'DL';
-
-% Save the 'small package' as a string
-data = [ESC, double(Code)];
-len = length(data);
-initStr = [DC1, len, data];
-bcc = mod(sum(initStr), 256);
-str = [initStr, bcc];
-
-% Skriv
-matlabclient(1, str')
-%fwrite(lcd, str)
+% DC1 = 17;
+% ESC = 27;
+% Code = 'DL';
+%
+% % Save the 'small package' as a string
+% data = [ESC, double(Code)];
+% len = length(data);
+% initStr = [DC1, len, data];
+% bcc = mod(sum(initStr), 256);
+% str = [initStr, bcc];
+%
+% % Skriv
+% matlabclient(1, str')
+% %fwrite(lcd, str)
%% Avsluta kommunikation med display
-matlabclient(3); \ No newline at end of file
+matlabclient(3);