diff --git a/APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig b/APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig index 2b09c7440..30d6ca106 100644 --- a/APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig +++ b/APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig @@ -1,11 +1,11 @@ config K210_DETECT_ENTRY - bool "enable apps/k210 detect entry" + bool "enable apps/k210 yolov2 detect entry" depends on BOARD_K210_EVB depends on DRV_USING_OV2640 depends on USING_KPU_PROCESSING depends on USING_YOLOV2 depends on USING_YOLOV2_JSONPARSER - depends on USING_K210_DETECT + depends on USING_K210_YOLOV2_DETECT select LIB_USING_CJSON default n diff --git a/APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript b/APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript index 0cd922009..4aed81e73 100644 --- a/APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript +++ b/APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript @@ -4,6 +4,6 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -group = DefineGroup('Applications', src, depend = ['USING_K210_DETECT'], LOCAL_CPPPATH = CPPPATH) +group = DefineGroup('Applications', src, depend = ['USING_K210_YOLOV2_DETECT'], LOCAL_CPPPATH = CPPPATH) Return('group') diff --git a/APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c b/APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c index afd0c5cc2..ab8db673a 100644 --- a/APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c +++ b/APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c @@ -1,5 +1,5 @@ -#ifdef USING_K210_DETECT -#include "k210_detect.h" +#ifdef USING_K210_YOLOV2_DETECT +#include "k210_yolov2_detect.h" #endif #include diff --git a/APP_Framework/Framework/knowing/kpu/Kconfig b/APP_Framework/Framework/knowing/kpu/Kconfig index 2c039b9a0..313de9393 100644 --- a/APP_Framework/Framework/knowing/kpu/Kconfig +++ b/APP_Framework/Framework/knowing/kpu/Kconfig @@ -4,5 +4,5 @@ menuconfig USING_KPU_PROCESSING if USING_KPU_PROCESSING source "$APP_DIR/Framework/knowing/kpu/yolov2/Kconfig" source "$APP_DIR/Framework/knowing/kpu/yolov2_json/Kconfig" - source "$APP_DIR/Framework/knowing/kpu/k210_detect_procedure/Kconfig" + source "$APP_DIR/Framework/knowing/kpu/k210_yolov2_detect_procedure/Kconfig" endif diff --git a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/SConscript b/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/SConscript deleted file mode 100644 index d28963ca7..000000000 --- a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/SConscript +++ /dev/null @@ -1,10 +0,0 @@ -from building import * -import os - -cwd = GetCurrentDir() - -src = Glob('*.c') - -group = DefineGroup('k210_detect_procedure', src, depend = ['USING_YOLOV2', 'USING_YOLOV2_JSONPARSER', 'USING_KPU_PROCESSING'], CPPPATH = [cwd]) - -Return('group') diff --git a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/Kconfig b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/Kconfig similarity index 71% rename from APP_Framework/Framework/knowing/kpu/k210_detect_procedure/Kconfig rename to APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/Kconfig index 475a9c0f7..fa5819f4f 100644 --- a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/Kconfig +++ b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/Kconfig @@ -1,4 +1,4 @@ -menuconfig USING_K210_DETECT +menuconfig USING_K210_YOLOV2_DETECT bool "k210 yolov2 detect procedure" depends on USING_KPU_PROCESSING default n diff --git a/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/SConscript b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/SConscript new file mode 100644 index 000000000..05512d48d --- /dev/null +++ b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/SConscript @@ -0,0 +1,10 @@ +from building import * +import os + +cwd = GetCurrentDir() + +src = Glob('*.c') + +group = DefineGroup('k210_yolov2_detect_procedure', src, depend = ['USING_YOLOV2', 'USING_YOLOV2_JSONPARSER', 'USING_KPU_PROCESSING'], CPPPATH = [cwd]) + +Return('group') diff --git a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.c b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c similarity index 99% rename from APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.c rename to APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c index 897fe96d1..668e9fc69 100644 --- a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.c +++ b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c @@ -1,4 +1,4 @@ -#include "k210_detect.h" +#include "k210_yolov2_detect.h" #include "cJSON.h" #ifdef USING_YOLOV2_JSONPARSER diff --git a/APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.h b/APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.h similarity index 100% rename from APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.h rename to APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.h diff --git a/Ubiquitous/RT_Thread/aiit_board/k210/.config b/Ubiquitous/RT_Thread/aiit_board/k210/.config index 372e2f64d..6b76bdcca 100644 --- a/Ubiquitous/RT_Thread/aiit_board/k210/.config +++ b/Ubiquitous/RT_Thread/aiit_board/k210/.config @@ -508,7 +508,7 @@ CONFIG_SUPPORT_KNOWING_FRAMEWORK=y CONFIG_USING_KPU_PROCESSING=y CONFIG_USING_YOLOV2=y CONFIG_USING_YOLOV2_JSONPARSER=y -CONFIG_USING_K210_DETECT=y +CONFIG_USING_K210_YOLOV2_DETECT=y # CONFIG_SUPPORT_CONTROL_FRAMEWORK is not set # diff --git a/Ubiquitous/RT_Thread/aiit_board/k210/rtconfig.h b/Ubiquitous/RT_Thread/aiit_board/k210/rtconfig.h index 1c7ccedb4..e062aaaf2 100644 --- a/Ubiquitous/RT_Thread/aiit_board/k210/rtconfig.h +++ b/Ubiquitous/RT_Thread/aiit_board/k210/rtconfig.h @@ -337,7 +337,7 @@ #define USING_KPU_PROCESSING #define USING_YOLOV2 #define USING_YOLOV2_JSONPARSER -#define USING_K210_DETECT +#define USING_K210_YOLOV2_DETECT /* Security */