Diff: Converter.cpp

Revision:

25:a08a1f5fbb6a

Parent:

23:33d7efd62537

Child:

27:afdaee781efa

--- a/Converter.cpp	Mon Dec 12 10:19:12 2016 +0000
+++ b/Converter.cpp	Mon Dec 12 10:58:04 2016 +0000
@@ -1,15 +1,21 @@
 #include "convert.h"
 #include "models.h"
 #include "point.h"
-
+#include "C12832_lcd.h" 
 #define CHAR_SIZE 8
 
-Bitmap Converter::convert(int[LCD_Y][] map){
+Bitmap Converter::convert(int map[][LCD_X]){
     char char_map[LCD_Y*LCD_X/CHAR_SIZE];
     for(int i = 0; i < LCD_Y; i++){
         for(int j = 0; j < LCD_X; j++){
-            char_map[(i*LCD_X+j)/CHAR_SIZE + 1] |= map[i][j] << ;
+            char_map[(i*LCD_X+j)/CHAR_SIZE + 1] |= map[i][j] << ((CHAR_SIZE - 1) - i % CHAR_SIZE);
         }
     }
-    
-}
\ No newline at end of file
+    Bitmap bitmap_converted = {
+    LCD_X,
+    LCD_Y,
+    LCD_X/CHAR_SIZE,
+    char_map,
+};
+    return bitmap_converted;
+}