Inicio Explorar Axuda
Iniciar sesión
dyadmisha
/
AI-on-the-edge-device
réplica de https://github.com/jomjol/AI-on-the-edge-device
1
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

add html version

Philipp Harsch %!s(int64=5) %!d(string=hai) anos
pai
9080f1d2f0
achega
964486a819
Modificáronse 7 ficheiros con 66 adicións e 16 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 8 0
      code/src/server_main.cpp
  2. 12 2
      code/src/server_tflite.cpp
  3. 3 3
      code/src/version.cpp
  4. 20 0
      code/src/version.h
  5. 3 3
      code/version.cpp
  6. 19 8
      sd-card/html/info.html
  7. 1 0
      sd-card/html/version.txt

+ 8 - 0
code/src/server_main.cpp
Ver ficheiro 

@@ -83,6 +83,14 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         return ESP_OK;        
     }
 
 
+    if (_task.compare("HTMLVersion") == 0)
 
+    {
 
+        std::string zw;
 
+        zw = std::string(getHTMLversion());
 
+        httpd_resp_sendstr_chunk(req, zw.c_str());
 
+        httpd_resp_sendstr_chunk(req, NULL);  
+        return ESP_OK;        
+    }
 
 
     return ESP_OK;
 
 }

+ 12 - 2
code/src/server_tflite.cpp
Ver ficheiro 

@@ -18,6 +18,8 @@
 
 
 #include "ClassLogFile.h"
 
 
+#include "version.h"
 
+
 
 ClassFlowControll tfliteflow;
 
 
 TaskHandle_t xHandleblink_task_doFlow = NULL;
 
@@ -417,11 +419,19 @@ esp_err_t handler_sysinfo(httpd_req_t *req)
 
     const char* resp_str;
 
     string zw;
 
     string cputemp = std::to_string(temperatureRead());
 
+    string gitversion = libfive_git_version();
 
+    string buildtime = build_time();
 
+    string gitbranch = libfive_git_branch();
 
+    string gitbasebranch = git_base_branch();
 
+    string htmlversion = getHTMLversion();
 
 
     zw = "[\
 
             {\
 
-                \"firmware\" : \"2.0.0\",\
 
-                \"html\" : \"1.0.1\",\
 
+                \"firmware\" : \"" + gitversion + "\",\
 
+                \"buildtime\" : \"" + buildtime + "\",\
 
+                \"gitbranch\" : \"" + gitbranch + "\",\
 
+                \"gitbasebranch\" : \"" + gitbasebranch + "\",\
 
+                \"html\" : \"" + htmlversion + "\",\
 
                 \"cputemp\" : \"" + cputemp + "\",\
 
                 \"hostname\" : \"host\",\
 
                 \"IPv4\" : \"IP\"\

+ 3 - 3
code/src/version.cpp
Ver ficheiro 

@@ -1,4 +1,4 @@
 
-const char* GIT_REV="bafd67b";
 
+const char* GIT_REV="9080f1d+";
 
 const char* GIT_TAG="";
 
-const char* GIT_BRANCH="master";
 
-const char* BUILD_TIME="2020-09-28 19:57";
 
+const char* GIT_BRANCH="rolling";
 
+const char* BUILD_TIME="2020-09-28 23:50";

+ 20 - 0
code/src/version.h
Ver ficheiro 

@@ -8,6 +8,8 @@ extern "C"
 
     extern const char* BUILD_TIME;
 
 }
 
 
+#include <string>
 
+
 
 const char* GIT_BASE_BRANCH = "master - v2.1.1 - 2020-09-28";
 
 
 
@@ -35,4 +37,22 @@ const char* libfive_git_revision(void)
 
 const char* libfive_git_branch(void)
 
 {
 
     return GIT_BRANCH;
 
+}
 
+
 
+std::string getHTMLversion(void){
 
+    
+    string line = "";
 
+    
+    FILE* pFile;
 
+    string fn = FormatFileName("/sdcard/html/version.txt");
 
+    pFile = fopen(fn.c_str(), "r");
 
+
 
+    if (pFile == NULL)
 
+        return std::string("NAN");
 
+
 
+    char zw[1024];
 
+    fgets(zw, 1024, pFile);
 
+    line = std::string(trim(zw));
 
+
 
+    return line;
 
 }

+ 3 - 3
code/version.cpp
Ver ficheiro 

@@ -1,4 +1,4 @@
 
-const char* GIT_REV="bafd67b";
 
+const char* GIT_REV="9080f1d+";
 
 const char* GIT_TAG="";
 
-const char* GIT_BRANCH="master";
 
-const char* BUILD_TIME="2020-09-28 19:57";
 
+const char* GIT_BRANCH="rolling";
 
+const char* BUILD_TIME="2020-09-28 23:50";

+ 19 - 8
sd-card/html/info.html
Ver ficheiro 

@@ -3,7 +3,7 @@
 
 <head>
 
 <title>Set PreValue</title>
 
 <meta charset="utf-8">
 
-	
+
 
 <style>
 
 h1 {font-size: 2em;}
 
 h2 {font-size: 1.5em;}
 
@@ -16,11 +16,11 @@ div {
 
     border: 1px solid #ccc;
 
 	font-family: arial;
 
     font-size: 16px;
 
-	max-height: 35px;	
+	max-height: 35px;
 
 }
 
 
-</style>	
-	
+</style>
 
+
 
 </head>
 
 
 
@@ -38,7 +38,7 @@ div {
 
 			<object data="/version?type=GitBranch"></object>
 
 		</div>
 
 	</td>
 
-  </tr>	
+  </tr>
 
 
   <tr>
 
 	<td>
 
@@ -49,7 +49,7 @@ div {
 
 			<object data="/version?type=GitBaseBranch"></object>
 
 		</div>
 
 	</td>
 
-  </tr>	
+  </tr>
 
 
   <tr>
 
 	<td>
 
@@ -60,7 +60,7 @@ div {
 
 			<object data="/version?type=GitVersion"></object>
 
 		</div>
 
 	</td>
 
-  </tr>	
+  </tr>
 
 
   <tr>
 
 	<td>
 
@@ -71,9 +71,20 @@ div {
 
 			<object data="/version?type=BuildTime"></object>
 
 		</div>
 
 	</td>
 
+  </tr>
 
+
 
+	<tr>
 
+	<td>
 
+		HTML Version:
 
+	</td>
 
+	<td>
 
+		<div>
 
+			<object data="/version?type=HTMLVersion"></object>
 
+		</div>
 
+	</td>
 
   </tr>
 
 </table>
 
 
 
 </body>
 
-</html>
 
+</html>

+ 1 - 0
sd-card/html/version.txt
Ver ficheiro 

@@ -0,0 +1 @@
 
+1.0.0