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

Use only commit hash for comparison instead whole string (#1436)

Browse Source 
* Use only commit hash for comparison instead whole string

* .
This commit is contained in:
CaCO3
2022-11-30 20:25:34 +01:00
committed by GitHub
parent 8be7beab9a
commit 6c51af7107
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/main/CMakeLists.txt
View File

@@ -41,9 +41,9 @@ const char* GIT_BRANCH=\"${GIT_BRANCH}\";
const char* BUILD_TIME=\"${BUILD_TIME}\";") const char* BUILD_TIME=\"${BUILD_TIME}\";")
if ("${GIT_TAG}" STREQUAL "") # Tag not set, show branch if ("${GIT_TAG}" STREQUAL "") # Tag not set, show branch
set(VERSION_HTML "Development-Branch: ${GIT_BRANCH} (Commit: ${GIT_REV}${GIT_DIFF})") set(VERSION_HTML "Development-Branch: ${GIT_BRANCH} (Commit: ${GIT_REV}${GIT_DIFF})\n${GIT_REV}")
else() # Tag is set, ignore branch else() # Tag is set, ignore branch
set(VERSION_HTML "Release: ${GIT_TAG} (Commit: ${GIT_REV}${GIT_DIFF})") set(VERSION_HTML "Release: ${GIT_TAG} (Commit: ${GIT_REV}${GIT_DIFF})\n${GIT_REV}")
endif() endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp)

7
code/main/main.cpp
View File

@@ -35,7 +35,8 @@ 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); extern std::string getHTMLversion(void);
extern std::string getHTMLcommit(void);
#define __HIDE_PASSWORD #define __HIDE_PASSWORD
@@ -234,8 +235,8 @@ 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)) { if (getHTMLcommit() != std::string(GIT_REV)) {
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Web UI version does not match firmware version!"); LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Web UI version (") + getHTMLcommit() + ") does not match firmware version (" + std::string(GIT_REV) + ") !");
} }
std::string zw = gettimestring("%Y%m%d-%H%M%S"); std::string zw = gettimestring("%Y%m%d-%H%M%S");

2
code/main/server_main.cpp
View File

@@ -92,7 +92,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
} }
else if (_task.compare("HTMLVersion") == 0) else if (_task.compare("HTMLVersion") == 0)
{ {
httpd_resp_sendstr_chunk(req, getHTMLversion()); httpd_resp_sendstr_chunk(req, getHTMLversion().c_str());
httpd_resp_sendstr_chunk(req, NULL); httpd_resp_sendstr_chunk(req, NULL);
return ESP_OK; return ESP_OK;
} }

27
code/main/version.h
View File

@@ -38,20 +38,35 @@ const char* libfive_git_branch(void)
} }
char _char_getHTMLversion[100]="?\0"; std::string getHTMLversion(void){
char buf[100]="?\0";
const char* getHTMLversion(void){
FILE* pFile; FILE* pFile;
string fn = FormatFileName("/sdcard/html/version.txt"); string fn = FormatFileName("/sdcard/html/version.txt");
pFile = fopen(fn.c_str(), "r"); pFile = fopen(fn.c_str(), "r");
if (pFile == NULL) if (pFile == NULL)
return _char_getHTMLversion; return std::string(buf);
fgets(_char_getHTMLversion, sizeof(_char_getHTMLversion), pFile); fgets(buf, sizeof(buf), pFile); // Line 1: Version
fclose(pFile); fclose(pFile);
return _char_getHTMLversion; return std::string(buf);
}
std::string getHTMLcommit(void){
char buf[100]="?\0";
FILE* pFile;
string fn = FormatFileName("/sdcard/html/version.txt");
pFile = fopen(fn.c_str(), "r");
if (pFile == NULL)
return std::string(buf);
fgets(buf, sizeof(buf), pFile); // Line 1: Version -> ignored
fgets(buf, sizeof(buf), pFile); // Line 2: Commit
fclose(pFile);
return std::string(buf);
} }
#endif // _VERSION_H #endif // _VERSION_H

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

@@ -100,6 +100,6 @@ function compareVersions() {
console.log("FW Hash: " + fWGitHash + ", Web UI Hash: " + webUiHash); console.log("FW Hash: " + fWGitHash + ", Web UI Hash: " + webUiHash);
if (fWGitHash != webUiHash) { if (fWGitHash != webUiHash) {
alert("The Version of the Web Interface does not match the Firmware Version! It is suggested to keep them on the same version!"); alert("The Version of the Web Interface (" + webUiHash + ") does not match the Firmware Version (" + fWGitHash + ")! It is suggested to keep them on the same version!");
} }
} }