Merge branch 'ISSUE_630' into master-3006

gnuton · Jul 21, 2024 · abf6df5 · abf6df5
2 parents 10f6548 + bcb9d60
commit abf6df5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/release/src/router/www/Main_WStatus_Content.asp b/release/src/router/www/Main_WStatus_Content.asp
@@ -115,7 +115,7 @@ function redraw(){
 	var bandname_array = [];
 	var code = "";
 
-	if (based_modelid === 'GT-AXE16000') {
+	if (based_modelid === 'GT-AXE16000' ||  based_modelid === 'GT-BE98') {
 		apinfo_array = [dataarray3, dataarray0, dataarray1, dataarray2];
 		client_array = [wificlients3, wificlients0, wificlients1, wificlients2];
 		dfs_array = [[],dfs_statusarray0, dfs_statusarray1, []];

diff --git a/release/src/router/www/Tools_Sysinfo.asp b/release/src/router/www/Tools_Sysinfo.asp
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <html xmlns:v>
 <head>
@@ -375,16 +375,16 @@ function update_temperatures(){
 			update_temperatures();
 		},
 		success: function(response){
-			if (based_modelid === 'GT-AXE16000') {
+			if (based_modelid === 'GT-AXE16000' || based_modelid === 'GT-BE98') {
 				curr_coreTmp_24_raw = curr_coreTmp_wl3_raw;
 				curr_coreTmp_5_raw = curr_coreTmp_wl0_raw;
 				curr_coreTmp_52_raw = curr_coreTmp_wl1_raw;
 				curr_coreTmp_6_raw = curr_coreTmp_wl2_raw;
 			} else if (based_modelid === 'GT-BE98_PRO') {
-                                curr_coreTmp_24_raw = curr_coreTmp_wl3_raw;
-                                curr_coreTmp_5_raw = curr_coreTmp_wl0_raw;
-                                curr_coreTmp_6_raw = curr_coreTmp_wl1_raw;
-                                curr_coreTmp_62_raw = curr_coreTmp_wl2_raw;
+                curr_coreTmp_24_raw = curr_coreTmp_wl3_raw;
+                curr_coreTmp_5_raw = curr_coreTmp_wl0_raw;
+                curr_coreTmp_6_raw = curr_coreTmp_wl1_raw;
+                curr_coreTmp_62_raw = curr_coreTmp_wl2_raw;
 			} else {
 				curr_coreTmp_24_raw = curr_coreTmp_wl0_raw;
 				if (band5g_support)
@@ -473,16 +473,16 @@ function showbootTime(){
 function show_connstate(){
 	document.getElementById("conn_td").innerHTML = conn_stats_arr[0] + " / <% sysinfo("conn.max"); %>&nbsp;&nbsp;-&nbsp;&nbsp;" + conn_stats_arr[1] + " active";
 
-	if (based_modelid === 'GT-AXE16000') {
+	if (based_modelid === 'GT-AXE16000' || based_modelid === 'GT-BE98') {
 		wlc_24_arr = wlc_3_arr;
 		wlc_51_arr = wlc_0_arr;
 		wlc_52_arr = wlc_1_arr;
 		wlc_6_arr = wlc_2_arr;
 	} else if (based_modelid === 'GT-BE98_PRO') {
-                wlc_24_arr = wlc_3_arr;
-                wlc_51_arr = wlc_0_arr;
-                wlc_6_arr = wlc_1_arr;
-                wlc_62_arr = wlc_2_arr;
+        wlc_24_arr = wlc_3_arr;
+        wlc_51_arr = wlc_0_arr;
+        wlc_6_arr = wlc_1_arr;
+        wlc_62_arr = wlc_2_arr;
 	} else {
 		wlc_24_arr = wlc_0_arr;
 		if (band5g_support)
@@ -580,7 +580,7 @@ function show_wifi_version() {
 		buf += "<br><% sysinfo("driver_version.1"); %>";
 	if (wl_info.band5g_2_support || wl_info.band6g_support)
 		buf += "<br><% sysinfo("driver_version.2"); %>";
-	if (based_modelid === 'GT-AXE16000' || based_modelid === 'GT-BE98_PRO')
+	if (based_modelid === 'GT-AXE16000' || based_modelid === 'GT-BE98_PRO' || based_modelid === 'GT-BE98')
 		buf += "<br><% sysinfo("driver_version.3"); %>";
 	buf += "</td>";
 
@@ -825,3 +825,7 @@ function show_wifi_version() {
 </body>
 </html>
 
+
+</body>
+</html>
+