文件数量正确 #3

xxq2506 · 2021-12-31T10:10:16+08:00

xxq2506 commented

2021-12-31 10:10:16 +08:00

文件数量正确

xxq2506 added 17 commits 2021-12-31 10:10:16 +08:00

60ce72b37a Ubiquitous/RT_Thread/bsp/:fix the problem that the iic parameters were changed when menuconfig

d99d4e8f52 APP_Framework/Applications/:eliminate some warnings about menuconfig in linux

6816dc023a update .gitmodules file

d71c5fcd2f Ubiquitous/RT_Thread/:add romfs file system ,including SD and FLASH directory

de27c59e51 Ubiquitous/RT_Thread/: update file system

1.change the tick base on  the board/Kconfig
2.The SD card and FLASH can be mounted to the specified directory of romFS at the same time,and SD card or flash can be used independently
3.Avoid the SD card and Flash mounting sequence. If the Flash mounts the SD card to a specific directory, ensure that the SD card is mounted first

235dcb761c Ubiquitous/RT_Thread/:change the path name

d368db9e76 refactor(knowing apps): yolov2 json parser

c07c918150 refactor(knowing app): add common k210 yolov2 detection procedure

203184e18c fix(bsp/k210): resolve conflict of 235dcb761c path changed

4640055ab6 fix(knowing app/yolov2): AI address error while sensor output and net input height mismatch

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

c782dd26c4 feat(knowing app): remove json config from menuconfig, adding to detect_app arg

62df72af5b fix(knowing framework/yolov2 region layer): free region layer thresholds

12c9220487 the kmodel load function has been verified

be4da6f37d Ubiquitous/RT_Thread/:change the path name

b6bd1de959 APP_Framework/Applications/:eliminate the warning

17be211288 Merge branch 'wang_dev' into test_pre

solve the Conflicts
# Conflicts:
#	APP_Framework/Framework/knowing/Kconfig

This pull request has changes conflicting with the target branch.

APP_Framework/Applications/knowing_app/Kconfig
APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c
APP_Framework/Framework/knowing/image_processing/TJpgDec/Kconfig
.gitmodules
APP_Framework/Applications/knowing_app/image_processing/TJpgDec_APP/Kconfig
APP_Framework/Applications/knowing_app/iris_ml_demo/iris_ml_demo.c
APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig
APP_Framework/Framework/knowing/Kconfig
APP_Framework/Framework/knowing/image_processing/Kconfig
APP_Framework/Applications/knowing_app/image_processing/Kconfig

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b test_pre prepare_for_master_test

git pull origin test_pre

Step 2:

Merge the changes and update on Gitea.

git checkout prepare_for_master_test

git merge --no-ff test_pre

git push origin prepare_for_master_test

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: xxq2506/xiuos3#3