Pass log file name to WiFi Config page. Correctly start new log on command.

nseidle · nseidle · commit ad7a965ded23 · 2023-03-02T11:09:33.000-07:00
diff --git a/Firmware/RTK_Surveyor/AP-Config/index.html b/Firmware/RTK_Surveyor/AP-Config/index.html
@@ -1842,6 +1842,13 @@ <h2>
                             </div>
                         </div>
 
+                        <div id="logFile" class="row">
+                            <div class="mb-2">
+                                <label for="logFile" class="form-group box-margin20">Log file name: <span id="logFileName" style="display:inline;">SFE_Log.ubx</span>
+                                </label>
+                            </div>
+                        </div>
+                        
                         <div class="form-group row">
                             <div style="margin-bottom:5px;">
                                 <button type="button" id="startNewLog" class="btn btn-primary box-margin20"
diff --git a/Firmware/RTK_Surveyor/AP-Config/src/main.js b/Firmware/RTK_Surveyor/AP-Config/src/main.js
@@ -128,6 +128,7 @@ function parseIncoming(msg) {
             || id.includes("profile7Name")
             || id.includes("radioMAC")
             || id.includes("deviceBTID")
+            || id.includes("logFileName")
         ) {
             ge(id).innerHTML = val;
         }
diff --git a/Firmware/RTK_Surveyor/Form.ino b/Firmware/RTK_Surveyor/Form.ino
@@ -631,6 +631,8 @@ void createSettingsString(char* newSettings)
   }
   stringRecord(newSettings, "espnowBroadcast", settings.espnowBroadcast);
 
+  stringRecord(newSettings, "logFileName", logFileName);
+
   //Add ECEF and Geodetic station data
   for (int index = 0; index < COMMON_COORDINATES_MAX_STATIONS ; index++) //Arbitrary 50 station limit
   {
@@ -990,7 +992,16 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
   else if (strcmp(settingName, "startNewLog") == 0)
   {
     if (settings.enableLogging == true && online.logging == true)
-      endSD(false, true); //Close down file. A new one will be created at the next calling of updateLogs().
+    {
+      endLogging(false, true); //(gotSemaphore, releaseSemaphore) Close file. Reset parser stats.
+      beginLogging(); //Create new file based on current RTC.
+      setLoggingType(); //Determine if we are standard, PPP, or custom. Changes logging icon accordingly.
+
+      char newFileNameCSV[sizeof("logFileName,") + sizeof(logFileName) + 1];
+      sprintf(newFileNameCSV, "logFileName,%s,", logFileName);
+
+      websocket->textAll(newFileNameCSV); //Tell the config page the name of the file we just created
+    }
   }
   else if (strcmp(settingName, "checkNewFirmware") == 0)
   {
diff --git a/Firmware/RTK_Surveyor/form.h b/Firmware/RTK_Surveyor/form.h
@@ -151,6 +151,7 @@ function parseIncoming(msg) {
             || id.includes("profile7Name")
             || id.includes("radioMAC")
             || id.includes("deviceBTID")
+            || id.includes("logFileName")
         ) {
             ge(id).innerHTML = val;
         }
@@ -2472,7 +2473,8 @@ static const char *index_html = R"=====(
             <div class="d-grid gap-2">
                 <button class="btn btn-primary mt-3 toggle-btn" id="baseConfig" type="button" data-toggle="collapse"
                     data-target="#collapseBaseConfig" aria-expanded="false" aria-controls="collapseBaseConfig"
-                    style="display:none">
+                    >
+                    <!-- style="display:none"> -->
                     Base Configuration <i id="baseCaret" class="caret-icon bi icon-caret-down"></i>
                 </button>
             </div>
@@ -3370,6 +3372,13 @@ static const char *index_html = R"=====(
                             </div>
                         </div>
 
+                        <div id="logFile" class="row">
+                            <div class="mb-2">
+                                <label for="logFile" class="form-group box-margin20">Log file name: <span id="logFileName" style="display:inline;">SFE_Log.ubx</span>
+                                </label>
+                            </div>
+                        </div>
+                        
                         <div class="form-group row">
                             <div style="margin-bottom:5px;">
                                 <button type="button" id="startNewLog" class="btn btn-primary box-margin20"

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ function parseIncoming(msg) {`
`128`	`128`	`\|\| id.includes("profile7Name")`
`129`	`129`	`\|\| id.includes("radioMAC")`
`130`	`130`	`\|\| id.includes("deviceBTID")`
	`131`	`+ \|\| id.includes("logFileName")`
`131`	`132`	`) {`
`132`	`133`	`ge(id).innerHTML = val;`
`133`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -631,6 +631,8 @@ void createSettingsString(char* newSettings)`
`631`	`631`	`}`
`632`	`632`	`stringRecord(newSettings, "espnowBroadcast", settings.espnowBroadcast);`
`633`	`633`
	`634`	`+ stringRecord(newSettings, "logFileName", logFileName);`
	`635`	`+`
`634`	`636`	`//Add ECEF and Geodetic station data`
`635`	`637`	`for (int index = 0; index < COMMON_COORDINATES_MAX_STATIONS ; index++) //Arbitrary 50 station limit`
`636`	`638`	`{`
`@@ -990,7 +992,16 @@ void updateSettingWithValue(const char settingName, const char settingValueStr`
`990`	`992`	`else if (strcmp(settingName, "startNewLog") == 0)`
`991`	`993`	`{`
`992`	`994`	`if (settings.enableLogging == true && online.logging == true)`
`993`		`- endSD(false, true); //Close down file. A new one will be created at the next calling of updateLogs().`
	`995`	`+ {`
	`996`	`+ endLogging(false, true); //(gotSemaphore, releaseSemaphore) Close file. Reset parser stats.`
	`997`	`+ beginLogging(); //Create new file based on current RTC.`
	`998`	`+ setLoggingType(); //Determine if we are standard, PPP, or custom. Changes logging icon accordingly.`
	`999`	`+`
	`1000`	`+ char newFileNameCSV[sizeof("logFileName,") + sizeof(logFileName) + 1];`
	`1001`	`+ sprintf(newFileNameCSV, "logFileName,%s,", logFileName);`
	`1002`	`+`
	`1003`	`+ websocket->textAll(newFileNameCSV); //Tell the config page the name of the file we just created`
	`1004`	`+ }`
`994`	`1005`	`}`
`995`	`1006`	`else if (strcmp(settingName, "checkNewFirmware") == 0)`
`996`	`1007`	`{`