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 20:46:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

removed GIT_BASE_BRANCH and instead use the autogenerated values in info.html

Browse Source
This commit is contained in:
CaCO3
2022-09-18 22:37:16 +02:00
parent 3d1d41e36b
commit 39ec90895e
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/main/server_main.cpp
View File

@@ -80,9 +80,10 @@ esp_err_t info_get_handler(httpd_req_t *req)
return ESP_OK; return ESP_OK;
} }
// No longer used
if (_task.compare("GitBaseBranch") == 0) if (_task.compare("GitBaseBranch") == 0)
{ {
httpd_resp_sendstr_chunk(req, git_base_branch()); httpd_resp_sendstr_chunk(req, "");
httpd_resp_sendstr_chunk(req, NULL); httpd_resp_sendstr_chunk(req, NULL);
return ESP_OK; return ESP_OK;
} }
@@ -285,7 +286,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
std::string gitversion = libfive_git_version(); std::string gitversion = libfive_git_version();
std::string buildtime = build_time(); std::string buildtime = build_time();
std::string gitbranch = libfive_git_branch(); std::string gitbranch = libfive_git_branch();
std::string gitbasebranch = git_base_branch(); std::string gittag = libfive_git_version();
std::string gitrevision = libfive_git_revision();
std::string htmlversion = getHTMLversion(); std::string htmlversion = getHTMLversion();
char freeheapmem[11]; char freeheapmem[11];
sprintf(freeheapmem, "%zu", esp_get_free_heap_size()); sprintf(freeheapmem, "%zu", esp_get_free_heap_size());
@@ -300,7 +302,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
\"firmware\" : \"" + gitversion + "\",\ \"firmware\" : \"" + gitversion + "\",\
\"buildtime\" : \"" + buildtime + "\",\ \"buildtime\" : \"" + buildtime + "\",\
\"gitbranch\" : \"" + gitbranch + "\",\ \"gitbranch\" : \"" + gitbranch + "\",\
\"gitbasebranch\" : \"" + gitbasebranch + "\",\ \"gittag\" : \"" + gittag + "\",\
\"gitrevision\" : \"" + gitrevision + "\",\
\"html\" : \"" + htmlversion + "\",\ \"html\" : \"" + htmlversion + "\",\
\"cputemp\" : \"" + cputemp + "\",\ \"cputemp\" : \"" + cputemp + "\",\
\"hostname\" : \"" + hostname + "\",\ \"hostname\" : \"" + hostname + "\",\

9
code/main/version.h
View File

@@ -16,15 +16,6 @@ extern "C"
#include "Helper.h" #include "Helper.h"
#include <fstream> #include <fstream>
// todo remove
const char* GIT_BASE_BRANCH = "master - v11.3.0 - 2022-09-16";
const char* git_base_branch(void)
{
return GIT_BASE_BRANCH;
}
const char* build_time(void) const char* build_time(void)
{ {

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

@@ -93,22 +93,22 @@ div {
<tr> <tr>
<td> <td>
Git-Base-Branch: Git-Tag:
</td> </td>
<td> <td>
<div> <div>
<object data="/version?type=GitBaseBranch"></object> <object data="/version?type=GitTag"></object>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
Git-Version: Git-Revision:
</td> </td>
<td> <td>
<div> <div>
<object data="/version?type=GitVersion"></object> <object data="/version?type=GitRevision"></object>
</div> </div>
</td> </td>
</tr> </tr>