Browse Source

fix(knowing framework): fix unproperly named k210 detect procedure, specified yolov2

pull/119/head
yangtuo250 8 months ago
parent
commit
efb28105e8
  1. 4
      APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig
  2. 2
      APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript
  3. 4
      APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c
  4. 2
      APP_Framework/Framework/knowing/kpu/Kconfig
  5. 10
      APP_Framework/Framework/knowing/kpu/k210_detect_procedure/SConscript
  6. 2
      APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/Kconfig
  7. 10
      APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/SConscript
  8. 2
      APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.c
  9. 0
      APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.h
  10. 2
      Ubiquitous/RT_Thread/aiit_board/k210/.config
  11. 2
      Ubiquitous/RT_Thread/aiit_board/k210/rtconfig.h

4
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

2
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')

4
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 <transform.h>

2
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

10
APP_Framework/Framework/knowing/kpu/k210_detect_procedure/SConscript

@ -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')

2
APP_Framework/Framework/knowing/kpu/k210_detect_procedure/Kconfig → 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

10
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')

2
APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.c → 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

0
APP_Framework/Framework/knowing/kpu/k210_detect_procedure/k210_detect.h → APP_Framework/Framework/knowing/kpu/k210_yolov2_detect_procedure/k210_yolov2_detect.h

2
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
#

2
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 */

Loading…
Cancel
Save