Главная Обзор Помощь
Вход
dyadmisha
/
AI-on-the-edge-device
зеркало из https://github.com/jomjol/AI-on-the-edge-device
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Update info page (#1420)

* consolidate info page

* use new REST API

* .

* .

* .

* .

* .

* .

* .

* Make sure after the reboot we go to the overview page

* .

* Update server_main.cpp
CaCO3 3 лет назад
Родитель
7b0e6200d6
Сommit
524d800a0a
8 измененных файлов с 91 добавлено и 125 удалено
Единый вид Показать статистику Diff
  1. 1 1
      code/components/jomjol_fileserver_ota/server_ota.cpp
  2. 6 1
      code/main/CMakeLists.txt
  3. 25 42
      code/main/server_main.cpp
  4. 1 1
      code/main/version.h
  5. 1 1
      sd-card/html/backup.html
  6. 3 3
      sd-card/html/common.js
  7. 50 73
      sd-card/html/info.html
  8. 4 3
      sd-card/html/ota_page.html

+ 1 - 1
code/components/jomjol_fileserver_ota/server_ota.cpp
Просмотреть файл 

@@ -615,7 +615,7 @@ esp_err_t handler_reboot(httpd_req_t *req)
 
 
 
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot");
 
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot");
 
     ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!");
 
     ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!");
 
-    const char* resp_str = "<body style='font-family: arial'> <h3 id=t></h3></body><script>var h='Rebooting!<br>The page will automatically reload in around 25..60s - in case of firmware update up to 180s.<br>'; document.getElementById('t').innerHTML=h; setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h; fetch(window.location.hostname,{mode: 'no-cors'}).then(r=>{parent.location.href=('/index.html');})}, 1000);</script>";
 
+    const char* resp_str = "<body style='font-family: arial'> <h3 id=t></h3></body><script>var h='Rebooting!<br>The page will automatically reload in around 25..60s<br>(in case of a firmware update it can take up to 180s).<br>'; document.getElementById('t').innerHTML=h; setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h; fetch(window.location.hostname,{mode: 'no-cors'}).then(r=>{parent.location.href=('/index.html');})}, 1000);</script>";
 
     httpd_resp_send(req, resp_str, strlen(resp_str)); 
     httpd_resp_send(req, resp_str, strlen(resp_str)); 
     
     
     doReboot();
 
     doReboot();

+ 6 - 1
code/main/CMakeLists.txt
Просмотреть файл 

@@ -39,7 +39,12 @@ set(VERSION "const char* GIT_REV=\"${GIT_REV}${GIT_DIFF}\";
 
 const char* GIT_TAG=\"${GIT_TAG}\";
 
 const char* GIT_TAG=\"${GIT_TAG}\";
 
 const char* GIT_BRANCH=\"${GIT_BRANCH}\";
 
 const char* GIT_BRANCH=\"${GIT_BRANCH}\";
 
 const char* BUILD_TIME=\"${BUILD_TIME}\";")
 
 const char* BUILD_TIME=\"${BUILD_TIME}\";")
 
-set(VERSION_HTML "${GIT_BRANCH}, ${GIT_TAG}, ${GIT_REV}${GIT_DIFF}")
 
+
 
+if ("${GIT_TAG}" STREQUAL "") # Tag not set, show branch
 
+    set(VERSION_HTML "Development-Branch: ${GIT_BRANCH} (Commit: ${GIT_REV}${GIT_DIFF})")
 
+else() # Tag is set, ignore branch
 
+    set(VERSION_HTML "Release: ${GIT_TAG} (Commit: ${GIT_REV}${GIT_DIFF})")
 
+endif()
 
 
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp)
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp)
 
     file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_)
 
     file(READ ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp VERSION_)

+ 25 - 42
code/main/server_main.cpp
Просмотреть файл 

@@ -58,50 +58,45 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-
 
-    if (_task.compare("GitTag") == 0)
 
