Merge pull request #60 from OpenSiFli/xiaozhi2

1.3.3

Author: HalfSweet

app/boards/sf32lb52-xty-ai_base/bsp_pinmux.c

@@ -243,9 +243,15 @@ static void BSP_PIN_Common(void)
     HAL_PIN_Set(PAD_PA21, GPIO_A21, PIN_PULLDOWN, 1);
 #endif
 
-    HAL_PIN_Set(PAD_PA11, GPIO_A11, PIN_PULLDOWN, 1); // 漏电
+#ifdef BSP_USING_BOARD_SF32LB52_XTY_AI_THT
     HAL_PIN_Set(PAD_PA38, GPIO_A38, PIN_PULLDOWN, 1); // 漏电
     HAL_PIN_Set(PAD_PA40, GPIO_A40, PIN_PULLDOWN, 1); // 漏电
+#else
+    HAL_PIN_Set(PAD_PA38, GPIO_A38, PIN_PULLUP, 1); // 漏电
+    HAL_PIN_Set(PAD_PA40, GPIO_A40, PIN_PULLUP, 1); // 漏电
+#endif
+
+    HAL_PIN_Set(PAD_PA11, GPIO_A11, PIN_PULLDOWN, 1); // 漏电
 #endif
 
 }

app/src/SConscript

@@ -18,12 +18,13 @@ CPPDEFINES += ['MBEDTLS_PLATFORM_MEMORY']
 
 cwd     = GetCurrentDir()
 CPPPATH = [cwd]
-libpath = [cwd]
-CPPPATH += [cwd + '/et_config']
+libpath = [cwd + '/kws']
+CPPPATH += [cwd + '/kws']
 # Add source code
 src = Glob('*.c')
 src = src + Glob('./mcp/*.cc') 
-src = src + Glob('./iot/*.cc') 
+src = src + Glob('./iot/*.cc')  
+src = src + Glob('./kws/*.c') 
 #SrcRemove(src, 'xiaozhi.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPDEFINES = CPPDEFINES, 

app/src/app_recorder_process.c renamed to app/src/kws/app_recorder_process.c

@@ -15,7 +15,7 @@
 #include "et_keyword.h"
 #include "et_thres_list.h"
 #include "et_weights.h"
-#include "et_config/third_kws_event.h"
+#include "third_kws_event.h"
 #include "xiaozhi_public.h"
 extern void  simulate_button_pressed();