Merge pull request #195 from hifiberry/development

Development
hifiberry · Dec 14, 2020 · f719684 · f719684
2 parents b9a57e6 + d29844a
commit f719684
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 17 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,11 @@
+20201213:
+- updated Bluetooth player
+- improvements for Amp100/DSP combination
+- fixed in DAC+ DSP and DSP add-on DSP profiles
+- improved docker container configuration
+- stability improvements
+
+
 20201201:
 - added OpenHome player
 - added Amp100 driver

diff --git a/buildroot/buildroot-2020.11-rc3.patch → buildroot/buildroot-2020.11.patch b/buildroot/buildroot-2020.11-rc3.patch → buildroot/buildroot-2020.11.patch
diff --git a/buildroot/package/beocreate/beocreate.mk b/buildroot/package/beocreate/beocreate.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-BEOCREATE_VERSION = 9ec7f2ebdd849703acb04f89d3b649fdc0739d3a
-BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
+#BEOCREATE_VERSION = 1185fec35a1dc50e1b2af31652f23507e6277a57
+#BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
 
-#BEOCREATE_VERSION = 09a27c842377b039919a5b4c00f0892153fb1127
-#BEOCREATE_SITE = $(call github,hifiberry,create,$(BEOCREATE_VERSION))
+BEOCREATE_VERSION = 8a635fc9275ddfdcbc7b49ed92c307902a5a1217
+BEOCREATE_SITE = $(call github,hifiberry,create,$(BEOCREATE_VERSION))
 
 BEOCREATE_DEPENDENCIES += nodejs
 

diff --git a/buildroot/package/dspprofiles/dsp-addon-96-13.xml b/buildroot/package/dspprofiles/dsp-addon-96-13.xml
@@ -43,13 +43,13 @@
 	<metadata type="levelsCRegister" storable="yes">696</metadata>
 	<metadata type="levelsDRegister" storable="yes">699</metadata>
 	<metadata type="volumeControlRegister" storable="yes">51</metadata>
-	<metadata type="volumeLimitRegister">32</metadata>
-	<metadata type="volumeLimitPiRegister" storable="yes">32</metadata>
+	<metadata type="volumeLimitRegister">31</metadata>
+	<metadata type="volumeLimitPiRegister" storable="yes">31</metadata>
 	<metadata type="delayARegister" maxDelay="2000" storable="yes">704</metadata>
 	<metadata type="delayDRegister" maxDelay="2000" storable="yes">701</metadata>
 	<metadata type="delayCRegister" maxDelay="2000" storable="yes">703</metadata>
 	<metadata type="delayBRegister" maxDelay="2000" storable="yes">702</metadata>
-	<metadata type="volumeLimitSPDIFRegister" storable="yes">39</metadata>
+	<metadata type="volumeLimitSPDIFRegister" storable="yes">38</metadata>
   </beometa>
   <page modetype="Mode 0">
     <action instr="writeXbytes" len="4" addr="62464" AddrIncr="0" ParamName="IC 1.HIBERNATE" DspName="IC 1">00 01</action>

diff --git a/buildroot/package/hifiberry-bluezalsa/bluealsa-aplay-start b/buildroot/package/hifiberry-bluezalsa/bluealsa-aplay-start
@@ -1,4 +1,4 @@
 #!/bin/sh
 . /etc/hifiberry.state
-/usr/bin/bluealsa-aplay --pcm-buffer-time=250000 00:00:00:00:00:00 --volume-control $CURRENT_MIXER_CONTROL
+/usr/bin/bluealsa-aplay --pcm-buffer-time=250000 00:00:00:00:00:00 --mixer=$CURRENT_MIXER_CONTROL
 
