diff --git a/code/.project b/code/.project
index 1514a30..06fb76d 100644
--- a/code/.project
+++ b/code/.project
@@ -968,11 +968,6 @@
 			<type>1</type>
 			<location>/home/matthias/esp/esp-idf/components/vfs/vfs_uart.c</location>
 		</link>
-		<link>
-			<name>build/ide/esp_idf_components/vfs/vfs_usb_serial_jtag.c</name>
-			<type>1</type>
-			<location>/home/matthias/esp/esp-idf/components/vfs/vfs_usb_serial_jtag.c</location>
-		</link>
 		<link>
 			<name>build/ide/esp_idf_components/wear_levelling/Partition.cpp</name>
 			<type>1</type>
diff --git a/code/main/CMakeLists.txt b/code/main/CMakeLists.txt
index bbd1862..f869fc7 100644
--- a/code/main/CMakeLists.txt
+++ b/code/main/CMakeLists.txt
@@ -2,16 +2,10 @@
 # for more information about component CMakeLists.txt files.
 
 idf_component_register(
-<<<<<<< HEAD
-    SRCS 				# list the source files of this component
-    "main.cpp"         
-    "src/gpio.cpp"
-=======
     SRCS                # list the source files of this component
     "main.cpp" 
-    "gpio.cpp"
-    "wifi.cpp"
->>>>>>> wifi
+    "src/gpio.cpp"
+    "src/wifi.cpp"
     INCLUDE_DIRS        # optional, add here public include directories
     "inc"
     PRIV_INCLUDE_DIRS   # optional, add here private include directories
diff --git a/code/main/inc/gpio.h b/code/main/inc/gpio.h
index 99881a4..006601e 100644
--- a/code/main/inc/gpio.h
+++ b/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;
-};
 
 
 /** @} */
diff --git a/code/main/inc/wifi.h b/code/main/inc/wifi.h
index 99cbc39..9c87ce9 100644
--- a/code/main/inc/wifi.h
+++ b/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;
+
 };
 
 
diff --git a/code/main/main.c b/code/main/main.c
deleted file mode 100644
index 4b7582d..0000000
--- a/code/main/main.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-
-
-
-
-
-void app_main(void)
-{
-    while (true) {
-        printf("Hello from app_main!\n");
-        sleep(1);
-    }
-}
diff --git a/code/main/main.cpp b/code/main/main.cpp
index 9feab88..cf78a06 100644
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -1,18 +1,39 @@
-#include <cstdlib>
-
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_sntp.h"
+#include "esp_wifi.h"
+
+#include "nvs_flash.h"
+
 #include "driver/gpio.h"
 #include "inc/gpio.h"
+#include "inc/wifi.h"
 
 static TaskHandle_t devTaskHandle = NULL;
 static void devTask(void* parameters);
-static GPIO gpio0(0, GPIO_DIRECTION_OUTPUT);
-static GPIO gpio1(1, GPIO_DIRECTION_OUTPUT);
+static GPIO gpio0(4, GPIO_DIRECTION_OUTPUT);
+static GPIO gpio1(18, GPIO_DIRECTION_OUTPUT);
+static time_t currentTime;
+//
+//static void wifi_init(void);
+static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
+void wifi_init_sta(void);
 
 extern "C" void app_main(void)
 {
+   esp_log_level_set("*", ESP_LOG_WARN);
+
+
+   esp_err_t ret = nvs_flash_init();
+
+   if(ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND)
+   {
+      ESP_ERROR_CHECK(nvs_flash_erase());
+      ret = nvs_flash_init();
+   }
 
    // Create the development task
    if(xTaskCreate(devTask, "DevTask", 2048, NULL, 3, &devTaskHandle) != pdPASS)
@@ -20,8 +41,25 @@ extern "C" void app_main(void)
       printf("Task not created");
    }
 
+   Wifi wifi;
+   wifi.start_client();
+
+   // Start NTP
+   setenv("TZ", "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00", 1);
+   tzset();
+   sntp_setoperatingmode(SNTP_OPMODE_POLL);
+   sntp_setservername(0, "pool.ntp.org");
+   sntp_init();
+
     while (true)
     {
+
+       struct tm tm;
+       time(&currentTime);
+       localtime_r(&currentTime, &tm);
+
+       printf("%lld\n\r", currentTime);
+       printf("%i:%i:%i\n\r", tm.tm_hour, tm.tm_min, tm.tm_sec);
         vTaskDelay(1000);
     }
 }
