diff --git a/.gitignore b/.gitignore
index de7f2fd..4c111fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/build/
-/debug/
-/dist/
\ No newline at end of file
+solar_panel.X/build/
+solar_panel.X/debug/
+solar_panel.X/dist/
\ No newline at end of file
diff --git a/solar_panel.X/main.c b/solar_panel.X/main.c
index f217874..0dbb396 100644
--- a/solar_panel.X/main.c
+++ b/solar_panel.X/main.c
@@ -43,7 +43,9 @@
 
 #include "mcc_generated_files/mcc.h"
 #include "lcd/lcd.h"
+#include "measure.h"
 
+#define MAX_COL 16
 /*
                          Main application
  */
@@ -53,6 +55,7 @@ void main(void)
     SYSTEM_Initialize();
     
     Lcd_Init(); 
+    adc_init();
 
     // If using interrupts in PIC18 High/Low Priority Mode you need to enable the Global High and Low Interrupts
     // If using interrupts in PIC Mid-Range Compatibility Mode you need to enable the Global and Peripheral Interrupts
@@ -72,29 +75,19 @@ void main(void)
 
     while (1)
     {
-        uint16_t value;
         
-        value = ADC_GetConversion(voltage);
-        char* msg;
-        sprintf(msg, "%i", value);
+        uint16_t valueV = measure_voltage();
+        uint16_t valueI = measure_current(offsetCurrent);
         
+        char msg[MAX_COL+1];
+        //LCD_2x16_WriteCmd(0x01);    // clear display
+        
+        snprintf(msg, MAX_COL+1, "U = %4i [mV]   ", valueV);
         LCD_2x16_WriteMsg(msg,0);
         
+        snprintf(msg, MAX_COL+1, "I = %4i [uA]   ", valueI);
+        LCD_2x16_WriteMsg(msg,1);
         
-        
-        
-        
-        
-        
-        /*
-        LCD_2x16_WriteMsg("TURBOPUTE",0);
-        LCD_2x16_WriteMsg("bip ",1);
-        for(uint32_t i = 0; i<100000; i++)
-        {}
-        LCD_2x16_WriteMsg("boup",1);
-        for(uint32_t i = 0; i<100000; i++)
-        {}
-        */
     }
 }
 /**