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-09 13:06:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix version check (#1374)

Browse Source 
Co-authored-by: CaCO3 <caco@ruinelli.ch>
This commit is contained in:
CaCO3
2022-11-18 06:54:51 +01:00
committed by GitHub
parent dd28859a9f
commit 513e300676
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/main/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ set(VERSION "const char* GIT_REV=\"${GIT_REV}${GIT_DIFF}\";
const char* GIT_TAG=\"${GIT_TAG}\"; const char* GIT_TAG=\"${GIT_TAG}\";
const char* GIT_BRANCH=\"${GIT_BRANCH}\"; const char* GIT_BRANCH=\"${GIT_BRANCH}\";
const char* BUILD_TIME=\"${BUILD_TIME}\";") const char* BUILD_TIME=\"${BUILD_TIME}\";")
set(VERSION_HTML "${GIT_BRANCH}, ${GIT_REV}${GIT_DIFF}, ${GIT_TAG}") set(VERSION_HTML "${GIT_BRANCH}, ${GIT_TAG}, ${GIT_REV}${GIT_DIFF}")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_)

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

@@ -95,8 +95,11 @@ function compareVersions() {
arr = fwVersion.split(" "); arr = fwVersion.split(" ");
fWGitHash = arr[arr.length - 1].substring(0, 7); fWGitHash = arr[arr.length - 1].substring(0, 7);
arr = webUiVersion.split(" ");
webUiHash = arr[arr.length - 1].substring(0, 7);
console.log("FW Hash: " + fWGitHash + ", Web UI Hash: " + webUiHash);
if (fWGitHash != webUiVersion) { if (fWGitHash != webUiHash) {
alert("The Version of the Web Interface does not match the Firmware Version!"); alert("The Version of the Web Interface does not match the Firmware Version! It is suggested to keep them on the same version!");
} }
} }