rafaelcaricio/mch2022-talktopics
1
0
Fork 0
forked from mirrors/mch2022-template-app
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #42 from badgeteam/wifi_test

Browse source 
Prepare for enterprise WiFi.
This commit is contained in:
Robot 2022-05-25 17:09:10 +02:00 committed by GitHub
commit ab92043c75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 184 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/include/wifi_connection.h
View file

@ -7,3 +7,5 @@
void wifi_init(); void wifi_init();
bool wifi_connect(const char* aSsid, const char* aPassword, wifi_auth_mode_t aAuthmode, uint8_t aRetryMax); bool wifi_connect(const char* aSsid, const char* aPassword, wifi_auth_mode_t aAuthmode, uint8_t aRetryMax);
bool wifi_connect_ent(const char* aSsid, const char *aIdent, const char *aAnonIdent, const char* aPassword, uint8_t aRetryMax);
void wifi_scan();

186
main/main.c
View file

@ -87,9 +87,9 @@ void appfs_store_app(pax_buf_t* pax_buffer, ILI9341* ili9341, char* path, char*
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
return; return;
} }
ESP_LOGI(TAG, "Application size %d", app_size); ESP_LOGI(TAG, "Application size %d", app_size);
res = appfsCreateFile(label, app_size, &handle); res = appfsCreateFile(label, app_size, &handle);
if (res != ESP_OK) { if (res != ESP_OK) {
graphics_task(pax_buffer, ili9341, NULL, "Failed to create on AppFS"); graphics_task(pax_buffer, ili9341, NULL, "Failed to create on AppFS");
@ -117,7 +117,7 @@ void menu_launcher(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili
menu_t* menu = menu_alloc("Main menu"); menu_t* menu = menu_alloc("Main menu");
*appfs_fd = APPFS_INVALID_FD; *appfs_fd = APPFS_INVALID_FD;
*menu_action = ACTION_NONE; *menu_action = ACTION_NONE;
while (1) { while (1) {
*appfs_fd = appfsNextEntry(*appfs_fd); *appfs_fd = appfsNextEntry(*appfs_fd);
if (*appfs_fd == APPFS_INVALID_FD) break; if (*appfs_fd == APPFS_INVALID_FD) break;
@ -133,15 +133,15 @@ void menu_launcher(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili
menu_args_t* install_args = malloc(sizeof(menu_args_t)); menu_args_t* install_args = malloc(sizeof(menu_args_t));
install_args->action = ACTION_INSTALLER; install_args->action = ACTION_INSTALLER;
menu_insert_item(menu, "Hatchery", NULL, install_args, -1); menu_insert_item(menu, "Hatchery", NULL, install_args, -1);
menu_args_t* settings_args = malloc(sizeof(menu_args_t)); menu_args_t* settings_args = malloc(sizeof(menu_args_t));
settings_args->action = ACTION_SETTINGS; settings_args->action = ACTION_SETTINGS;
menu_insert_item(menu, "WiFi settings", NULL, settings_args, -1); menu_insert_item(menu, "WiFi settings", NULL, settings_args, -1);
menu_args_t* ota_args = malloc(sizeof(menu_args_t)); menu_args_t* ota_args = malloc(sizeof(menu_args_t));
ota_args->action = ACTION_OTA; ota_args->action = ACTION_OTA;
menu_insert_item(menu, "Firmware update", NULL, ota_args, -1); menu_insert_item(menu, "Firmware update", NULL, ota_args, -1);
menu_args_t* fpga_dl_args = malloc(sizeof(menu_args_t)); menu_args_t* fpga_dl_args = malloc(sizeof(menu_args_t));
fpga_dl_args->action = ACTION_FPGA_DL; fpga_dl_args->action = ACTION_FPGA_DL;
menu_insert_item(menu, "FPGA download", NULL, fpga_dl_args, -1); menu_insert_item(menu, "FPGA download", NULL, fpga_dl_args, -1);
@ -149,23 +149,23 @@ void menu_launcher(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili
menu_args_t* fpga_args = malloc(sizeof(menu_args_t)); menu_args_t* fpga_args = malloc(sizeof(menu_args_t));
fpga_args->action = ACTION_FPGA; fpga_args->action = ACTION_FPGA;
menu_insert_item(menu, "FPGA test", NULL, fpga_args, -1); menu_insert_item(menu, "FPGA test", NULL, fpga_args, -1);
menu_args_t* rp2040bl_args = malloc(sizeof(menu_args_t)); menu_args_t* rp2040bl_args = malloc(sizeof(menu_args_t));
rp2040bl_args->action = ACTION_RP2040_BL; rp2040bl_args->action = ACTION_RP2040_BL;
menu_insert_item(menu, "RP2040 bootloader", NULL, rp2040bl_args, -1); menu_insert_item(menu, "RP2040 bootloader", NULL, rp2040bl_args, -1);
menu_args_t* wifi_connect_args = malloc(sizeof(menu_args_t)); menu_args_t* wifi_connect_args = malloc(sizeof(menu_args_t));
wifi_connect_args->action = ACTION_WIFI_CONNECT; wifi_connect_args->action = ACTION_WIFI_CONNECT;
menu_insert_item(menu, "WiFi connect", NULL, wifi_connect_args, -1); menu_insert_item(menu, "WiFi connect", NULL, wifi_connect_args, -1);
menu_args_t* file_browser_args = malloc(sizeof(menu_args_t)); menu_args_t* file_browser_args = malloc(sizeof(menu_args_t));
file_browser_args->action = ACTION_FILE_BROWSER; file_browser_args->action = ACTION_FILE_BROWSER;
menu_insert_item(menu, "File browser (sd card)", NULL, file_browser_args, -1); menu_insert_item(menu, "File browser (sd card)", NULL, file_browser_args, -1);
menu_args_t* file_browser_int_args = malloc(sizeof(menu_args_t)); menu_args_t* file_browser_int_args = malloc(sizeof(menu_args_t));
file_browser_int_args->action = ACTION_FILE_BROWSER_INT; file_browser_int_args->action = ACTION_FILE_BROWSER_INT;
menu_insert_item(menu, "File browser (internal)", NULL, file_browser_int_args, -1); menu_insert_item(menu, "File browser (internal)", NULL, file_browser_int_args, -1);
menu_args_t* uninstall_args = malloc(sizeof(menu_args_t)); menu_args_t* uninstall_args = malloc(sizeof(menu_args_t));
uninstall_args->action = ACTION_UNINSTALL; uninstall_args->action = ACTION_UNINSTALL;
menu_insert_item(menu, "Uninstall app", NULL, uninstall_args, -1); menu_insert_item(menu, "Uninstall app", NULL, uninstall_args, -1);
@ -205,18 +205,18 @@ void menu_launcher(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili
graphics_task(pax_buffer, ili9341, menu, NULL); graphics_task(pax_buffer, ili9341, menu, NULL);
render = false; render = false;
} }
if (menuArgs != NULL) { if (menuArgs != NULL) {
*appfs_fd = menuArgs->fd; *appfs_fd = menuArgs->fd;
*menu_action = menuArgs->action; *menu_action = menuArgs->action;
break; break;
} }
} }
for (size_t index = 0; index < menu_get_length(menu); index++) { for (size_t index = 0; index < menu_get_length(menu); index++) {
free(menu_get_callback_args(menu, index)); free(menu_get_callback_args(menu, index));
} }
menu_free(menu); menu_free(menu);
} }
@ -227,15 +227,15 @@ void menu_wifi_settings(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341
menu_args_t* wifi_scan_args = malloc(sizeof(menu_args_t)); menu_args_t* wifi_scan_args = malloc(sizeof(menu_args_t));
wifi_scan_args->action = ACTION_WIFI_SCAN; wifi_scan_args->action = ACTION_WIFI_SCAN;
menu_insert_item(menu, "Add by scan...", NULL, wifi_scan_args, -1); menu_insert_item(menu, "Add by scan...", NULL, wifi_scan_args, -1);
menu_args_t* wifi_manual_args = malloc(sizeof(menu_args_t)); menu_args_t* wifi_manual_args = malloc(sizeof(menu_args_t));
wifi_manual_args->action = ACTION_WIFI_MANUAL; wifi_manual_args->action = ACTION_WIFI_MANUAL;
menu_insert_item(menu, "Add manually...", NULL, wifi_manual_args, -1); menu_insert_item(menu, "Add manually...", NULL, wifi_manual_args, -1);
menu_args_t* wifi_list_args = malloc(sizeof(menu_args_t)); menu_args_t* wifi_list_args = malloc(sizeof(menu_args_t));
wifi_list_args->action = ACTION_WIFI_LIST; wifi_list_args->action = ACTION_WIFI_LIST;
menu_insert_item(menu, "List known networks", NULL, wifi_list_args, -1); menu_insert_item(menu, "List known networks", NULL, wifi_list_args, -1);
menu_args_t* back_args = malloc(sizeof(menu_args_t)); menu_args_t* back_args = malloc(sizeof(menu_args_t));
back_args->action = ACTION_BACK; back_args->action = ACTION_BACK;
menu_insert_item(menu, "< Back", NULL, back_args, -1); menu_insert_item(menu, "< Back", NULL, back_args, -1);
@ -275,17 +275,17 @@ void menu_wifi_settings(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341
graphics_task(pax_buffer, ili9341, menu, NULL); graphics_task(pax_buffer, ili9341, menu, NULL);
render = false; render = false;
} }
if (menuArgs != NULL) { if (menuArgs != NULL) {
*menu_action = menuArgs->action; *menu_action = menuArgs->action;
break; break;
} }
} }
for (size_t index = 0; index < menu_get_length(menu); index++) { for (size_t index = 0; index < menu_get_length(menu); index++) {
free(menu_get_callback_args(menu, index)); free(menu_get_callback_args(menu, index));
} }
menu_free(menu); menu_free(menu);
} }
@ -306,28 +306,77 @@ void display_fatal_error(pax_buf_t* pax_buffer, ILI9341* ili9341, const char* li
ili9341_write(ili9341, pax_buffer->buf); ili9341_write(ili9341, pax_buffer->buf);
} }
// void wifi_connect_to_stored() {
// wifi_connect_ent("MCH2022-legacy", "thefunny", "q", "nope, you are not", 3);
// }
void wifi_connect_to_stored() { void wifi_connect_to_stored() {
// Open NVS.
nvs_handle_t handle; nvs_handle_t handle;
nvs_open("system", NVS_READWRITE, &handle); nvs_open("system", NVS_READWRITE, &handle);
char ssid[33]; uint8_t use_ent;
char password[33]; char *ssid = NULL;
size_t requiredSize; char *ident = NULL;
esp_err_t res = nvs_get_str(handle, "wifi.ssid", NULL, &requiredSize); char *anon_ident = NULL;
if (res != ESP_OK) { char *password = NULL;
strcpy(ssid, ""); size_t len;
} else if (requiredSize < sizeof(ssid)) {
res = nvs_get_str(handle, "wifi.ssid", ssid, &requiredSize); // Read NVS.
if (res != ESP_OK) strcpy(ssid, ""); esp_err_t res;
res = nvs_get_str(handle, "wifi.password", NULL, &requiredSize); // Read SSID.
if (res != ESP_OK) { res = nvs_get_str(handle, "wifi.ssid", NULL, &len);
strcpy(password, ""); if (res) goto errcheck;
} else if (requiredSize < sizeof(password)) { ssid = malloc(len);
res = nvs_get_str(handle, "wifi.password", password, &requiredSize); res = nvs_get_str(handle, "wifi.ssid", ssid, &len);
if (res != ESP_OK) strcpy(password, ""); if (res) goto errcheck;
} // Check whether connection is enterprise.
res = nvs_get_u8(handle, "wifi.use_ent", &use_ent);
if (res) goto errcheck;
if (use_ent) {
// Read enterprise-specific parameters.
// Read identity.
res = nvs_get_str(handle, "wifi.ident", NULL, &len);
if (res) goto errcheck;
ident = malloc(len);
res = nvs_get_str(handle, "wifi.ident", ident, &len);
// Read anonymous identity.
res = nvs_get_str(handle, "wifi.anon_ident", NULL, &len);
if (res) goto errcheck;
anon_ident = malloc(len);
res = nvs_get_str(handle, "wifi.anon_ident", anon_ident, &len);
if (res) goto errcheck;
} }
// Read password.
res = nvs_get_str(handle, "wifi.password", NULL, &len);
if (res) goto errcheck;
password = malloc(len);
res = nvs_get_str(handle, "wifi.password", password, &len);
if (res) goto errcheck;
// Close NVS.
nvs_close(handle); nvs_close(handle);
wifi_connect(ssid, password, WIFI_AUTH_WPA2_PSK, 3);
// Open the appropriate connection.
if (use_ent) {
wifi_connect_ent(ssid, ident, anon_ident, password, 3);
} else {
wifi_connect(ssid, password, WIFI_AUTH_WPA2_PSK, 3);
}
errcheck:
if (res == ESP_ERR_NVS_NOT_FOUND || res == ESP_ERR_NVS_NOT_INITIALIZED) {
// When NVS is not initialised.
ESP_LOGI(TAG, "WiFi settings not stored in NVS.");
} else if (res) {
// Other errors.
ESP_LOGE(TAG, "Error connecting to WiFi: %s", esp_err_to_name(res));
}
// Free memory.
if (ssid) free(ssid);
if (ident) free(ident);
if (anon_ident) free(anon_ident);
if (password) free(password);
} }
void list_files_in_folder(const char* path) { void list_files_in_folder(const char* path) {
@ -336,7 +385,7 @@ void list_files_in_folder(const char* path) {
ESP_LOGE(TAG, "Failed to open directory %s", path); ESP_LOGE(TAG, "Failed to open directory %s", path);
return; return;
} }
struct dirent *ent; struct dirent *ent;
char type; char type;
char size[12]; char size[12];
@ -459,7 +508,7 @@ void uninstall_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341*
graphics_task(pax_buffer, ili9341, menu, NULL); graphics_task(pax_buffer, ili9341, menu, NULL);
render = false; render = false;
} }
if (menuArgs != NULL) { if (menuArgs != NULL) {
char message[1024]; char message[1024];
sprintf(message, "Uninstalling %s...", menuArgs->name); sprintf(message, "Uninstalling %s...", menuArgs->name);
@ -469,16 +518,16 @@ void uninstall_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341*
menuArgs = NULL; menuArgs = NULL;
break; break;
} }
if (exit) { if (exit) {
break; break;
} }
} }
for (size_t index = 0; index < menu_get_length(menu); index++) { for (size_t index = 0; index < menu_get_length(menu); index++) {
free(menu_get_callback_args(menu, index)); free(menu_get_callback_args(menu, index));
} }
menu_free(menu); menu_free(menu);
} }
@ -493,7 +542,7 @@ void find_parent_dir(char* path, char* parent) {
for (size_t index = 0; index < strlen(path); index++) { for (size_t index = 0; index < strlen(path); index++) {
if (path[index] == '/') last_separator = index; if (path[index] == '/') last_separator = index;
} }
strcpy(parent, path); strcpy(parent, path);
parent[last_separator] = '\0'; parent[last_separator] = '\0';
} }
@ -501,7 +550,7 @@ void find_parent_dir(char* path, char* parent) {
void file_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, const char* initial_path) { void file_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9341, const char* initial_path) {
char path[512] = {0}; char path[512] = {0};
strncpy(path, initial_path, sizeof(path)); strncpy(path, initial_path, sizeof(path));
while (true) { while (true) {
menu_t* menu = menu_alloc(path); menu_t* menu = menu_alloc(path);
DIR* dir = opendir(path); DIR* dir = opendir(path);
if (dir == NULL) { if (dir == NULL) {
@ -575,7 +624,7 @@ void file_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9
graphics_task(pax_buffer, ili9341, menu, NULL); graphics_task(pax_buffer, ili9341, menu, NULL);
render = false; render = false;
} }
if (menuArgs != NULL) { if (menuArgs != NULL) {
if (menuArgs->type == 'd') { if (menuArgs->type == 'd') {
strcpy(path, menuArgs->path); strcpy(path, menuArgs->path);
@ -587,23 +636,23 @@ void file_browser(xQueueHandle buttonQueue, pax_buf_t* pax_buffer, ILI9341* ili9
menuArgs = NULL; menuArgs = NULL;
render = true; render = true;
} }
if (exit) { if (exit) {
break; break;
} }
} }
for (size_t index = 0; index < menu_get_length(menu); index++) { for (size_t index = 0; index < menu_get_length(menu); index++) {
free(menu_get_callback_args(menu, index)); free(menu_get_callback_args(menu, index));
} }
menu_free(menu); menu_free(menu);
} }
} }
void app_main(void) { void app_main(void) {
esp_err_t res; esp_err_t res;
/* Initialize memory */ /* Initialize memory */
uint8_t* framebuffer = heap_caps_malloc(ILI9341_BUFFER_SIZE, MALLOC_CAP_8BIT); uint8_t* framebuffer = heap_caps_malloc(ILI9341_BUFFER_SIZE, MALLOC_CAP_8BIT);
if (framebuffer == NULL) { if (framebuffer == NULL) {
@ -611,40 +660,40 @@ void app_main(void) {
esp_restart(); esp_restart();
} }
memset(framebuffer, 0, ILI9341_BUFFER_SIZE); memset(framebuffer, 0, ILI9341_BUFFER_SIZE);
pax_buf_t* pax_buffer = malloc(sizeof(pax_buf_t)); pax_buf_t* pax_buffer = malloc(sizeof(pax_buf_t));
if (framebuffer == NULL) { if (framebuffer == NULL) {
ESP_LOGE(TAG, "Failed to allocate buffer for PAX graphics library"); ESP_LOGE(TAG, "Failed to allocate buffer for PAX graphics library");
esp_restart(); esp_restart();
} }
memset(pax_buffer, 0, sizeof(pax_buf_t)); memset(pax_buffer, 0, sizeof(pax_buf_t));
pax_buf_init(pax_buffer, framebuffer, ILI9341_WIDTH, ILI9341_HEIGHT, PAX_BUF_16_565RGB); pax_buf_init(pax_buffer, framebuffer, ILI9341_WIDTH, ILI9341_HEIGHT, PAX_BUF_16_565RGB);
/* Initialize hardware */ /* Initialize hardware */
efuse_protect(); efuse_protect();
if (bsp_init() != ESP_OK) { if (bsp_init() != ESP_OK) {
ESP_LOGE(TAG, "Failed to initialize basic board support functions"); ESP_LOGE(TAG, "Failed to initialize basic board support functions");
esp_restart(); esp_restart();
} }
ILI9341* ili9341 = get_ili9341(); ILI9341* ili9341 = get_ili9341();
if (ili9341 == NULL) { if (ili9341 == NULL) {
ESP_LOGE(TAG, "ili9341 is NULL"); ESP_LOGE(TAG, "ili9341 is NULL");
esp_restart(); esp_restart();
} }
display_boot_screen(pax_buffer, ili9341); display_boot_screen(pax_buffer, ili9341);
if (bsp_rp2040_init() != ESP_OK) { if (bsp_rp2040_init() != ESP_OK) {
ESP_LOGE(TAG, "Failed to initialize the RP2040 co-processor"); ESP_LOGE(TAG, "Failed to initialize the RP2040 co-processor");
display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "RP2040 co-processor error", NULL, NULL); display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "RP2040 co-processor error", NULL, NULL);
esp_restart(); esp_restart();
} }
RP2040* rp2040 = get_rp2040(); RP2040* rp2040 = get_rp2040();
if (rp2040 == NULL) { if (rp2040 == NULL) {
ESP_LOGE(TAG, "rp2040 is NULL"); ESP_LOGE(TAG, "rp2040 is NULL");
@ -667,13 +716,13 @@ void app_main(void) {
display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "ICE40 FPGA error", NULL, NULL); display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "ICE40 FPGA error", NULL, NULL);
esp_restart(); esp_restart();
} }
ICE40* ice40 = get_ice40(); ICE40* ice40 = get_ice40();
if (ice40 == NULL) { if (ice40 == NULL) {
ESP_LOGE(TAG, "ice40 is NULL"); ESP_LOGE(TAG, "ice40 is NULL");
esp_restart(); esp_restart();
} }
if (bsp_bno055_init() != ESP_OK) { if (bsp_bno055_init() != ESP_OK) {
ESP_LOGE(TAG, "Failed to initialize the BNO055 position sensor"); ESP_LOGE(TAG, "Failed to initialize the BNO055 position sensor");
display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "BNO055 sensor error", "Check I2C bus", "Remove SAO and try again"); display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "BNO055 sensor error", "Check I2C bus", "Remove SAO and try again");
@ -705,7 +754,7 @@ void app_main(void) {
display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "AppFS failed to initialize", "Flash may be corrupted", NULL); display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "AppFS failed to initialize", "Flash may be corrupted", NULL);
esp_restart(); esp_restart();
} }
/* Start NVS */ /* Start NVS */
res = nvs_init(); res = nvs_init();
if (res != ESP_OK) { if (res != ESP_OK) {
@ -713,12 +762,12 @@ void app_main(void) {
display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "NVS failed to initialize", "Flash may be corrupted", NULL); display_fatal_error(pax_buffer, ili9341, "Failed to initialize", "NVS failed to initialize", "Flash may be corrupted", NULL);
esp_restart(); esp_restart();
} }
/* Start internal filesystem */ /* Start internal filesystem */
const esp_partition_t* fs_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_FAT, "locfd"); const esp_partition_t* fs_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_FAT, "locfd");
wl_handle_t s_wl_handle = WL_INVALID_HANDLE; wl_handle_t s_wl_handle = WL_INVALID_HANDLE;
if (fs_partition != NULL) { if (fs_partition != NULL) {
const esp_vfs_fat_mount_config_t mount_config = { const esp_vfs_fat_mount_config_t mount_config = {
.format_if_mount_failed = true, .format_if_mount_failed = true,
@ -734,7 +783,7 @@ void app_main(void) {
} else { } else {
ESP_LOGE(TAG, "locfd partition not found"); ESP_LOGE(TAG, "locfd partition not found");
} }
/* Start SD card filesystem */ /* Start SD card filesystem */
res = mount_sd(GPIO_SD_CMD, GPIO_SD_CLK, GPIO_SD_D0, GPIO_SD_PWR, "/sd", false, 5); res = mount_sd(GPIO_SD_CMD, GPIO_SD_CLK, GPIO_SD_D0, GPIO_SD_PWR, "/sd", false, 5);
bool sdcard_ready = (res == ESP_OK); bool sdcard_ready = (res == ESP_OK);
@ -747,7 +796,7 @@ void app_main(void) {
ws2812_init(GPIO_LED_DATA); ws2812_init(GPIO_LED_DATA);
uint8_t ledBuffer[15] = {50, 0, 0, 50, 0, 0, 50, 0, 0, 50, 0, 0, 50, 0, 0}; uint8_t ledBuffer[15] = {50, 0, 0, 50, 0, 0, 50, 0, 0, 50, 0, 0, 50, 0, 0};
ws2812_send_data(ledBuffer, sizeof(ledBuffer)); ws2812_send_data(ledBuffer, sizeof(ledBuffer));
/* Start WiFi */ /* Start WiFi */
wifi_init(); wifi_init();
@ -769,7 +818,7 @@ void app_main(void) {
esp_restart(); esp_restart();
} else if (menu_action == ACTION_INSTALLER) { } else if (menu_action == ACTION_INSTALLER) {
graphics_task(pax_buffer, ili9341, NULL, "Not implemented"); graphics_task(pax_buffer, ili9341, NULL, "Not implemented");
} else if (menu_action == ACTION_WIFI_CONNECT) { } else if (menu_action == ACTION_WIFI_CONNECT) {
graphics_task(pax_buffer, ili9341, NULL, "Connecting..."); graphics_task(pax_buffer, ili9341, NULL, "Connecting...");
wifi_connect_to_stored(); wifi_connect_to_stored();
} else if (menu_action == ACTION_OTA) { } else if (menu_action == ACTION_OTA) {
@ -818,6 +867,7 @@ void app_main(void) {
} else { } else {
graphics_task(pax_buffer, ili9341, NULL, "Canceled"); graphics_task(pax_buffer, ili9341, NULL, "Canceled");
} }
nvs_set_u8(handle, "wifi.use_ent", 0);
nvs_close(handle); nvs_close(handle);
} else if (menu_action == ACTION_WIFI_LIST) { } else if (menu_action == ACTION_WIFI_LIST) {
nvs_handle_t handle; nvs_handle_t handle;
@ -850,6 +900,6 @@ void app_main(void) {
} }
} }
free(framebuffer); free(framebuffer);
} }

