Skip to content

Code Improvements #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martinski4GitHub merged 2 commits into from
Aug 5, 2026
Merged

Code Improvements #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48d1e3c
Code Improvements
Martinski4GitHub Aug 4, 2026
0adcc19
Update scmerlin.sh
Martinski4GitHub Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# scMerlin

## v2.5.50
### Updated on 2026-Aug-01
### Updated on 2026-Aug-04

## About
scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin.
Expand Down
4 changes: 2 additions & 2 deletions scmerlin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
## Forked from: https://github.com/jackyaz/scMerlin ##
## ##
######################################################
# Last Modified: 2026-Aug-01
# Last Modified: 2026-Aug-04
#-----------------------------------------------------

########## Shellcheck directives ###########
Expand All @@ -34,7 +34,7 @@ readonly SCRIPT_NAME="scMerlin"
readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')"
readonly SCM_VERSION="v2.5.50"
readonly SCRIPT_VERSION="v2.5.50"
readonly SCRIPT_VERSTAG="26080100"
readonly SCRIPT_VERSTAG="26080422"
SCRIPT_BRANCH="develop"
SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
Expand Down
35 changes: 26 additions & 9 deletions scmerlin_www.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo
<script>

/**----------------------------**/
/** Last Modified: 2026-Jul-24 **/
/** Last Modified: 2026-Aug-04 **/
/**----------------------------**/

var custom_settings;
Expand Down Expand Up @@ -156,11 +156,14 @@ function show_memcpu()
document.getElementById('nvram_td').innerHTML = round(mem_stats_arr[6]/1024,2).toFixed(2) + ' / ' + nvramtotal + ' KB';
document.getElementById('jffs_td').innerHTML = jffs_Usage;

if (parseInt(mem_stats_arr[5]) == 0){
if (parseInt(mem_stats_arr[5]) === 0)
{
document.getElementById('mem_swap_td').innerHTML = '<span>No swap configured</span>';
}
else{
document.getElementById('mem_swap_td').innerHTML = mem_stats_arr[4] + ' / ' + mem_stats_arr[5] + ' MB';
else
{
document.getElementById('mem_swap_td').innerHTML =
mem_stats_arr[4] + ' / ' + round(mem_stats_arr[5], 1).toFixed(1) + ' MB';
}
}

Expand Down Expand Up @@ -511,13 +514,17 @@ let unitsConversion = false;
let unitsFahrenheit = false;
function ToggleTemperatureUnits(checkboxElem)
{
unitsConversion = true;
unitsFahrenheit = checkboxElem.checked;
update_temperatures();
unitsConversion = true;
unitsFahrenheit = checkboxElem.checked;
if (unitsFahrenheit)
{ SetCookie(checkboxElem.id,'unitsFahrenheit'); }
else
{ SetCookie(checkboxElem.id,'unitsCelsius'); }
update_temperatures();
}

/**----------------------------------------**/
/** Modified by Martinski W. [2026-Jul-24] **/
/** Modified by Martinski W. [2026-Aug-04] **/
/**----------------------------------------**/
function update_temperatures()
{
Expand All @@ -535,6 +542,16 @@ function update_temperatures()
if (window._scmPauseAjax) return;
let code, cpuTempValue, cpuTempUnits;

let temptrUnitsElem = document.getElementById('temptrUnitsF');
if (temptrUnitsElem)
{
if (GetCookie(temptrUnitsElem.id, 'string') === 'unitsFahrenheit')
{ unitsFahrenheit = true; }
else
{ unitsFahrenheit = false; }
temptrUnitsElem.checked = unitsFahrenheit;
}

code = '<b>2.4 GHz: </b><span>' + GetTemperatureValue ('2.4GHz') + '</span>';

if (band_5GHz_2_supported)
Expand Down Expand Up @@ -562,7 +579,7 @@ function update_temperatures()
{ CPUtemp = curr_coreTmp_cpu; }
else
{ CPUtemp = curr_cpuTemp; }

if (CPUtemp !== '' && CPUtemp.length > 1)
{
cpuTempUnits = 'C';
Expand Down