Skip to content

Commit

Permalink
Merge pull request #25 from Martinski4GitHub/develop
Browse files Browse the repository at this point in the history 
Improved code to get temperatures from a 3rd set of vars.
  • Loading branch information
@jackyaz
jackyaz authored Jul 7, 2023
2 parents 09dee12 + d76fbb0 commit 8410589
Showing 1 changed file with 32 additions and 10 deletions.
42 changes: 32 additions & 10 deletions scmerlin_www.asp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ else
}
/**----------------------------------------------**/
/** Added/Modified by Martinski W. [2023-Jun-03] **/
/** Added/Modified by Martinski W. [2023-Jul-05] **/
/**----------------------------------------------**/
function GetTemperatureValue (bandIDstr)
{
Expand All @@ -110,38 +110,60 @@ function GetTemperatureValue (bandIDstr)
switch (bandIDstr)
{
case '2.4GHz':
if (productid == 'GT-AXE16000' &&
typeof curr_coreTmp_wl3_raw != 'undefined' && curr_coreTmp_wl3_raw != null)
{ temperatureVal = curr_coreTmp_wl3_raw; }
if (productid == 'GT-AXE16000')
{
if (typeof curr_coreTmp_wl3_raw != 'undefined' && curr_coreTmp_wl3_raw != null)
{ temperatureVal = curr_coreTmp_wl3_raw; }
else if (typeof curr_coreTmp_3_raw != 'undefined' && curr_coreTmp_3_raw != null)
{ temperatureVal = curr_coreTmp_3_raw; }
}
else if (typeof curr_coreTmp_wl0_raw != 'undefined' && curr_coreTmp_wl0_raw != null)
{ temperatureVal = curr_coreTmp_wl0_raw; }
else if (typeof curr_coreTmp_0_raw != 'undefined' && curr_coreTmp_0_raw != null)
{ temperatureVal = curr_coreTmp_0_raw; }
else if (typeof curr_coreTmp_2_raw != 'undefined' && curr_coreTmp_2_raw != null)
{ temperatureVal = curr_coreTmp_2_raw; }
break;
case '5GHz_1':
if (productid == 'GT-AXE16000' &&
typeof curr_coreTmp_wl0_raw != 'undefined' && curr_coreTmp_wl0_raw != null)
{ temperatureVal = curr_coreTmp_wl0_raw; }
if (productid == 'GT-AXE16000')
{
if (typeof curr_coreTmp_wl0_raw != 'undefined' && curr_coreTmp_wl0_raw != null)
{ temperatureVal = curr_coreTmp_wl0_raw; }
else if (typeof curr_coreTmp_0_raw != 'undefined' && curr_coreTmp_0_raw != null)
{ temperatureVal = curr_coreTmp_0_raw; }
}
else if (typeof curr_coreTmp_wl1_raw != 'undefined' && curr_coreTmp_wl1_raw != null)
{ temperatureVal = curr_coreTmp_wl1_raw; }
else if (typeof curr_coreTmp_1_raw != 'undefined' && curr_coreTmp_1_raw != null)
{ temperatureVal = curr_coreTmp_1_raw; }
else if (typeof curr_coreTmp_5_raw != 'undefined' && curr_coreTmp_5_raw != null)
{ temperatureVal = curr_coreTmp_5_raw; }
break;
case '5GHz_2':
if (productid == 'GT-AXE16000' &&
typeof curr_coreTmp_wl1_raw != 'undefined' && curr_coreTmp_wl1_raw != null)
{ temperatureVal = curr_coreTmp_wl1_raw; }
if (productid == 'GT-AXE16000')
{
if (typeof curr_coreTmp_wl1_raw != 'undefined' && curr_coreTmp_wl1_raw != null)
{ temperatureVal = curr_coreTmp_wl1_raw; }
else if (typeof curr_coreTmp_1_raw != 'undefined' && curr_coreTmp_1_raw != null)
{ temperatureVal = curr_coreTmp_1_raw; }
}
else if (typeof curr_coreTmp_wl2_raw != 'undefined' && curr_coreTmp_wl2_raw != null)
{ temperatureVal = curr_coreTmp_wl2_raw; }
else if (typeof curr_coreTmp_0_raw != 'undefined' && curr_coreTmp_0_raw != null &&
typeof curr_coreTmp_2_raw != 'undefined' && curr_coreTmp_2_raw != null)
{ temperatureVal = curr_coreTmp_2_raw; }
else if (typeof curr_coreTmp_52_raw != 'undefined' && curr_coreTmp_52_raw != null)
{ temperatureVal = curr_coreTmp_52_raw; }
break;
case '6GHz_1':
if (typeof curr_coreTmp_wl2_raw != 'undefined' && curr_coreTmp_wl2_raw != null)
{ temperatureVal = curr_coreTmp_wl2_raw; }
else if (typeof curr_coreTmp_0_raw != 'undefined' && curr_coreTmp_0_raw != null &&
typeof curr_coreTmp_2_raw != 'undefined' && curr_coreTmp_2_raw != null)
{ temperatureVal = curr_coreTmp_2_raw; }
else if (typeof curr_coreTmp_52_raw != 'undefined' && curr_coreTmp_52_raw != null)
{ temperatureVal = curr_coreTmp_52_raw; }
break;
Expand Down

0 comments on commit 8410589

Please sign in to comment.