Add MDNS hostname as a config element (#17)
* add MDNS hostname as a config element * add MDNS hostname to http config Co-authored-by: SG <who.just.the.doctor@gmail.com>
This commit is contained in:
Denis Bodor (aka Lefinnois)
GitHub
parent
c4aefda915
commit
473bdd4d09
|
|
@ -262,7 +262,6 @@
|
|||
"dependencies": {
|
||||
"anymatch": "~3.1.2",
|
||||
"braces": "~3.0.2",
|
||||
"fsevents": "~2.3.2",
|
||||
"glob-parent": "~5.1.2",
|
||||
"is-binary-path": "~2.1.0",
|
||||
"is-glob": "~4.0.1",
|
||||
|
|
@ -748,9 +747,6 @@
|
|||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.0.tgz",
|
||||
"integrity": "sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fsevents": "~2.3.2"
|
||||
},
|
||||
"bin": {
|
||||
"rollup": "dist/bin/rollup"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
main.svelte-bny5z.svelte-bny5z{border:4px dashed #000;margin:10px auto;padding:10px;max-width:800px;overflow:hidden}.svelte-bny5z.svelte-bny5z{-moz-user-select:none;-o-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}tabs.svelte-bny5z.svelte-bny5z{border-bottom:4px dashed #000;width:100%;display:block}tab.svelte-bny5z.svelte-bny5z{margin-right:10px;padding:5px 10px;margin-bottom:5px;display:inline-block}tab.svelte-bny5z.svelte-bny5z:hover,tab.selected.svelte-bny5z.svelte-bny5z:hover{background:rgb(255, 255, 255);color:#000000}tab.selected.svelte-bny5z.svelte-bny5z{background-color:black;color:white}tabs-content.svelte-bny5z.svelte-bny5z{display:block;margin-top:10px}error.svelte-bny5z.svelte-bny5z{padding:5px 10px;background-color:rgb(255, 0, 0);color:black}@font-face{font-family:"DOS";src:url("../assets/ega8.otf") format("opentype");font-weight:normal;font-style:normal;-webkit-font-kerning:none;font-kerning:none;font-synthesis:none;-webkit-font-variant-ligatures:none;font-variant-ligatures:none;font-variant-numeric:tabular-nums}body{padding:0;margin:0;background-color:#ffa21c;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0)}.grid.svelte-bny5z.svelte-bny5z{display:inline-grid;grid-template-columns:auto auto}.grid.svelte-bny5z>div.svelte-bny5z{margin-top:10px}.value-name.svelte-bny5z.svelte-bny5z{text-align:right}task-list.svelte-bny5z.svelte-bny5z{display:inline-grid;grid-template-columns:auto auto auto auto auto;width:100%}.button-css.svelte-yar6m3{background-color:black;color:white;font-size:28px;font-family:"DOS", monospace;line-height:1;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);border:0;padding:5px 10px;display:inline-block;max-width:100%}.button-css.svelte-yar6m3:hover{background:rgb(255, 255, 255);color:#000000}popup-wrapper.svelte-1ufadaz{background-color:rgba(0, 0, 0, 0.863);width:100%;height:100%;display:table;table-layout:fixed;z-index:999;overflow:auto;position:fixed;top:0;left:0;right:0;bottom:0}popup-body.svelte-1ufadaz{margin:auto;display:table-cell;text-align:center;vertical-align:middle;width:100%}popup-content.svelte-1ufadaz{background-color:#ffa21c;display:inline-block;outline:none;position:relative;text-align:initial;max-width:100vw}popup-border.svelte-1ufadaz{display:block;border:4px dashed #000;margin:10px;padding:10px}popup-close.svelte-1ufadaz{background-color:#000;display:inline-block;color:#ffa21c;position:absolute;width:24px;right:0px;top:0px;text-align:center}popup-close.svelte-1ufadaz:hover{background-color:#fff;color:#000}.input-text-css.svelte-4h7oz2{display:inline-block;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;box-sizing:border-box;margin:0;border:0;border-bottom:4px solid #000;padding:0 5px 0 5px;box-shadow:none;border-radius:0;-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#ffa21c;height:32px}.input-text-css.svelte-4h7oz2:focus-visible,.input-text-css.svelte-4h7oz2:hover{outline:0;background-color:white}@keyframes svelte-1471rey-spinner-animation{0%{content:"|"}25%{content:"/"}50%{content:"-"}75%{content:"\\"}100%{content:"|"}}spinner.svelte-1471rey::after{display:inline-block;animation:svelte-1471rey-spinner-animation 0.6s linear infinite alternate;content:"|"}select.svelte-1rf61qb.svelte-1rf61qb{display:inline-block;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;box-sizing:border-box;margin:0;border:0;border-bottom:4px solid #000;padding:0 5px 0 5px;box-shadow:none;border-radius:0;-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#ffa21c}select.svelte-1rf61qb.svelte-1rf61qb::-ms-expand{display:none}select.svelte-1rf61qb.svelte-1rf61qb:hover{background:rgb(255, 255, 255);color:#000000}select.svelte-1rf61qb.svelte-1rf61qb:focus{box-shadow:none;outline:none;background:rgb(255, 255, 255);color:#000000}select.svelte-1rf61qb option.svelte-1rf61qb{font-weight:normal}.button.svelte-1rqr1h4{box-sizing:border-box;display:inline-block;font-size:28px;font-family:"DOS", monospace;line-height:1;border:0;padding:0 5px 0 5px;box-shadow:none;border-radius:0;display:inline-block;max-width:100%}.black.svelte-1rqr1h4{color:white;background-color:black;border-bottom:4px solid #000}.black.svelte-1rqr1h4:hover{background:#fff;color:#000}.normal.svelte-1rqr1h4{color:#000;background-color:#ffa21c;border-bottom:4px solid #ffa21c}.normal.svelte-1rqr1h4:hover{background:#000;color:#fff}
|
||||
main.svelte-bny5z.svelte-bny5z{border:4px dashed #000;margin:10px auto;padding:10px;max-width:800px;overflow:hidden}.svelte-bny5z.svelte-bny5z{-moz-user-select:none;-o-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}tabs.svelte-bny5z.svelte-bny5z{border-bottom:4px dashed #000;width:100%;display:block}tab.svelte-bny5z.svelte-bny5z{margin-right:10px;padding:5px 10px;margin-bottom:5px;display:inline-block}tab.svelte-bny5z.svelte-bny5z:hover,tab.selected.svelte-bny5z.svelte-bny5z:hover{background:rgb(255, 255, 255);color:#000000}tab.selected.svelte-bny5z.svelte-bny5z{background-color:black;color:white}tabs-content.svelte-bny5z.svelte-bny5z{display:block;margin-top:10px}error.svelte-bny5z.svelte-bny5z{padding:5px 10px;background-color:rgb(255, 0, 0);color:black}@font-face{font-family:"DOS";src:url("../assets/ega8.otf") format("opentype");font-weight:normal;font-style:normal;-webkit-font-kerning:none;font-kerning:none;font-synthesis:none;-webkit-font-variant-ligatures:none;font-variant-ligatures:none;font-variant-numeric:tabular-nums}body{padding:0;margin:0;background-color:#ffa21c;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0)}.grid.svelte-bny5z.svelte-bny5z{display:inline-grid;grid-template-columns:auto auto}.grid.svelte-bny5z>div.svelte-bny5z{margin-top:10px}.value-name.svelte-bny5z.svelte-bny5z{text-align:right}task-list.svelte-bny5z.svelte-bny5z{display:inline-grid;grid-template-columns:auto auto auto auto auto;width:100%}.input-text-css.svelte-4h7oz2{display:inline-block;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;box-sizing:border-box;margin:0;border:0;border-bottom:4px solid #000;padding:0 5px 0 5px;box-shadow:none;border-radius:0;-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#ffa21c;height:32px}.input-text-css.svelte-4h7oz2:focus-visible,.input-text-css.svelte-4h7oz2:hover{outline:0;background-color:white}@keyframes svelte-1471rey-spinner-animation{0%{content:"|"}25%{content:"/"}50%{content:"-"}75%{content:"\\"}100%{content:"|"}}spinner.svelte-1471rey::after{display:inline-block;animation:svelte-1471rey-spinner-animation 0.6s linear infinite alternate;content:"|"}popup-wrapper.svelte-1ufadaz{background-color:rgba(0, 0, 0, 0.863);width:100%;height:100%;display:table;table-layout:fixed;z-index:999;overflow:auto;position:fixed;top:0;left:0;right:0;bottom:0}popup-body.svelte-1ufadaz{margin:auto;display:table-cell;text-align:center;vertical-align:middle;width:100%}popup-content.svelte-1ufadaz{background-color:#ffa21c;display:inline-block;outline:none;position:relative;text-align:initial;max-width:100vw}popup-border.svelte-1ufadaz{display:block;border:4px dashed #000;margin:10px;padding:10px}popup-close.svelte-1ufadaz{background-color:#000;display:inline-block;color:#ffa21c;position:absolute;width:24px;right:0px;top:0px;text-align:center}popup-close.svelte-1ufadaz:hover{background-color:#fff;color:#000}.button.svelte-1rqr1h4{box-sizing:border-box;display:inline-block;font-size:28px;font-family:"DOS", monospace;line-height:1;border:0;padding:0 5px 0 5px;box-shadow:none;border-radius:0;display:inline-block;max-width:100%}.black.svelte-1rqr1h4{color:white;background-color:black;border-bottom:4px solid #000}.black.svelte-1rqr1h4:hover{background:#fff;color:#000}.normal.svelte-1rqr1h4{color:#000;background-color:#ffa21c;border-bottom:4px solid #ffa21c}.normal.svelte-1rqr1h4:hover{background:#000;color:#fff}select.svelte-1rf61qb.svelte-1rf61qb{display:inline-block;color:#000;font-size:28px;font-family:"DOS", monospace;line-height:1;box-sizing:border-box;margin:0;border:0;border-bottom:4px solid #000;padding:0 5px 0 5px;box-shadow:none;border-radius:0;-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#ffa21c}select.svelte-1rf61qb.svelte-1rf61qb::-ms-expand{display:none}select.svelte-1rf61qb.svelte-1rf61qb:hover{background:rgb(255, 255, 255);color:#000000}select.svelte-1rf61qb.svelte-1rf61qb:focus{box-shadow:none;outline:none;background:rgb(255, 255, 255);color:#000000}select.svelte-1rf61qb option.svelte-1rf61qb{font-weight:normal}.button-css.svelte-yar6m3{background-color:black;color:white;font-size:28px;font-family:"DOS", monospace;line-height:1;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);border:0;padding:5px 10px;display:inline-block;max-width:100%}.button-css.svelte-yar6m3:hover{background:rgb(255, 255, 255);color:#000000}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -40,6 +40,7 @@
|
|||
let ap_pass_input;
|
||||
let sta_ssid_input;
|
||||
let sta_pass_input;
|
||||
let hostname_input;
|
||||
|
||||
let current_tab = "WiFi";
|
||||
if (localStorage.getItem("current_tab") != null) {
|
||||
|
|
@ -56,6 +57,7 @@
|
|||
ap_pass: ap_pass_input.get_value(),
|
||||
sta_ssid: sta_ssid_input.get_value(),
|
||||
sta_pass: sta_pass_input.get_value(),
|
||||
hostname: hostname_input.get_value(),
|
||||
}).then((json) => {
|
||||
if (json.error) {
|
||||
popup_message_text = json.error;
|
||||
|
|
@ -145,6 +147,8 @@
|
|||
<div><Spinner /></div>
|
||||
<div class="value-name">Pass:</div>
|
||||
<div><Spinner /></div>
|
||||
<div class="value-name">Hostname:</div>
|
||||
<div><Spinner /></div>
|
||||
{:then json}
|
||||
<div class="value-name">Mode:</div>
|
||||
<div>
|
||||
|
|
@ -184,6 +188,11 @@
|
|||
<div>
|
||||
<Input value={json.ap_pass} bind:this={ap_pass_input} />
|
||||
</div>
|
||||
|
||||
<div class="value-name">Hostname:</div>
|
||||
<div>
|
||||
<Input value={json.hostname} bind:this={hostname_input} />
|
||||
</div>
|
||||
{:catch error}
|
||||
<error>{error.message}</error>
|
||||
{/await}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,10 @@ void cli_config_get(Cli* cli, mstring_t* args) {
|
|||
cli_printf(cli, "sta_pass: %s", mstring_get_cstr(value));
|
||||
cli_write_eol(cli);
|
||||
|
||||
nvs_config_get_hostname(value);
|
||||
cli_printf(cli, "hostname: %s", mstring_get_cstr(value));
|
||||
cli_write_eol(cli);
|
||||
|
||||
nvs_config_get_wifi_mode(&wifi_mode);
|
||||
switch(wifi_mode) {
|
||||
case WiFiModeAP:
|
||||
|
|
@ -165,6 +169,27 @@ void cli_config_set_sta_ssid(Cli* cli, mstring_t* args) {
|
|||
mstring_free(ssid);
|
||||
}
|
||||
|
||||
void cli_config_set_hostname(Cli* cli, mstring_t* args) {
|
||||
mstring_t* hostname = mstring_alloc();
|
||||
|
||||
do {
|
||||
if(!cli_args_read_quoted_string_and_trim(args, hostname)) {
|
||||
cli_write_str(cli, "config_set_hostname \"<hostname>\", 1-32 symbols");
|
||||
break;
|
||||
}
|
||||
|
||||
if(nvs_config_set_hostname(hostname) == ESP_OK) {
|
||||
cli_write_str(cli, "OK");
|
||||
cli_write_eol(cli);
|
||||
cli_write_str(cli, "Reboot to apply");
|
||||
} else {
|
||||
cli_write_str(cli, "config_set_hostname \"<hostname>\", 1-32 symbols");
|
||||
}
|
||||
} while(false);
|
||||
|
||||
mstring_free(hostname);
|
||||
}
|
||||
|
||||
const char* nvs_type_to_str(nvs_type_t type) {
|
||||
switch(type) {
|
||||
case NVS_TYPE_U8:
|
||||
|
|
@ -225,4 +250,4 @@ void cli_nvs_dump(Cli* cli, mstring_t* args) {
|
|||
}
|
||||
|
||||
cli_write_str(cli, "OK");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ void cli_config_set_ap_pass(Cli* cli, mstring_t* args);
|
|||
void cli_config_set_ap_ssid(Cli* cli, mstring_t* args);
|
||||
void cli_config_set_sta_pass(Cli* cli, mstring_t* args);
|
||||
void cli_config_set_sta_ssid(Cli* cli, mstring_t* args);
|
||||
void cli_config_set_hostname(Cli* cli, mstring_t* args);
|
||||
|
||||
void cli_nvs_dump(Cli* cli, mstring_t* args);
|
||||
|
||||
|
|
@ -73,6 +74,11 @@ const CliItem cli_items[] = {
|
|||
.desc = "set STA mode SSID, requires a reboot to apply",
|
||||
.callback = cli_config_set_sta_ssid,
|
||||
},
|
||||
{
|
||||
.name = "config_set_hostname",
|
||||
.desc = "set MDNS host name, requires a reboot to apply",
|
||||
.callback = cli_config_set_hostname,
|
||||
},
|
||||
{
|
||||
.name = "device_info",
|
||||
.desc = "show device info (mac, fw version, chip info, etc)",
|
||||
|
|
@ -221,4 +227,4 @@ void cli_led(Cli* cli, mstring_t* args) {
|
|||
led_set((uint8_t)red, (uint8_t)green, (uint8_t)blue);
|
||||
cli_write_str(cli, "OK");
|
||||
} while(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -305,6 +305,7 @@ static esp_err_t wifi_get_credentials_handler(httpd_req_t* req) {
|
|||
mstring_t* ap_pass = mstring_alloc();
|
||||
mstring_t* sta_ssid = mstring_alloc();
|
||||
mstring_t* sta_pass = mstring_alloc();
|
||||
mstring_t* hostname = mstring_alloc();
|
||||
WiFiMode wifi_mode;
|
||||
|
||||
nvs_config_get_wifi_mode(&wifi_mode);
|
||||
|
|
@ -312,11 +313,13 @@ static esp_err_t wifi_get_credentials_handler(httpd_req_t* req) {
|
|||
nvs_config_get_ap_pass(ap_pass);
|
||||
nvs_config_get_sta_ssid(sta_ssid);
|
||||
nvs_config_get_sta_pass(sta_pass);
|
||||
nvs_config_get_hostname(hostname);
|
||||
|
||||
cJSON_AddStringToObject(root, "ap_ssid", mstring_get_cstr(ap_ssid));
|
||||
cJSON_AddStringToObject(root, "ap_pass", mstring_get_cstr(ap_pass));
|
||||
cJSON_AddStringToObject(root, "sta_ssid", mstring_get_cstr(sta_ssid));
|
||||
cJSON_AddStringToObject(root, "sta_pass", mstring_get_cstr(sta_pass));
|
||||
cJSON_AddStringToObject(root, "hostname", mstring_get_cstr(hostname));
|
||||
|
||||
switch(wifi_mode) {
|
||||
case WiFiModeAP:
|
||||
|
|
@ -335,6 +338,7 @@ static esp_err_t wifi_get_credentials_handler(httpd_req_t* req) {
|
|||
mstring_free(ap_pass);
|
||||
mstring_free(sta_ssid);
|
||||
mstring_free(sta_pass);
|
||||
mstring_free(hostname);
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
|
|
@ -348,6 +352,7 @@ static esp_err_t wifi_set_credentials_handler(httpd_req_t* req) {
|
|||
mstring_t* sta_ssid = mstring_alloc();
|
||||
mstring_t* sta_pass = mstring_alloc();
|
||||
mstring_t* wifi_mode = mstring_alloc();
|
||||
mstring_t* hostname = mstring_alloc();
|
||||
const char* error_text = JSON_ERROR("unknown error");
|
||||
int received = 0;
|
||||
httpd_resp_set_type(req, "application/json");
|
||||
|
|
@ -407,6 +412,14 @@ static esp_err_t wifi_set_credentials_handler(httpd_req_t* req) {
|
|||
error_text = JSON_ERROR("request dont have [wifi_mode] field");
|
||||
goto err_fail;
|
||||
}
|
||||
|
||||
if(cJSON_GetObjectItem(root, "hostname") != NULL) {
|
||||
mstring_set(hostname, cJSON_GetObjectItem(root, "hostname")->valuestring);
|
||||
} else {
|
||||
cJSON_Delete(root);
|
||||
error_text = JSON_ERROR("request dont have [hostname] field");
|
||||
goto err_fail;
|
||||
}
|
||||
cJSON_Delete(root);
|
||||
|
||||
if(strcmp(mstring_get_cstr(wifi_mode), CFG_WIFI_MODE_AP) != 0 &&
|
||||
|
|
@ -444,7 +457,19 @@ static esp_err_t wifi_set_credentials_handler(httpd_req_t* req) {
|
|||
}
|
||||
}
|
||||
|
||||
if(nvs_config_set_hostname(hostname) != ESP_OK) {
|
||||
error_text = JSON_ERROR("invalid value in [hostname]");
|
||||
goto err_fail;
|
||||
}
|
||||
|
||||
httpd_resp_sendstr(req, JSON_RESULT("WIFI settings saved"));
|
||||
free(buffer);
|
||||
mstring_free(ap_ssid);
|
||||
mstring_free(ap_pass);
|
||||
mstring_free(sta_ssid);
|
||||
mstring_free(sta_pass);
|
||||
mstring_free(wifi_mode);
|
||||
mstring_free(hostname);
|
||||
return ESP_OK;
|
||||
|
||||
err_fail:
|
||||
|
|
@ -455,6 +480,7 @@ err_fail:
|
|||
mstring_free(sta_ssid);
|
||||
mstring_free(sta_pass);
|
||||
mstring_free(wifi_mode);
|
||||
mstring_free(hostname);
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
|
|
@ -559,6 +585,7 @@ static esp_err_t gpio_led_set_handler(httpd_req_t* req) {
|
|||
}
|
||||
|
||||
httpd_resp_sendstr(req, JSON_RESULT("OK"));
|
||||
free(buffer);
|
||||
return ESP_OK;
|
||||
|
||||
err_fail:
|
||||
|
|
|
|||
|
|
@ -152,9 +152,13 @@ static bool network_connect_ap(mstring_t* ap_ssid, mstring_t* ap_pass) {
|
|||
}
|
||||
|
||||
void network_post_init(void) {
|
||||
mstring_t* hostname = mstring_alloc();
|
||||
|
||||
ESP_LOGI(TAG, "init mdns");
|
||||
mdns_init();
|
||||
mdns_hostname_set(MDNS_HOST_NAME);
|
||||
|
||||
nvs_config_get_hostname(hostname);
|
||||
mdns_hostname_set(mstring_get_cstr(hostname));
|
||||
mdns_instance_name_set(MDNS_INSTANCE);
|
||||
|
||||
mdns_txt_item_t serviceTxtData[] = {{"board", "esp32"}, {"path", "/"}};
|
||||
|
|
@ -171,8 +175,10 @@ void network_post_init(void) {
|
|||
|
||||
ESP_LOGI(TAG, "init netbios");
|
||||
netbiosns_init();
|
||||
netbiosns_set_name(MDNS_HOST_NAME);
|
||||
netbiosns_set_name(mstring_get_cstr(hostname));
|
||||
ESP_LOGI(TAG, "init netbios done");
|
||||
|
||||
mstring_free(hostname);
|
||||
}
|
||||
|
||||
WiFiMode network_init(void) {
|
||||
|
|
@ -207,4 +213,4 @@ WiFiMode network_init(void) {
|
|||
|
||||
WiFiMode network_get_mode(void) {
|
||||
return wifi_mode;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@
|
|||
#define WIFI_AP_PASS_KEY "wifi_ap_pass"
|
||||
#define WIFI_STA_SSID_KEY "wifi_sta_ssid"
|
||||
#define WIFI_STA_PASS_KEY "wifi_sta_pass"
|
||||
#define WIFI_HOSTNAME "wifi_hostname"
|
||||
|
||||
#define ESP_WIFI_DEFAULT_SSID "blackmagic"
|
||||
#define ESP_WIFI_DEFAULT_PASS "iamwitcher"
|
||||
#define ESP_WIFI_DEFAULT_HOSTNAME "blackmagic"
|
||||
|
||||
esp_err_t nvs_config_set_wifi_mode(WiFiMode value) {
|
||||
mstring_t* mode = mstring_alloc();
|
||||
|
|
@ -69,6 +71,16 @@ esp_err_t nvs_config_set_sta_pass(const mstring_t* pass) {
|
|||
return err;
|
||||
}
|
||||
|
||||
esp_err_t nvs_config_set_hostname(const mstring_t* hostname) {
|
||||
esp_err_t err = ESP_FAIL;
|
||||
|
||||
if(mstring_size(hostname) > 0 && mstring_size(hostname) <= 32) {
|
||||
err = nvs_save_string(WIFI_HOSTNAME, hostname);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
esp_err_t nvs_config_get_wifi_mode(WiFiMode* value) {
|
||||
mstring_t* mode = mstring_alloc();
|
||||
esp_err_t err = nvs_load_string(WIFI_MODE_KEY, mode);
|
||||
|
|
@ -122,4 +134,14 @@ esp_err_t nvs_config_get_sta_pass(mstring_t* pass) {
|
|||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
esp_err_t nvs_config_get_hostname(mstring_t* hostname) {
|
||||
esp_err_t err = nvs_load_string(WIFI_HOSTNAME, hostname);
|
||||
|
||||
if(err != ESP_OK) {
|
||||
mstring_set(hostname, ESP_WIFI_DEFAULT_HOSTNAME);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,9 +24,11 @@ esp_err_t nvs_config_set_ap_ssid(const mstring_t* ssid);
|
|||
esp_err_t nvs_config_set_ap_pass(const mstring_t* pass);
|
||||
esp_err_t nvs_config_set_sta_ssid(const mstring_t* ssid);
|
||||
esp_err_t nvs_config_set_sta_pass(const mstring_t* pass);
|
||||
esp_err_t nvs_config_set_hostname(const mstring_t* hostname);
|
||||
|
||||
esp_err_t nvs_config_get_wifi_mode(WiFiMode* value);
|
||||
esp_err_t nvs_config_get_ap_ssid(mstring_t* ssid);
|
||||
esp_err_t nvs_config_get_ap_pass(mstring_t* pass);
|
||||
esp_err_t nvs_config_get_sta_ssid(mstring_t* ssid);
|
||||
esp_err_t nvs_config_get_sta_pass(mstring_t* pass);
|
||||
esp_err_t nvs_config_get_sta_pass(mstring_t* pass);
|
||||
esp_err_t nvs_config_get_hostname(mstring_t* hostname);
|
||||
|
|
|
|||
39
sdkconfig
39
sdkconfig
|
|
@ -53,6 +53,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL=0
|
|||
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
|
||||
# CONFIG_BOOTLOADER_FACTORY_RESET is not set
|
||||
# CONFIG_BOOTLOADER_APP_TEST is not set
|
||||
CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE=y
|
||||
CONFIG_BOOTLOADER_WDT_ENABLE=y
|
||||
# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
|
||||
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
|
||||
|
|
@ -105,6 +106,9 @@ CONFIG_ESPTOOLPY_FLASHFREQ="80m"
|
|||
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
|
||||
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
|
||||
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
|
||||
# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
|
||||
# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
|
||||
# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
|
||||
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
|
||||
CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
|
||||
CONFIG_ESPTOOLPY_BEFORE_RESET=y
|
||||
|
|
@ -226,6 +230,13 @@ CONFIG_ADC_DISABLE_DAC=y
|
|||
#
|
||||
CONFIG_UART_ISR_IN_IRAM=y
|
||||
# end of UART configuration
|
||||
|
||||
#
|
||||
# GDMA Configuration
|
||||
#
|
||||
# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
|
||||
# CONFIG_GDMA_ISR_IRAM_SAFE is not set
|
||||
# end of GDMA Configuration
|
||||
# end of Driver configurations
|
||||
|
||||
#
|
||||
|
|
@ -241,8 +252,8 @@ CONFIG_EFUSE_MAX_BLK_LEN=256
|
|||
#
|
||||
CONFIG_ESP_TLS_USING_MBEDTLS=y
|
||||
CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y
|
||||
# CONFIG_ESP_TLS_SERVER is not set
|
||||
# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set
|
||||
# CONFIG_ESP_TLS_SERVER is not set
|
||||
# CONFIG_ESP_TLS_PSK_VERIFICATION is not set
|
||||
# CONFIG_ESP_TLS_INSECURE is not set
|
||||
# end of ESP-TLS
|
||||
|
|
@ -277,7 +288,6 @@ CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0
|
|||
# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set
|
||||
CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0
|
||||
CONFIG_ESP32S2_DEBUG_OCDAWARE=y
|
||||
# CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set
|
||||
CONFIG_ESP32S2_BROWNOUT_DET=y
|
||||
CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y
|
||||
# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set
|
||||
|
|
@ -390,6 +400,11 @@ CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
|
|||
# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
|
||||
# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set
|
||||
# end of Sleep Config
|
||||
|
||||
#
|
||||
# RTC Clock Config
|
||||
#
|
||||
# end of RTC Clock Config
|
||||
# end of Hardware Settings
|
||||
|
||||
#
|
||||
|
|
@ -425,6 +440,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
|
|||
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
|
||||
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
|
||||
CONFIG_ESP_PHY_MAX_TX_POWER=20
|
||||
# CONFIG_ESP_PHY_ENABLE_USB is not set
|
||||
# end of PHY
|
||||
|
||||
#
|
||||
|
|
@ -471,6 +487,7 @@ CONFIG_ESP_CONSOLE_UART_NUM=-1
|
|||
# CONFIG_ESP_INT_WDT is not set
|
||||
# CONFIG_ESP_TASK_WDT is not set
|
||||
# CONFIG_ESP_PANIC_HANDLER_IRAM is not set
|
||||
# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
|
||||
CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y
|
||||
# end of ESP System Settings
|
||||
|
||||
|
|
@ -510,6 +527,7 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
|
|||
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
|
||||
# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set
|
||||
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
|
||||
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
|
||||
# end of Wi-Fi
|
||||
|
||||
#
|
||||
|
|
@ -837,6 +855,15 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
|
|||
# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
|
||||
# CONFIG_MBEDTLS_DEBUG is not set
|
||||
|
||||
#
|
||||
# mbedTLS v2.28.x related
|
||||
#
|
||||
# CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH is not set
|
||||
# CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set
|
||||
# CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
|
||||
CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
|
||||
# end of mbedTLS v2.28.x related
|
||||
|
||||
#
|
||||
# Certificate Bundle
|
||||
#
|
||||
|
|
@ -989,6 +1016,7 @@ CONFIG_NEWLIB_NANO_FORMAT=y
|
|||
#
|
||||
# NVS
|
||||
#
|
||||
# CONFIG_NVS_ASSERT_ERROR_CHECK is not set
|
||||
# end of NVS
|
||||
|
||||
#
|
||||
|
|
@ -1043,6 +1071,7 @@ CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y
|
|||
CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
|
||||
CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y
|
||||
CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y
|
||||
CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y
|
||||
# end of Auto-detect flash chips
|
||||
|
||||
CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y
|
||||
|
|
@ -1128,7 +1157,6 @@ CONFIG_VFS_SUPPORT_TERMIOS=y
|
|||
# Host File System I/O (Semihosting)
|
||||
#
|
||||
CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1
|
||||
CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
|
||||
# end of Host File System I/O (Semihosting)
|
||||
# end of Virtual file system
|
||||
|
||||
|
|
@ -1145,6 +1173,7 @@ CONFIG_WL_SECTOR_SIZE=4096
|
|||
#
|
||||
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
|
||||
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
|
||||
CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y
|
||||
# end of Wi-Fi Provisioning Manager
|
||||
|
||||
#
|
||||
|
|
@ -1157,6 +1186,8 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y
|
|||
# CONFIG_WPA_TESTING_OPTIONS is not set
|
||||
# CONFIG_WPA_WPS_STRICT is not set
|
||||
# CONFIG_WPA_11KV_SUPPORT is not set
|
||||
# CONFIG_WPA_MBO_SUPPORT is not set
|
||||
# CONFIG_WPA_DPP_SUPPORT is not set
|
||||
# end of Supplicant
|
||||
# end of Component config
|
||||
|
||||
|
|
@ -1233,6 +1264,7 @@ CONFIG_ESP_CONSOLE_UART_NONE=y
|
|||
CONFIG_CONSOLE_UART_NUM=-1
|
||||
# CONFIG_INT_WDT is not set
|
||||
# CONFIG_TASK_WDT is not set
|
||||
# CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set
|
||||
CONFIG_TIMER_TASK_STACK_SIZE=3584
|
||||
# CONFIG_EXTERNAL_COEX_ENABLE is not set
|
||||
# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
|
||||
|
|
@ -1291,5 +1323,4 @@ CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
|
|||
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
|
||||
CONFIG_SUPPORT_TERMIOS=y
|
||||
CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
|
||||
CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
|
||||
# End of deprecated options
|
||||
|
|
|
|||
Loading…
Reference in New Issue