74
main/wifi_connection.c
View file

@ -4,6 +4,7 @@
#include "freertos/event_groups.h" #include "freertos/event_groups.h"
#include "esp_system.h" #include "esp_system.h"
#include "esp_wifi.h" #include "esp_wifi.h"
#include "esp_wpa2.h"
#include "esp_event.h" #include "esp_event.h"
#include "esp_log.h" #include "esp_log.h"
#include "lwip/err.h" #include "lwip/err.h"
@ -43,15 +44,15 @@ static void event_handler(void* arg, esp_event_base_t event_base, int32_t event_
void wifi_init() { void wifi_init() {
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_ERROR_CHECK(esp_event_loop_create_default());
esp_netif_create_default_wifi_sta(); esp_netif_create_default_wifi_sta();
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_wifi_init(&cfg)); ESP_ERROR_CHECK(esp_wifi_init(&cfg));
esp_event_handler_instance_t instance_any_id; esp_event_handler_instance_t instance_any_id;
esp_event_handler_instance_t instance_got_ip; 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(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL, &instance_any_id));
@ -67,13 +68,17 @@ bool wifi_connect(const char* aSsid, const char* aPassword, wifi_auth_mode_t aAu
strcpy((char*) wifi_config.sta.ssid, aSsid); strcpy((char*) wifi_config.sta.ssid, aSsid);
strcpy((char*) wifi_config.sta.password, aPassword); strcpy((char*) wifi_config.sta.password, aPassword);
wifi_config.sta.threshold.authmode = aAuthmode; wifi_config.sta.threshold.authmode = aAuthmode;
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) ); // Set WiFi config.
ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) ); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_start() ); ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
// Disable 11b as NOC asked.
esp_wifi_config_11b_rate(WIFI_IF_STA, true);
// Start WiFi.
ESP_ERROR_CHECK(esp_wifi_start());
ESP_LOGI(TAG, "Connecting to WiFi..."); ESP_LOGI(TAG, "Connecting to WiFi...");
/* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum /* 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) */ * 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); EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
@ -90,3 +95,52 @@ bool wifi_connect(const char* aSsid, const char* aPassword, wifi_auth_mode_t aAu
} }
return false; return false;
} }
bool wifi_connect_ent(const char* aSsid, const char *aIdent, const char *aAnonIdent, const char* aPassword, uint8_t aRetryMax) {
gRetryCounter = 0;
gRetryMax = aRetryMax;
wifi_config_t wifi_config = {0};
if (strlen(aSsid) > 32) {
ESP_LOGE(TAG, "SSID is too long (%zu > 32)!", strlen(aSsid));
return false;
}
strncpy((char*) wifi_config.sta.ssid, aSsid, 32);
// Set WiFi config.
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
// Set WPA2 ENT config.
esp_wifi_sta_wpa2_ent_set_identity((const uint8_t *) aAnonIdent, strlen(aAnonIdent));
esp_wifi_sta_wpa2_ent_set_username((const uint8_t *) aIdent, strlen(aIdent));
esp_wifi_sta_wpa2_ent_set_password((const uint8_t *) aPassword, strlen(aPassword));
esp_wifi_sta_wpa2_ent_set_ttls_phase2_method(ESP_EAP_TTLS_PHASE2_MSCHAPV2);
// Enable enterprise auth.
esp_wifi_sta_wpa2_ent_enable();
// Disable 11b as NOC asked.
esp_wifi_config_11b_rate(WIFI_IF_STA, true);
// Start the connection.
esp_wifi_start();
ESP_LOGI(TAG, "Connecting to WiFi...");
/* 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 WiFi");
return true;
} else if (bits & WIFI_FAIL_BIT) {
ESP_LOGE(TAG, "Failed to connect");
ESP_ERROR_CHECK(esp_wifi_stop());
} else {
ESP_LOGE(TAG, "Unknown event received while waiting on connection");
ESP_ERROR_CHECK(esp_wifi_stop());
}
return false;
}
void wifi_scan() {
}