Merge pull request #494 from schreibfaul1/V3.4

V3.4
schreibfaul1 · Aug 26, 2024 · 632f59a · 632f59a
2 parents 461f5a0 + 2b51e27
commit 632f59a
Show file tree

Hide file tree

Showing 11 changed files with 1,031 additions and 697 deletions.
diff --git a/Content_on_SD_Card.zip b/Content_on_SD_Card.zip
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Schematic<br>
 ![Schematic ESP32-S3 with external DAC](docs/MWR_V3.1_ESP32-S3_schematic.jpg)<br>
 <br>
 
-[Display Layout](docs/MiniWebRadio%20V3.1%20Layout.pdf)<br>
+[Display Layout](docs/MiniWebRadio%20V3.4%20Layout.pdf)<br>
 
 [Using the Community Radio Browser](docs/Using%20the%20RadioBrowser.pdf)<br>
 

diff --git a/docs/MWR.jpg b/docs/MWR.jpg
diff --git a/docs/MiniWebRadio V3.1 Layout.pdf → docs/MiniWebRadio V3.4 Layout.pdf b/docs/MiniWebRadio V3.1 Layout.pdf → docs/MiniWebRadio V3.4 Layout.pdf
diff --git a/lib/tftLib/src/tft.cpp b/lib/tftLib/src/tft.cpp
@@ -2794,6 +2794,11 @@ uint16_t TFT::validCharsInString(const char* str, uint16_t* chArr, int8_t* ansiA
                     ansiArr[chLen] = 10;
                     break;
                 } // ANSI_ESC_ORANGE
+                if(strncmp(str + idx, "\033[90m", 5) == 0) {
+                    idx += 5;
+                    ansiArr[chLen] = 11;
+                    break;
+                } // ANSI_ESC_GREY
                 if(strncmp(str + idx, "\033[0m", 4) == 0) {
                     idx += 4;
                     ansiArr[chLen] = -1;
@@ -3010,6 +3015,7 @@ size_t TFT::writeText(const char* str, uint16_t win_X, uint16_t win_Y, int16_t w
                 if(ansiArr[idx] ==  8) setTextColor(TFT_WHITE);
                 if(ansiArr[idx] ==  9) setTextColor(TFT_BROWN);
                 if(ansiArr[idx] == 10) setTextColor(TFT_ORANGE);
+                if(ansiArr[idx] == 11) setTextColor(TFT_GREY);
             }
             if(cnt == 0 && utfPosArr[idx] == 0x20) {
                 idx++;

diff --git a/lib/tftLib/src/tft.h b/lib/tftLib/src/tft.h
@@ -29,6 +29,7 @@ extern __attribute__((weak)) void tp_released(uint16_t x, uint16_t y);
 extern __attribute__((weak)) void tp_long_released();
 
 #define ANSI_ESC_BLACK      "\033[30m"
+#define ANSI_ESC_GREY       "\033[90m"
 #define ANSI_ESC_RED        "\033[31m"
 #define ANSI_ESC_GREEN      "\033[32m"
 #define ANSI_ESC_YELLOW     "\033[33m"
@@ -64,7 +65,7 @@ extern __attribute__((weak)) void tp_long_released();
 #define TFT_DARKRED         0x5800 //  90,   0,   0
 #define TFT_DARKYELLOW      0x6B60 // 110, 110,   0
 #define TFT_DEEPSKYBLUE     0x05FF //   0, 191, 255
-#define TFT_GRAY            0x8410 // 128, 128, 128
+#define TFT_GREY            0x8410 // 128, 128, 128
 #define TFT_GREEN           0x07E0 //   0, 255,   0
 #define TFT_GREENYELLOW     0xAFE5 // 173, 255,  47
 #define TFT_GOLD            0xFEA0 // 255, 215,   0

diff --git a/lib/websrv/websrv.cpp b/lib/websrv/websrv.cpp
@@ -2,7 +2,7 @@
  * websrv.cpp
  *
  *  Created on: 09.07.2017
- *  updated on: 24.01.2024
+ *  updated on: 26.08.2024
  *      Author: Wolle
  */
 
@@ -120,7 +120,7 @@ boolean WebSrv::streamfile(fs::FS &fs,const char* path){ // transfer file from S
     strcpy(m_path, path);
     idx = indexOf(m_path, '?', 0);
     if(idx != -1) m_path[idx] = '\0';  // remobe all after '?'
-    if(!fs.exists(m_path)){ /* log_e("path not found %s", m_path); */  return false;}
+    if(!fs.exists(m_path)){ return false;}
 
     file = fs.open(m_path, "r");
     if(!file){
@@ -487,7 +487,7 @@ boolean WebSrv::handlehttp() {                // HTTPserver, message received
         }
         else{   // its the requestbody
             if(currentLine.length() > 1){
-                if(WEBSRV_onRequest) WEBSRV_onRequest(currentLine, 0);
+                if(WEBSRV_onRequest) WEBSRV_onRequest(currentLine, contentLength);
                 if(WEBSRV_onInfo) WEBSRV_onInfo(currentLine.c_str());
             }
 
@@ -794,4 +794,4 @@ String WebSrv::responseCodeToString(int32_t code) {
     default:  return "";
   }
 }
-//--------------------------------------------------------------------------------------------------------------
+//--------------------------------------------------------------------------------------------------------------
diff --git a/src/audiocontroltask.cpp b/src/audiocontroltask.cpp
@@ -216,7 +216,7 @@ void audioTask(void *parameter) {
                 else audio.setVolume(t_volume, t_volCurve);
             }
         }
-        vTaskDelay(7);
+        vTaskDelay(7 / portTICK_PERIOD_MS);
     }
 }
 
@@ -414,4 +414,3 @@ void audioSetCoreID(uint8_t coreId){
     audioMessage RX = transmitReceive(audioTxMessage);
     (void)RX;
 }
-