merge from dueros xiaolvyun

verify successfully with arm32-6mic 20180803 version
verify successfully with arm64-6mic 20180717 version

Change-Id: Ia2850a37a6954e34c04739e9f41c52fc136f50fd
Signed-off-by: Hertz Wang <wangh@rock-chips.com>

rk3308/dueros/RkLunch.sh

@@ -49,6 +49,8 @@ sleep 2 # at 3th second, dueros will do mp3 decoding which consume high cpu
 #sleep 3
 #dhcpcd &
 
+/oem/scripts/start_ntp.sh &
+
 # start dueros
 /oem/dueros_service.sh start
 

rk3308/dueros/arm64/baidu_spil_rk3308_6mic/config

@@ -1,2 +0,0 @@
-mic_num: 6
-samplerate: ?

rk3308/dueros/arm64/baidu_spil_rk3308_6mic/readme.txt

@@ -1,20 +0,0 @@
-libbdSPILAudioProc.so
-md5: 78b343f4d5f393d119dc88e3c019835c
-
-libbd_audio_vdev.so
-md5: f31ade415b132a07eda1ccef039b260a
-
-libbdaudResample.so
-md5: 73f66d2c73248bb6778d455206cac7ed
-
-libbd_alsa_audio_client.so
-md5: 236132ef695cef50deffe2dde95e4fc8
-
-使用说明：
-1. adb push so库和alsa_audio_main_service, setup.sh, config_rk3229_linux_6_2.lst到/data目录
-2. 修改权限chmod 777 setup.sh
-   chmod 777 alsa_audio_main_service
-3. 运行录音程序
-	cd /data
-   ./alsa_audio_main_service 6mic_loopback &
-4. 运行duer_linux或者demo

rk3308/dueros/dueros_service.sh

@@ -41,7 +41,7 @@ case "$1" in
 	./alsa_audio_main_service 6mic_loopback &
 
 	# start dueros
