From fa898d8e414d4515595127274c432b26ca5ffb15 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Tue, 30 Jun 2015 16:02:23 +0200
Subject: [PATCH] [ES] Aufgabe 5 fertiggestellt

Signed-off-by: Jim Martens <github@2martens.de>
---
 es/blatt5/uebung5-1/uebung5-1.ino | 22 ---------------
 es/blatt5/uebung5-2/uebung5-2.ino | 16 +++++++++--
 es/blatt5/uebung5-3/uebung5-3.ino | 45 +++++++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/es/blatt5/uebung5-1/uebung5-1.ino b/es/blatt5/uebung5-1/uebung5-1.ino
index bfedb60..eea1f63 100644
--- a/es/blatt5/uebung5-1/uebung5-1.ino
+++ b/es/blatt5/uebung5-1/uebung5-1.ino
@@ -125,27 +125,5 @@ void setPixel(int x, int y, int value)
   
   char finalExistingValue = existingValue & invMask;
   char finalValue = finalExistingValue | newValue;
-
-  Serial.print("bank:");
-  Serial.println(bank);
-  Serial.print("relRow:");
-  Serial.println(relativeRow);  
-  Serial.print("index:");
-  Serial.println(index);
-  Serial.print("value:");
-  Serial.println(value);
-  Serial.print("existingValue:");
-  Serial.println(existingValue, BIN);
-  Serial.print("finalExistingValue:");
-  Serial.println(finalExistingValue, BIN);
-  Serial.print("pixelMask:");
-  Serial.println(pixelMask, BIN);
-  Serial.print("invMask:");
-  Serial.println(invMask, BIN);
-  Serial.print("newValue:");
-  Serial.println(newValue, BIN);
-  Serial.print("finalValue:");
-  Serial.println(finalValue, BIN);
-  Serial.println("-----");
   screenBuffer[index] = finalValue;
 }
diff --git a/es/blatt5/uebung5-2/uebung5-2.ino b/es/blatt5/uebung5-2/uebung5-2.ino
index c9f334b..02d3da6 100644
--- a/es/blatt5/uebung5-2/uebung5-2.ino
+++ b/es/blatt5/uebung5-2/uebung5-2.ino
@@ -197,6 +197,13 @@ void setPixel(int x, int y, int value)
   int index = bankStartIndex + y;
   char bitValue = 0x0;
   
+  Serial.print("x:");
+  Serial.println(x);
+  Serial.print("y:");
+  Serial.println(y);
+  Serial.print("value:");
+  Serial.println(value);
+  
   if (value == 1) {
     bitValue = 0xff;
   }
@@ -237,8 +244,13 @@ int printChar(int x, int y, char value)
     char data = font[arrayIndex][i];
     for (int _x = 0; _x < 8; _x++) {
       char bitmask = 1 << _x;
-      int pixel = bitmask & data;
-      setPixel(x + _x, y + i, pixel);
+      bitmask = 0x0 | bitmask;
+      char pixel = bitmask & data;
+      int pixelInt = 0;
+      if (pixel != 0x0) {
+        pixelInt = 1;
+      }
+      setPixel(x + _x, y + i, pixelInt);
     }
   }
 
diff --git a/es/blatt5/uebung5-3/uebung5-3.ino b/es/blatt5/uebung5-3/uebung5-3.ino
index 7ecd857..3bc4738 100644
--- a/es/blatt5/uebung5-3/uebung5-3.ino
+++ b/es/blatt5/uebung5-3/uebung5-3.ino
@@ -164,6 +164,37 @@ void loop()
   printChar(29, 51, '2');
   printChar(29, 57, '3');
   flushBuffer();
+  resetBuffer();
+  delay(5000);
+  // write his data
+  printChar(9, 21, 'J');
+  printChar(9, 27, 'o');
+  printChar(9, 33, 'a');
+  printChar(9, 39, 'c');
+  printChar(9, 45, 'h');
+  printChar(9, 51, 'i');
+  printChar(9, 57, 'm');
+  printChar(19, 6, 'S');
+  printChar(19, 12, 'c');
+  printChar(19, 18, 'h');
+  printChar(19, 24, 'm');
+  printChar(19, 30, 'i');
+  printChar(19, 36, 'd');
+  printChar(19, 42, 'b');
+  printChar(19, 48, 'e');
+  printChar(19, 54, 'r');
+  printChar(19, 60, 'g');
+  printChar(19, 66, 'e');
+  printChar(19, 72, 'r');
+  printChar(29, 21, '6');
+  printChar(29, 27, '5');
+  printChar(29, 33, '3');
+  printChar(29, 39, '6');
+  printChar(29, 45, '4');
+  printChar(29, 51, '9');
+  printChar(29, 57, '6');
+  flushBuffer();
+  resetBuffer();
   delay(5000);
 }
 
@@ -255,10 +286,20 @@ int printChar(int x, int y, char value)
     char data = font[arrayIndex][i];
     for (int _x = 0; _x < 8; _x++) {
       char bitmask = 1 << _x;
-      int pixel = bitmask & data;
-      setPixel(x + _x, y + i, pixel);
+      bitmask = 0x0 | bitmask;
+      char pixel = bitmask & data;
+      int pixelInt = 0;
+      if (pixel != 0x0) {
+        pixelInt = 1;
+      }
+      setPixel(x + _x, y + i, pixelInt);
     }
   }
 
   return 0;
 }
+
+void printString(int x, int y, String text)
+{
+  
+}