Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-08 12:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check web UI version and show alert on mismatch with Firmware version (#1329)

Browse Source 
* SHhw Web UI version and compare it with the firmware. If it does not match, show a warning in the log

* compare version on Web UI loading and show alert on mismatch

* restructured info page
This commit is contained in:
CaCO3
2022-11-14 19:58:22 +01:00
committed by GitHub
parent 395b9a4c5b
commit 39960b15ed
4 changed files with 135 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/main/main.cpp
View File

@@ -35,6 +35,7 @@ extern const char* GIT_REV;
extern const char* GIT_BRANCH; extern const char* GIT_BRANCH;
extern const char* BUILD_TIME; extern const char* BUILD_TIME;
extern const char* getHTMLversion(void);
#define __HIDE_PASSWORD #define __HIDE_PASSWORD
@@ -145,16 +146,9 @@ void task_NoSDBlink(void *pvParameter)
extern "C" void app_main(void) extern "C" void app_main(void)
{ {
TickType_t xDelay; TickType_t xDelay;
string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + "', Tag: '" + std::string(GIT_TAG) + \
"', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME);
ESP_LOGI(TAG, "\n\n\n\n\n"); // Add mark on log to see when it restarted ESP_LOGI(TAG, "\n\n\n\n\n"); // Add mark on log to see when it restarted
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "%s", versionFormated.c_str());
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "Reset reason: %s", getResetReason().c_str());
PowerResetCamera(); PowerResetCamera();
esp_err_t cam = Camera.InitCam(); esp_err_t cam = Camera.InitCam();
Camera.LightOnOff(false); Camera.LightOnOff(false);
@@ -162,13 +156,25 @@ extern "C" void app_main(void)
ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay); ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay);
vTaskDelay( xDelay ); vTaskDelay( xDelay );
if (!Init_NVS_SDCard()) if (!Init_NVS_SDCard())
{ {
xTaskCreate(&task_NoSDBlink, "task_NoSDBlink", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, NULL); xTaskCreate(&task_NoSDBlink, "task_NoSDBlink", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, NULL);
return; return;
}; };
string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + \
"', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME) + \
", Web UI: " + getHTMLversion();
if (std::string(GIT_TAG) != "") { // We are on a tag, add it as prefix
string versionFormated = "Tag: '" + std::string(GIT_TAG) + "', " + versionFormated;
}
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "%s", versionFormated.c_str());
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "Reset reason: %s", getResetReason().c_str());
CheckOTAUpdate(); CheckOTAUpdate();
LogFile.CreateLogDirectories(); LogFile.CreateLogDirectories();
@@ -221,6 +227,10 @@ extern "C" void app_main(void)
LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated); LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated);
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason()); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason());
if (std::string(getHTMLversion()) != std::string(GIT_REV)) {
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Web UI version does not match firmware version!");
}
std::string zw = gettimestring("%Y%m%d-%H%M%S"); std::string zw = gettimestring("%Y%m%d-%H%M%S");
ESP_LOGD(TAG, "time %s", zw.c_str()); ESP_LOGD(TAG, "time %s", zw.c_str());

66
sd-card/html/common.js
View File