+    else if (_task.compare("GitTag") == 0)
 
     {
 
     {
 
         httpd_resp_sendstr_chunk(req, libfive_git_version());
 
         httpd_resp_sendstr_chunk(req, libfive_git_version());
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-
 
-
 
-    if (_task.compare("GitRevision") == 0)
 
+    else if (_task.compare("GitRevision") == 0)
 
     {
 
     {
 
         httpd_resp_sendstr_chunk(req, libfive_git_revision());
 
         httpd_resp_sendstr_chunk(req, libfive_git_revision());
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("BuildTime") == 0)
 
+    else if (_task.compare("BuildTime") == 0)
 
     {
 
     {
 
         httpd_resp_sendstr_chunk(req, build_time());
 
         httpd_resp_sendstr_chunk(req, build_time());
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("GitBaseBranch") == 0)
 
+    else if (_task.compare("FirmwareVersion") == 0)
 
     {
 
     {
 
-        string buf = "Branch: '" + std::string(GIT_BRANCH) + "', Tag: '" + std::string(GIT_TAG) + \
 
-            "', Revision: " + std::string(GIT_REV);
 
+        string buf;
 
+        if (std::string(GIT_TAG) == "") { // Tag not set, show branch
 
+            buf = "Development-Branch: " + std::string(GIT_BRANCH);
 
+        }
 
+        else { // Tag is set, ignore branch
 
+            buf = "Release: " + std::string(GIT_TAG);
 
+        }
 
+        buf = buf + " (Commit: " + std::string(GIT_REV) + ")";
 
         httpd_resp_sendstr_chunk(req, buf.c_str());
 
         httpd_resp_sendstr_chunk(req, buf.c_str());
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("HTMLVersion") == 0)
 
+    else if (_task.compare("HTMLVersion") == 0)
 
     {
 
     {
 
-//        std::string zw;
 
-//        zw = std::string(getHTMLversion());
 
         httpd_resp_sendstr_chunk(req, getHTMLversion());
 
         httpd_resp_sendstr_chunk(req, getHTMLversion());
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("Hostname") == 0)
 
+    else if (_task.compare("Hostname") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = std::string(hostname);
 
         zw = std::string(hostname);
 
@@ -109,8 +104,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("IP") == 0)
 
+    else if (_task.compare("IP") == 0)
 
     {
 
     {
 
         std::string *zw;
 
         std::string *zw;
 
         zw = getIPAddress();
 
         zw = getIPAddress();
 
@@ -118,8 +112,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SSID") == 0)
 
+    else if (_task.compare("SSID") == 0)
 
     {
 
     {
 
         std::string *zw;
 
         std::string *zw;
 
         zw = getSSID();
 
         zw = getSSID();
 
@@ -127,8 +120,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("FlowStatus") == 0)
 
+    else if (_task.compare("FlowStatus") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = std::string("FlowStatus");
 
         zw = std::string("FlowStatus");
 
@@ -136,8 +128,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardPartitionSize") == 0)
 
+    else if (_task.compare("SDCardPartitionSize") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardPartitionSize();
 
         zw = getSDCardPartitionSize();
 
@@ -145,8 +136,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardFreePartitionSpace") == 0)
 
+    else if (_task.compare("SDCardFreePartitionSpace") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardFreePartitionSpace();
 
         zw = getSDCardFreePartitionSpace();
 
@@ -154,8 +144,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardPartitionAllocationSize") == 0)
 
+    else if (_task.compare("SDCardPartitionAllocationSize") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardPartitionAllocationSize();
 
         zw = getSDCardPartitionAllocationSize();
 
@@ -163,8 +152,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardManufacturer") == 0)
 
+    else if (_task.compare("SDCardManufacturer") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardManufacturer(); 
         zw = getSDCardManufacturer(); 
@@ -172,8 +160,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardName") == 0)
 
+    else if (_task.compare("SDCardName") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardName(); 
         zw = getSDCardName(); 
@@ -181,8 +168,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardCapacity") == 0)
 
+    else if (_task.compare("SDCardCapacity") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardCapacity();
 
         zw = getSDCardCapacity();
 
@@ -190,8 +176,7 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         httpd_resp_sendstr_chunk(req, NULL);  
         httpd_resp_sendstr_chunk(req, NULL);  
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
-
 
-    if (_task.compare("SDCardSectorSize") == 0)
 
+    else if (_task.compare("SDCardSectorSize") == 0)
 
     {
 
     {
 
         std::string zw;
 
         std::string zw;
 
         zw = getSDCardSectorSize();
 
         zw = getSDCardSectorSize();
 
@@ -200,8 +185,6 @@ esp_err_t info_get_handler(httpd_req_t *req)
 
         return ESP_OK;        
         return ESP_OK;        
     }
 
     }
 
 
 
-
 
-
 
     return ESP_OK;
 
     return ESP_OK;
 
 }
 
 }
 
 
 
@@ -394,7 +377,7 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
 
 void register_server_main_uri(httpd_handle_t server, const char *base_path)
 
 void register_server_main_uri(httpd_handle_t server, const char *base_path)
 
 {
 
 {
 
     httpd_uri_t info_get_handle = {
 
     httpd_uri_t info_get_handle = {
 
-        .uri       = "/version",  // Match all URIs of type /path/to/file
 
+        .uri       = "/info",  // Match all URIs of type /path/to/file
 
         .method    = HTTP_GET,
 
         .method    = HTTP_GET,
 
         .handler   = info_get_handler,
 
         .handler   = info_get_handler,
 
         .user_ctx  = (void*) base_path    // Pass server data as context
 
         .user_ctx  = (void*) base_path    // Pass server data as context

+ 1 - 1
code/main/version.h
Просмотреть файл 

@@ -38,7 +38,7 @@ const char* libfive_git_branch(void)
 
 }
 
 }
 
 
 
 
 
-char _char_getHTMLversion[50]="NaN\0";
 
+char _char_getHTMLversion[100]="?\0";
 
 
 
 const char* getHTMLversion(void){
 
 const char* getHTMLversion(void){
 
     FILE* pFile;
 
     FILE* pFile;

+ 1 - 1
sd-card/html/backup.html
Просмотреть файл 

@@ -58,7 +58,7 @@ function doBackup() {
 
     // Get hostname
 
     // Get hostname
 
     try {
 
     try {
 
         var xhttp = new XMLHttpRequest();
 
         var xhttp = new XMLHttpRequest();
 
-        xhttp.open("GET", "/version?type=Hostname", false);
 
+        xhttp.open("GET", "/info?type=Hostname", false);
 
         xhttp.send();
 
         xhttp.send();
 
         hostname = xhttp.responseText;
 
         hostname = xhttp.responseText;
 
     }
 
     }

+ 3 - 3
sd-card/html/common.js
Просмотреть файл 

@@ -19,7 +19,7 @@ function LoadHostname() {
 
 
 
 //     var xhttp = new XMLHttpRequest();
 
 //     var xhttp = new XMLHttpRequest();
 
     try {
 
     try {
 
-            url = _basepath + '/version?type=Hostname';     
+            url = _basepath + '/info?type=Hostname';     
             xhttp.open("GET", url, true);
 
             xhttp.open("GET", url, true);
 
             xhttp.send();
 
             xhttp.send();
 
 
 
@@ -52,7 +52,7 @@ function LoadFwVersion() {
 
     });
 
     });
 
 
 
     try {
 
     try {
 
-        url = _basepath + '/version?type=GitBaseBranch';     
+        url = _basepath + '/info?type=FirmwareVersion';     
         xhttp.open("GET", url, true);
 
         xhttp.open("GET", url, true);
 
         xhttp.send();
 
         xhttp.send();
 
     }
 
     }
 
@@ -78,7 +78,7 @@ function LoadWebUiVersion() {
 
     });
 
     });
 
 
 
     try {
 
     try {
 
-        url = _basepath + '/version?type=HTMLVersion';     
+        url = _basepath + '/info?type=HTMLVersion';     
         xhttp.open("GET", url, true);
 
         xhttp.open("GET", url, true);
 
         xhttp.send();
 
         xhttp.send();
 
     }
 
     }

+ 50 - 73
sd-card/html/info.html
Просмотреть файл 

@@ -25,20 +25,55 @@ div {
 
 </head>
 
 </head>
 
 
 
 <body style="font-family: arial; padding: 0px 10px;">
 
 <body style="font-family: arial; padding: 0px 10px;">
 
-<h3>Current</h3>
 
+<h3>Runtime Information</h3>
 
 <table style="font-family: arial">
 
 <table style="font-family: arial">
 
 	<tr>
 
 	<tr>
 
 		<td>
 
 		<td>
 
 			Last restart:
 
 			Last restart:
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
-			<div id="gitbranch">
 
+			<div id="starttime">
 
 				<object data="/starttime"></object>
 
 				<object data="/starttime"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
 </table>
 
 </table>
 
 
 
+<h3>Build Info</h3>
 
+<table style="font-family: arial">
 
+  <tr>
 
+	<td>
 
+		Firmware Version:
 
+	</td>
 
+	<td>
 
+		<div id="firmware" style="width: 700px">
 
+		    <object data="/info?type=FirmwareVersion" style="width: 700px"></object>
 
+		</div>
 
+	</td>
 
+  </tr>
 
+  <tr>
 
+	<td>
 
+		Firmware Build Time:
 
+	</td>
 
+	<td>
 
+		<div id="build-time">
 
+			<object data="/info?type=BuildTime"></object>
 
+		</div>
 
+	</td>
 
+  </tr>
 
+
 
+	<tr>
 
+	<td>
 
+		Web Interface Version:
 
+	</td>
 
+	<td>
 
+		    <div id="web-ui" style="width: 700px">
 
+			<object data="/info?type=HTMLVersion" style="width: 700px"></object>
 
+		</div>
 
+	</td>
 
+  </tr>
 
+</table>
 
+
 
 
 
 <h3>Host Info</h3>
 
 <h3>Host Info</h3>
 
 <table style="font-family: arial">
 
 <table style="font-family: arial">
 
@@ -47,8 +82,8 @@ div {
 
 			Hostname:
 
 			Hostname:
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
-			<div id="gitbranch">
 
-				<object data="/version?type=Hostname"></object>
 
+			<div id="Hostname">
 
+				<object data="/info?type=Hostname"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -57,8 +92,8 @@ div {
 
 			IP-Address:
 
 			IP-Address:
 
 		</td>	
 		</td>	
 		<td>
 
 		<td>
 
-			<div id="gitbranch">
 
-				<object data="/version?type=IP"></object>
 
+			<div id="IP">
 
+				<object data="/info?type=IP"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -67,71 +102,13 @@ div {
 
 			WLan-SSID:
 
 			WLan-SSID:
 
 		</td>	
 		</td>	
 		<td>
 
 		<td>
 
-			<div id="gitbranch">
 
-				<object data="/version?type=SSID"></object>
 
+			<div id="SSID">
 
+				<object data="/info?type=SSID"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
 </table>
 
 </table>
 
 
 
-<h3>Version Info</h3>
 
-<table style="font-family: arial">
 
-  <tr>
 
-	<td>
 
-		Git-Branch:
 
-	</td>
 
-	<td>
 
-		<div id="gitbranch">
 
-			<object data="/version?type=GitBranch"></object>
 
-		</div>
 
-	</td>
 
-  </tr>
 
-
 
-  <tr>
 
-	<td>
 
-		Git-Tag:
 
-	</td>
 
-	<td>
 
-		<div>
 
-			<object data="/version?type=GitTag"></object>
 
-		</div>
 
-	</td>
 
-  </tr>
 
-
 
-  <tr>
 
-	<td>
 
-		Git-Revision:
 
-	</td>
 
-	<td>
 
-		<div>
 
-			<object data="/version?type=GitRevision"></object>
 
-		</div>
 
-	</td>
 
-  </tr>
 
-
 
-  <tr>
 
-	<td>
 
-		Build Time:
 
-	</td>
 
-	<td>
 
-		<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>
 
-
 
 <h3>SD Card Info</h3>
 
 <h3>SD Card Info</h3>
 
 <table style="font-family: arial">
 
 <table style="font-family: arial">
 
 	<tr>
 
 	<tr>
 
@@ -140,7 +117,7 @@ div {
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
 			<div id="SDCardManufacturer">
 
 			<div id="SDCardManufacturer">
 
-				<object data="/version?type=SDCardManufacturer"></object>
 
+				<object data="/info?type=SDCardManufacturer"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -150,7 +127,7 @@ div {
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
 			<div id="SDCardName">
 
 			<div id="SDCardName">
 
-				<object data="/version?type=SDCardName"></object>
 
+				<object data="/info?type=SDCardName"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -160,7 +137,7 @@ div {
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
 			<div id="SDCardCapacity">
 
 			<div id="SDCardCapacity">
 
-				<object data="/version?type=SDCardCapacity"></object>
 
+				<object data="/info?type=SDCardCapacity"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -170,7 +147,7 @@ div {
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
 			<div id="SDCardSectorSize">
 
 			<div id="SDCardSectorSize">
 
-				<object data="/version?type=SDCardSectorSize"></object>
 
+				<object data="/info?type=SDCardSectorSize"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -180,7 +157,7 @@ div {
 
 		</td>
 
 		</td>
 
 		<td>
 
 		<td>
 
 			<div id="SDPartitionSize">
 
 			<div id="SDPartitionSize">
 
-				<object data="/version?type=SDCardPartitionSize"></object>
 
+				<object data="/info?type=SDCardPartitionSize"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -190,7 +167,7 @@ div {
 
 		</td>	
 		</td>	
 		<td>
 
 		<td>
 
 			<div id="SDFreePartitionSpace">
 
 			<div id="SDFreePartitionSpace">
 
-				<object data="/version?type=SDCardFreePartitionSpace"></object>
 
+				<object data="/info?type=SDCardFreePartitionSpace"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>
 
@@ -200,7 +177,7 @@ div {
 
 		</td>	
 		</td>	
 		<td>
 
 		<td>
 
 			<div id="SDCardPartitionAllocationSize">
 
 			<div id="SDCardPartitionAllocationSize">
 
-				<object data="/version?type=SDCardPartitionAllocationSize"></object>
 
+				<object data="/info?type=SDCardPartitionAllocationSize"></object>
 
 			</div>
 
 			</div>
 
 		</td>
 
 		</td>
 
 	</tr>
 
 	</tr>

+ 4 - 3
sd-card/html/ota_page.html
Просмотреть файл 

@@ -89,7 +89,7 @@ function init(){
 
 
 
 
 
 function doRebootAfterUpdate() {
 
 function doRebootAfterUpdate() {
 
-	if (confirm("Update completed!\nThe ESP32 will reboot now!")) {
 
+	if (confirm("Upload completed!\nThe device will reboot now and complete the update.\nThis will take up to 180s!")) {
 
 		var stringota = "/reboot";
 
 		var stringota = "/reboot";
 
 		window.location = stringota;
 
 		window.location = stringota;
 
 		window.location.href = stringota;
 
 		window.location.href = stringota;
 
@@ -132,7 +132,7 @@ function prepareOnServer() {
 
         return;
 
         return;
 
     }
 
     }
 
 
 
-    document.getElementById("status").innerText = "Status: Preparations on ESP32";
 
+    document.getElementById("status").innerText = "Status: Preparations on device";
 
     document.getElementById("doUpdate").disabled = true;
 
     document.getElementById("doUpdate").disabled = true;
 
 
 
 	var xhttp = new XMLHttpRequest();
 
 	var xhttp = new XMLHttpRequest();
 
@@ -199,7 +199,7 @@ function upload() {
 
 
 
 
 
 function extract() {
 
 function extract() {
 
-    document.getElementById("status").innerText = "Status: Processing on ESP32 (takes up to 3 minutes)...";
 
+    document.getElementById("status").innerText = "Status: Processing on device (takes up to 3 minutes)...";
 
 
 
     var xhttp = new XMLHttpRequest();
 
     var xhttp = new XMLHttpRequest();
 
     /* first delete the old firmware */	
     /* first delete the old firmware */	
@@ -210,6 +210,7 @@ function extract() {
 
                 document.getElementById("status").innerText = "Status: Update completed!";
 
                 document.getElementById("status").innerText = "Status: Update completed!";
 
                 document.getElementById("doUpdate").disabled = true;
 
                 document.getElementById("doUpdate").disabled = true;
 
                 document.getElementById("newfile").disabled = false;
 
                 document.getElementById("newfile").disabled = false;
 
+                document.cookie = "overview.html"; // Make sure after the reboot we go to the overview page
 
 
 
                 if (xhttp.responseText.startsWith("reboot"))
 
                 if (xhttp.responseText.startsWith("reboot"))
 
                 {
 
                 {