diff --git a/code/main/CMakeLists.txt b/code/main/CMakeLists.txt index 9e34818e..44a27eb2 100644 --- a/code/main/CMakeLists.txt +++ b/code/main/CMakeLists.txt @@ -39,6 +39,7 @@ set(VERSION "const char* GIT_REV=\"${GIT_REV}${GIT_DIFF}\"; const char* GIT_TAG=\"${GIT_TAG}\"; const char* GIT_BRANCH=\"${GIT_BRANCH}\"; const char* BUILD_TIME=\"${BUILD_TIME}\";") +set(VERSION_HTML "${GIT_BRANCH}, ${GIT_REV}${GIT_DIFF}, ${GIT_TAG}") if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_) @@ -48,6 +49,7 @@ endif() if (NOT "${VERSION}" STREQUAL "${VERSION_}") file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp "${VERSION}") + file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/../sd-card/html/version.txt "${VERSION_HTML}") endif() ####################################################################### ####################################################################### diff --git a/code/main/version.h b/code/main/version.h index 38a8ae99..0456cd9e 100644 --- a/code/main/version.h +++ b/code/main/version.h @@ -38,7 +38,7 @@ const char* libfive_git_branch(void) } -char _char_getHTMLversion[20]="NaN\0"; +char _char_getHTMLversion[50]="NaN\0"; const char* getHTMLversion(void){ FILE* pFile; @@ -48,7 +48,7 @@ const char* getHTMLversion(void){ if (pFile == NULL) return _char_getHTMLversion; - fgets(_char_getHTMLversion, 20, pFile); + fgets(_char_getHTMLversion, sizeof(_char_getHTMLversion), pFile); fclose(pFile); return _char_getHTMLversion; diff --git a/sd-card/html/info.html b/sd-card/html/info.html index 28467a03..2ad7c351 100644 --- a/sd-card/html/info.html +++ b/sd-card/html/info.html @@ -12,7 +12,7 @@ h3 {font-size: 1.2em;} p {font-size: 1em;} div { - width: 250px; + width: 350px; padding: 10px 5px; border: 1px solid #ccc; font-family: arial; diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt index 0baffb7e..b2085e73 100644 --- a/sd-card/html/version.txt +++ b/sd-card/html/version.txt @@ -1 +1,2 @@ -16.4.1 +# HTML version +# Do not edit, it will get be updated by cmake! \ No newline at end of file