Browse Source

Update HTML

jomjol 5 năm trước cách đây
mục cha
commit
d142917afc
7 tập tin đã thay đổi với 57 bổ sung1 xóa
  1. 5 1
      README.md
  2. 8 0
      code/src/CMakeLists.txt
  3. 1 0
      code/src/main.cpp
  4. 43 0
      code/src/version.cmake
  5. BIN
      firmware/bootloader.bin
  6. BIN
      firmware/firmware.bin
  7. BIN
      firmware/html.zip

+ 5 - 1
README.md

@@ -29,7 +29,11 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571
 
 
 
-##### Rolling - (2020-09-16)
+##### Rolling - (2020-09-20)
+
+* Update HTML-Backround (thanks to michaeljoos72)
+
+2020-09-16
 
 * Impovements in hostname
 

+ 8 - 0
code/src/CMakeLists.txt

@@ -1,6 +1,14 @@
 # This file was automatically generated for projects
 # without default 'CMakeLists.txt' file.
 
+if(NOT CMAKE_BUILD_EARLY_EXPANSION) 
+ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp
+           ${CMAKE_CURRENT_BINARY_DIR}/_version.cpp
+    COMMAND ${CMAKE_COMMAND} -P
+            ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake)
+endif()
+
 FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
 
 # idf_component_register(SRCS ${app_sources})

+ 1 - 0
code/src/main.cpp

@@ -5,6 +5,7 @@
 
 #include "driver/gpio.h"
 #include "sdkconfig.h"
+//#include "version.h"
 
 #include "ClassLogFile.h"
 

+ 43 - 0
code/src/version.cmake

@@ -0,0 +1,43 @@
+execute_process(COMMAND git log --pretty=format:'%h' -n 1
+                OUTPUT_VARIABLE GIT_REV
+                ERROR_QUIET)
+
+# Check whether we got any revision (which isn't
+# always the case, e.g. when someone downloaded a zip
+# file from Github instead of a checkout)
+if ("${GIT_REV}" STREQUAL "")
+    set(GIT_REV "N/A")
+    set(GIT_DIFF "")
+    set(GIT_TAG "N/A")
+    set(GIT_BRANCH "N/A")
+else()
+    execute_process(
+        COMMAND bash -c "git diff --quiet --exit-code || echo +"
+        OUTPUT_VARIABLE GIT_DIFF)
+    execute_process(
+        COMMAND git describe --exact-match --tags
+        OUTPUT_VARIABLE GIT_TAG ERROR_QUIET)
+    execute_process(
+        COMMAND git rev-parse --abbrev-ref HEAD
+        OUTPUT_VARIABLE GIT_BRANCH)
+
+    string(STRIP "${GIT_REV}" GIT_REV)
+    string(SUBSTRING "${GIT_REV}" 1 7 GIT_REV)
+    string(STRIP "${GIT_DIFF}" GIT_DIFF)
+    string(STRIP "${GIT_TAG}" GIT_TAG)
+    string(STRIP "${GIT_BRANCH}" GIT_BRANCH)
+endif()
+
+set(VERSION "const char* GIT_REV=\"${GIT_REV}${GIT_DIFF}\";
+const char* GIT_TAG=\"${GIT_TAG}\";
+const char* GIT_BRANCH=\"${GIT_BRANCH}\";")
+
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp)
+    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_)
+else()
+    set(VERSION_ "")
+endif()
+
+if (NOT "${VERSION}" STREQUAL "${VERSION_}")
+    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp "${VERSION}")
+endif()

BIN
firmware/bootloader.bin


BIN
firmware/firmware.bin


BIN
firmware/html.zip