Testing

lib/font.h

@@ -13,11 +13,13 @@
  * @depend      
  * ---------------------------------------------------------------+
  */
-#include <avr/pgmspace.h>
 
 #ifndef __FONT_H__
 #define __FONT_H__
 
+  // includes
+  #include <avr/pgmspace.h>
+
   // Characters definition
   // -----------------------------------
   // number of columns for chars

lib/ssd1306.c

@@ -271,7 +271,7 @@ uint8_t SSD1306_NormalScreen (uint8_t address)
  */
 uint8_t SSD1306_InverseScreen (uint8_t address)
 {
-  uint8_t status = INIT_STATUS;
+  uint8_t status = INIT_STATUS;                                   // TWI init status 0xFF
 
   // TWI start & SLAW
   // -------------------------------------------------------------------------------------

lib/ssd1306.h

@@ -23,14 +23,11 @@
 #ifndef __SSD1306_H__
 #define __SSD1306_H__
 
-<<<<<<< HEAD
   // include libraries
-  #include <string.h>
+  #include <string.h>                     // memset
   #include "font.h"
   #include "twi.h"
 
-=======
->>>>>>> origin/develop
   // Success
   // -------------------------------------------
   #define SSD1306_SUCCESS           0

main.c

@@ -23,6 +23,7 @@
 // include libraries
 #include "lib/ssd1306.h"
 #include <util/delay.h>
+#include <stdio.h>
 
 /**
  * @desc    Main function
@@ -41,7 +42,7 @@ int main(void)
   SSD1306_Init (addr);
 
   // clear screen
-  SSD1306_ClearScreen (addr);
+  SSD1306_ClearScreen ();
   // draw line
   SSD1306_DrawLine (0, MAX_X, 4, 4);
   // set position