Merge remote-tracking branch 'upstream/main'

Author: CircuitSetup

README.md

@@ -310,13 +310,13 @@ Those files are not provided here. You can use any mp3, with a bitrate of 128kpb
 
 ### Installing Custom & Replacement Audio Files
 
-As of version 1.20 of the Dash Gauges firmware, above mentioned audio files (both replacements and custom sounds) can either be copied to the SD card using a computer, or uploaded through the Config Portal.
+As of version 1.20 of the Dash Gauges firmware, above mentioned audio files (both replacements and custom sounds) can either be copied to the SD card using a computer (as before), or uploaded through the Config Portal.
 
-Uploading through the Config Portal works exactly like [installing the default audio files](#audio-data-installation); on the main menu, click "UPDATE". Afterwards choose the file to upload in the bottom file selector, and click "UPLOAD". The firmware recognizes mp3 files, and stores them on the SD card. (Unlike with the default files, no further "installation" takes place.)
+Uploading through the Config Portal works exactly like [installing the default audio files](#audio-data-installation); on the main menu, click "UPDATE". Afterwards choose one or more mp3 files to upload using the bottom file selector, and click "UPLOAD". The firmware will store the uploaded mp3 files on the SD card.
 
 In order to delete a file from the SD card, upload a file whose name is prefixed with "delete-". For example: To delete "key1.mp3" from the SD card, either rename your "key1.mp3" into "delete-key1.mp3", or create a new file named "delete-key1.mp3", and upload this file. The firmware detects the "delete-" part and, instead of storing the uploaded file, it throws it away and deletes "key1.mp3" from the SD card.
 
-For technical reasons, the Dash Gauges must reboot after a file is uploaded in this way.
+For technical reasons, the Dash Gauges must reboot after mp3 files are uploaded in this way.
 
 Please remember that the maximum bitrate for mp3 files is 128kbps. Also note that the uploaded file is stored to the root folder of the SD card, so this way of uploading cannot be used to upload songs for the Music Player. 
 

install/dashgauges-A10001986.ino.nodemcu-32s.bin

@@ -115,6 +115,12 @@
 
 /*  Changelog
  *  
+ *  2025/09/19 (A10001986) [1.21]
+ *    - Extend mp3 upload by allowing multiple (max 16) mp3 files to be uploaded
+ *      at once. The DGA.bin file can be uploaded at the same time as well.
+ *  2025/09/17 (A10001986)
+ *    - WiFi Manager: Reduce page size by removing "quality icon" styles where
+ *      not needed.
  *  2025/09/15 (A10001986) [1.20]
  *    - Refine mp3 upload facility; allow deleting files from SD by prefixing
  *      filename with "delete-".

src/dashgauges-A10001986.ino

@@ -15,8 +15,8 @@
  ***                          Version Strings                          ***
  *************************************************************************/
 
-#define DG_VERSION       "V1.20"
-#define DG_VERSION_EXTRA "SEP152025"
+#define DG_VERSION       "V1.21"
+#define DG_VERSION_EXTRA "SEP192025"
 
 //#define DG_DBG              // debug output on Serial
 

src/dg_global.h

@@ -98,7 +98,8 @@ static const char *CONID  = "DGAA";
 static uint32_t   soa = AC_TS;
 static bool       ic = false;
 static uint8_t*   f(uint8_t *d, uint32_t m, int y) { return d; }
-static char       *uploadFileName = NULL;
+static char       *uploadFileNames[MAX_SIM_UPLOADS] = { NULL };
+static char       *uploadRealFileNames[MAX_SIM_UPLOADS] = { NULL };
 
 static const char *cfgName    = "/dgconfig.json";   // Main config (flash)
 static const char *ipCfgName  = "/dgipcfg.json";    // IP config (flash)
@@ -314,6 +315,10 @@ void settings_setup()
         allowCPA = check_if_default_audio_present();
     }
 
+    for(int i = 0; i < MAX_SIM_UPLOADS; i++) {
+        uploadFileNames[i] = uploadRealFileNames[i] = NULL;
+    }
+
     // Allow user to delete static IP data by holding time travel
     // while booting and switching side switch twice within 10 seconds
     if(digitalRead(TT_IN_PIN)) {
@@ -1335,15 +1340,99 @@ static bool writeFileToFS(const char *fn, uint8_t *buf, int len)
         return false;
 }
 
-bool openACFile(File& file)
+static char *allocateUploadFileName(const char *fn, int idx)
+{
+    char *t = NULL;
+
+    if(uploadFileNames[idx]) {
+        free(uploadFileNames[idx]);
+    }
+    if(uploadRealFileNames[idx]) {
+        free(uploadRealFileNames[idx]);
+    }
+    uploadFileNames[idx] = uploadRealFileNames[idx] = NULL;
+
+    if(!strlen(fn))
+        return NULL;
+  
+    if(!(uploadFileNames[idx] = (char *)malloc(strlen(fn)+4)))
+        return NULL;
+
+    if(!(uploadRealFileNames[idx] = (char *)malloc(strlen(fn)+4))) {
+        free(uploadFileNames[idx]);
+        uploadFileNames[idx] = NULL;
+        return NULL;
+    }
+
+    return uploadRealFileNames[idx];
+}
+
+bool openUploadFile(String& fn, File& file, int idx, bool haveAC, int& opType, int& errNo)
 {
+    char *uploadFileName = NULL;
+    bool ret = false;
+    
     if(haveSD) {
-        if(file = SD.open(CONFN, FILE_WRITE)) {
-            return true;
+
+        errNo = 0;
+        opType = 0;  // 0=normal, 1=AC, -1=deletion
+
+        if(!(uploadFileName = allocateUploadFileName(fn.c_str(), idx))) {
+            errNo = UPL_MEMERR;
+            return false;
+        }
+        strcpy(uploadFileNames[idx], fn.c_str());
+        
+        uploadFileName[0] = '/';
+        uploadFileName[1] = '-';
+        uploadFileName[2] = 0;
+
+        if(fn.length() > 4 && fn.endsWith(".mp3")) {
+
+            strcat(uploadFileName, fn.c_str());
+
+            if((strlen(uploadFileName) > 9) &&
+               (strstr(uploadFileName, "/-delete-") == uploadFileName)) {
+
+                uploadFileName[8] = '/';
+                SD.remove(uploadFileName+8);
+                opType = -1;
+                
+            }
+
+        } else if(fn.endsWith(".bin")) {
+
+            if(!haveAC) {
+                strcat(uploadFileName, CONFN+1);  // Skip '/', already there
+                opType = 1;
+            } else {
+                errNo = UPL_DPLBIN;
+                opType = -1;
+            }
+
+        } else {
+
+            errNo = UPL_UNKNOWN;
+            opType = -1;
+            // ret must be false!
+
         }
+
+        if(opType >= 0) {
+            if((file = SD.open(uploadFileName, FILE_WRITE))) {
+                ret = true;
+            } else {
+                errNo = UPL_OPENERR;
+            }
+        }
+
+    } else {
+      
+        errNo = UPL_NOSDERR;
+        
     }
 
-    return false;
+    return ret;
 }
 
 size_t writeACFile(File& file, uint8_t *buf, size_t len)
@@ -1356,59 +1445,46 @@ void closeACFile(File& file)
     file.close();
 }
 
-void removeACFile(bool isUPLFile)
+void removeACFile(int idx)
 {
     if(haveSD) {
-        if(!isUPLFile) {
-            SD.remove(CONFN);
-        } else if(uploadFileName) {
-            SD.remove(uploadFileName);
+        if(uploadRealFileNames[idx]) {
+            SD.remove(uploadRealFileNames[idx]);
         }
     }
 }
 
-bool openUploadFile(const char *fn, File& file, bool& isDel)
+int getUploadFileNameLen(int idx)
 {
-    if(haveSD) {
-
-        isDel = false;
-
-        if(!strlen(fn))
-            return false;
-      
-        if(!(uploadFileName = (char *)malloc(strlen(fn)+4)))
-            return false;
-
-        uploadFileName[0] = '/';
-        uploadFileName[1] = '-';
-        uploadFileName[2] = 0;
-        strcat(uploadFileName, fn);
-
-        if((strlen(uploadFileName) <= 9) ||
-           (strstr(uploadFileName, "/-delete-") != uploadFileName)) {
-    
-            if((file = SD.open(uploadFileName, FILE_WRITE))) {
-                isDel = false;
-                return true;
-            }
+    if(idx >= MAX_SIM_UPLOADS) return 0; 
+    if(!uploadFileNames[idx]) return 0;
+    return strlen(uploadFileNames[idx]);
+}
 
-        } else {
+char *getUploadFileName(int idx)
+{
+    if(idx >= MAX_SIM_UPLOADS) return NULL; 
+    return uploadFileNames[idx];
+}
 
-            uploadFileName[8] = '/';
-            SD.remove(uploadFileName+8);
-            isDel = true;
-          
+void freeUploadFileNames()
+{
+    for(int i = 0; i < MAX_SIM_UPLOADS; i++) {
+        if(uploadFileNames[i]) {
+            free(uploadFileNames[i]);
+            uploadFileNames[i] = NULL;
+        }
+        if(uploadRealFileNames[i]) {
+            free(uploadRealFileNames[i]);
+            uploadRealFileNames[i] = NULL;
         }
-
-        free(uploadFileName);
-        uploadFileName = NULL;
     }
-
-    return false;
 }
 
-void renameUploadFile()
+void renameUploadFile(int idx)
 {
+    char *uploadFileName = uploadRealFileNames[idx];
+    
     if(haveSD && uploadFileName) {
 
         char *t = (char *)malloc(strlen(uploadFileName)+4);
@@ -1417,11 +1493,9 @@ void renameUploadFile()
         strcat(t, uploadFileName+2);
 
         SD.remove(t);
+        
         SD.rename(uploadFileName, t);
 
         free(t);
-
-        free(uploadFileName);
-        uploadFileName = NULL;
     }
 }

src/dg_settings.cpp

@@ -203,12 +203,22 @@ void doCopyAudioFiles();
 bool check_allow_CPA();
 void delete_ID_file();
 
+#define MAX_SIM_UPLOADS 16
+#define UPL_OPENERR 1
+#define UPL_NOSDERR 2
+#define UPL_WRERR   3
+#define UPL_BADERR  4
+#define UPL_MEMERR  5
+#define UPL_UNKNOWN 6
+#define UPL_DPLBIN  7
 #include <FS.h>
-bool   openACFile(File& file);
+bool   openUploadFile(String& fn, File& file, int idx, bool haveAC, int& opType, int& errNo);
 size_t writeACFile(File& file, uint8_t *buf, size_t len);
 void   closeACFile(File& file);
-void   removeACFile(bool isUPLFile);
-bool   openUploadFile(const char *fn, File& file, bool& isDel);
-void   renameUploadFile();
+void   removeACFile(int idx);
+void   renameUploadFile(int idx);
+char   *getUploadFileName(int idx);
+int    getUploadFileNameLen(int idx);
+void   freeUploadFileNames();
 
 #endif