NVS Refactor ** Factory+Squeezelite FLASH required for this branch!

This is a major refactoring of the nvs parameters storage. To support
this, a new partition was added. To start using this branch, one must
flash all binaries and possibly re-configure the system.

main/CMakeLists.txt

@@ -2,7 +2,7 @@ set(COMPONENT_ADD_INCLUDEDIRS . )
 
 set(COMPONENT_SRCS "esp_app_main.c" "platform_esp32.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c")
 set(REQUIRES esp_common)
-set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console ota )
+set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console ota tools )
 
 
 register_component()

main/component.mk

@@ -7,4 +7,6 @@
 # please read the SDK documents if you need to do this.
 #
 CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG
+COMPONENT_ADD_INCLUDEDIRS += $(COMPONENT_PATH)/../tools
+COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/
 LDFLAGS += -s

main/esp_app_main.c

@@ -40,12 +40,14 @@
 #include "lwip/netdb.h"
 #include "nvs_utilities.h"
 #include "http_server.h"
+#include "trace.h"
 #include "wifi_manager.h"
 #include "squeezelite-ota.h"
 
 static EventGroupHandle_t wifi_event_group;
-extern char current_namespace[];
-
+bool enable_bt_sink=false;
+bool enable_airplay=false;
+bool jack_mutes_amp=false;
 const int CONNECTED_BIT = BIT0;
 #define JOIN_TIMEOUT_MS (10000)
 
@@ -61,6 +63,9 @@ char * fwurl = NULL;
 #endif
 static bool bWifiConnected=false;
 
