Merge branch 'main' into anc-testing

Dockerfile

@@ -41,6 +41,11 @@ RUN apt-get update \
     && curl \
     https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-$(arch)-linux.tar.bz2 | tar -xj -C /src/
 
+RUN apt-get update \
+    && apt-get install -y \
+    minicom \
+    sudo
+
 ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin"
 COPY --from=rust_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool
 COPY . /usr/src

config/open_source/target.mk

@@ -237,7 +237,7 @@ A2DP_LHDC_LARC ?= 1
 export FLASH_UNIQUE_ID ?= 1
 endif
 
-A2DP_LDAC_ON ?= 0
+A2DP_LDAC_ON ?= 1
 
 export TX_RX_PCM_MASK ?= 0
 
@@ -352,6 +352,8 @@ export BT_EXT_PA ?=0
 
 ifeq ($(A2DP_LHDC_ON),1)
 AUDIO_BUFFER_SIZE := 140*1024
+else ifeq ($(A2DP_LDAC_ON),1)
+AUDIO_BUFFER_SIZE := 140*1024
 else
 AUDIO_BUFFER_SIZE := 100*1024
 endif

services/bt_app/app_bt_stream.cpp

@@ -3866,7 +3866,9 @@ int bt_sbc_player(enum PLAYER_OPER_T on, enum APP_SYSFREQ_FREQ_T freq) {
     }
 #endif
 #endif
-    freq = APP_SYSFREQ_52M;
+    if (freq < APP_SYSFREQ_52M) {
+      freq = APP_SYSFREQ_52M;
+    }
     app_sysfreq_req(APP_SYSFREQ_USER_BT_A2DP, freq);
     TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq %d", freq);
     TRACE_AUD_STREAM_I("[A2DP_PLAYER] sysfreq calc : %d\n",
@@ -3886,8 +3888,10 @@ int bt_sbc_player(enum PLAYER_OPER_T on, enum APP_SYSFREQ_FREQ_T freq) {
 
       else if (codec_type == BTIF_AVDTP_CODEC_TYPE_NON_A2DP) {
         TRACE(1, "current_a2dp_non_type %d", current_a2dp_non_type);
+        if (0) {
+        }
 #if defined(A2DP_LHDC_ON)
-        if (current_a2dp_non_type == A2DP_NON_CODEC_TYPE_LHDC) {
+        else if (current_a2dp_non_type == A2DP_NON_CODEC_TYPE_LHDC) {
           app_overlay_select(APP_OVERLAY_A2DP_LHDC);
         }
 #endif

uart_log.sh

@@ -1,5 +1,11 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-num=$(find /dev -name 'ttyUSB*' | rev | cut -c 1)
-echo "$num"
-sudo minicom "port$num"
+rightbud=/dev/serial/by-id/usb-wch.cn_USB_Dual_Serial_0123456789-if00
+leftbud=/dev/serial/by-id/usb-wch.cn_USB_Dual_Serial_0123456789-if02
+
+read -p "Which bud do you want to connect to UART for? L/R (default L): " -n 1 -r
+ttydev=$leftbud
+if [[ $REPLY =~ ^[Rr]$ ]]; then
+    ttydev=$rightbud
+fi
+sudo minicom -D $ttydev -b 2000000