diff --git a/code/main/src/gpio.cpp b/code/main/src/gpio.cpp
index de41a2a..9d59029 100644
--- a/code/main/src/gpio.cpp
+++ b/code/main/src/gpio.cpp
@@ -17,17 +17,13 @@
 // Include files
 // --------------------------------------------------------------------------------------------------------------------
 
-<<<<<<< HEAD
+#include "esp_system.h"
+#include "esp_log.h"
+
 #include <gpio.h>
 #include "driver/gpio.h"
 
 
-=======
-#include "driver/gpio.h"
-
-#include "gpio.h"
->>>>>>> wifi
-
 
 // --------------------------------------------------------------------------------------------------------------------
 // Constant and macro definitions
@@ -57,18 +53,14 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 
-<<<<<<< HEAD
+
 
 GPIO::GPIO(int number, GPIO_Direction_t direction)
-=======
-bool GPIO::GPIO(int number, GPIO_Direction_t direction)
->>>>>>> wifi
+
 {
    this->number = number;
    this->direction = direction;
 
-<<<<<<< HEAD
-
    //zero-initialize the config structure.
    gpio_config_t io_conf = {};
    //disable interrupt
@@ -122,12 +114,3 @@ GPIO_Value_t GPIO::GetInput(void)
 
 
 
-
-=======
-   return true;
-}
->>>>>>> wifi
-
-
-
-
diff --git a/code/main/src/wifi.cpp b/code/main/src/wifi.cpp
index 68c1bd3..0c8228a 100644
--- a/code/main/src/wifi.cpp
+++ b/code/main/src/wifi.cpp
@@ -16,6 +16,9 @@
 // --------------------------------------------------------------------------------------------------------------------
 // Include files
 // --------------------------------------------------------------------------------------------------------------------
+#include "string.h"
+#include "esp_log.h"
+#include "esp_wifi.h"
 
 #include "wifi.h"
 
@@ -23,18 +26,31 @@
 // Constant and macro definitions
 // --------------------------------------------------------------------------------------------------------------------
 
+#define EXAMPLE_ESP_MAXIMUM_RETRY  5
 
+/* The event group allows multiple bits for each event, but we only care about two events:
+ * - we are connected to the AP with an IP
+ * - we failed to connect after the maximum amount of retries */
+#define WIFI_CONNECTED_BIT BIT0
+#define WIFI_FAIL_BIT      BIT1
 
+#define ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD WIFI_AUTH_WPA_WPA2_PSK
 // --------------------------------------------------------------------------------------------------------------------
 // Type definitions
 // --------------------------------------------------------------------------------------------------------------------
 
 
+
 // --------------------------------------------------------------------------------------------------------------------
 // File-scope variables
 // --------------------------------------------------------------------------------------------------------------------
 
+static EventGroupHandle_t s_wifi_event_group;
+static int s_retry_num;
+static const char *TAG = "wifi station";
 
+static const char* ssid = "Kowalski";
+static const char* pass = "madagascar";
 
 // --------------------------------------------------------------------------------------------------------------------
 // Function declarations