-	mkdir -p /data/duer && cd /data/duer
+	mkdir -p /data/duer/test && cd /data/duer
 	ln -snf /oem/duer/* ./
 	./duer_linux &
 	;;

rk3308/dueros/scripts/start_ntp.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+/etc/init.d/S49ntp stop
+
+while true
+do
+        ntpd=`ntpd -qgx4 202.108.6.95 58.220.207.226 47.92.108.218 202.112.29.82 120.25.108.11 182.92.12.11 115.28.122.198 \
+                | grep 'ntpd: time'`
+        if [[ "$ntpd" != "" ]]
+        then
+            touch /tmp/ntp_successful
+            break
+        fi
+	sleep 1
+done
+
+#/usr/sbin/ntpd -p /run/ntpd.pid -g
+/etc/init.d/S49ntp start

rk3308/dueros/scripts/upload_corelog.sh

@@ -0,0 +1,24 @@
+CURRENT_TIME=`date +%m%d%H%M%S`
+CURL_CMD="/data/duer/curl"
+SERVER_ADDR="http://10.201.42.53:8234/corelog"
+
+CUID=`vendor_storage -r VENDOR_SN_ID`
+VERSION=`head -1 /etc/X180_version.ini`
+FILE_PREFIX="${CUID}_${VERSION}_${CURRENT_TIME}_"
+
+upload_file() {
+    if [[ ! -f $1 ]]; then
+        exit 1
+    fi
+
+    ORG_FILENAME=`echo $1 | cut -f5 -d"/"`
+    cp $1 /tmp/${FILE_PREFIX}${ORG_FILENAME}
+
+    export LD_LIBRARY_PATH="/data/duer/lib32"
+    CMD="${CURL_CMD} -X POST ${SERVER_ADDR} -F file=@/tmp/${FILE_PREFIX}${ORG_FILENAME}"
+    `${CMD}`
+}
+
+upload_file /data/duer/dcssdk.log
+upload_file /data/duer/duer_link.log
+upload_file /data/duer/speechsdk.log

rk3308/dueros/scripts/upload_stat.sh

@@ -0,0 +1,42 @@
+CURRENT_TIME=`date +%H%M`
+UPLOAD_TIME="1000"
+CURL_CMD="/data/duer/curl"
+SERVER_ADDR="http://10.201.42.53:8234/testdata"
+
+if [[ "${CURRENT_TIME}" != "${UPLOAD_TIME}" ]]; then
+    exit 0
+fi
+
+CUID=`vendor_storage -r VENDOR_SN_ID | cut -b15-18`
+VERSION=`head -1 /etc/X180_version.ini`
+CURRENT_DATE=`date +%m%d`
+FILE_PREFIX="${CUID}_${VERSION}_${CURRENT_DATE}_"
+UPTIME=`uptime`
+
+upload_file() {
+    if [[ ! -f $1 ]]; then
+        exit 1
+    fi
+
+    ORG_FILENAME=`echo $1 | cut -f5 -d"/"`
+    COPY_FILENAME="/tmp/${FILE_PREFIX}${ORG_FILENAME}"
+    if [[ -f ${COPY_FILENAME} ]] ; then
+        exit 0
+    fi
+
+    cp $1 ${COPY_FILENAME}
+
+    export LD_LIBRARY_PATH="/data/duer/lib32"
+    CMD="${CURL_CMD} -X POST ${SERVER_ADDR} -F file=@${COPY_FILENAME}"
+    `${CMD}`
+
+    #rm ${COPY_FILENAME}
+}
+
+upload_file /data/duer/test/counts_alsa_audio_main_service.txt
+upload_file /data/duer/test/counts_duer_linux.txt
+upload_file /data/duer/test/top_alsa_audio_main_service.txt
+upload_file /data/duer/test/top_duer_linux.txt
+
+echo ${UPTIME} > /data/duer/test/uptime.txt
+upload_file /data/duer/test/uptime.txt

rk3308/dueros/spil/arm32/baidu_spil_rk3308_3mic/config_rk3308_3_2.lst

@@ -0,0 +1,5 @@
+MIC_NUM: 3
+MIC_COORD:[0.030,0,0];[-0.015,-0.026,0];[-0.015,0.026,0]
+REF_CH: 2
+WAKEUP_MIC_INDEX: 1
+LOCATION_RANGE:[-180,180]

rk3308/dueros/spil/arm32/baidu_spil_rk3308_6mic/readme.txt

@@ -0,0 +1,2 @@
+更新了6+2信号库
+修复了状态保护问题

rk3308/dueros/spil/arm64/baidu_spil_rk3308_4mic/config_huamei_rk3308_4_1.lst

@@ -0,0 +1,5 @@
+MIC_NUM: 4
+MIC_COORD:[0.030,0,0];[0,-0.030,0];[-0.030,0,0];[0,0.030,0]
+REF_CH: 1
+WAKEUP_MIC_INDEX: 0
+LOCATION_RANGE:[-180,180]

rk3308/dueros/spil/arm64/baidu_spil_rk3308_4mic/readme.txt

@@ -0,0 +1,44 @@
+libbdSPILAudioProc.so
+md5:e5d3bf87f8c39dbf43b707227564317e
+
+libbd_audio_vdev.so
+md5:f7ab4d038d31313c84ea4416a558f41e
+
+libbd_alsa_audio_client.so
+md5:c68fe39322647b4bf8bb576ad19bb707
+
+<EFBFBD><EFBFBD><EFBFBD>ɺ<EFBFBD>ʹ<EFBFBD><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+1. push<73>⵽<EFBFBD>豸<EFBFBD><E8B1B8>
+   adb push libbdSPILAudioProc.so /data
+   adb push libbd_audio_vdev.so /data
+   adb push libbd_alsa_audio_client.so /data
+   adb push config_huamei_rk3308_4_1.lst /data
+   adb push setup.sh /data
+   adb push alsa_audio_main_service /data
+   adb push alsa_audio_client_sample /data
+   adb shell sync
+2. <20><><EFBFBD><EFBFBD>Ŀ¼<C4BF><C2BC><EFBFBD>޸<EFBFBD>Ȩ<EFBFBD><C8A8>
+   adb shell;cd /data
+   chmod +x alsa_audio_*
+   chmod +x setup.sh
+   mkdir -p /data/local/ipc
+   chmod 777 /data/local/ipc
+3. <20><><EFBFBD><EFBFBD>main service
+   ./setup.sh
+   ./alsa_audio_main_service hw:0,0 &
+   hw:0,0<>Ƕ<EFBFBD>Ӧ<EFBFBD><D3A6>¼<EFBFBD><C2BC><EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>device<63>ţ<EFBFBD>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>asound.conf<6E><66>ʹ<EFBFBD><CAB9><EFBFBD>߼<EFBFBD>pcm<63>豸<EFBFBD><E8B1B8>
+4. <20><><EFBFBD><EFBFBD>app,<2C><><EFBFBD><EFBFBD>duer_linux, <20><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>/dataĿ¼<C4BF><C2BC>duer_linux<75>Ķ<EFBFBD>̬<EFBFBD><CCAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD>
+   Ҳ<><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>sample<6C><65><EFBFBD><EFBFBD>
+   ./alsa_audio_client_sample
+   <20>ڵ<EFBFBD>ǰĿ¼<C4BF>»ᱣ<C2BB>澭<EFBFBD><E6BEAD><EFBFBD>źŴ<C5BA><C5B4><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD>ļ<EFBFBD>dump_pcm.pcm<63><6D><EFBFBD><EFBFBD>˫<EFBFBD><CBAB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>16K<36><4B>С<EFBFBD>ˣ<EFBFBD>16bitλ<74><CEBB><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5>
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭʼ¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵķ<EFBFBD><EFBFBD><EFBFBD>:
+	<09><><EFBFBD><EFBFBD>¼<EFBFBD><C2BC>ǰ<EFBFBD><C7B0><EFBFBD>У<EFBFBD>
+	mkdir -p /data/local/aw.so_profile
+	touch  /data/local/aw.so_profile/dump_switch
+	touch /data/local/aw.so_profile/dump_switch_wakets
+	mkdir -p /data/local/aud_rec/
+	chmod 777 /data/local/aud_rec/
+<EFBFBD><EFBFBD>/data/local/aud_recĿ¼<C4BF>»ᱣ<C2BB><E1B1A3>4·<34><C2B7><EFBFBD>˷<EFBFBD><CBB7><EFBFBD><EFBFBD>ݺ<EFBFBD>1·<31>ο<EFBFBD><CEBF><EFBFBD><EFBFBD>ݣ<EFBFBD>һ·ʶ<C2B7><CAB6><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD>һ·<D2BB><C2B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݡ<EFBFBD>
+<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݸ<EFBFBD>ʽ<EFBFBD><EFBFBD><EFBFBD>ǣ<EFBFBD> 16KHz<48><7A>С<EFBFBD>ˡ<EFBFBD>16bit<69><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+   

rk3308/dueros/spil/arm64/baidu_spil_rk3308_4mic/setup.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+touch /dev/shm/shm_bd_a278_asr
+touch /dev/shm/shm_bd_a278_comm
+touch /tmp/sem_bd_a278_asr
+touch /tmp/sem_bd_a278_comm
+touch /tmp/sem_bd_a278_read
+chmod 666 /dev/shm/shm_bd_a278_asr
+chmod 666 /dev/shm/shm_bd_a278_comm
+chmod 666 /tmp/sem_bd_a278_asr
+chmod 666 /tmp/sem_bd_a278_comm
+chmod 666 /tmp/sem_bd_a278_read

rk3308/dueros/spil/arm64/baidu_spil_rk3308_6mic/setup.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+touch /dev/shm/shm_bd_a278_asr
+touch /dev/shm/shm_bd_a278_comm
+touch /tmp/sem_bd_a278_asr
+touch /tmp/sem_bd_a278_comm
+touch /tmp/sem_bd_a278_read
+chmod 666 /dev/shm/shm_bd_a278_asr
+chmod 666 /dev/shm/shm_bd_a278_comm
+chmod 666 /tmp/sem_bd_a278_asr
+chmod 666 /tmp/sem_bd_a278_comm
+chmod 666 /tmp/sem_bd_a278_read

rk3308/mkfirmware.sh

@@ -42,10 +42,10 @@ if [ "${RK_OEM_DIR}" == "dueros"  ];then
 	OEM_DIR=${ROCKDEV}/.oem
 	rm -rf ${OEM_DIR}
 	mkdir -p ${OEM_DIR}
-	find ${PRODUCT_PATH}/${RK_OEM_DIR} -maxdepth 1 -not -name "arm*" \
+	find ${PRODUCT_PATH}/${RK_OEM_DIR} -maxdepth 1 -not -name "spil" \
         	-not -wholename "${PRODUCT_PATH}/${RK_OEM_DIR}" \
-        	-exec sh -c 'cp -rf ${0} ${1}' "{}" ${OEM_DIR} \;
+        	-exec sh -c 'cp -arf ${0} ${1}' "{}" ${OEM_DIR} \;
-	cp -rf ${PRODUCT_PATH}/${RK_OEM_DIR}/${TARGET_ARM_TYPE}/baidu_spil_rk3308_${MIC_NUM}mic ${OEM_DIR}/baidu_spil_rk3308
+	cp -rf ${PRODUCT_PATH}/${RK_OEM_DIR}/spil/${TARGET_ARM_TYPE}/baidu_spil_rk3308_${MIC_NUM}mic ${OEM_DIR}/baidu_spil_rk3308
 	echo "copy ${TARGET_ARM_TYPE} with ${MIC_NUM}mic."
 else
 	OEM_DIR=${PRODUCT_PATH}/${RK_OEM_DIR}