From ad8483a0978efb05ca8b8ceabf68ea125faed1f6 Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 08:48:53 +0700 Subject: [PATCH 1/6] Update system.js --- srv/http/assets/js/system.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srv/http/assets/js/system.js b/srv/http/assets/js/system.js index 8afb0469f..c151b5d87 100644 --- a/srv/http/assets/js/system.js +++ b/srv/http/assets/js/system.js @@ -1,3 +1,11 @@ +ps.storage = data => { + clearTimeout( V.debounce ); + V.debounce = setTimeout( () => { + S.liststorage = data.list; + util.renderStorage(); + if ( $( '#data' ).length ) $( '#data' ).html( highlightJSON( S ) ); + }, 1000 ); +} var config = { _disable : { shareddata : () => { @@ -897,14 +905,6 @@ function renderPage() { $( 'a[ href ]' ).prop( 'tabindex', -1 ); showContent(); } -ps.storage = data => { - clearTimeout( V.debounce ); - V.debounce = setTimeout( () => { - S.liststorage = data.list; - util.renderStorage(); - if ( $( '#data' ).length ) $( '#data' ).html( highlightJSON( S ) ); - }, 1000 ); -} $( function() { // document ready start >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> From cb450911bb83d439836e8d80d81b98a137d68059 Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 08:50:56 +0700 Subject: [PATCH 2/6] Update camilla.js --- srv/http/assets/js/camilla.js | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/srv/http/assets/js/camilla.js b/srv/http/assets/js/camilla.js index 2763805dc..829708cca 100644 --- a/srv/http/assets/js/camilla.js +++ b/srv/http/assets/js/camilla.js @@ -1,3 +1,26 @@ +ps.volume = data => { + if ( V.local ) { + V.local = false; + return + } + var vol = data.val; + if ( data.type === 'mute' ) { + common.volumeAnimate( 0, S.volume ); + S.volume = 0; + S.volumemute = vol; + } else if ( data.type === 'unmute' ) { + common.volumeAnimate( S.volumemute, 0 ); + S.volume = vol; + S.volumemute = 0; + } else { + if ( data.type === 'drag' ) { + V.drag = true; + setTimeout( () => V.drag = false, 300 ); + } + common.volumeAnimate( vol, S.volume ); + S.volume = vol; + } +} // variables ////////////////////////////////////////////////////////////////////////////// V = { clipped : false @@ -482,29 +505,6 @@ function renderPage() { // common from settings.js - render with 'GetConfigJson' function onPageInactive() { if ( wscamilla ) wscamilla.close(); } -ps.volume = data => { - if ( V.local ) { - V.local = false; - return - } - var vol = data.val; - if ( data.type === 'mute' ) { - common.volumeAnimate( 0, S.volume ); - S.volume = 0; - S.volumemute = vol; - } else if ( data.type === 'unmute' ) { - common.volumeAnimate( S.volumemute, 0 ); - S.volume = vol; - S.volumemute = 0; - } else { - if ( data.type === 'drag' ) { - V.drag = true; - setTimeout( () => V.drag = false, 300 ); - } - common.volumeAnimate( vol, S.volume ); - S.volume = vol; - } -} var config = { configuration : () => { From 8b294b3808a08f783261966e58c08bdfdb6e2ff9 Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 13:21:20 +0700 Subject: [PATCH 3/6] Update system.js --- srv/http/assets/js/system.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srv/http/assets/js/system.js b/srv/http/assets/js/system.js index c151b5d87..32b233aea 100644 --- a/srv/http/assets/js/system.js +++ b/srv/http/assets/js/system.js @@ -380,7 +380,7 @@ var util = { , beforeshow : () => { $( '#infoList label' ).parents( 'td' ).prop( 'colspan', 3 ); $( '.infofooter i' ) - .toggleClass( 'disabled', ! S.lcdchar || data.reboot ) + .toggleClass( 'disabled', ! S.lcdchar ) .on( 'click', function() { bash( [ 'lcdcharset', $( this ).index() ? 'off' : 'logo', 'CMD ACTION' ] ); } ); From d7f9fb5d43e29177c2b017b715159a871e33461c Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 14:10:45 +0700 Subject: [PATCH 4/6] Update system.sh --- srv/http/bash/settings/system.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srv/http/bash/settings/system.sh b/srv/http/bash/settings/system.sh index 7f94746e8..7387d286c 100644 --- a/srv/http/bash/settings/system.sh +++ b/srv/http/bash/settings/system.sh @@ -47,7 +47,7 @@ i2c-dev' i2c-dev snd-soc-wm8960' fi - [[ -e $module ]] && sort -u <<< $module > $file_module || rm -f $file_module + [[ $module ]] && sort -u <<< $module | awk NF > $file_module || rm -f $file_module fi if [[ $poweraudiophonic ]]; then config+=" From 4dca4bcacac6c8440dc0109eedf52bcf92da00be Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 14:35:44 +0700 Subject: [PATCH 5/6] Update data-status.sh --- srv/http/bash/settings/data-status.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/srv/http/bash/settings/data-status.sh b/srv/http/bash/settings/data-status.sh index 46076c816..a75c8d470 100644 --- a/srv/http/bash/settings/data-status.sh +++ b/srv/http/bash/settings/data-status.sh @@ -145,7 +145,6 @@ $( sed -E -e '1,3 d' -e '/^ATA device|Media.*:|Serial.*:|Transport:/ d' <<< $par fi ;; system ) - firmware="pacman -Qs 'firmware|bootloader' | grep -Ev '^\s|whence' | cut -d/ -f2" config="\ # cat /boot/cmdline.txt $( < /boot/cmdline.txt ) @@ -153,14 +152,14 @@ $( < /boot/cmdline.txt ) # cat /boot/config.txt $( grep -Ev '^#|^\s*$' /boot/config.txt ) -# $firmware -$( eval $firmware )" - raspberrypiconf=$( cat $filemodule 2> /dev/null ) - if [[ $raspberrypiconf ]]; then +# firmware, bootloader +$( pacman -Qs 'firmware|bootloader' | grep -Ev '^\s|whence' | cut -d/ -f2 )" + file_module=/etc/modules-load.d/raspberrypi.conf + if [[ -e $file_module ]]; then config+=" -# $filemodule -$raspberrypiconf" +# cat $file_module +$( < $file_module )" dev=$( ls /dev/i2c* 2> /dev/null | cut -d- -f2 ) [[ $dev ]] && config+=" From 5183dca94e68660ef9cf0b921db4ec8cd0b4a41e Mon Sep 17 00:00:00 2001 From: rern Date: Sat, 28 Dec 2024 14:38:05 +0700 Subject: [PATCH 6/6] Update data-status.sh --- srv/http/bash/settings/data-status.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srv/http/bash/settings/data-status.sh b/srv/http/bash/settings/data-status.sh index a75c8d470..aa09a833b 100644 --- a/srv/http/bash/settings/data-status.sh +++ b/srv/http/bash/settings/data-status.sh @@ -154,6 +154,11 @@ $( grep -Ev '^#|^\s*$' /boot/config.txt ) # firmware, bootloader $( pacman -Qs 'firmware|bootloader' | grep -Ev '^\s|whence' | cut -d/ -f2 )" + ignorepkg=$( grep ^IgnorePkg /etc/pacman.conf ) + [[ $ignorepkg ]] && config+=" + +# grep ^IgnorePkg /etc/pacman.conf +$ignorepkg" file_module=/etc/modules-load.d/raspberrypi.conf if [[ -e $file_module ]]; then config+=" @@ -166,11 +171,6 @@ $( < $file_module )" # i2cdetect -y $dev $( i2cdetect -y $dev )" fi - ignorepkg=$( grep ^IgnorePkg /etc/pacman.conf ) - [[ $ignorepkg ]] && config+=" - -# grep ^IgnorePkg /etc/pacman.conf -$ignorepkg" echo "$config" ;; timezone )