Merge pull request #1860 from rern/UPDATE

Update
rern · Jan 11, 2025 · 802d6db · 802d6db
2 parents 9b4774e + dbaf0c2
commit 802d6db
Show file tree

Hide file tree

Showing 36 changed files with 547 additions and 591 deletions.
diff --git a/install.sh b/install.sh
@@ -4,6 +4,35 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
+# 20250111
+if [[ -e /boot/kernel.img ]]; 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
+fi
+
+if [[ $( pacman -Q python-rpi-gpio ) != 'python-rpi-gpio 0.7.1-3' ]]; then
+	pacman -R --noconfirm python-rpi-gpio
+	pacman -Sy --noconfirm python-rpi-gpio
+fi
+
+file=/etc/systemd/system/mpd_oled.service
+if [[ -e $file ]]; then
+	rm -f $file
+	pacman -R --noconfirm audio_spectrum_oled &> /dev/null
+	pacman -Sy --noconfirm mpd_oled
+fi
+
+file=$dirsystem/lcdchar.conf
+if [[ -e $dirsystem/lcdchar.conf ]]; then
+	conf2json $file | jq > ${file/conf/json}
+	rm -f $file
+fi
+
 # 20241208
 rm -f $dirshm/playlist*
 
@@ -22,56 +51,11 @@ if [[ -e /boot/kernel7.img ]] && ! grep -q mesa $file; then
 	sed -i '/^IgnorePkg/ s/$/ mesa/' $file
 fi
 
-sed -i '/^brightness/ d' $dirsystem/localbrowser.conf
+[[ ! -e /boot/kernel.img ]] && sed -i '/^brightness/ d' $dirsystem/localbrowser.conf
 
 # 20241130
 systemctl -q is-active mediamtx && touch $dirsystem/dabradio
 
-# 20241110
-if [[ ! -e /boot/kernel.img ]]; then
-	revision=$( grep ^Revision /proc/cpuinfo )
-	if [[ ${revision: -3:2} < 11 ]]; then
-		file=/etc/modprobe.d/brcmfmac.conf
-		[[ ! -e $file ]] && echo 'options brcmfmac feature_disable=0x82000' > $file
-	fi
-fi
-
-# 20241108
-[[ $( pacman -Q cava ) < 'cava 0.10.2-2' ]] && pacman -Sy --noconfirm cava
-
-file=$dirsystem/lcdchar.conf
-if [[ -e $file ]] && grep -q -m1 ^0= $file; then
-	rm $dirsystem/lcdchar*
-fi
-
-# 20241111
-if [[ ! -e /boot/kernel.img ]]; then
-	revision=$( grep ^Revision /proc/cpuinfo )
-	[[ ${revision: -3:2} < 11 ]] && echo 'options brcmfmac feature_disable=0x82000' > /etc/modprobe.d/brcmfmac.conf
-fi
-
-file=/etc/systemd/system/dab.service
-if [[ -e $file ]] && grep -q Requires $file; then
-	sed -i '/^Requires\|^After/ d' $file
-	rm -rf /etc/systemd/system/mediamtx.service.d
-	systemctl daemon-reload
-	systemctl try-restart mediamtx
-fi
-
-# 20241108
-[[ $( pacman -Q cava ) < 'cava 0.10.2-2' ]] && pacman -Sy --noconfirm cava
-
-rm -f $dirsystem/lcdmodel
-
-file=$dirsystem/lcdchar.conf
-if [[ -e $file && $( sed -n -E '/^charmap/,/^p0/ p' $file | wc -l ) -gt 2 ]]; then
-	. $file
-	for k in inf cols charmap p0 pin_rs p1 pin_rw p2 pin_e p3 backlight; do
-		conf+="$k=${!k}\n"
-	done
-	echo -e $conf > $file
-fi
-
 #-------------------------------------------------------------------------------
 installstart "$1"
 

diff --git a/srv/http/assets/css/common.css b/srv/http/assets/css/common.css
@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family : rern;
-	src         : url( '/assets/fonts/rern.woff2?v=1733921041' );
+	src         : url( '/assets/fonts/rern.woff2?v=1735997122' );
 }
 @font-face {
 	font-family : Lato;
@@ -62,6 +62,7 @@ i {
 .i-bluealsa::before,
 .i-bluetooth::before,
 .i-btreceiver::before      { content: '\F51A' }
+.i-brightness::before      { content: '\F55F' }
 .i-btsender::before        { content: '\F51B' }
 .i-camilla::before,
 .i-camilladsp::before      { content: '\F59D'; position: absolute; color: var( --cg60 ); }
@@ -257,7 +258,8 @@ body {
 }
 i,
 .infobtn,
-#debug {
+#debug,
+#lib-list .coverart {
 	-webkit-user-select: none;
 	user-select: none;
 }
@@ -425,6 +427,7 @@ code {
 	text-overflow: ellipsis;
 }
 #bannerTitle {
+	line-height: 22px;
 	font-size: 18px;
 	font-weight: 300;
 }
@@ -468,6 +471,17 @@ code {
 	font-size: 13px;
 }
 
