Improved audio ui, bug fixes

sle118 · Apr 7, 2023 · 7ac628a · 7ac628a
1 parent 1e0fce5
commit 7ac628a
Show file tree

Hide file tree

Showing 34 changed files with 1,176 additions and 169 deletions.
diff --git a/components/platform_config/platform_config.c b/components/platform_config/platform_config.c
@@ -121,7 +121,7 @@ void config_start_timer(){
 nvs_type_t  config_get_item_type(cJSON * entry){
 	if(entry==NULL){
 		ESP_LOGE(TAG,"null pointer received!");
-		return true;
+		return 0;
 	}
 	cJSON * item_type = cJSON_GetObjectItemCaseSensitive(entry, "type");
 	if(item_type ==NULL ) {
@@ -142,7 +142,7 @@ cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key,  const void
 		return NULL;
 	}
 
-	cJSON * existing = cJSON_GetObjectItemCaseSensitive(nvs_json, key);
+cJSON * existing = cJSON_GetObjectItemCaseSensitive(nvs_json, key);
 	if(existing !=NULL && nvs_type == NVS_TYPE_STR && config_get_item_type(existing) != NVS_TYPE_STR  ) {
 		ESP_LOGW(TAG, "Storing numeric value from string");
 		numvalue = atof((char *)value);

diff --git a/components/platform_console/app_squeezelite/cmd_squeezelite.c b/components/platform_console/app_squeezelite/cmd_squeezelite.c
@@ -61,21 +61,19 @@ static void squeezelite_thread(void *arg){
     for(int i = 0;i<thread_parms.argc; i++){
     	ESP_LOGV(TAG ,"     %s",thread_parms.argv[i]);
     }
-
     ESP_LOGI(TAG ,"Calling squeezelite");
     int ret = squeezelite_main(thread_parms.argc, thread_parms.argv);
 
-    messaging_post_message(ret > 1 ?  MESSAGING_ERROR : MESSAGING_WARNING,
-                           MESSAGING_CLASS_SYSTEM, "squeezelite exited with error code %d", ret);   
+    cmd_send_messaging("cfg-audio-tmpl",ret > 1 ?  MESSAGING_ERROR : MESSAGING_WARNING,"squeezelite exited with error code %d\n", ret);
 
     if (ret == 1) {
-        int wait = 60;      
+        int wait = 60;
         wait_for_commit();
-        messaging_post_message(MESSAGING_WARNING, MESSAGING_CLASS_SYSTEM, "Rebooting in %d sec", wait); 
+        cmd_send_messaging("cfg-audio-tmpl",MESSAGING_ERROR,"Rebooting in %d sec\n", wait);
         vTaskDelay( pdMS_TO_TICKS(wait * 1000));
         esp_restart();
     } else {
-        messaging_post_message(MESSAGING_ERROR, MESSAGING_CLASS_SYSTEM, "Correct command line and reboot"); 
+		cmd_send_messaging("cfg-audio-tmpl",MESSAGING_ERROR,"Correct command line and reboot\n");
         vTaskSuspend(NULL);
     }