diff --git a/buildroot/package/hifiberry-bluezalsa/hifiberry-bluezalsa.mk b/buildroot/package/hifiberry-bluezalsa/hifiberry-bluezalsa.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 HIFIBERRY_BLUEZALSA_VERSION = 2.1.0
-HIFIBERRY_BLUEZALSA_SITE = $(call github,Arkq,bluez-alsa,v$(HIFIBERRY_BLUEZALSA_VERSION))
-HIFIBERRY_BLUEZALSA_VERSION = 01fc155f2200d457f19c11692994e58e606b6433
-#HIFIBERRY_BLUEZALSA_VERSION = c9021d932ae9464b6cdc4ca5ac240a6b8ada6e36
-HIFIBERRY_BLUEZALSA_SITE = $(call github,joerg-krause,bluez-alsa,$(HIFIBERRY_BLUEZALSA_VERSION))
+#HIFIBERRY_BLUEZALSA_SITE = $(call github,Arkq,bluez-alsa,v$(HIFIBERRY_BLUEZALSA_VERSION))
+# Use the patched version with ALSA volume control
+HIFIBERRY_BLUEZALSA_SITE = $(call github,hifiberry,bluez-alsa,$(HIFIBERRY_BLUEZALSA_VERSION))
+HIFIBERRY_BLUEZALSA_VERSION = 5ef22c7debbff8b6d7b3a5327dfd81a2f7f3b45a
 HIFIBERRY_BLUEZALSA_LICENSE = MIT
 HIFIBERRY_BLUEZALSA_LICENSE_FILES = LICENSE
 HIFIBERRY_BLUEZALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf

diff --git a/buildroot/package/hifiberry-tools/reconfigure-players b/buildroot/package/hifiberry-tools/reconfigure-players
@@ -222,7 +222,7 @@ guess_card() {
   if [ "$HAS_DSP" == "1" ]; then
      CARD="Amp100 + DSP Module"
      DSPTYPE="DSP add-on"
-     FEATURES="$FEATURES spdifnoclock"
+     FEATURES="$FEATURES spdifnoclock toslink"
    else
      CARD="Amp100"
    fi
@@ -270,6 +270,7 @@ guess_card() {
  DACDSP=`aplay -l | grep DAC+DSP`
  if [ "$DACDSP" != "" ]; then
    CARD="DAC+ DSP"
+   FEATURES="$FEATURES toslink"
    return
  fi
 
@@ -303,7 +304,7 @@ guess_card() {
  if [ "$CLKGEN" == "0x03" ]; then
     CARD="Beocreate 4-Channel Amplifier"
     if  [ "${FEATURES/dsp/}" == "$FEATURES" ]; then
-      FEATURES="$FEATURES dsp"
+      FEATURES="$FEATURES dsp toslink"
     fi
     return
  fi

diff --git a/buildroot/package/hifiberry-tools/resize-partitions b/buildroot/package/hifiberry-tools/resize-partitions
@@ -44,6 +44,12 @@ if [ $SIZE -gt 15000000000 ]; then
   P3=$((P0+8000001))
   P4=$((P0+16000000))
 fi
+if [ $SIZE -gt 30000000000 ]; then
+  P1=$((P0+1))
+  P2=$((P0+16000000))
+  P3=$((P0+16000001))
+  P4=$((P0+32000000))
+fi
 
 echo "New partitions:"
 echo "p2: $P1 .. $P2"

diff --git a/buildroot/package/snapcastmpris/snapcastmpris.mk b/buildroot/package/snapcastmpris/snapcastmpris.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SNAPCASTMPRIS_VERSION = 0f0620b6fa6b6dd907022a43019c741e87856c09
+SNAPCASTMPRIS_VERSION = 00614cfa80ff34c9a3dcebc05093f5cd3a27ddc9
 SNAPCASTMPRIS_SITE = $(call github,hifiberry,snapcastmpris,$(SNAPCASTMPRIS_VERSION))
 
 define SNAPCASTMPRIS_BUILD_CMDS

diff --git a/get-buildroot b/get-buildroot
@@ -1,7 +1,6 @@
 #!/bin/bash
 if [ "$1" == "" ]; then 
- 	TAG=2020.08
-	TAG=2020.11-rc3 # Testing BR 2020.11
+	TAG=2020.11
 else
 	TAG=$1
 fi