Cato
/
Cheetah_Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

browser_config: Rename field flag enum entries to avoid confusion with Kconfig defines

This commit is contained in:
Julian Metzler 2024-02-11 15:24:32 +01:00
parent d357c88ace
commit d976ac8ef1
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
components/browser_config/browser_config.c
View File

@ -20,30 +20,30 @@ extern const uint8_t browser_config_html_end[] asm("_binary_browser_config_htm
// List of config options to present
nvs_handle_t config_nvs_handle;
config_entry_t config_entries[] = {
{.key = "hostname", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_ssid", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_anon_ident", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_ident", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_pass", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_phase2", .dataType = U8, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_phase2_ttls", .dataType = U8, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sta_retries", .dataType = U8, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "ap_ssid", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "ap_pass", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "tg_bot_token", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_WRITE_ONLY},
{.key = "disp_led_gamma", .dataType = U16, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "sel_conf_file", .dataType = STR, .flags = CONFIG_FIELD_FLAG_SPIFFS_FILE_SELECT},
{.key = "wg_private_key", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_WRITE_ONLY},
{.key = "wg_public_key", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_WRITE_ONLY},
{.key = "wg_allowed_ip", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "wg_allowed_mask", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "wg_listen_port", .dataType = U16, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "wg_endpoint", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "wg_endpnt_port", .dataType = U16, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "wg_keepalive", .dataType = U16, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "poll_url", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "poll_token", .dataType = STR, .flags = CONFIG_FIELD_FLAGS_WRITE_ONLY},
{.key = "poll_interval", .dataType = U16, .flags = CONFIG_FIELD_FLAGS_NONE},
{.key = "hostname", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_ssid", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_anon_ident", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_ident", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_pass", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_phase2", .dataType = U8, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_phase2_ttls", .dataType = U8, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sta_retries", .dataType = U8, .flags = BC_FIELD_FLAGS_NONE},
{.key = "ap_ssid", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "ap_pass", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "tg_bot_token", .dataType = STR, .flags = BC_FIELD_FLAGS_WRITE_ONLY},
{.key = "disp_led_gamma", .dataType = U16, .flags = BC_FIELD_FLAGS_NONE},
{.key = "sel_conf_file", .dataType = STR, .flags = BC_FIELD_FLAGS_SPIFFS_FILE_SELECT},
{.key = "wg_private_key", .dataType = STR, .flags = BC_FIELD_FLAGS_WRITE_ONLY},
{.key = "wg_public_key", .dataType = STR, .flags = BC_FIELD_FLAGS_WRITE_ONLY},
{.key = "wg_allowed_ip", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "wg_allowed_mask", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "wg_listen_port", .dataType = U16, .flags = BC_FIELD_FLAGS_NONE},
{.key = "wg_endpoint", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "wg_endpnt_port", .dataType = U16, .flags = BC_FIELD_FLAGS_NONE},
{.key = "wg_keepalive", .dataType = U16, .flags = BC_FIELD_FLAGS_NONE},
{.key = "poll_url", .dataType = STR, .flags = BC_FIELD_FLAGS_NONE},
{.key = "poll_token", .dataType = STR, .flags = BC_FIELD_FLAGS_WRITE_ONLY},
{.key = "poll_interval", .dataType = U16, .flags = BC_FIELD_FLAGS_NONE},
};
@ -84,7 +84,7 @@ static esp_err_t config_get_fields_handler(httpd_req_t *req) {
} else if (config_entries[i].dataType == STR) {
// Query string length
size_t valueLength;
if (config_entries[i].flags & CONFIG_FIELD_FLAGS_WRITE_ONLY) {
if (config_entries[i].flags & BC_FIELD_FLAGS_WRITE_ONLY) {
// The string "<unchanged>" will also be checked for when receiving field data.
// This means that a field can not actually have this value.
// This seems acceptable.

6
components/browser_config/include/browser_config.h
View File

@ -18,9 +18,9 @@ typedef enum config_data_type {
} config_data_type_t;
typedef enum config_field_flags {
CONFIG_FIELD_FLAGS_NONE = 0,
CONFIG_FIELD_FLAGS_WRITE_ONLY = 1, // If set, fields.json will not contain the actual value. Good for things like passwords or access tokens. Only works for strings at the moment.
CONFIG_FIELD_FLAG_SPIFFS_FILE_SELECT = 2 // For STR entries, makes the field show a select input populated with filenames from SPIFFS
BC_FIELD_FLAGS_NONE = 0,
BC_FIELD_FLAGS_WRITE_ONLY = 1, // If set, fields.json will not contain the actual value. Good for things like passwords or access tokens. Only works for strings at the moment.
BC_FIELD_FLAGS_SPIFFS_FILE_SELECT = 2 // For STR entries, makes the field show a select input populated with filenames from SPIFFS
} config_field_flags_t;
typedef struct config_entry {