@@ -47,91 +63,97 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 
-
-void Wifi::event_handler(void* arg, esp_event_base_t event_base,
-                                int32_t event_id, void* event_data)
+Wifi::Wifi()
 {
-    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
-        esp_wifi_connect();
-    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
-        if (s_retry_num < EXAMPLE_ESP_MAXIMUM_RETRY) {
-            esp_wifi_connect();
-            s_retry_num++;
-            ESP_LOGI(TAG, "retry to connect to the AP");
-        } else {
-            xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
-        }
-        ESP_LOGI(TAG,"connect to the AP fail");
-    } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
-        ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
-        ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
-        s_retry_num = 0;
-        xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
-    }
+   s_retry_num = 0;
+
+}
+
+void Wifi::event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
+{
+   if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START)
+   {
+      esp_wifi_connect();
+   }
+   else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED)
+   {
+      if (s_retry_num < EXAMPLE_ESP_MAXIMUM_RETRY)
+      {
+         esp_wifi_connect();
+         s_retry_num++;
+         ESP_LOGI(TAG, "retry to connect to the AP");
+      }
+      else
+      {
+         xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
+      }
+      ESP_LOGI(TAG, "connect to the AP fail");
+   }
+   else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP)
+   {
+      ip_event_got_ip_t *event = (ip_event_got_ip_t*) event_data;
+      ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
+      s_retry_num = 0;
+      xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
+   }
 }
 
 void Wifi::start_client(void)
 {
-    s_wifi_event_group = xEventGroupCreate();
+   s_wifi_event_group = xEventGroupCreate();
 
-    ESP_ERROR_CHECK(esp_netif_init());
+   ESP_ERROR_CHECK(esp_netif_init());
 
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-    esp_netif_create_default_wifi_sta();
+   ESP_ERROR_CHECK(esp_event_loop_create_default());
+   esp_netif_create_default_wifi_sta();
 
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
+   wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+   ESP_ERROR_CHECK(esp_wifi_init(&cfg));
 
-    esp_event_handler_instance_t instance_any_id;
-    esp_event_handler_instance_t instance_got_ip;
-    ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
-                                                        ESP_EVENT_ANY_ID,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_any_id));
-    ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT,
-                                                        IP_EVENT_STA_GOT_IP,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_got_ip));
+   esp_event_handler_instance_t instance_any_id;
+   esp_event_handler_instance_t instance_got_ip;
+   ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &Wifi::event_handler, NULL, &instance_any_id));
+   ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &Wifi::event_handler, NULL, &instance_got_ip));
 
-    wifi_config_t wifi_config = {
-        .sta = {
-            .ssid = EXAMPLE_ESP_WIFI_SSID,
-            .password = EXAMPLE_ESP_WIFI_PASS,
-            /* Authmode threshold resets to WPA2 as default if password matches WPA2 standards (pasword len => 8).
-             * If you want to connect the device to deprecated WEP/WPA networks, Please set the threshold value
-             * to WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK and set the password with length and format matching to
-        * WIFI_AUTH_WEP/WIFI_AUTH_WPA_PSK standards.
-             */
-            .threshold.authmode = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD,
-            .sae_pwe_h2e = WPA3_SAE_PWE_BOTH,
-        },
-    };
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
-    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
-    ESP_ERROR_CHECK(esp_wifi_start() );
+   wifi_config_t wifi_config;
 
-    ESP_LOGI(TAG, "wifi_init_sta finished.");
+   memset(&wifi_config, 0, sizeof(wifi_config));
 
-    /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
-     * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
-    EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
-            WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
-            pdFALSE,
-            pdFALSE,
-            portMAX_DELAY);
+   strncpy((char*)wifi_config.sta.ssid, ssid, sizeof(wifi_config.sta.ssid));
+   strncpy((char*)wifi_config.sta.password, pass, sizeof(wifi_config.sta.password));
 
-    /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
-     * happened. */
-    if (bits & WIFI_CONNECTED_BIT) {
-        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
-                 EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS);
-    } else if (bits & WIFI_FAIL_BIT) {
-        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
-                 EXAMPLE_ESP_WIFI_SSID, EXAMPLE_ESP_WIFI_PASS);
-    } else {
-        ESP_LOGE(TAG, "UNEXPECTED EVENT");
-    }
+   wifi_config.sta.threshold.authmode  = ESP_WIFI_SCAN_AUTH_MODE_THRESHOLD;
+   wifi_config.sta.sae_pwe_h2e         = WPA3_SAE_PWE_BOTH;
+
+
+
+   ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
+   ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
+   ESP_ERROR_CHECK(esp_wifi_start());
+
+   ESP_LOGI(TAG, "wifi_init_sta finished.");
+
+   /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
+    * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
+   EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
+   WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
+   pdFALSE,
+   pdFALSE,
+   portMAX_DELAY);
+
+   /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
+    * happened. */
+   if (bits & WIFI_CONNECTED_BIT)
+   {
+      ESP_LOGI(TAG, "connected to ap SSID:%s password:%s", ssid, pass);
+   }
+   else if (bits & WIFI_FAIL_BIT)
+   {
+      ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s", ssid, pass);
+   }
+   else
+   {
+      ESP_LOGE(TAG, "UNEXPECTED EVENT");
+   }
 }
 
