diff --git a/Makefile b/Makefile index dc8c9a47c..b7be04d97 100644 --- a/Makefile +++ b/Makefile @@ -560,10 +560,10 @@ BOARD=ESP32 EMBEDDED=1 USE_NET=1 #USE_HASHLIB=1 -#USE_GRAPHICS=1 -#USE_CRYPTO=1 -#USE_TLS=1 -#USE_TELNET=1 +USE_GRAPHICS=1 +USE_CRYPTO=1 +USE_TLS=1 +USE_TELNET=1 DEFINES+=-DESP_PLATFORM -DESP32=1 OPTIMIZEFLAGS+=-Og diff --git a/libs/network/esp32/jswrap_esp32_network.c b/libs/network/esp32/jswrap_esp32_network.c index b9583885a..73bec38ff 100644 --- a/libs/network/esp32/jswrap_esp32_network.c +++ b/libs/network/esp32/jswrap_esp32_network.c @@ -1646,27 +1646,3 @@ void jswrap_ESP32_ping( } -void initialise_wifi(void) -{ - tcpip_adapter_init(); - //wifi_event_group = xEventGroupCreate(); - ESP_ERROR_CHECK( esp_event_loop_init(event_handler, NULL) ); - wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); - ESP_ERROR_CHECK( esp_wifi_init(&cfg) ); - ESP_ERROR_CHECK( esp_wifi_set_storage(WIFI_STORAGE_RAM) ); - wifi_config_t wifi_config = { - .sta = { - .ssid = "williams", - .password = "1a2b3c4d5e", - }, - }; - ESP_LOGI(tag, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid); - - - ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) ); - - - esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config); - ESP_ERROR_CHECK( esp_wifi_start() ); -} - diff --git a/targets/esp32/main.c b/targets/esp32/main.c index 1f0c45a35..9ab62269d 100644 --- a/targets/esp32/main.c +++ b/targets/esp32/main.c @@ -20,7 +20,7 @@ extern void initialise_wifi(void); static void uartTask(void *data) { initConsole(); - //initADC(1); + initADC(1); while(1) { consoleToEspruino(); } @@ -46,7 +46,6 @@ int app_main(void) nvs_flash_init(); spi_flash_init(); tcpip_adapter_init(); - //initialise_wifi(); #ifdef RTOS queues_init(); tasks_init();