@@ -31,26 +31,72 @@ function LoadHostname() {
} }
function LoadVersion() { var fwVersion = "";
var webUiVersion = "";
function LoadFwVersion() {
_basepath = getbasepath(); _basepath = getbasepath();
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.addEventListener('load', function(event) { xhttp.addEventListener('load', function(event) {
if (xhttp.status >= 200 && xhttp.status < 300) { if (xhttp.status >= 200 && xhttp.status < 300) {
version = xhttp.responseText; fwVersion = xhttp.responseText;
document.getElementById("Version").innerHTML = version; document.getElementById("Version").innerHTML = fwVersion;
console.log(fwVersion);
compareVersions();
} }
else { else {
console.warn(request.statusText, request.responseText); console.warn(request.statusText, request.responseText);
fwVersion = "NaN";
} }
}); });
try { try {
url = _basepath + '/version?type=GitBaseBranch'; url = _basepath + '/version?type=GitBaseBranch';
xhttp.open("GET", url, true); xhttp.open("GET", url, true);
xhttp.send(); xhttp.send();
}
catch (error) {
fwVersion = "NaN";
}
}
function LoadWebUiVersion() {
_basepath = getbasepath();
var xhttp = new XMLHttpRequest();
xhttp.addEventListener('load', function(event) {
if (xhttp.status >= 200 && xhttp.status < 300) {
webUiVersion = xhttp.responseText;
console.log("Web UI Version: " + webUiVersion);
compareVersions();
}
else {
console.warn(request.statusText, request.responseText);
webUiVersion = "NaN";
}
});
try {
url = _basepath + '/version?type=HTMLVersion';
xhttp.open("GET", url, true);
xhttp.send();
}
catch (error) {
webUiVersion = "NaN";
}
}
function compareVersions() {
if (fwVersion == "" || webUiVersion == "") {
return;
}
arr = fwVersion.split(" ");
fWGitHash = arr[arr.length - 1].substring(0, 7);
if (fWGitHash != webUiVersion) {
alert("The Version of the Web Interface does not match the Firmware Version!");
} }
catch (error)
{}
} }

3
sd-card/html/index.html
View File

@@ -83,7 +83,8 @@
<script type="text/javascript"> <script type="text/javascript">
LoadHostname(); LoadHostname();
LoadVersion(); LoadFwVersion();
LoadWebUiVersion();
</script> </script>
</div> </div>

124
sd-card/html/info.html
View File

@@ -37,13 +37,10 @@ div {
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
<table style="font-family: arial">
<h3>Host Info</h3> <h3>Host Info</h3>
<table style="font-family: arial"> <table style="font-family: arial">
<tr> <tr>
<td> <td>
@@ -77,8 +74,64 @@ div {
</tr> </tr>
</table> </table>
<h3>Version Info</h3>
<table style="font-family: arial"> <table style="font-family: arial">
<tr>
<td>
Git-Branch:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=GitBranch"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Tag:
</td>
<td>
<div>
<object data="/version?type=GitTag"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Revision:
</td>
<td>
<div>
<object data="/version?type=GitRevision"></object>
</div>
</td>
</tr>
<tr>
<td>
Build Time:
</td>
<td>
<div>
<object data="/version?type=BuildTime"></object>
</div>
</td>
</tr>
<tr>
<td>
HTML Version:
</td>
<td>
<div>
<object data="/version?type=HTMLVersion"></object>
</div>
</td>
</tr>
</table>
<h3>SD Card Info</h3> <h3>SD Card Info</h3>
<table style="font-family: arial"> <table style="font-family: arial">
<tr> <tr>
@@ -153,67 +206,6 @@ div {
</tr> </tr>
</table> </table>
<table style="font-family: arial">
<h3>Version Info</h3>
<table style="font-family: arial">
<tr>
<td>
Git-Branch:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=GitBranch"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Tag:
</td>
<td>
<div>
<object data="/version?type=GitTag"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Revision:
</td>
<td>
<div>
<object data="/version?type=GitRevision"></object>
</div>
</td>
</tr>
<tr>
<td>
Build Time:
</td>
<td>
<div>
<object data="/version?type=BuildTime"></object>
</div>
</td>
</tr>
<tr>
<td>
HTML Version:
</td>
<td>
<div>
<object data="/version?type=HTMLVersion"></object>
</div>
</td>
</tr>
</table>
<h3>Copyright</h3> <h3>Copyright</h3>
Copyright &copy; 2020 - 2022 by <a href="https://github.com/jomjol/AI-on-the-edge-device" target=_blank>Jomjol</a> and others. Copyright &copy; 2020 - 2022 by <a href="https://github.com/jomjol/AI-on-the-edge-device" target=_blank>Jomjol</a> and others.