diff --git a/README.md b/README.md index 20128658f..8f38b23a5 100644 --- a/README.md +++ b/README.md @@ -98,16 +98,18 @@ Audio player for - Manjaro: `pacman -Sy rpi-imager` - Others: [Build and install](https://github.com/raspberrypi/rpi-imager) - Download an image file. - - `CHOOSE OS` > Use custom (OR right click the image file > Open with > Raspberry Pi Imager) - - `CHOOSE STORAGE`: - - Select SD card - normal boot - - Select USB drive - boot from USB drive without SD card - - For Raspberry Pi 2B v1.2, 3A+, 3B, 3B+, 4B - - [USB mass storage boot](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md) must be set. - - Should be used only when USB drive is faster than SD card. - - Do not set anything in `Advance options` - - `WRITE` - - Verify is optional. + - **Raspberry Pi Imager:** + - `CHOOSE DEVICE` - (No need) + - `CHOOSE OS` > Use custom + - `CHOOSE STORAGE`: + - Select SD card - normal boot + - Select USB drive - boot from USB drive without SD card + - For Raspberry Pi 2B v1.2, 3A+, 3B, 3B+, 4B + - [USB mass storage boot](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md) must be set. + - Should be used only when USB drive is faster than SD card. + - Do not set anything in `Advance options` + - `WRITE` + - Verify is optional. - Existing users: - Keep current setup SD card. - Try with a spare one before moving forward. diff --git a/install.sh b/install.sh index 7211a45a8..9c6033d85 100644 --- a/install.sh +++ b/install.sh @@ -27,13 +27,13 @@ fi # 20250111 if [[ -e /boot/kernel.img ]]; then - if [[ $( pacman -Q cava ) != 'cava 0.7.4-1' ]]; then + if [[ $( pacman -Q cava ) < 'cava 0.7.4-1' ]]; then wget https://github.com/rern/rern.github.io/raw/refs/heads/main/armv6h/cava-0.7.4-1-any.pkg.tar.xz pacman -U --noconfirm cava-0.7.4-1-any.pkg.tar.xz rm cava-0.7.4-1-any.pkg.tar.xz fi else - [[ $( pacman -Q cava ) != 'cava 0.10.3-2' ]] && pacman -Sy --noconfirm cava + [[ $( pacman -Q cava ) < 'cava 0.10.3-2' ]] && pacman -Sy --noconfirm cava fi if [[ $( pacman -Q python-rpi-gpio ) < 'python-rpi-gpio 0.7.1-3' ]]; then @@ -54,26 +54,6 @@ if [[ -e $dirsystem/lcdchar.conf ]]; then rm -f $file fi -# 20241208 -rm -f $dirshm/playlist* - -dir=/srv/http/assets/img/guide -if [[ -e $dir/58.jpg ]]; then - rm $dir/* - curl -skL https://github.com/rern/_assets/raw/master/guide/guide.tar.xz | bsdtar xf - -C $dir -fi - -file=/etc/pacman.conf -if ! grep -q linux-rpi $file; then - [[ -e /boot/kernel7.img ]] && ignore='libunwind mesa' - sed -i -e '/^#*IgnorePkg/ d' -e "/^#*IgnoreGroup/ i\IgnorePkg = linux-rpi $ignore" $file -fi -if [[ -e /boot/kernel7.img ]] && ! grep -q mesa $file; then - sed -i '/^IgnorePkg/ s/$/ mesa/' $file -fi - -[[ ! -e /boot/kernel.img ]] && sed -i '/^brightness/ d' $dirsystem/localbrowser.conf - #------------------------------------------------------------------------------- installstart "$1" diff --git a/srv/http/assets/js/addons.js b/srv/http/assets/js/addons.js index 5c4495ab9..13b13288e 100644 --- a/srv/http/assets/js/addons.js +++ b/srv/http/assets/js/addons.js @@ -1,6 +1,6 @@ V = {} // var global var icon = 'addons'; -var keys = [ 'installurl', 'postinfo', 'title', 'uninstall', 'version' ]; +var keys = [ 'installurl', 'postmessage', 'title', 'uninstall', 'version' ]; $( '.helphead' ).remove(); if ( [ 'localhost', '127.0.0.1' ].includes( location.hostname ) ) $( 'a' ).removeAttr( 'href' ); diff --git a/srv/http/assets/js/camilla.js b/srv/http/assets/js/camilla.js index ebc801863..a50b0a4a5 100644 --- a/srv/http/assets/js/camilla.js +++ b/srv/http/assets/js/camilla.js @@ -1148,6 +1148,8 @@ var render = { } //----------------------------------------------------------------------------------- , filters : () => { var data = render.dataSort(); + if ( ! data ) return + var li = ''; $.each( data, ( k, v ) => li += render.filter( k, v ) ); $( '#'+ V.tab +' .entries.main' ).html( li ); @@ -1202,7 +1204,9 @@ var render = { } //----------------------------------------------------------------------------------- , mixers : () => { var data = render.dataSort(); - var li = ''; + if ( ! data ) return + + var li = ''; $.each( data, ( k, v ) => li += render.mixer( k, v ) ); $( '#'+ V.tab +' .entries.main' ).html( li ); render.toggle(); @@ -1214,7 +1218,6 @@ var render = { +'' } , mixersSub : name => { - console.log(name) var iconadd = max => ico( max ? 'add disabled' : 'add' ); var data = MIX[ name ].mapping; var chin = DEV.capture.channels; @@ -1260,7 +1263,9 @@ var render = { } //----------------------------------------------------------------------------------- , processors : () => { var data = render.dataSort(); - var li = ''; + if ( ! data ) return + + var li = ''; $.each( data, ( k, v ) => { var param = jsonClone( v.parameters ); [ 'channels', 'monitor_channels', 'process_channels' ].forEach( k => delete param[ k ] ); @@ -1273,7 +1278,10 @@ var render = { render.toggle(); } //----------------------------------------------------------------------------------- , pipeline : () => { - $( '.i-flowchart' ).toggleClass( 'disabled', PIP.length === 0 ); + var nopip = ! PIP || ! PIP.length; + $( '.i-flowchart' ).toggleClass( 'disabled', nopip ); + if ( nopip ) return + var li = ''; PIP.forEach( ( el, i ) => li += render.pipe( el, i ) ); $( '#'+ V.tab +' .entries.main' ).html( li ); @@ -1386,10 +1394,10 @@ var render = { } //----------------------------------------------------------------------------------- , dataSort : () => { var kv = S.config[ V.tab ]; - if ( ! kv ) return + var keys = Object.keys( kv ); + if ( ! keys.length ) return false var data = {}; - var keys = Object.keys( kv ); keys.sort().forEach( k => data[ k ] = kv[ k ] ); return data } @@ -1745,7 +1753,7 @@ var setting = { S.config.processors = {} PRO = S.config.processors; } - PRO[ namenew ] = { type: v.type, parameters: val } + PRO[ namenew ] = { type: typenew, parameters: val } if ( name in PRO && name !== namenew ) delete PRO[ name ]; setting.save( title, name ? 'Change ...' : 'Save ...' ); render.processors(); diff --git a/srv/http/bash/settings/camilla.py b/srv/http/bash/settings/camilla.py deleted file mode 100644 index c8220e048..000000000 --- a/srv/http/bash/settings/camilla.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python - -import json -import sys - -args = json.loads( sys.argv[ 1 ].replace( '\\"', '"' ) ) - -if 'index' in args: # pipeline - from camilladsp_plot import eval_filterstep - data = eval_filterstep( args, args[ 'index' ] ) -else: # filter - from camilladsp_plot import eval_filter - data = eval_filter( args ) - -print( json.dumps( data ) ) - \ No newline at end of file