Splits provisioning (softAP + captive portal + NVS-backed config) into wifi_provisioning.c and home-network connection into frame_client.c. /save_config now parses the form body and persists it to NVS; on boot the device goes straight to STA mode if a config exists, retrying a few times before falling back to provisioning if the home network is unreachable. The provisioning AP is now always named ESPRESSO with a random per-device password (generated once, persisted in NVS) instead of a fixed Kconfig value, drawn from a charset that avoids visually ambiguous characters since it'll be read off the e-ink panel and possibly typed by hand.
45 lines
1.5 KiB
C
45 lines
1.5 KiB
C
#include "esp_event.h"
|
|
#include "esp_log.h"
|
|
#include "nvs_flash.h"
|
|
#include "esp_netif.h"
|
|
|
|
#include "wifi_provisioning.h"
|
|
#include "frame_client.h"
|
|
|
|
static const char *TAG = "main";
|
|
|
|
void app_main(void)
|
|
{
|
|
/* Redirected/invalid captive-portal traffic generates a lot of noise
|
|
* at the default log level. */
|
|
esp_log_level_set("httpd_uri", ESP_LOG_ERROR);
|
|
esp_log_level_set("httpd_txrx", ESP_LOG_ERROR);
|
|
esp_log_level_set("httpd_parse", ESP_LOG_ERROR);
|
|
|
|
ESP_ERROR_CHECK(esp_netif_init());
|
|
ESP_ERROR_CHECK(esp_event_loop_create_default());
|
|
|
|
esp_err_t nvs_err = nvs_flash_init();
|
|
if (nvs_err == ESP_ERR_NVS_NO_FREE_PAGES || nvs_err == ESP_ERR_NVS_NEW_VERSION_FOUND) {
|
|
ESP_ERROR_CHECK(nvs_flash_erase());
|
|
nvs_err = nvs_flash_init();
|
|
}
|
|
ESP_ERROR_CHECK(nvs_err);
|
|
|
|
frame_config_t cfg;
|
|
esp_err_t cfg_err = frame_config_load(&cfg);
|
|
if (cfg_err == ESP_OK) {
|
|
ESP_LOGI(TAG, "Found stored config for '%s', connecting to home WiFi", cfg.sta_ssid);
|
|
if (frame_wifi_connect_sta(&cfg) == ESP_OK) {
|
|
frame_client_run(&cfg);
|
|
return; /* frame_client_run currently never returns */
|
|
}
|
|
ESP_LOGW(TAG, "Could not connect to stored WiFi after %d attempts, falling back to provisioning",
|
|
CONFIG_FRAME_STA_CONNECT_MAX_RETRIES);
|
|
} else {
|
|
ESP_LOGI(TAG, "No stored config found (%s), starting provisioning", esp_err_to_name(cfg_err));
|
|
}
|
|
|
|
wifi_provisioning_start();
|
|
}
|