Diff: Converter.cpp

Revision:

36:b88fa8ff0be9

Parent:

35:b767ad058a8b

Child:

38:63b99151e218

--- a/Converter.cpp	Mon Dec 12 12:00:44 2016 +0000
+++ b/Converter.cpp	Mon Dec 12 12:47:07 2016 +0000
@@ -2,21 +2,22 @@
 #include "models.h"
 #include "point.h"
 #include "C12832_lcd.h" 
-#define CHAR_SIZE 8
+#include <math.h>
 
 Bitmap Converter::convert(int map[][LCD_X]){
     int len = LCD_Y*LCD_X/CHAR_SIZE;
+    int count = 0;
+    int tmp = 0;
     char char_map[len];
     for(int i = 0; i < len; i++ ){
         char_map[i] = 0;
     }
     for(int i = 0; i < LCD_Y; i++){
         for(int j = 0; j < LCD_X; j++){
-            char_map[(i*LCD_X+j)/CHAR_SIZE] |= map[i][j] << ((CHAR_SIZE - 1) - i % CHAR_SIZE);
-        }
+            int index = (i*LCD_X + j)/CHAR_SIZE;
+            char_map[index] |= map[i][j] << ((CHAR_SIZE - 1) - index % CHAR_SIZE);        }
     }
-    return char_map;
-    /*
+    //return char_map;
     Bitmap bitmap_converted = {
         LCD_X,
         LCD_Y,
@@ -24,5 +25,4 @@
         char_map,
     };
     return bitmap_converted;
-    */
 }