+
+
+
 /* brief this is an exemple of a callback that you can setup in your own app to get notified of wifi manager event */
 void cb_connection_got_ip(void *pvParameter){
 	ESP_LOGI(TAG, "I have a connection!");
@@ -104,7 +109,7 @@ char * process_ota_url(){
 	if(fwurl!=NULL)
 	{
 		ESP_LOGD(TAG,"Deleting nvs entry for Firmware URL %s", fwurl);
-		esp_err_t err = nvs_open(current_namespace, NVS_READWRITE, &nvs);
+		esp_err_t err = nvs_open_from_partition(settings_partition, current_namespace, NVS_READWRITE, &nvs);
 		if (err == ESP_OK) {
 			err = nvs_erase_key(nvs, "fwurl");
 			if (err == ESP_OK) {
@@ -133,11 +138,50 @@ char * process_ota_url(){
 	return fwurl;
 }
 
+//CONFIG_SDIF_NUM=0
+//CONFIG_SPDIF_BCK_IO=26
+//CONFIG_SPDIF_WS_IO=25
+//CONFIG_SPDIF_DO_IO=15
+//CONFIG_A2DP_CONTROL_DELAY_MS=500
+//CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000
+//CONFIG_WIFI_MANAGER_MAX_RETRY=2
+
+void register_default_nvs(){
+	nvs_value_set_default(NVS_TYPE_STR, "bt_sink_name", CONFIG_BT_NAME, 0);
+	nvs_value_set_default(NVS_TYPE_STR, "bt_sink_pin", QUOTE(CONFIG_BT_SINK_PIN), 0);
+	nvs_value_set_default(NVS_TYPE_STR, "host_name", "squeezelite-esp32", 0);
+	nvs_value_set_default(NVS_TYPE_STR, "release_url", SQUEEZELITE_ESP32_RELEASE_URL, 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_ip_address",CONFIG_DEFAULT_AP_IP , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_ip_gateway",CONFIG_DEFAULT_AP_GATEWAY , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_ip_netmask",CONFIG_DEFAULT_AP_NETMASK , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_channel",QUOTE(CONFIG_DEFAULT_AP_CHANNEL) , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_ssid",CONFIG_DEFAULT_AP_SSID , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "ap_password", CONFIG_DEFAULT_AP_PASSWORD, 0);
+	nvs_value_set_default(NVS_TYPE_STR, "airplay_name",CONFIG_AIRPLAY_NAME , 0);
+	nvs_value_set_default(NVS_TYPE_STR, "airplay_port", CONFIG_AIRPLAY_PORT, 0);
+	nvs_value_set_default(NVS_TYPE_STR, "a2dp_sink_name", CONFIG_A2DP_SINK_NAME, 0);
+	nvs_value_set_default(NVS_TYPE_STR, "a2dp_device_name", CONFIG_A2DP_DEV_NAME, 0);
+
+	char * flag = get_nvs_value_alloc_default(NVS_TYPE_STR, "enable_bt_sink", QUOTE(CONFIG_BT_SINK), 0);
+	enable_bt_sink= (strcmp(flag,"1")==0 ||strcasecmp(flag,"y")==0);
+	free(flag);
+	flag = get_nvs_value_alloc_default(NVS_TYPE_STR, "enable_airplay", QUOTE(CONFIG_AIRPLAY_SINK), 0);
+	enable_airplay= (strcmp(flag,"1")==0 ||strcasecmp(flag,"y")==0);
+	free(flag);
+
+	flag = get_nvs_value_alloc_default(NVS_TYPE_STR, "jack_mutes_amp", "n", 0);
+	jack_mutes_amp= (strcmp(flag,"1")==0 ||strcasecmp(flag,"y")==0);
+	free(flag);
+
+
+
+}
 
 void app_main()
 {
 	char * fwurl = NULL;
 	initialize_nvs();
+	register_default_nvs();
 	led_config(LED_GREEN, LED_GREEN_GPIO, 0);
 	led_config(LED_RED, LED_RED_GPIO, 0);
 	wifi_event_group = xEventGroupCreate();

main/nvs_utilities.c

@@ -13,9 +13,11 @@
 #include "esp_vfs_fat.h"
 #include "nvs.h"
 #include "nvs_flash.h"
-extern char current_namespace[];
 
+const char current_namespace[] = "config";
+const char settings_partition[] = "settings";
 static const char * TAG = "platform_esp32";
+
 bool isNameValid(char * key){
 	bool bFound=false;
 	nvs_handle nvs;
@@ -99,9 +101,10 @@ esp_err_t store_nvs_value_len(nvs_type_t type, const char *key, void * data,
 	nvs_close(nvs);
 	return err;
 }
-
+void nvs_value_set_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size) {
+	free(get_nvs_value_alloc_default(type, key, default_value, blob_size));
+}
 void * get_nvs_value_alloc_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size) {
-
 	void * current_value = get_nvs_value_alloc(type, key);
 	if(current_value == NULL && default_value != NULL){
 		if(type == NVS_TYPE_BLOB && blob_size == 0){
@@ -114,6 +117,9 @@ void * get_nvs_value_alloc_default(nvs_type_t type, const char *key, void * defa
 				ESP_LOGE(TAG,"Unable to store default nvs value. Error: %s",esp_err_to_name(err));
 				return NULL;
 			}
+			else{
+				ESP_LOGI(TAG,"Stored new default value for key %s", key);
+			}
 		}
 	}
 	if(current_value == NULL){

main/nvs_utilities.h

@@ -4,6 +4,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+extern const char current_namespace[];
+extern const char settings_partition[];
 bool isNameValid(char * key);
 esp_err_t store_nvs_value_len(nvs_type_t type, const char *key, void * data, size_t data_len);
 esp_err_t store_nvs_value(nvs_type_t type, const char *key, void * data);
@@ -11,6 +13,7 @@ esp_err_t get_nvs_value(nvs_type_t type, const char *key, void*value, const uint
 void * get_nvs_value_alloc(nvs_type_t type, const char *key);
 esp_err_t erase_nvs(const char *key);
 void * get_nvs_value_alloc_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size);
+void nvs_value_set_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size);
 #ifdef __cplusplus
 }
 #endif

main/platform_esp32.h

@@ -22,6 +22,9 @@
 #pragma once
 
 #include "esp_pthread.h"
+#ifndef SQUEEZELITE_ESP32_RELEASE_URL
+#define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
+#endif
 
 extern void run_command(char * line);
 extern  bool wait_for_wifi();