From d7e29f19ccde9a7daecdaa21975171941c9f8072 Mon Sep 17 00:00:00 2001 From: chunyexixiaoyu <834670833@qq.com> Date: Fri, 24 Sep 2021 16:18:39 +0800 Subject: [PATCH] APP_Framework/Framework/:add voice sensor in framework,and update the d124.c file --- APP_Framework/Framework/sensor/voice/SConscript | 14 ++++++++++++++ .../Framework/sensor/voice/d124/SConscript | 10 ++++++++++ APP_Framework/Framework/sensor/voice/d124/d124.c | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 APP_Framework/Framework/sensor/voice/SConscript create mode 100644 APP_Framework/Framework/sensor/voice/d124/SConscript diff --git a/APP_Framework/Framework/sensor/voice/SConscript b/APP_Framework/Framework/sensor/voice/SConscript new file mode 100644 index 000000000..f307e3f70 --- /dev/null +++ b/APP_Framework/Framework/sensor/voice/SConscript @@ -0,0 +1,14 @@ +import os +Import('RTT_ROOT') +from building import * + +cwd = GetCurrentDir() +objs = [] +list = os.listdir(cwd) + +for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + objs = objs + SConscript(os.path.join(path, 'SConscript')) + +Return('objs') diff --git a/APP_Framework/Framework/sensor/voice/d124/SConscript b/APP_Framework/Framework/sensor/voice/d124/SConscript new file mode 100644 index 000000000..885542ede --- /dev/null +++ b/APP_Framework/Framework/sensor/voice/d124/SConscript @@ -0,0 +1,10 @@ +from building import * +import os + +cwd = GetCurrentDir() +src = [] +if GetDepend(['SENSOR_D124']): + src += ['d124.c'] +group = DefineGroup('sensor voice d124', src, depend = [], CPPPATH = [cwd]) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Framework/sensor/voice/d124/d124.c b/APP_Framework/Framework/sensor/voice/d124/d124.c index 5a933ffde..6c9b93f4a 100644 --- a/APP_Framework/Framework/sensor/voice/d124/d124.c +++ b/APP_Framework/Framework/sensor/voice/d124/d124.c @@ -21,7 +21,7 @@ #include static struct SensorDevice d124; -static int32_t active_task_id; +static pthread_t active_task_id; static pthread_mutex_t buff_lock; static struct SensorProductInfo info =