diff --git a/code/sdkconfig b/code/sdkconfig
index 228ddf7..e0bbafd 100644
--- a/code/sdkconfig
+++ b/code/sdkconfig
@@ -365,16 +365,16 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # Example Configuration
 #
-CONFIG_ESP_WIFI_SSID="myssid"
-CONFIG_ESP_WIFI_PASSWORD="mypassword"
+CONFIG_ESP_WIFI_SSID="vbchaos"
+CONFIG_ESP_WIFI_PASSWORD="mijninternet"
 # end of Example Configuration
 
 #
 # Compiler options
 #
-CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
 # CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
-# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
@@ -644,7 +644,6 @@ CONFIG_RTC_CLK_SRC_INT_RC=y
 # CONFIG_RTC_CLK_SRC_EXT_OSC is not set
 # CONFIG_RTC_CLK_SRC_INT_8MD256 is not set
 CONFIG_RTC_CLK_CAL_CYCLES=1024
-CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y
 # end of RTC Clock Config
 
 #
@@ -711,7 +710,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP_PHY_MAX_TX_POWER=20
 CONFIG_ESP_PHY_REDUCE_TX_POWER=y
-CONFIG_ESP_PHY_ENABLE_USB=y
 # end of PHY
 
 #
@@ -738,12 +736,11 @@ CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
 # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160
-# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
-CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
 # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
-CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
 CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y
 CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
@@ -767,8 +764,8 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
-# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set
-CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
 CONFIG_ESP_CONSOLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
@@ -906,11 +903,7 @@ CONFIG_FATFS_PER_FILE_CACHE=y
 #
 # CONFIG_FREERTOS_SMP is not set
 CONFIG_FREERTOS_UNICORE=y
-<<<<<<< HEAD
-CONFIG_FREERTOS_HZ=1000
-=======
 CONFIG_FREERTOS_HZ=100
->>>>>>> wifi
 CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
@@ -933,7 +926,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
 #
 # Port
 #
-CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
 CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
@@ -1501,8 +1493,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_FLASHMODE_DIO=y
 # CONFIG_FLASHMODE_DOUT is not set
 CONFIG_MONITOR_BAUD=115200
-CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
 # CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
 CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
diff --git a/code/sdkconfig.old b/code/sdkconfig.old
index 16c13a6..4a42b22 100644
--- a/code/sdkconfig.old
+++ b/code/sdkconfig.old
@@ -372,9 +372,9 @@ CONFIG_ESP_WIFI_PASSWORD="mypassword"
 #
 # Compiler options
 #
-CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
+# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
 # CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
-# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
 # CONFIG_COMPILER_OPTIMIZATION_NONE is not set
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
@@ -644,7 +644,6 @@ CONFIG_RTC_CLK_SRC_INT_RC=y
 # CONFIG_RTC_CLK_SRC_EXT_OSC is not set
 # CONFIG_RTC_CLK_SRC_INT_8MD256 is not set
 CONFIG_RTC_CLK_CAL_CYCLES=1024
-CONFIG_RTC_CLOCK_BBPLL_POWER_ON_WITH_USB=y
 # end of RTC Clock Config
 
 #
@@ -711,7 +710,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP_PHY_MAX_TX_POWER=20
 CONFIG_ESP_PHY_REDUCE_TX_POWER=y
-CONFIG_ESP_PHY_ENABLE_USB=y
 # end of PHY
 
 #
@@ -738,12 +736,11 @@ CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
 # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160
-# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
-CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
+CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
+# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
 # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
-CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y
 CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y
 CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y
@@ -767,8 +764,8 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_NONE is not set
-# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set
-CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y
+CONFIG_ESP_CONSOLE_SECONDARY_NONE=y
+# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set
 CONFIG_ESP_CONSOLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
@@ -929,7 +926,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
 #
 # Port
 #
-CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
 CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
@@ -1497,8 +1493,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_FLASHMODE_DIO=y
 # CONFIG_FLASHMODE_DOUT is not set
 CONFIG_MONITOR_BAUD=115200
-CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
+# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
 # CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
 CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y