+input[ type=checkbox ],
+input[ type=radio ],
+input[ type=range ],
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button,
+input[ type=range ]::-webkit-slider-thumb {
+	appearance: none;
+}
+input[ type=number ] {
+	appearance: textfield;
+}
 input[ type=range ] {
 	--track: linear-gradient( 90deg, transparent 10px, #000 10px, #000 calc( 100% - 10px ), transparent 10px ) !important;
 	--trackborder : 1px solid var( --cgd ) !important;
@@ -476,7 +490,6 @@ input[ type=range ] {
 	margin: 0;
 	max-width: 70%;
 	background: transparent;
-	-webkit-appearance: none;
 }
 input[ type=range ]::-webkit-slider-thumb {
 	height: 40px;
@@ -486,7 +499,6 @@ input[ type=range ]::-webkit-slider-thumb {
 	border-radius: 4px;
 	background: var( --glossy-btn );
 	background-color: var( --cm );
-	-webkit-appearance: none;
 	box-shadow: var( --shadow-btn );
 }
 input[ type=range ]::-moz-range-thumb { /* cannot be combined */
@@ -573,9 +585,11 @@ input[ type=checkbox ] {
 .infobtn-default {
 	background-color: var( --cg );
 }
-.disabled {
+.disabled,
+.disabled i {
 	color: var( --cg60 ) !important;
 	pointer-events: none;
+	cursor: default;
 }
 .infobtn.disabled {
 	background-color: var( --cgd ) !important;
@@ -584,7 +598,6 @@ input[ type=checkbox ] {
 }
 #infoOk.disabled {
 	pointer-events: auto;
-	cursor: default;
 }
 input[ type=checkbox ].disabled {
 	pointer-events: auto;
@@ -824,9 +837,16 @@ hr {
 	color: var( --cg60 );
 }
 .infofooter i {
+	width: auto !important;
 	margin: 0 6px;
 	vertical-align: -2px;
 }
+.infofooter span {
+	margin-right: 10px;
+}
+.infofooter span:last-child {
+	margin-right: 0;
+}
 .infomessage {
 	padding-top: 5px;
 	line-height: 24px;
@@ -901,13 +921,6 @@ input[ type=number ]:disabled {
 	border: 1px solid var( --cgl );
 	opacity: 1;
 }
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-	-webkit-appearance: none;
-}
-input[ type=number ] {
-	-moz-appearance:textfield;
-}
 #infoPasswordBox {
 	margin-top: 0 !important;
 	outline: none;
@@ -919,7 +932,6 @@ input[ type=number ] {
 }
 input[ type=radio ],
 input[ type=checkbox ] {
-	-webkit-appearance: none;
 	width: 24px;
 	height: 24px;
 	margin: 3px 6px 3px 1px;
@@ -1028,7 +1040,6 @@ input[ type=radio ]:disabled {
 }
 @media ( max-width: 420px ) {
 	#infoList { padding: 20px 5px 10px 5px }
-	.infoheader, .infofooter { padding: 0 5px }
 }
 @media ( max-width: 330px ) {
 	#infoOverlay {
@@ -1052,6 +1063,7 @@ input[ type=radio ]:disabled {
 	.i-volume,
 	.infobtn,
 	.infofooter i,
+	.infofooter span,
 	.infolabel i,
 	.infomessage img,
 	.infomessage .tagpath,

diff --git a/srv/http/assets/css/hovercursor.css b/srv/http/assets/css/hovercursor.css
@@ -144,8 +144,9 @@ li:not( .licover ),
 #volume-text {
 	cursor: pointer;
 }
-#lib-title a:last-of-type:hover,
-.mode.nodata * {
+.disabled,
+.mode.nodata *,
+#lib-title a:last-of-type:hover {
 	cursor: default;
 }
 #lib-title a:last-of-type:hover {

diff --git a/srv/http/assets/css/main.css b/srv/http/assets/css/main.css
@@ -1795,6 +1795,11 @@ li.active .li1 bl {
 	font-size: 14px !important;
 	color: var( --cg60 );
 }
+li.webradio .artist::before,
+li.webradio .station::before,
+li.webradio .url::before {
+	content: ' • ';
+}
 #pl-savedlist .li2 {
 	max-width: 100%;
 }
@@ -1928,9 +1933,6 @@ li.active .li2 bl {
 	margin-left: 10px;
 	text-align: left;
 }
-.tagfooter {
-	line-height: 40px;
-}
 .tagfooter div {
 	display: inline-block;
 }

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -200,8 +200,6 @@ heading {
 	font-size: 24px;
 	font-weight: 300;
 	border-bottom: 1px solid var( --cg );
-}
-heading {
 	letter-spacing: 5px;
 }
 heading.subhead {

diff --git a/srv/http/assets/fonts/rern.woff2 b/srv/http/assets/fonts/rern.woff2
diff --git a/srv/http/assets/js/camilla.js b/srv/http/assets/js/camilla.js
@@ -1,4 +1,4 @@
-ps.volume = data => {
+W.volume      = data => {
 	if ( V.local ) {
 		V.local = false;
 		return
@@ -722,7 +722,7 @@ var graph     = {
 }
 var render    = {
 	  status      : () => { // onload only
-		playbackButton();
+		headIcon();
 		if ( S.volume !== false ) {
 			$( '#divvolume' ).removeClass( 'hide' );
 			$( '#divvolume .control' ).text( S.control );