Merge pull request #403 from hifiberry/development

Merge Development
hifiberry · Nov 18, 2022 · 4b26bc6 · 4b26bc6
2 parents b49383c + d180c29
commit 4b26bc6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+20221118:
+- Fix a bug in range of the Amp3 volume control
+- Change DSP addon DSP profile to 1MHz SPI programming clocky
+
 20221109:
 - improve Digi2 Pro detection
 - improve volume control of Amp3/DSP add-on 

diff --git a/buildroot/package/dspprofiles/dsp-addon-96-13.xml b/buildroot/package/dspprofiles/dsp-addon-96-13.xml
@@ -157,7 +157,7 @@
     <action instr="writeXbytes" len="6" addr="57" AddrIncr="0" ParamName="g_initialized" DspName="IC 1">00 00 00 00</action>
     <action instr="writeXbytes" len="6" addr="52" AddrIncr="0" ParamName="g_Erase" DspName="IC 1">00 00 00 01</action>
     <action instr="writeXbytes" len="6" addr="54" AddrIncr="0" ParamName="g_PageAddress" DspName="IC 1">00 00 00 00</action>
-    <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A0_S256_N27_idx0" DspName="IC 1">AA 00 00 10 00 02 00 60 00 65 00 03 00 00 00 0E 00 00 00 10 02 C0 00 00 00 00 02 D0 00 00 02 D0 00 00 0F A4 00 00 00 00 00 00 00 0C 00 00 00 0C 00 00 10 FC 00 00 00 00 00 00 00 00 00 00 00 00 00 FF F9 72 00 00 00 00 00 00 00 00 00 FF F9 72 00 00 00 00 01 00 00 00 00 00 20 8A 00 00 00 00 00 07 53 00 00 00 00 01 00 00 06 8E 00 00 00 00 01 00 00 00 00 00 20 8A 00 00 00 00 00 07 53 00 00 00 00 01 00 00 41 89 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 0F 00 00 00 12 00 00 20 8A 00 00 00 00 00 CB 59 18 00 00 20 8A 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</action>
+    <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A0_S256_N27_idx0" DspName="IC 1">AA 00 00 10 00 02 00 60 00 65 00 03 01 C2 01 01 00 00 00 10 02 C0 00 00 00 00 02 D0 00 00 02 D0 00 00 0F A4 00 00 00 00 00 00 00 0C 00 00 00 0C 00 00 10 FC 00 00 00 00 00 00 00 00 00 00 00 00 00 FF F9 72 00 00 00 00 00 00 00 00 00 FF F9 72 00 00 00 00 01 00 00 00 00 00 20 8A 00 00 00 00 00 07 53 00 00 00 00 01 00 00 06 8E 00 00 00 00 01 00 00 00 00 00 20 8A 00 00 00 00 00 07 53 00 00 00 00 01 00 00 41 89 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 0F 00 00 00 12 00 00 20 8A 00 00 00 00 00 CB 59 18 00 00 20 8A 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</action>
     <action instr="writeXbytes" len="6" addr="53" AddrIncr="0" ParamName="g_PageSize" DspName="IC 1">00 00 01 00</action>
     <action instr="writeXbytes" len="6" addr="54" AddrIncr="0" ParamName="g_PageAddress" DspName="IC 1">00 00 01 00</action>
     <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A256_S256_N27_idx1" DspName="IC 1">00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00</action>
@@ -235,7 +235,7 @@
     <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A6400_S256_N27_idx25" DspName="IC 1">00 00 00 40 00 00 00 22 00 00 00 00 00 00 00 00 00 00 00 40 00 00 00 22 00 00 00 00 00 00 00 00 00 00 F4 01 00 04 00 00 00 00 00 03 00 00 00 01 00 00 00 00 00 00 00 00 00 00 F5 16 00 04 00 00 00 00 00 07 00 00 00 07 00 00 00 0C 00 00 00 70 00 00 F5 26 00 04 00 00 00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 F5 2D 00 04 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F5 81 00 04 00 00 00 00 07 FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F6 04 00 04 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F6 90 00 04 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 F7 87 00 04 00 00 00 00 00 1B 00 00 00 18 00 00 00 18 00 00 00 18 80 00 F7 94 00 10 00 00 00 00 00 18 00 00 00 18 00 00 00 18 00 00 00 18 00 00 00 18 00 00 00 0A</action>
     <action instr="writeXbytes" len="6" addr="53" AddrIncr="0" ParamName="g_PageSize" DspName="IC 1">00 00 01 00</action>
     <action instr="writeXbytes" len="6" addr="54" AddrIncr="0" ParamName="g_PageAddress" DspName="IC 1">00 00 1A 00</action>
