Fixed wifi issues

code/main/inc/gpio.h

@@ -59,7 +59,6 @@ typedef enum
 class GPIO
 {
    public:
-<<<<<<< HEAD
 
       GPIO(int number, GPIO_Direction_t direction);
 
@@ -76,23 +75,7 @@ class GPIO
 
       GPIO_Value_t value = GPIO_VALUE_LOW;
 };
-=======
->>>>>>> wifi
 
-      bool GPIO(int number, GPIO_Direction_t direction);
-
-      bool GPIO_setOutput(GPIO_Value_t value);
-
-      GPIO_Value_t GPIO_getInput(void);
-
-   private:
-
-      int number;
-
-      GPIO_Direction_t direction;
-
-      GPIO_Value_t value;
-};
 
 
 /** @} */

code/main/inc/wifi.h

@@ -70,10 +70,10 @@ class Wifi
 
       void start_client(void);
 
-      void event_handler(void* arg, esp_event_base_t event_base,  int32_t event_id, void* event_data);
+      static void event_handler(void* arg, esp_event_base_t event_base,  int32_t event_id, void* event_data);
 
    private:
-      EventGroupHandle_t s_wifi_event_group;
+
 };