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 : () => {
diff --git a/srv/http/assets/js/system.js b/srv/http/assets/js/system.js
index 8afb0469f..32b233aea 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 : () => {
@@ -372,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' ] );
} );
@@ -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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/srv/http/bash/settings/data-status.sh b/srv/http/bash/settings/data-status.sh
index 46076c816..aa09a833b 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,25 +152,25 @@ $( < /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 )"
+ 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+="
-# $filemodule
-$raspberrypiconf"
+# cat $file_module
+$( < $file_module )"
dev=$( ls /dev/i2c* 2> /dev/null | cut -d- -f2 )
[[ $dev ]] && config+="
# i2cdetect -y $dev
$( i2cdetect -y $dev )"
fi
- ignorepkg=$( grep ^IgnorePkg /etc/pacman.conf )
- [[ $ignorepkg ]] && config+="
-
-# grep ^IgnorePkg /etc/pacman.conf
-$ignorepkg"
echo "$config"
;;
timezone )
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+="