diff --git a/code/main/server_main.cpp b/code/main/server_main.cpp index 4f2f0ce4..7579f902 100644 --- a/code/main/server_main.cpp +++ b/code/main/server_main.cpp @@ -80,9 +80,10 @@ esp_err_t info_get_handler(httpd_req_t *req) return ESP_OK; } + // No longer used if (_task.compare("GitBaseBranch") == 0) { - httpd_resp_sendstr_chunk(req, git_base_branch()); + httpd_resp_sendstr_chunk(req, ""); httpd_resp_sendstr_chunk(req, NULL); return ESP_OK; } @@ -285,7 +286,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req) std::string gitversion = libfive_git_version(); std::string buildtime = build_time(); 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(); char freeheapmem[11]; sprintf(freeheapmem, "%zu", esp_get_free_heap_size()); @@ -300,7 +302,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req) \"firmware\" : \"" + gitversion + "\",\ \"buildtime\" : \"" + buildtime + "\",\ \"gitbranch\" : \"" + gitbranch + "\",\ - \"gitbasebranch\" : \"" + gitbasebranch + "\",\ + \"gittag\" : \"" + gittag + "\",\ + \"gitrevision\" : \"" + gitrevision + "\",\ \"html\" : \"" + htmlversion + "\",\ \"cputemp\" : \"" + cputemp + "\",\ \"hostname\" : \"" + hostname + "\",\ diff --git a/code/main/version.h b/code/main/version.h index 3e534ba6..38a8ae99 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -16,15 +16,6 @@ extern "C" #include "Helper.h" #include -// 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) { diff --git a/sd-card/html/info.html b/sd-card/html/info.html index 2324a114..28467a03 100644 --- a/sd-card/html/info.html +++ b/sd-card/html/info.html @@ -93,22 +93,22 @@ div { - Git-Base-Branch: + Git-Tag:
- +
- Git-Version: + Git-Revision:
- +