Minor bug fixes

* Fixed radio playing after reconnecting to the wifi network.

Author: SubCoderHUN

WT32-SC01-PLUS/src/main.cpp

@@ -211,14 +211,14 @@ void BrightnessControll()
 void SetBrightnessDim()
 {
   tft.setBrightness(1);
-  lv_slider_set_value(ui_brightnessslider, 1, LV_ANIM_ON);
+  lv_slider_set_value(ui_brightnessslider, 1, LV_ANIM_OFF);
   lv_label_set_text(ui_BrightnessText, "Auto");
   lv_obj_add_flag(ui_percentagetext1, LV_OBJ_FLAG_HIDDEN);
 }
 void SetBrightnessNormal()
 {
   tft.setBrightness(screen_brightness);
-  lv_slider_set_value(ui_brightnessslider, screen_brightness, LV_ANIM_ON);
+  lv_slider_set_value(ui_brightnessslider, screen_brightness, LV_ANIM_OFF);
   lv_label_set_text(ui_BrightnessText, "Auto");
   lv_obj_add_flag(ui_percentagetext1, LV_OBJ_FLAG_HIDDEN);
 }
@@ -392,13 +392,6 @@ void BrightnessDIMMControll()
           SetupRadio(); // Setup radio stations for dropdown menu
         }
     }
-    xTaskCreatePinnedToCore(radiotask,
-                            "radiotask",
-                            4000,
-                            NULL,
-                            1,
-                            NULL,
-                            1);
     xTaskCreatePinnedToCore(WiFiErrorHandling,
                             "WiFiErrorHandling",
                             4000,

WT32-SC01-PLUS/src/radio/radio.cpp

@@ -9,8 +9,10 @@
 
 Audio audio;              // Create audio object
 AudioBuffer audio_buffer; // Create audio buffer object
+TaskHandle_t *RadioTaskHandle;
 
 int statcount = 0;
+int volume = 10;
 bool radioIsPlaying, stateisselected = false;
 const int ARRAY_SIZE = 7; // Array size for stations
 const char *stations[ARRAY_SIZE]{
@@ -40,52 +42,62 @@ void StartStopRadio()
 }
 void radiotask(void *pvParameters)
 {
-    while (true)
+    while (isConnected)
     {
-        if (isConnected)
+        if (lv_obj_has_state(ui_playbtn, LV_EVENT_CLICKED))
         {
-            if (lv_obj_has_state(ui_playbtn, LV_EVENT_CLICKED))
+            radioIsPlaying = true;
+            StartStopRadio();
+            lv_obj_add_flag(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_flag(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_state(ui_playbtn, LV_EVENT_CLICKED);
+        }
+        if (lv_obj_has_state(ui_stopbtn, LV_EVENT_CLICKED))
+        {
+            radioIsPlaying = false;
+            StartStopRadio();
+            lv_obj_add_flag(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_flag(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
+            lv_obj_clear_state(ui_stopbtn, LV_EVENT_CLICKED);
+        }
+        if (lv_dropdown_is_open(ui_radiostationdropdown))
+            stateisselected = true;
+        else
+        {
+            if (stateisselected)
             {
+                statcount = lv_dropdown_get_selected(ui_radiostationdropdown);
                 radioIsPlaying = true;
                 StartStopRadio();
-                lv_obj_add_flag(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
-                lv_obj_clear_flag(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
-                lv_obj_clear_state(ui_playbtn, LV_EVENT_CLICKED);
+                lv_obj_clear_state(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
+                lv_obj_add_state(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
+                stateisselected = false;
             }
-            if (lv_obj_has_state(ui_stopbtn, LV_EVENT_CLICKED))
-            {
-                radioIsPlaying = false;
-                StartStopRadio();
-                lv_obj_add_flag(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
-                lv_obj_clear_flag(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
-                lv_obj_clear_state(ui_stopbtn, LV_EVENT_CLICKED);
-            }
-            if (lv_dropdown_is_open(ui_radiostationdropdown))
-                stateisselected = true;
-            else
-            {
-                if (stateisselected)
-                {
-                    statcount = lv_dropdown_get_selected(ui_radiostationdropdown);
-                    radioIsPlaying = true;
-                    StartStopRadio();
-                    lv_obj_clear_state(ui_stopbtn, LV_OBJ_FLAG_HIDDEN);
-                    lv_obj_add_state(ui_playbtn, LV_OBJ_FLAG_HIDDEN);
-                    stateisselected = false;
-                }
-            }
-            if (lv_slider_is_dragged(ui_volumeslider))
-                audio.setVolume(lv_slider_get_value(ui_volumeslider));
-           audio.loop();
         }
+        if (lv_slider_is_dragged(ui_volumeslider))
+        {
+            volume = lv_slider_get_value(ui_volumeslider);
+            audio.setVolume(volume);
+        }
+        audio.loop();
     }
+    vTaskDelete(RadioTaskHandle);
 }
 void SetupRadio()
 {
-    audio.setVolume(50);
+    lv_slider_set_value(ui_volumeslider,volume,LV_ANIM_OFF);
+    audio.setVolume(volume);
     lv_dropdown_clear_options(ui_radiostationdropdown);
     for (int i = 0; i < ARRAY_SIZE; i++) // Setup stations list
         lv_dropdown_add_option(ui_radiostationdropdown, stations_name[i], i);
+    xTaskCreatePinnedToCore(radiotask,
+                            "radiotask",
+                            4000,
+                            NULL,
+                            1,
+                            RadioTaskHandle,
+                            1);
+    StartStopRadio();
 }
 void InitRadioPinout()
 {

WT32-SC01-PLUS/src/wifi/init_wifi.cpp

@@ -40,9 +40,8 @@ void WiFiErrorHandling(void *pvParameters)
                 WiFi.disconnect();
                 isConnected = false;
                 connectOverride = true;
-                StartWifiFromEEPROM();
-                if (radioIsPlaying)
-                    StartStopRadio();
+                if (radioIsPlaying && StartWifiFromEEPROM())
+                    SetupRadio();
             }
             else
                 Serial.printf("WiFiErrorHandling: Pinging google.com successful\n");
@@ -134,6 +133,8 @@ bool InitWifi()
         isConnected = true;
         writeStringToEEPROM(0, WIFI_SSID);  // Write SSID to EEPROM
         writeStringToEEPROM(64, WIFI_PASS); // Write password to EEPROM
+        if (radioIsPlaying)
+            SetupRadio();
     }
     return isConnected;
 }