浏览代码

fix target config priority between NVS and dedicated builds

Philippe G 3 年之前
父节点
当前提交
839f31d485
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      components/targets/targets.c
  2. 1 1
      main/esp_app_main.c

+ 1 - 1
components/targets/targets.c

@@ -4,7 +4,7 @@
 const struct target_s *target_set[] = { &target_muse, NULL };
 
 void target_init(char *target) { 
-	for (int i = 0; target_set[i]; i++) if (strcasestr(target_set[i]->model, target)) {
+	for (int i = 0; *target && target_set[i]; i++) if (strcasestr(target_set[i]->model, target)) {
 		target_set[i]->init();
 		break;
 	}	

+ 1 - 1
main/esp_app_main.c

@@ -449,7 +449,7 @@ void app_main()
 	ESP_LOGI(TAG,"Initializing display");
 	display_init("SqueezeESP32");
 	MEMTRACE_PRINT_DELTA();
-	char *target = config_alloc_get_default(NVS_TYPE_STR, "target", CONFIG_TARGET, 0);
+	char *target = config_alloc_get_str("target", CONFIG_TARGET, NULL);
 	if (target) {
 		target_init(target);
 		free(target);