-    <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A6656_S256_N27_idx26" DspName="IC 1">00 00 00 08 00 00 00 08 00 00 00 08 00 00 00 18 00 00 00 18 00 00 00 18 00 00 00 0F 00 00 00 18 00 00 00 18 00 00 00 1F 00 00 00 FE 69 57 BD 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</action>
+    <action instr="writeXbytes" len="258" addr="60" AddrIncr="4" ParamName="Page_A6656_S256_N27_idx26" DspName="IC 1">00 00 00 08 00 00 00 08 00 00 00 08 00 00 00 18 00 00 00 18 00 00 00 18 00 00 00 0F 00 00 00 18 00 00 00 18 00 00 00 1F 00 00 00 FE 6B 19 BE 33 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</action>
     <action instr="writeXbytes" len="6" addr="53" AddrIncr="0" ParamName="g_PageSize" DspName="IC 1">00 00 01 00</action>
     <action instr="writeXbytes" len="4" addr="62464" AddrIncr="0" ParamName="IC 1.HIBERNATE" DspName="IC 1">00 01</action>
     <action instr="delay" ParamName="IC 1.Hibernate Delay" DspName="IC 1">00 FF</action>
@@ -330,5 +330,5 @@
     <action instr="writeXbytes" len="4" addr="62466" AddrIncr="0" ParamName="IC 1.START_CORE" DspName="IC 1">00 01</action>
     <action instr="delay" ParamName="IC 1.Start Delay" DspName="IC 1">00 01</action>
     <action instr="writeXbytes" len="4" addr="62464" AddrIncr="0" ParamName="IC 1.HIBERNATE" DspName="IC 1">00 00</action>
-  </page>
+  </page>	
 </ROM>
diff --git a/buildroot/package/hifiberry-tools/reconfigure-players b/buildroot/package/hifiberry-tools/reconfigure-players
@@ -1,5 +1,17 @@
 #!/bin/bash
 
+# Supported features
+# usehwvolume:  use the hardware volume control instead of DSP volume control if both controls are available
+# bluetooth: hardware supports bluetooth
+# pi3orlater: Pi3 or Pi4
+# arm7: arm7 or higher CPU generation
+# spdifnoclock: card has an SPDIF input, but requires Pi clock generation
+# toslink: card has a TOSLink input
+# analoginput: card has an analog input
+# digi: card is a digital sound card
+# dsp: DSP available
+# localui: Local UI web browser supported
+
 REBOOTFILE=/tmp/reboot
 SERVICES="spotify raat mpd shairport-sync squeezelite bluealsa-aplay alsaloop dlnampris mopidy upmpdcli"
 FEATURES="pi"
@@ -262,9 +274,9 @@ guess_card() {
      SECONDARY_MIXER_CONTROL="A.Mstr Vol"
    else
      CARD="Amp3"
-     FEATURE_prefer_dsp_volume=0
+     FEATURE_usehwvolume=1
    fi
-   if [ "$FEATURE_prefer_dsp_volume" != "1" ]; then
+   if [ "$FEATURE_usehwvolume" == "1" ]; then
      SET_VOLUMERANGE="[50,100]"
    else
      SET_VOLUMERANGE="[0,100]"
@@ -761,7 +773,7 @@ if [ "$HAS_DSP" == "1" ]; then
 fi
 
 # if there is a hardware mixer, we might use this instead of DSP
-if [ "$MIXER_CONTROL" == "DSPVolume" -a "$FEATURE_prefer_dsp_volume" != "1" ]; then
+if [ "$MIXER_CONTROL" == "DSPVolume" -a "$FEATURE_usehwvolume" == "1" ]; then
  if [ "$SECONDARY_MIXER_CONTROL" != "" ] && \
     [ "$SECONDARY_MIXER_CONTROL" != "Softvol" ]; then
       TMP="$MIXER_CONTROL"

diff --git a/configs/hifiberryos-gui b/configs/hifiberryos-gui
@@ -533,7 +533,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 # BR2_LINUX_KERNEL_CUSTOM_GIT is not set
 # BR2_LINUX_KERNEL_CUSTOM_HG is not set
 # BR2_LINUX_KERNEL_CUSTOM_SVN is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,54d44290debae98ac25416742a7534046b011125)/54d44290debae98ac25416742a7534046b011125.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,c6e5940047add3e370955c376c692fca465bfe56)/c6e5940047add3e370955c376c692fca465bfe56.tar.gz"
 BR2_LINUX_KERNEL_VERSION="custom"
 BR2_LINUX_KERNEL_PATCH="../hifiberry-os/buildroot/patches/linux-custom"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y