diff --git a/Ubiquitous/RT_Thread/aiit_board/k210/Kconfig b/Ubiquitous/RT_Thread/aiit_board/k210/Kconfig index bf4404d20..feab35037 100644 --- a/Ubiquitous/RT_Thread/aiit_board/k210/Kconfig +++ b/Ubiquitous/RT_Thread/aiit_board/k210/Kconfig @@ -31,7 +31,7 @@ config APP_DIR source "$RTT_DIR/Kconfig" source "base-drivers/Kconfig" source "kendryte-sdk/Kconfig" -source "$RT_Thread_DIR/drivers/Kconfig" +source "$RT_Thread_DIR/app_match_rt-thread/Kconfig" source "$ROOT_DIR/APP_Framework/Kconfig" config __STACKSIZE__ diff --git a/Ubiquitous/RT_Thread/aiit_board/k210/SConstruct b/Ubiquitous/RT_Thread/aiit_board/k210/SConstruct index 8aad441d4..5da36ead2 100644 --- a/Ubiquitous/RT_Thread/aiit_board/k210/SConstruct +++ b/Ubiquitous/RT_Thread/aiit_board/k210/SConstruct @@ -51,7 +51,7 @@ stack_lds.write('__STACKSIZE__ = %d;' % stack_size) stack_lds.close() # include more drivers -objs.extend(SConscript(os.getcwd() + '/../../drivers/SConscript')) +objs.extend(SConscript(os.getcwd() + '/../../app_match_rt-thread/SConscript')) # include APP_Framework/Framework objs.extend(SConscript(os.getcwd() + '/../../../../APP_Framework/Framework/SConscript')) diff --git a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/.config b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/.config index 1365da0a9..eaffde58f 100644 --- a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/.config +++ b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/.config @@ -522,12 +522,14 @@ CONFIG_SENSOR_DEVICE_D124_DEV="/dev/uart2" # CONFIG_SUPPORT_CONNECTION_FRAMEWORK is not set CONFIG_SUPPORT_KNOWING_FRAMEWORK=y # CONFIG_USING_TENSORFLOWLITEMICRO is not set -CONFIG_USING_KPU_PROCESSING=y -# CONFIG_USING_YOLOV2 is not set # CONFIG_USING_KNOWING_FILTER is not set # CONFIG_USING_OTA_MODEL is not set # CONFIG_USING_IMAGE_PROCESSING is not set # CONFIG_USING_CMSIS_5 is not set +CONFIG_USING_KPU_PROCESSING=y +# CONFIG_USING_YOLOV2 is not set +# CONFIG_USING_YOLOV2_JSONPARSER is not set +# CONFIG_USING_K210_YOLOV2_DETECT is not set # CONFIG_SUPPORT_CONTROL_FRAMEWORK is not set # diff --git a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/Kconfig b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/Kconfig index e00bee3b8..4c16e293c 100644 --- a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/Kconfig +++ b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/Kconfig @@ -24,6 +24,6 @@ config APP_DIR source "$RTT_DIR/Kconfig" source "$RTT_DIR/bsp/stm32/libraries/Kconfig" source "board/Kconfig" -source "$RT_Thread_DIR/drivers/Kconfig" +source "$RT_Thread_DIR/app_match_rt-thread/Kconfig" source "$ROOT_DIR/APP_Framework/Kconfig" diff --git a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/SConstruct b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/SConstruct index 2bc33db05..05537cf15 100644 --- a/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/SConstruct +++ b/Ubiquitous/RT_Thread/aiit_board/stm32f407_core/SConstruct @@ -74,7 +74,7 @@ objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SCons objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # include more drivers -objs.extend(SConscript(os.getcwd() + '/../../drivers/SConscript')) +objs.extend(SConscript(os.getcwd() + '/../../app_match_rt-thread/SConscript')) # include APP_Framework/Framework objs.extend(SConscript(os.getcwd() + '/../../../../APP_Framework/Framework/SConscript')) diff --git a/Ubiquitous/RT_Thread/app_match_rt-thread/Kconfig b/Ubiquitous/RT_Thread/app_match_rt-thread/Kconfig new file mode 100644 index 000000000..14ddb6557 --- /dev/null +++ b/Ubiquitous/RT_Thread/app_match_rt-thread/Kconfig @@ -0,0 +1,5 @@ +menu "More Drivers" + +source "$RT_Thread_DIR/app_match_rt-thread/rw007/Kconfig" +source "$RT_Thread_DIR/app_match_rt-thread/ov2640/Kconfig" +endmenu diff --git a/Ubiquitous/RT_Thread/drivers/SConscript b/Ubiquitous/RT_Thread/app_match_rt-thread/SConscript similarity index 100% rename from Ubiquitous/RT_Thread/drivers/SConscript rename to Ubiquitous/RT_Thread/app_match_rt-thread/SConscript diff --git a/Ubiquitous/RT_Thread/drivers/ov2640/Kconfig b/Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/Kconfig similarity index 100% rename from Ubiquitous/RT_Thread/drivers/ov2640/Kconfig rename to Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/Kconfig diff --git a/Ubiquitous/RT_Thread/drivers/ov2640/SConscript b/Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/SConscript similarity index 100% rename from Ubiquitous/RT_Thread/drivers/ov2640/SConscript rename to Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/SConscript diff --git a/Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/SConscript b/Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/SConscript similarity index 100% rename from Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/SConscript rename to Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/SConscript diff --git a/Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/drv_ov2640.c b/Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/drv_ov2640.c similarity index 100% rename from Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/drv_ov2640.c rename to Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/drv_ov2640.c diff --git a/Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/drv_ov2640.h b/Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/drv_ov2640.h similarity index 100% rename from Ubiquitous/RT_Thread/drivers/ov2640/ov2640_source/drv_ov2640.h rename to Ubiquitous/RT_Thread/app_match_rt-thread/ov2640/ov2640_source/drv_ov2640.h diff --git a/Ubiquitous/RT_Thread/drivers/rw007/Kconfig b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/Kconfig similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/Kconfig rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/Kconfig diff --git a/Ubiquitous/RT_Thread/drivers/rw007/SConscript b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/SConscript similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/SConscript rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/SConscript diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/.gitignore b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/.gitignore similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/.gitignore rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/.gitignore diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/LICENSE b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/LICENSE similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/LICENSE rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/LICENSE diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/README.md b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/README.md similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/README.md rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/README.md diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/README_ZH.md b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/README_ZH.md similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/README_ZH.md rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/README_ZH.md diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/SConscript b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/SConscript similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/SConscript rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/SConscript diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/example/rw007_stm32_port.c b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/example/rw007_stm32_port.c similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/example/rw007_stm32_port.c rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/example/rw007_stm32_port.c diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/inc/spi_wifi_rw007.h b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/inc/spi_wifi_rw007.h similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/inc/spi_wifi_rw007.h rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/inc/spi_wifi_rw007.h diff --git a/Ubiquitous/RT_Thread/drivers/rw007/rw007-source/src/spi_wifi_rw007.c b/Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/src/spi_wifi_rw007.c similarity index 100% rename from Ubiquitous/RT_Thread/drivers/rw007/rw007-source/src/spi_wifi_rw007.c rename to Ubiquitous/RT_Thread/app_match_rt-thread/rw007/rw007-source/src/spi_wifi_rw007.c diff --git a/Ubiquitous/RT_Thread/drivers/Kconfig b/Ubiquitous/RT_Thread/drivers/Kconfig deleted file mode 100644 index b6893957a..000000000 --- a/Ubiquitous/RT_Thread/drivers/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -menu "More Drivers" - -source "$RT_Thread_DIR/drivers/rw007/Kconfig" -source "$RT_Thread_DIR/drivers/ov2640/Kconfig" -endmenu