1709 Commits

Author SHA1 Message Date
IACU
e03b3b390a update prepare_for_master latest commit(5a10e4153c) to 2023_open_source_contest
it is OK
2023-11-01 16:29:47 +08:00
Liu_Weichao
0aa73a14c2 Merge branch 'prepare_for_master' of https://www.gitlink.org.cn/xuos/xiuos into 2023_open 2023-11-01 16:26:02 +08:00
IACU
5a10e4153c feat support SQLite function from Liu_Weichao
it is OK
2023-11-01 16:27:09 +08:00
Liu_Weichao
b3f473ec86 Merge branch 'prepare_for_master' of https://www.gitlink.org.cn/xuos/xiuos into 2023_open 2023-11-01 16:22:01 +08:00
Liu_Weichao
d35d0bedb2 fix lwip_connect error, enable CHECKSUM_BY_HARDWARE in lwipopts.h 2023-11-01 16:17:50 +08:00
Liu_Weichao
4b579d1c8f feat support SQLite function, need follow README.md, RAM > 512KB, shell task stack > 32KB, TF card mount FATFS 2023-11-01 16:09:52 +08:00
Liu_Weichao
dfa6b664ac feat add SQLite, compile OK 2023-10-25 16:07:23 +08:00
IACU
eed7d2f37c 2023_open_source_contest_final_1st_issue3 from 华东师范大学_bdislab_final战队_杨龙
it is OK
2023-10-24 09:27:53 +08:00
yanglong
261a2a1653 fix the conflict 2023-10-23 19:50:31 +08:00
IACU
ad2dba22c3 2023_open_source_contest_preliminary_1st_issue3 from 东华大学_第二乐章战队_方源
it is OK
2023-10-23 15:56:32 +08:00
ambrumf
6a2e18806a bugfix 2023-10-23 15:49:50 +08:00
Ambrumf
eca32c203b bugfix 2023-10-23 15:29:03 +08:00
ambrumf
c3e686c50b bugfix 2023-10-23 15:26:41 +08:00
ambrumf
ab77fe8a09 update ftpclient 2023-10-23 15:06:13 +08:00
IACU
a883474327 2023_open_source_contest_preliminary_1st_issue2 from Huang_Chen
it is OK
2023-10-23 14:20:51 +08:00
IACU
77b6b8cb97 2023_open_source_contest_preliminary_1st_issue1 from 上海大学_每天学习战队_姚文莹
it is OK
2023-10-23 14:20:25 +08:00
IACU
91ee0f7b28 2023_open_source_contest_final_2st_issue1 from 西北工业大学_天仙永昌战队_楚云飞
it is OK
2023-10-23 14:18:16 +08:00
IACU
c7bbf2935f 2023_open_source_contest_preliminary_2st_issue1 from 西北工业大学_天仙永昌战队_楚云飞
it is OK
2023-10-23 13:57:15 +08:00
IACU
21785c37ee 2023_open_source_contest_preliminary_1st_issue3 from 华东师范大学_bdislab_final战队_杨龙
it is OK
2023-10-23 13:56:24 +08:00
IACU
0705bdaf1a fix create event bug and add dev_recv_callback for uart in APP_Framework from Liu_Weichao
it is OK
2023-10-12 20:01:46 +08:00
Liu_Weichao
2b44a0c6fb feat add dev_recv_callback for uart in APP_Framework 2023-10-12 19:58:24 +08:00
Liu_Weichao
d4b47088d2 update lorawan submodule, fix create event bug 2023-10-12 19:56:32 +08:00
IACU
dc25947261 feat support cortex-m7-emulator for XiZi from Huang_Chen
it is OK
2023-10-12 09:38:48 +08:00
yanglong
c508c2d43b add print file content function 2023-10-11 21:29:10 +08:00
huang
1cf3baeb2e delete clock 2023-10-11 17:57:09 +08:00
huang
24023fd343 modify description 2023-10-11 17:51:27 +08:00
huang
341cfd34bd modify location 2023-10-11 17:34:24 +08:00
huang
196a8e001a add some files 2023-10-11 17:30:56 +08:00
huang
3fe9cf3d91 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-10-11 17:23:02 +08:00
huang
3f1be486cf remove aiot 2023-10-11 17:20:52 +08:00
IACU
f82f41ade7 update gitmodules url for lorawan from Liu_Weichao
it is OK
2023-10-11 17:10:44 +08:00
huang
c17c899ea7 add m7 readme 2023-10-11 17:08:19 +08:00
Liu_Weichao
648aaaae90 update gitsubmodules commit for lorawan 2023-10-11 17:07:00 +08:00
Liu_Weichao
dd4cfd93c6 update gitmodules url for lorawan 2023-10-11 16:55:42 +08:00
huang
699c04e94d Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-10-11 16:48:47 +08:00
IACU
1e651e74b4 feat support lorawan end-device stack and fix some bugs from Liu_Weichao
it is OK
2023-10-11 16:26:13 +08:00
Liu_Weichao
bc8b003c1e update lorawan function, support lorawan-ed-device connect chirpstack through lorawan-gateway-Ebyte-E890 2023-10-11 16:08:23 +08:00
yanglong
56216a530d Optimization server algorithm and add a test 2023-10-11 13:17:06 +08:00
Liu_Weichao
f962cf6919 fix timer bug in posix_support for XiZi kernel 2023-10-11 09:34:14 +08:00
Liu_Weichao
ca0ef77764 fix timer callback bug 2023-10-10 13:23:05 +08:00
Ambrumf
7f14d047cb update TestFtp 2023-10-09 21:13:11 +08:00
Ambrumf
b8335863ba create branch 2023-10-09 20:41:09 +08:00
yanglong
5039ebc85f add ftp_server code 2023-10-08 18:53:59 +08:00
安果尤拉
03751e3d1e update copyright 2023-10-07 02:31:50 -07:00
yanglong
380aa361fe add reference 2023-10-07 17:01:28 +08:00
yanglong
ff720789ab fix merge conflict 2023-10-07 16:47:02 +08:00
huang
30b98101ec readme modify 2023-10-07 15:01:05 +08:00
huang
e07d4e2711 调整格式 2023-10-07 14:59:41 +08:00
安果尤拉
f85dfb3ccf delete p2p 2023-10-03 06:32:56 -07:00
chuyunfei
499047e31b Update README.md 2023-10-03 21:25:42 +08:00
安果尤拉
11ae2bd7da upload code 2023-10-03 06:19:24 -07:00
Yao15921243763
bf505768e8 test webserver 2023-09-30 23:16:14 +08:00
Yao15921243763
0f77f4e86b Merge branch '2023_open_source_contest' of https://gitlink.org.cn/xuos/xiuos into 2023_open_source_contest 2023-09-28 15:40:54 +08:00
Yao15921243763
682460747b test LwipSetIP 2023-09-28 15:40:25 +08:00
Liu_Weichao
58fe8fc887 feat support set task name using PrivTaskCreate in XiZi 2023-09-27 17:05:27 +08:00
huang
cf565f5d69 transport modify 2023-09-27 16:24:11 +08:00
huang
40cedd339c add license 2023-09-27 16:21:43 +08:00
huang
6c40800dfe delete cjson process 2023-09-27 16:04:55 +08:00
huang
cc4106dd11 imx6q dts 2023-09-27 15:58:37 +08:00
huang
e055ffdc2c modify microkernel 2023-09-27 15:54:00 +08:00
huang
014e51c0ad mmodify the liscence 2023-09-27 15:47:47 +08:00
huang
339ea93b09 delete no need 2023-09-27 14:21:14 +08:00
Liu_Weichao
6228e76194 1、add ch32v307 riscv support in Makefile;2、fix lock uninitialized error in dev_serial. 2023-09-27 14:13:37 +08:00
huang
5a02b89ffc delete mqtt 2023-09-27 14:13:10 +08:00
huang
274759aafb Merge branch '2023_open_source_contest' of https://gitlink.org.cn/hc0014/xiuos into 2023_open_source_contest 2023-09-27 14:02:20 +08:00
IACU
cb785cf8a1 Fix Task priority bug, rename some wrong variables from Tu_Yuyang
it is ok
2023-09-26 17:01:39 +08:00
huang
d50d16bc86 Merge branch 'prepare_for_master' of https://gitlink.org.cn/hc0014/xiuos into prepare_for_master 2023-09-26 10:35:53 +08:00
huang
e745fc9129 aiot cache codes 2023-09-26 10:33:24 +08:00
huang
d884774bca contest final 2023-09-26 10:20:29 +08:00
huang
085c418faa contest chusai 2023-09-26 10:17:33 +08:00
TXuian
159159ecde Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into wiz_lwip 2023-09-21 10:34:11 +08:00
TXuian
b82a86d5c0 Fix Task priority bug, rename some wrong variables 2023-09-21 10:32:14 +08:00
yanglong
c326f7189e add concurrent upload function 2023-09-17 17:04:59 +08:00
yanglong
6bc375c316 add ftpclient final 2023-09-17 15:35:13 +08:00
huang
4d2e4498cc Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-09-11 11:19:52 +08:00
IACU
83681208ec ota project related from Wang_guozhu
it is OK
2023-09-11 10:04:00 +08:00
IACU
fb368d24a9 Support lwip with w5500 from Tu_Yuyang 2023-09-11 10:00:18 +08:00
涂煜洋
aefe92d67d Fix multicore byte_manager illegal parallel execution, fix w5500 pbuf creation failed checking. 2023-09-07 09:30:37 +08:00
涂煜洋
efba3f3bf3 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-09-06 11:20:46 +08:00
涂煜洋
31b939fbb8 Fit w5500 to lwip, fix some unintialized params and printf warning. 2023-09-06 11:12:42 +08:00
IACU
a1df906d16 2023_open_source_contest_warmup_2nd_issue1 from 好果汁有限公司
it is OK
2023-09-01 11:03:57 +08:00
IACU
74c04f2dbd Fix radix tree test from Zhao_Jiasheng
it is OK
2023-09-01 11:01:21 +08:00
chuyunfei
2615c5aab3 Update README.md 2023-08-31 11:33:26 +08:00
chuyunfei
8c601b031a Added data frame parsing 2023-08-30 20:06:31 -07:00
wgzAIIT
488419a6d0 update MQTT connection parameter configuration 2023-08-30 09:51:22 +08:00
wgzAIIT
fd608d8e81 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-08-29 11:02:27 +08:00
IACU
3fc12f67b9 add plc data store function for control framework from Liu_Weichao
it is OK
2023-08-28 16:17:42 +08:00
Liu_Weichao
5bb0f2aaf5 add plc data store function for control framework 2023-08-28 16:15:32 +08:00
wgzAIIT
610810da32 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-08-28 08:40:28 +08:00
IACU
e2c32e9e72 fix adapter_lora and lwip_tcp_demo bug from Liu_Weichao
it is OK
2023-08-25 15:31:08 +08:00
Liu_Weichao
4b75e1283a Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into micro_kernel 2023-08-25 15:27:56 +08:00
IACU
ff9a1645bd it is OK 2023-08-25 15:20:22 +08:00
涂煜洋
8b32c2f4ed Trying to support lwip with w5500. 2023-08-25 13:43:11 +08:00
Liu_Weichao
0278d54a24 fix lwip_tcp_demo lwip init bug 2023-08-25 09:25:56 +08:00
Liu_Weichao
1c775d42f6 fix adapter lora bug on edu-arm32 board 2023-08-24 14:38:24 +08:00
wgzAIIT
1f21fc15b2 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into mqtt 2023-08-24 10:17:32 +08:00
wgzAIIT
355e717cb8 Fix tests for edu-riscv64 textbook and edu-arm32 textbook 2023-08-23 20:24:41 +08:00
JasenChao
deb1f63d9e Merge branch '2023_open_source_contest' of https://gitlink.org.cn/JasenChao/xiuos into 2023_open_source_contest 2023-08-23 18:34:47 +08:00
JasenChao
68b7484fc5 Merge branch '2023_open_source_contest' of https://gitlink.org.cn/xuos/xiuos into 2023_open_source_contest 2023-08-23 18:33:53 +08:00
IACU
a5a809aa0a Fix tests for edu-riscv64 textbook from Jiang_Yufan
it is OK
2023-08-23 17:59:50 +08:00
Jiang Yufan
a289c0d653 Fix: test_app makefile update 2023-08-23 14:19:25 +08:00
Jiang Yufan
0f32060aea Fix: mergebin.py generate .bin file according to board 2023-08-23 13:53:04 +08:00
Jiang Yufan
f4c9edd070 Fix: LVGL file rename 2023-08-23 13:51:48 +08:00
Jiang Yufan
f848f36efb Fix: LVGL file rename 2023-08-23 10:44:46 +08:00
chuyunfei
202a43cbcb update some code 2023-08-22 19:10:57 -07:00
Jiang Yufan
4c9cc39801 BMP180 sensor test update 2023-08-22 14:48:39 +08:00
Jiang Yufan
48c40541f9 I2C driver update 2023-08-22 14:47:48 +08:00
Jiang Yufan
cdb2be7ca4 I2C test update 2023-08-22 14:33:27 +08:00
Jiang Yufan
feb0d29fc9 RS485 test update 2023-08-22 14:27:02 +08:00
Jiang Yufan
aef55df1dc Face recognition kconfig update 2023-08-22 14:11:48 +08:00
Jiang Yufan
fdc1783300 Task isolation test update 2023-08-22 14:10:43 +08:00
Jiang Yufan
379045d7eb WDT test update 2023-08-22 14:06:06 +08:00
Jiang Yufan
7447152767 Tensorflow test update 2023-08-22 14:05:10 +08:00
Jiang Yufan
df7de36516 HardwareTimer Kconfig update 2023-08-22 14:03:59 +08:00
Jiang Yufan
3ba4aa845f HardwareTimer test update 2023-08-22 14:02:39 +08:00
Jiang Yufan
a7d6f8215e HS300X app update 2023-08-22 14:00:05 +08:00
Jiang Yufan
fbeb75d1f1 LVGL demo update 2023-08-22 13:56:41 +08:00
chuyunfei
a6f1215923 add func header 2023-08-21 22:55:07 -07:00
chuyunfei
a274a809cc add copyright 2023-08-21 22:51:26 -07:00
yanglong
51a5fa5563 add ftp client 2023-08-22 11:04:21 +08:00
chuyunfei
859184945f test lora p2p 2023-08-21 19:49:08 -07:00
wgzAIIT
1eb783cc18 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into mqtt 2023-08-17 19:12:40 +08:00
IACU
7d3d4651d3 update prepare_for_master latest commit(90b7740ca0) to 2023_open_source_contest from Liu_Weichao
it is OK
2023-08-17 15:09:30 +08:00
IACU
90b7740ca0 feat add RS485 using usart4 for edu_arm32 board and fix test_rs485 error from Liu_Weichao
it is OK
2023-08-17 15:08:07 +08:00
Liu_Weichao
7077cf74c2 feat add RS485 using usart4 for edu_arm32 board and fix test_rs485 error 2023-08-17 15:04:48 +08:00
Liu_Weichao
d73470de3c Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into micro_kernel 2023-08-15 15:53:44 +08:00
wgzAIIT
34e855a3a9 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into mqtt 2023-08-11 11:17:10 +08:00
IACU
dd383ef424 Add app test and command line tool from Tu_Yuyang
it is OK
2023-08-11 11:06:42 +08:00
涂煜洋
3896242622 23/08/11 Add app test_uart. 2023-08-11 11:03:10 +08:00
涂煜洋
167bc3c047 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into cmdline 2023-08-11 10:11:36 +08:00
涂煜洋
dd35692866 23/08/11 Fix app test socket 2023-08-11 10:07:31 +08:00
涂煜洋
586ceba08e 23/08/11 Fix app test socket 2023-08-11 10:02:51 +08:00
涂煜洋
a9ebe1e96d 23/08/11 Add app test socket; Fix app test i2c; Add command line argument parse tool argparse; Increase lwip related threads' priority. 2023-08-11 10:01:08 +08:00
huang
6d9b66f05f Merge branch '2023_open_source_contest' into prepare_for_master 2023-08-10 16:47:21 +08:00
IACU
d1a198a4bc Fix edu-arm32 i2c from Tu_Yuyang
it is OK
2023-08-09 17:36:02 +08:00
涂煜洋
0e82fac640 Fix edu-arm32 i2c. 2023-08-09 17:31:06 +08:00
涂煜洋
bcf75bd62f Merge branch 'prepare_for_master' of https://gitlink.org.cn/tuyuyang/xiuos into HEAD 2023-08-09 16:35:26 +08:00
涂煜洋
379cd567a2 Fix edu-arm32 i2c. 2023-08-09 16:33:17 +08:00
IACU
8becc52a90 fix adc/dac funciton error on edu-arm32 baord from Liu_Weichao
it is OK
2023-08-09 15:12:13 +08:00
Liu_Weichao
5f642507b4 fix adc/dac funciton error on edu-arm32 baord 2023-08-09 15:10:11 +08:00
wgzAIIT
ed67ff5c62 Merge pull request 'merge code' (#42) from prepare_for_master into mqtt 2023-08-09 12:16:16 +08:00
8c1ad40f81 Update README.md 2023-08-09 11:13:42 +08:00
5510123098 更新 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md' 2023-08-09 11:09:53 +08:00
d6e7637128 更新 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md' 2023-08-09 11:09:00 +08:00
6a2a006a3f revert 87a57d0db0
revert Delete 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md'
2023-08-09 11:03:52 +08:00
chenyh
87a57d0db0 Delete 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md' 2023-08-09 10:59:04 +08:00
IACU
da7220a60c update prepare_for_master latest commit(3acc7e431f) to 2023_open_source_contest from Liu_Weichao
it is OK
2023-08-08 11:17:32 +08:00
IACU
3acc7e431f Fix UDPSend Bug from Tu_Yuyang
it is OK
2023-08-08 11:16:20 +08:00
涂煜洋
a51ef1c41f Fix edu-arm32 UDPSend bug. 2023-08-08 11:06:34 +08:00
wgzAIIT
e29eb633ca Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-08-08 08:56:51 +08:00
IACU
63b02913e4 update prepare_for_master latest commit(ec318c603a) to 2023_open_source_contest from Liu_Weichao
it is OK
2023-08-07 19:58:47 +08:00
IACU
ec318c603a fix lwip tcp/udp demo、test_i2c、usb irqhandle error from Liu_Weichao
it is OK
2023-08-07 19:55:30 +08:00
huang
53619b9b99 simplify codes 2023-08-07 17:43:40 +08:00
Liu_Weichao
ec7d9f1fcd 1、fix lwip_tcp_demo and lwip_udp_demo error;2、add license for ethernet/netdev;3、add netdev for xiwangtong、ok1052、imxrt1176 board。 2023-08-07 14:48:37 +08:00
huang
b481abd4eb cortex m7 emulator 2023-08-07 09:41:15 +08:00
Liu_Weichao
aa6fb2a8b0 fix test_i2c WriteReg coredump error 2023-08-04 10:39:11 +08:00
Liu_Weichao
3c1129d88a fix edu-arm32 board USB IRQ configure error 2023-08-04 10:14:23 +08:00
Liu_Weichao
27734606f5 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop 2023-08-04 10:06:26 +08:00
IACU
62eda1e3fa Net(Webnet and Lwip) and memory related updates from Tu_Yuyang
it is OK
2023-08-04 10:02:57 +08:00
涂煜洋
e9b4a0de6c 23/08/03 Fix former commit errors 2023-08-03 20:08:01 +08:00
涂煜洋
219575898a 23/08/03 Add Netdev to xidatong-arm32 2023-08-03 20:08:01 +08:00
涂煜洋
06b9d67f2d Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-08-03 19:02:47 +08:00
涂煜洋
ee10eccb26 23/08/02 1.Fix ByteManager Bug; 2.Move net delay to webnet(wn_session.h) so it wont affect other net functions. 2023-08-03 19:01:42 +08:00
涂煜洋
fce13fe874 23/08/02 1.Fix ByteManager Bug; 2.Move net delay to webnet(wn_session.h) so it wont affect other net functions. 2023-08-03 19:01:39 +08:00
IACU
fc4411dad4 feat add app_test DIR for 2023_open_source_contest from Liu_Weichao
it is OK
2023-08-03 19:01:15 +08:00
Gitlinkiacu2016
a25eccfac8 feat add app_test DIR for 2023_open_source_contest 2023-08-03 19:00:44 +08:00
涂煜洋
0307fb2671 23/07/27 1.Add netdev module and for edu-arm32, fit Lwip to it; 2.Fit Webnet to edu-arm32; 2023-08-03 18:53:16 +08:00
JasenChao
b04544f842 Fix conflict 2023-08-03 15:41:35 +08:00
Liu_Weichao
3efe663ee0 update lorawan submodule commit 2023-08-03 15:40:11 +08:00
JasenChao
8effd59528 Fix test 2023-08-02 21:13:41 +08:00
JasenChao
c56298fa99 Further completion 2023-08-02 19:09:46 +08:00
kkk
2df7b63f03 仓库同步修改 2023-07-31 12:51:36 +08:00
kkk
9c0eced907 Merge remote-tracking branch 'upstream/2023_open_source_contest' into 2023_open_source_contest_warmup_2nd_issue1 2023-07-31 11:46:12 +08:00
wgzAIIT
21ca38158e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-07-28 09:09:57 +08:00
IACU
20ffe20c36 Merge pull request 'feat add app_test DIR for 2023_open_source_contest' (#344) from prepare_for_master into 2023_open_source_contest 2023-07-27 15:24:02 +08:00
IACU
1a6ee0234b feat add app_test DIR for 2023_open_source_contest from Liu_Weichao
it is OK
2023-07-27 15:23:16 +08:00
Gitlinkiacu2016
269bc1e3de feat add app_test DIR for 2023_open_source_contest 2023-07-27 15:20:20 +08:00
wgzAIIT
02089a48ee move mqtt to APP_Framework/lib dir for ota 2023-07-27 11:01:10 +08:00
wgzAIIT
6559210341 Merge pull request 'merge code' (#32) from prepare_for_master into mqtt 2023-07-27 10:48:29 +08:00
IACU
8010ba6a36 feat update 2023_open_source_contest latest commit from prepare_for_master from Liu_Weichao
it is OK
2023-07-27 10:40:46 +08:00
xuedongliang
dd09d79a89 feat change edu arm32 board name from hc32f4a0 to edu-arm32 from Liu_weichao
it is OK
2023-07-27 10:27:45 +08:00
Gitlinkiacu2016
4ed02888a2 feat change edu arm32 board name from hc32f4a0 to edu-arm32 2023-07-27 10:21:37 +08:00
IACU
d00ff88dfb add image and json directory in app from Bi_Zhiyong
it is OK
2023-07-27 09:41:29 +08:00
Gitlinkiacu2016
20037285c0 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop 2023-07-27 09:41:16 +08:00
IACU
829d0cf836 Remove the debugging information to reduce the size of the bin package from Wang_Guozhu
it is OK
2023-07-27 09:41:06 +08:00
Gitlinkiacu2016
0d80fb6473 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop 2023-07-27 09:38:44 +08:00
wgzAIIT
69d86ef4e4 Merge pull request 'merge code' (#29) from prepare_for_master into mqtt 2023-07-27 09:16:57 +08:00
wgzAIIT
9cb7267371 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into prepare_for_master 2023-07-27 09:11:35 +08:00
IACU
3e13499000 update prepare_for_master latest commit from 2023_open_source_contest from Liu_Weichao
it is OK
2023-07-27 09:07:20 +08:00
IACU
a9140851c2 2023_open_source_contest_warmup_1st_issue2 from 复旦大学_若客战队_李明辉
it is OK
2023-07-26 18:14:42 +08:00
Liu_Weichao
3a5c0f44ec Merge branch '2023_open_source_contest' of https://gitlink.org.cn/xuos/xiuos into workplace 2023-07-26 18:02:44 +08:00
IACU
8b43b56c56 fix 2023 open source pr conflict 2 from Liu_Weichao 2023-07-26 17:56:12 +08:00
Liu_Weichao
077a4e1276 fix 2023 open source pr conflict 2 2023-07-26 17:54:47 +08:00
IACU
c8c5833a6e fix 2023 open source pr conflict from Liu_Weichao 2023-07-26 17:50:25 +08:00
Liu_Weichao
7968c0761d fix 2023 open source pr conflict 2023-07-26 17:47:32 +08:00
IACU
4b85ab3058 2023_open_source_contest_warmup_1st_issue1 from 上海大学_每天学习战队_姚文莹
it is OK
2023-07-26 17:33:17 +08:00
IACU
b901be4553 2023_open_source_contest_warmup_1st_issue3 from 中山大学_不挂机战队_赵佳盛
it is OK
2023-07-26 17:32:33 +08:00
huang
b0eabde4f6 modify features 2023-07-26 11:31:29 +08:00
huang
d8265d3579 Merge branch '2023_open_source_contest' of https://gitlink.org.cn/xuos/xiuos into pr2 2023-07-26 10:44:04 +08:00
Wien.b
0d1a4e5f31 add image and json directory in app 2023-07-25 19:09:52 -07:00
pgh_dd
10482724a9 "添加资源文件" 2023-07-25 22:10:16 +08:00
pgh_dd
b779734061 "modbustcp_20230725" 2023-07-25 20:02:06 +08:00
Wien.b
2a27cc550d modify app readme,add json and picture 2023-07-24 23:08:41 -07:00
wgzAIIT
7740e3c5ef change CONNECTION_FRAMEWORK_DEBUG default n 2023-07-21 09:29:15 +08:00
wgzAIIT
8bd8187e82 Merge pull request 'merge code' (#27) from prepare_for_master into mqtt 2023-07-20 17:29:38 +08:00
wgzAIIT
616332962b 1. Remove the debugging information to reduce the size of the bin package
2. The compilation option optimization level is increased to 1
2023-07-20 17:25:17 +08:00
IACU
d8021b55f8 update the latest branch in prepare_for_master to 2023_open_source_contest from Liu_Weichao 2023-07-20 16:47:13 +08:00
IACU
27e9613dcf fix ethernet config error and optimize ethernet speed for imxrt1052 from Liu_Weichao 2023-07-20 16:42:20 +08:00
wgzAIIT
5baf461e48 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-07-20 16:30:51 +08:00
Liu_Weichao
0aadf64012 optimize ethernet tx/rx speed testing by iperf on xidatong/ok1052-c/xiwangtong board 2023-07-20 16:10:25 +08:00
Liu_Weichao
813b175ca3 fix Ethernet input task error and add hardware-checksum for xidatong/ok1052-c/xiwangtong board 2023-07-20 11:13:33 +08:00
IACU
d663ca7193 feat add freemodbus and plc demo 2023-07-19 15:11:18 +08:00
wgzAIIT
24fcbb54e8 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-07-19 13:49:03 +08:00
wgzAIIT
b9e5e97741 The password for logging in to the mqtt server is generated using a function 2023-07-19 11:04:05 +08:00
IACU
e0d7761685 fix LwIP compile error and feat add lorewan single channel from Liu_Weichao 2023-07-19 10:47:40 +08:00
IACU
1ddd8982fb fix LwIP compile error and feat add lorewan single channel from Liu_Weichao 2023-07-19 10:45:32 +08:00
Liu_Weichao
2626acd70c fix LwIP ethernetif_input function error and fix Lwip compile error for BOARD imxrt1176/ok1052-c/xidatong-arm32/xiwangtong-arm32 2023-07-19 10:41:57 +08:00
Liu_Weichao
02b676e910 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop 2023-07-19 09:33:34 +08:00
IACU
fd48a45c15 update branch 2023_open_source_contest for preliminary contest from Liu_Weichao 2023-07-18 10:12:14 +08:00
IACU
2610b9295a Fix Lwip Driver from Tu_Yuyang
optimize lwip function
2023-07-18 10:00:29 +08:00
huang
5869154cca delete online 2023-07-17 14:23:08 +08:00
涂煜洋
115f6671e1 23/07/17 Deal Complicts. 2023-07-17 14:17:16 +08:00
huang
d33184cbd9 Merge branch 'lwip' of https://gitlink.org.cn/tuyuyang/xiuos into 2023_open_source_contest 2023-07-17 13:43:19 +08:00
huang
c06138364f mqtt update 2023-07-13 10:56:50 +08:00
huang
455fd31c7f mqtt update 2023-07-13 10:56:20 +08:00
涂煜洋
edd5a5ccb9 23/07/12 Add W5500 iperf; Add lwip http test. 2023-07-12 17:45:45 +08:00
涂煜洋
d7aa29e0df 23/07/12 Separate w5500 driver and its tests. 2023-07-12 09:55:10 +08:00
涂煜洋
3aad797827 23/07/11 Lwip test add iperf multithread. 2023-07-11 21:01:27 +08:00
涂煜洋
336b733a51 23/07/11 Fix Lwip TCP Rx Speed. 2023-07-11 18:57:12 +08:00
涂煜洋
1086321a63 23/07/11 Fix Lwip TCP Rx Speed. 2023-07-11 17:04:40 +08:00
jqy1988
2638268135 add connect framework freemodbus lib 2023-07-03 13:38:58 +08:00
涂煜洋
42e3b261ab Merge branch 'lwip' of https://gitlink.org.cn/JeremyMo/xiuos into lwip 2023-06-29 16:28:04 +08:00
wgzAIIT
3c179e7879 1、add MQTT connection parameter configuration by Kconfig
2、Send a heartbeat packet every 1 minute during idle time to keep alive
2023-06-28 14:54:20 +08:00
Liu_Weichao
7691b90abb feat fix FEATURES error in Kconfig and Makefile 2023-06-27 09:51:07 +08:00
wgzAIIT
5900b504e3 1、improving MQTT transmission speed 2K Bytes per package
2、rename mqtt file name
2023-06-26 15:23:13 +08:00
lmh
a95841c277 rbtree 2023-06-24 17:02:01 +08:00
wgzAIIT
6f3d3b8862 improving MQTT transmission speed 2023-06-21 14:00:09 +08:00
Liu_Weichao
200380a92e feat fix lorawan/README.md description error 2023-06-20 17:59:35 +08:00
wgzAIIT
87921c4212 Support OTA upgrade by MQTT 2023-06-20 15:49:07 +08:00
Liu_Weichao
9fa479815c fix fetures error 2023-06-20 13:27:08 +08:00
Liu_Weichao
cf85c4b99c fix ADD_XIZI_FETURES/ADD_NUTTX_FETURES/ADD_RTTHREAD_FETURES error 2023-06-20 13:20:41 +08:00
Liu_Weichao
5c08cae005 feat add lorawan_gateway_single_channel lib for XiUOS and compile OK 2023-06-20 11:24:15 +08:00
wgzAIIT
dd43dd6d17 Optimize ota function:changge ota version type 2023-06-16 17:40:00 +08:00
wgzAIIT
555b014bc9 Optimize mqtt function add MQTT_PublishDataQs1 function 2023-06-16 11:12:25 +08:00
wgzAIIT
9995980a1a 1.fix AT cmd framework bug
2.add mqtt support in the tool directory
2023-06-15 16:52:52 +08:00
wgzAIIT
ed1c5eea1f Optimize ota function 2023-06-15 16:43:02 +08:00
wgzAIIT
26f74120db Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-06-14 13:36:24 +08:00
xuedongliang
9686534e10 optimize kconfig add iper
it is OK
2023-06-13 18:31:01 +08:00
xuedongliang
b49b3a8107 1、change git submodules;2、support sabre-lite borad on xiuos appframework and Nuttx;3、add task module for XiZi_AIoT;4、 fix xidatong-arm32 UART RX/TX bug and add serial_timeout for ec200t module
it is OK
2023-06-13 18:30:00 +08:00
wgzAIIT
fb9250181f 1、Increase the size of the EntmSend function send_buff
2、Optimize ota.c、ota.h and server_tcp.c files
2023-06-13 17:08:42 +08:00
Liu_Weichao
5d8375caee feat update lora_radio_driver submodule version 2023-06-06 17:17:48 +08:00
wgzAIIT
0cc0693600 Merge pull request 'merge code' (#17) from prepare_for_master into develop 2023-06-06 10:26:41 +08:00
wgzAIIT
dcea61d5e0 Merge pull request 'merge code' (#16) from prepare_for_master into xidatong-arm32 2023-06-06 10:23:14 +08:00
wgzAIIT
e9b538c2dc Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-06-06 10:08:20 +08:00
wgzAIIT
5a1fe0be3b 1、Optimize the tcp server file reading operation during the OTA process
2、Optimize the ota.c file

3、revert dev_serial.c
2023-06-06 10:07:00 +08:00
wgzAIIT
abe0e452f9 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-06-06 09:53:05 +08:00
wgzAIIT
d60a3475f6 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-06-06 09:47:36 +08:00
wgzAIIT
e48bd6fd67 1、OTA supports 4g retransmission after file sending failure
2、Optimize the startup process of OTA
2023-06-02 17:07:56 +08:00
Jeremy
5b692bd0a5 Merge remote-tracking branch 'xuos/prepare_for_master' into prepare_for_master 2023-06-02 15:16:10 +08:00
wgzAIIT
f2b64e4306 fix OTA upgrade through 4G 2023-06-01 18:32:37 +08:00
wgzAIIT
8ecb3a8804 OTA upgrade through 4G is successful 2023-06-01 11:14:24 +08:00
wgzAIIT
5faa3e7b5a Optimize functions related to flash operation 2023-06-01 11:10:23 +08:00
wgzAIIT
938d46d5d9 Modify the tcp server to send 1024 bytes each time 2023-05-31 16:28:08 +08:00
wgzAIIT
c6af847c73 Improve the speed of 4G transmission bin package 2023-05-30 20:11:43 +08:00
wgzAIIT
788eb53f39 discard invalid data frames 2023-05-29 19:47:06 +08:00
wgzAIIT
7ba883affe modify data length for 4g translation 2023-05-29 19:43:59 +08:00
Liu_Weichao
3463c8515f feat add abstruction_mmu for XiZi_AIoT(support MmuInit\MmuSectionMap\MmuSectionUnmap\MmuTtbSwitch\MmuTransform) 2023-05-29 16:58:22 +08:00
Yao15921243763
f82d6d0c24 2023_open_source_contest_warmup_1st_issue1 2023-05-26 11:30:56 +08:00
wgzAIIT
f59139f78e send bin file by 4g 2023-05-26 11:23:12 +08:00
Yao15921243763
0a375fd373 热身赛一级赛题1, 实现哈希表 2023-05-26 11:19:31 +08:00
JasenChao
67818fbdb8 Add test_radix_tree.h 2023-05-24 18:52:36 +08:00
JasenChao
30161b7f24 Update README.md 2023-05-24 18:44:00 +08:00
JasenChao
08877cf72d Complete 热身赛一级赛题3 2023-05-24 18:34:49 +08:00
JasenChao
832ebbfaec Commit 热身赛一级赛题3 2023-05-24 16:39:32 +08:00
wgzAIIT
c7ac5681e4 Merge pull request 'merge code' (#14) from develop into xidatong-arm32 2023-05-23 19:13:39 +08:00
wgzAIIT
6601e228f2 Merge pull request 'merge code' (#15) from develop into prepare_for_master 2023-05-23 19:13:30 +08:00
wgzAIIT
b545031e5e fix xidatong-arm32 UART RX/TX bug and add serial_timeout for ec200t module 2023-05-23 17:44:37 +08:00
Liu_Weichao
b3563c899d Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into control_framework 2023-05-23 16:06:56 +08:00
IACU
a110ab511c fix emulator start shell failure and fix compile error when gcc using <-with-newlib> function from Liu_Weichao 2023-05-22 20:48:48 +08:00
Liu_Weichao
0788041dcc Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into 2023_open_source_contest 2023-05-22 20:45:59 +08:00
IACU
7754a149a9 fix emulator start shell failure and fix compile error when gcc using <-with-newlib> function from Liu_Weichao 2023-05-22 20:39:05 +08:00
Liu_Weichao
93a8685c31 fix cortex-m0-emulator start shell failure 2023-05-22 20:37:08 +08:00
Liu_Weichao
ad944a88d7 Merge branch '2023_open_source_contest' of https://gitlink.org.cn/IACU/xiuos into 2023_open_source_contest 2023-05-22 20:23:46 +08:00
Liu_Weichao
089f9c8975 fix cortex-m3-emulator start shell failure and fix compile error when using gcc -with-newlib param 2023-05-22 20:21:50 +08:00
wgzAIIT
a056aea50e Merge pull request 'merge code' (#13) from develop into xidatong-arm32 2023-05-22 10:17:40 +08:00
wgzAIIT
c40518d226 Merge pull request 'merge code' (#12) from develop into prepare_for_master 2023-05-22 10:17:09 +08:00
wgzAIIT
b2c76bcac5 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-05-22 10:12:03 +08:00
wgzAIIT
44810118af change task module for XiZi_AIoT 2023-05-22 10:11:22 +08:00
Wien.b
d67d8e96f0 recover modify 2023-05-22 10:10:38 +08:00
Wien.b
8e5250f047 modify risc-v compiler download link 2023-05-22 10:10:38 +08:00
Wien.b
0549dcd363 modify risc-v compiler download link 2023-05-22 10:10:38 +08:00
Wien.b
7b427dd3c3 modify edu-riscv64 compiler download link 2023-05-22 10:10:37 +08:00
4e5e123799 Update .gitmodules subdomain 2023-05-20 12:54:37 +08:00
65220e5aa7 Update .gitmodules subdomain 2023-05-20 12:52:41 +08:00
3d5ca66e7a Update .gitmodules subdomain 2023-05-20 12:46:01 +08:00
Liu_Weichao
13432d41c6 fix compile error when gcc using <-with-newlib> function 2023-05-18 16:48:55 +08:00
Liu_Weichao
3e3cd6ecdc Merge branch '2023_open_source_contest' of https://gitlink.org.cn/xuos/xiuos into control_framework 2023-05-18 13:57:54 +08:00
Liu_Weichao
6d9cae19c2 Merge branch 'control_framework' of https://gitlink.org.cn/IACU/xiuos into control_framework 2023-05-18 13:55:59 +08:00
wgzAIIT
ffeaf4771e fix cortex-m0-emulator and cortex-m3-emulator compile error 2023-05-17 14:32:48 +08:00
Wien.b
01848defec ad keyence app demo 2023-05-16 20:01:27 -07:00
jqy1988
07b87016ba add inovance am401 cpu1608tn serial test app 2023-05-16 15:12:19 +08:00
IACU
d90f3e5dac modify risc-v compiler download link from bizhiyong 2023-05-15 15:24:13 +08:00
Jeremy
db3784b928 optmize lwip demo and add iperf for hc32 2023-05-15 15:00:13 +08:00
IACU
a9c7733e1e modify risc-v compiler download link from bizhiyong 2023-05-15 14:06:19 +08:00
Jeremy
61f317abed edit makefile for add w5500 iperf 2023-05-15 14:04:29 +08:00
Wien.b
a656ffaa66 recover modify 2023-05-14 20:17:43 -07:00
Wien.b
b97b9c49cd modify risc-v compiler download link 2023-05-14 20:07:15 -07:00
Jeremy
4429d743ba optimize kconfig for w5500 2023-05-15 11:04:09 +08:00
Jeremy
7aac1926f3 add iperf for w5500 2023-05-15 11:02:00 +08:00
wgzAIIT
91ae4320fa change nuttx submodules 2023-05-15 11:01:46 +08:00
Jeremy
12c24ddc73 fix complie bug for hc32f4a0 2023-05-15 10:58:47 +08:00
Jeremy
39c8ee354b Merge branch 'xuos_prepare_for_master' into prepare_for_master 2023-05-15 10:57:50 +08:00
Wien.b
65603817a4 modify risc-v compiler download link 2023-05-14 19:49:41 -07:00
wgzAIIT
912f87ecc9 support sabre-lite borad on xiuos appframework and Nuttx 2023-05-15 10:25:32 +08:00
wgzAIIT
9c5c6b32b1 add task module for XiZi_AIoT 2023-05-12 15:39:33 +08:00
wgzAIIT
7629077769 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-05-12 14:01:47 +08:00
Wien.b
d3df1f97ef modify edu-riscv64 compiler download link 2023-05-11 19:55:48 -07:00
Wien.b
c4510ba3e1 add xinje and schneider readme 2023-05-11 19:43:39 -07:00
IACU
012111c2cc fix fpu-config error by set -mfloat-abi=softfp in hc32f4a0 from liu_weichao 2023-05-10 14:45:59 +08:00
IACU
872aba7ccd fix fpu-config error by set -mfloat-abi=softfp in hc32f4a0 from liu_weichao 2023-05-10 14:42:53 +08:00
Liu_Weichao
87dc5269ee fix fpu-config error by set -mfloat-abi=softfp in hc32f4a0 2023-05-10 14:39:16 +08:00
xuedongliang
48decbe80f fix compile bug for test apps from Mo_jiayang
it is OK
2023-05-10 10:12:52 +08:00
xuedongliang
9109db0d94 add ota project function code from Wang_guozhu
it is OK
2023-05-10 10:12:16 +08:00
xuedongliang
e0bc75c405 feat add S7 protocol in control framework and add plc app demo from liu_weichao
it is OK
2023-05-09 11:11:12 +08:00
wgzAIIT
d6ff73acab Merge pull request 'merge code' (#11) from xidatong-arm32 into prepare_for_master 2023-05-08 16:23:04 +08:00
wgzAIIT
2532ae43d4 move version rollback function for OTA to tool dir 2023-05-08 16:19:49 +08:00
wgzAIIT
b825fd7f84 Merge pull request 'merge code' (#10) from xidatong-arm32 into prepare_for_master 2023-05-08 15:57:56 +08:00
jqy1988
813ca3dd20 add delta dvp test readme 2023-05-08 15:28:02 +08:00
jqy1988
d471bc04db add mitsubishi fx2n test readme 2023-05-08 15:24:52 +08:00
jqy1988
2df93dc327 1.add br ppc2100 ethernet test app 2.add br ppc2100 test readme 2023-05-08 15:15:41 +08:00
wgzAIIT
078f4babf1 mover version rollback function for OTA to tool dir 2023-05-08 14:48:38 +08:00
wgzAIIT
33abc16c67 revert "Add version rollback function for OTA" 2023-05-08 13:59:41 +08:00
wgzAIIT
4b40ae19dc 1、Adapt ota-related interfaces to the XiZi_IIoT/tool/bootloader directory
2、Add flash config by menuconfig
2023-05-06 13:28:16 +08:00
Wien.b
b37885b839 Merge branch 'control_framework' of https://gitlink.org.cn/IACU/xiuos into control_framework 2023-05-05 19:21:33 -07:00
Wien.b
042a51dc36 add Omron CP1H test program 2023-05-05 19:20:53 -07:00
jqy1988
fb27201603 1.add ge cpe100 test app 2.add ge plc readme 2023-05-05 14:59:52 +08:00
wgzAIIT
1161db389d add task module for XiZi_AIoT 2023-05-04 17:45:13 +08:00
huang
0ecb29c887 Add version rollback function for OTA 2023-05-04 13:38:16 +08:00
Wien.b
af665f9f29 modify siemens app readme 2023-04-27 02:54:02 -07:00
Wien.b
7b33905b3e add siemens s7-1512 app readme 2023-04-27 02:34:22 -07:00
Wien.b
2ec0e796fe add omron readme 2023-04-26 01:17:30 -07:00
Liu_Weichao
e231a29f5a 1、delete useless code in s7.c;2、fix hc32f4a0 compile error when using libs7.a。 2023-04-26 11:20:31 +08:00
Liu_Weichao
4f72b78b96 Merge branch 'control_framework' of https://gitlink.org.cn/IACU/xiuos into control_framework 2023-04-26 11:02:48 +08:00
Liu_Weichao
8ae4bce9a5 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into control_framework 2023-04-26 10:50:45 +08:00
jqy1988
20d9a52bdb add inovance am401 communication test readme file 2023-04-26 10:14:43 +08:00
jqy1988
b38e5c1c5c add inovance am401 ethernet test app 2023-04-25 15:18:19 +08:00
wgzAIIT
54d6c01868 Merge pull request 'merge code' (#9) from xidatong-arm32 into prepare_for_master 2023-04-24 19:22:42 +08:00
wgzAIIT
d24eb9a57c Merge pull request 'merge code' (#8) from xidatong-arm32 into develop 2023-04-24 19:22:03 +08:00
wgzAIIT
84f78b6435 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-04-24 19:10:07 +08:00
xuedongliang
a894bc8940 feat add lorawan_radio_driver submodule and fix compile error from Liu_weichao
it is OK
2023-04-24 15:49:56 +08:00
wgzAIIT
3d16b694dd Use the serial port iap method to burn the initial firmware under the bootloader 2023-04-24 10:24:56 +08:00
wgzAIIT
cfadebc3e8 Optimize OTA information structure and flash_write function 2023-04-23 16:33:22 +08:00
wgzAIIT
6074b2b147 Add function comments for flash related functions 2023-04-21 10:15:15 +08:00
Jeremy
692e010e0d fix compile bug 2023-04-20 18:02:50 +08:00
wgzAIIT
8bc7546828 support ota function for xidatong-arm32 2023-04-20 15:34:19 +08:00
Wien.b
c63301a870 Modify S7 Protocol 2023-04-19 02:31:45 -07:00
Wien.b
94c6631a24 Add S7 protocol and a S7 App demo 2023-04-18 19:52:24 -07:00
Liu_Weichao
dc5537a64f feat add lorawan submodule README.md and fix Kconfig compile error 2023-04-18 18:14:10 +08:00
Liu_Weichao
2b3f3de22e feat add control device struct in control framework 2023-04-18 17:05:11 +08:00
wgzAIIT
a9deff5cd0 move UartConfig function to common.c 2023-04-18 15:38:52 +08:00
wgzAIIT
bbb8dd75f8 Add four macro definitions:
#define XIUOS_FLAH_ADDRESS  0x60100000
#define BAKUP_FLAH_ADDRESS  0x60300000
#define DOWN_FLAH_ADDRESS   0x60500000
#define FLAG_FLAH_ADDRESS   0x60700000
2023-04-17 18:36:47 +08:00
wgzAIIT
198fabf970 fix xidatong-arm32 NorFlash init bug 2023-04-17 15:08:10 +08:00
Jeremy
5677cd0768 Merge remote-tracking branch 'xuos/prepare_for_master' into prepare_for_master 2023-04-17 14:12:07 +08:00
Liu_Weichao
0c45a736d3 feat add bootloader in XiZi_IIoT/tool DIR 2023-04-14 14:07:48 +08:00
Liu_Weichao
3d9160fa44 fix compile error in pthread_arm.h 2023-04-14 14:06:18 +08:00
Liu_Weichao
6b41cdbcfe Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into lorawan_develop 2023-04-14 14:05:31 +08:00
Wien.b
ba7e1a0d3b new paragraph named xdh_60t4_e.c xsdh_60a32_e.c 2023-04-13 19:57:03 -07:00
Wien.b
0a58099c51 new paragraph named xdh_60t4_e.c xsdh_60a32_e.c omron_cp1l.c 2023-04-13 19:55:40 -07:00
xuedongliang
f0240eb702 1、fix compile bug;2、delete unused defconfig on nuttx;3、optimize w5500 socket test cmd for edu-riscv64 board from Wangguozhu
it is OK
2023-04-13 12:05:47 +08:00
xuedongliang
2db9716cc0 fix LwIP error on HC32F4A0
it is OK
2023-04-13 12:04:52 +08:00
xuedongliang
640c5e6f59 fix LCD error from Mo_Jiayang
it is OK
2023-04-13 12:03:10 +08:00
xuedongliang
e6390ecf73 add tinyttf engine for xidatong-arm32 from huchao
it is OK
2023-04-13 12:01:01 +08:00
xuedongliang
84f453d4ac fix issue from soft-spi's Kconfig and complete cmsis-nn runtime for XiZi from Wuzheng
it is OK
2023-04-13 12:00:30 +08:00
xuedongliang
f33c50b97e feat fix modbus-uart bugs for control_framework and add plc demo C files from Liu_weichao
it is Ok
2023-04-13 11:59:53 +08:00
xuedongliang
cc8f577ba4 repair the compiler error of the configuration with Seperating compiler or musl lib from Wangweigen
it is OK
2023-04-13 11:59:20 +08:00
wgzAIIT
85105cb65d Upgrading binary packages by iap on xidatong-arm32 2023-04-13 09:57:08 +08:00
wgzAIIT
d615793063 1、Modifying Flash Partitions:
Bootloader:0x60000000-0x6007FFFF 512K
   APP:0x60100000-0x601FFFFF 1024K
   Backup:0x60300000-0x603FFFFF 1024K
   Download:0x60500000-0x605FFFFF 1024K
   OTAFlag:0x60700000-0x6071FFFF 128K
2、add four flash function:flash_erase,flash_write,flash_read and flash_copy
2023-04-12 08:29:57 +08:00
wgzAIIT
3819716568 Update flash-mcuboot-app.ld 2023-04-11 11:19:25 +08:00
Wang_Weigen
60e1c1bf8f add part of bsp for sabre lite board 2023-04-07 16:23:09 +08:00
wgzAIIT
669ef1eb2b 1、feat add link-bootloader.lds[start from 0x60000000] and link-application.lds[start from 0x60040000];
2、support BSP_USING_OTA MCUBOOT_BOOTLOADER and MCUBOOT_APPLICATION in xidatong-arm32/Kconfig;
3、support compile XiZi-xidatong-arm32-boot.bin when enable MCUBOOT_BOOTLOADER and XiZi-xidatong-arm32-app.bin when enable MCUBOOT_APPLICATION;
4、add QSPIFlash function for xidatong-arm32。
2023-04-04 15:47:34 +08:00
Liu_Weichao
95b049e636 feat support lorawan_devicenode submodule 2023-03-31 14:14:54 +08:00
Jeremy
a3377c21b6 fix #260 pbuf assert 2023-03-30 10:26:11 +08:00
Jeremy
8a589d0eaa fix:test_lcd_edu.c draw line mem overread 2023-03-27 10:44:55 +08:00
Liu_Weichao
58057e0b5e feat add lorawan_devicenode submodule 2023-03-22 16:50:34 +08:00
Liu_Weichao
08388f1b11 1、updata lora_radio_driver submodules;2、fix radio define error in connect_lora_spi.c;3、fix ticks calculation bug in timer_settime。 2023-03-21 15:16:12 +08:00
wgzAIIT
0a3ba23753 add flash-mcuboot-app.ld file copy from flash-ocram.ld 2023-03-20 18:09:14 +08:00
Liu_Weichao
0a71b8b62a fix timer set_time over-value error 2023-03-20 17:21:43 +08:00
huchao
cf1d5a234b add tinyttf 2023-03-20 07:55:30 +00:00
Liu_Weichao
83d383feab feat support event function for XiZi transform_layer 2023-03-20 14:49:40 +08:00
Liu_Weichao
47cea831ba modify lora_radio_driver path and compile OK 2023-03-17 10:05:59 +08:00
Liu_Weichao
a4eec2646d feat add lora_radio_driver submodule 2023-03-16 11:21:47 +08:00
Liu_Weichao
4db0c44434 delete useless printf in connect_touch.c 2023-03-16 10:17:21 +08:00
Liu_Weichao
1776223332 feat add spi type in transform_layer 2023-03-14 17:08:21 +08:00
Liu_Weichao
79edaf3d17 feat add flags for soft timer to choose ONCE or PERIODIC 2023-03-14 17:07:30 +08:00
Liu_Weichao
5e499bf975 add soft timer posix support in XiZi 2023-03-10 17:11:53 +08:00
Liu_Weichao
d797a999ae Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2023-03-02 09:32:31 +08:00
wgzAIIT
a16223f850 fix compile bug 2023-03-01 10:17:01 +08:00
wgzAIIT
abba2ce735 delete defconfig on nuttx 2023-03-01 09:24:03 +08:00
Wang_Weigen
419b53594f repair the compiler error of gd32vf103 2023-02-28 18:06:28 +08:00
Wang_Weigen
179c894840 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2023-02-28 17:20:51 +08:00
Wang_Weigen
5ae31a37f3 repair the compiler error of the configuration with Seperating compiler or musl lib 2023-02-28 17:20:39 +08:00
wuzheng
195e0085db fix complie error for incompatibilities between kernels 2023-02-28 10:44:32 +08:00
wuzheng
4b0783ab07 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-02-27 17:21:37 +08:00
wuzheng
27ad06f4c1 readme update in cmsis-nn demo 2023-02-27 17:18:35 +08:00
wgzAIIT
0996e47b88 optimize w5500 socket test cmd for edu-riscv64 board 2023-02-27 16:59:08 +08:00
wuzheng
d7e72942b5 cmsis runtime complement for XiZi 2023-02-27 14:19:04 +08:00
xuedongliang
779444f998 add timer and flash and can drivers with test examples for hc32f4a0 in XiZi_IIoT from Wu_zheng
it is OK
2023-02-27 12:13:39 +08:00
xuedongliang
35dc835d12 optimize w5500 socket test cmd for edu-riscv64 board from Wang_guozhu
it is OK
2023-02-27 12:13:03 +08:00
wuzheng
918b3663b8 fix kconfig issue for tfcard drivered by soft-spi 2023-02-24 19:52:11 +08:00
wuzheng
eed171df2a path_kernel.mk update 2023-02-24 16:00:46 +08:00
wuzheng
9b3c321150 add makefiles to adapt nnom and cmsis-nn for xizi 2023-02-24 15:47:49 +08:00
wgzAIIT
a286b2292f Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-02-24 14:14:59 +08:00
wgzAIIT
1655d28d63 optimize w5500 socket test cmd for edu-riscv64 board 2023-02-24 13:51:36 +08:00
xuedongliang
5dc639a133 add ADC and DAC driver for hc32f4a0 on XiZi_IIOT from Zhao_yun
it is OK
2023-02-24 10:49:36 +08:00
xuedongliang
bebc65607e add rtc and watchdog driver for hc32f4a0 on XiZi_IIOT from Wu_zhen
it is OK
2023-02-24 10:48:53 +08:00
jqy1988
7fee9d9e9f 1.modify melsec Melsec3eqlGenerateCommand function 2.modify ModbusUartGetDataBySerial function 3.add delta,ge,mitsubishi plc test app 2023-02-22 16:13:50 +08:00
wuzheng
10c39d930c add cpp support for hc32f4a0 2023-02-22 15:15:40 +08:00
wuzheng
73fbeea117 add can and flash driver for hc32f4a0 in XiZi_IIoT 2023-02-22 09:38:41 +08:00
Liu_Weichao
e0c9761f75 Merge branch 'control_framework' of https://git.trustie.net/IACU/xiuos into control_framework 2023-02-20 10:42:08 +08:00
wuzheng
002325c1d8 add flash and timer driver for hc32f4a0 2023-02-17 16:21:06 +08:00
zhaoyun1215
1b73886dbc add adc and dac drivers for hc32f4a0 in XiZi Kernel 2023-02-14 18:04:49 -08:00
Wien.b
572cbd201a new a demo named omron_cp1l.c 2023-02-10 02:36:57 -08:00
Wien.b
0ebfda21f7 new a demo named schneider_m241.c 2023-02-09 22:32:21 -08:00
zhaoyun1215
3a5d63762b add adc and dac drivers for hc32f4a0 in XiZi Kernel 2023-02-09 00:43:15 -08:00
zhaoyun1215
3950a6ec28 add adc and dac drivers for hc32f4a0 in XiZi Kernel 2023-02-09 00:41:24 -08:00
wuzheng
ba51d8ba8e fix bugs for gpio interrupt in hc32f4a0 for XiZi_IIOT 2023-02-09 10:59:17 +08:00
wuzheng
c88ce9d708 fix bugs in hc32f4a0 GPIO driver 2023-02-08 09:20:58 +08:00
wuzheng
bfe1e72378 Format rtc and watchdog driver for hc32 2023-02-07 16:48:52 +08:00
wuzheng
e6fa8a2603 code simplified and delete some unused 2023-02-06 16:34:46 +08:00
wgzAIIT
732320f5c9 support sabre-lite borad on xiuos appframework and Nuttx 2023-02-03 13:32:52 +08:00
wuzheng
3a6b5d7f4f fix file log error 2023-02-03 09:50:21 +08:00
wuzheng
8632d37d14 fix the file time log error 2023-02-03 09:48:11 +08:00
wuzheng
bcb5e48d6a adapt watchdog driver for hc32f4a0 2023-02-03 09:45:20 +08:00
wuzheng
d2e6719a0e adapt rtc driver for hc32f4a0 2023-02-02 18:01:24 +08:00
Wien.b
f55da28789 new two plc in xinje 2023-01-31 23:50:23 -08:00
wuzheng
b2de31844a KPU's kconfig bug fix 2023-02-01 14:19:26 +08:00
Wien.b
a590d902f5 create a new folder called xinje 2023-01-18 18:48:36 -08:00
wgzAIIT
60dbe78045 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-01-18 16:24:34 +08:00
xuedongliang
ff78fcc100 1、add menuconfig and compilation function for XiZi_AIoT; 2、add isr function and machine start for imxrt6q-sabrelite from Wang_Weigen
it is OK
2023-01-18 15:08:00 +08:00
xuedongliang
aea6a4f63e fixed nsh can’t use bug support hc32f4a0 i2c driver from Wang_linyu
it is OK
2023-01-18 15:07:00 +08:00
xuedongliang
d1da6ae35b 1、feat add modbus tcp protocol for control framework; 2、fix spi6 io define error on hc32f4a0 board from Liu_Weichao
it is OK
2023-01-18 15:06:08 +08:00
xuedongliang
df2a1043df add lora e22、ch376 usb fuction、lora e220 and wifi esp8285 for edu-riscv64 on Nuttx from Wang_Guozhu
it is OK
2023-01-18 15:05:28 +08:00
xuedongliang
d144306f76 Add Feature from Wu_Zheng
add kpu driver for edu-riscv64.
adapt kpu framework for XiZi_IIOT.
unified dvp driver for edu-riscv64.
add ethernet(W5500) example for edu-riscv64
adapt qs-fs/fx sensor framework in XiZi for edu-riscv6
2023-01-18 15:04:51 +08:00
Liu_Weichao
55654af275 fix serial receive data bug in control framework on xidatong-arm32 board 2023-01-13 15:35:34 +08:00
Liu_Weichao
fb11970cab fix serial ioctl error in control framework 2023-01-13 10:29:20 +08:00
Wang_Weigen
806492e271 1、modify the 'link.lds' file accroding to sdk;2、add irq enable and disable function 2023-01-11 14:32:41 +08:00
Liu_Weichao
8001b07341 fix Calculte error 2023-01-10 17:49:20 +08:00
Liu_Weichao
c621db2ca7 add imxrt1052 board mdelay function 2023-01-10 17:21:10 +08:00
Liu_Weichao
f8b845ca62 optimize control framework using socket, support LwIP and W5500(need to add init/socket apis) 2023-01-06 17:25:11 +08:00
Liu_Weichao
9ad282c39e feat support LwIP in hc32f4a0 board 2023-01-06 10:17:24 +08:00
wgzAIIT
a4e37b962f add spi_sdcard driver for edu-riscv64 on Nuttx 2023-01-04 18:20:19 +08:00
Liu_Weichao
e4742a480c feat add modbus uart protocol for control framework, compile OK 2023-01-04 17:14:01 +08:00
Wang_Weigen
6b091797ae 1、add 'menuconfig' function for XiZi_AIoT with imx6q-sabrelite board;2、add compilation function for AIoT system with imx6q-sabrelite board;3、add newlib base files;4、add startup files and irq function for imx6q-sabrelite 2023-01-03 10:14:05 +08:00
wgzAIIT
e37d8ed7d1 Merge pull request 'fix kconfig bug for edu-riscv64' (#3) from develop into prepare_for_master 2022-12-30 10:35:39 +08:00
wgzAIIT
1a0880c3f2 fix kconfig bug for edu-riscv64 2022-12-30 10:31:43 +08:00
Liu_Weichao
6010fe5654 feat add melsec tcp protocol for control framework, compile OK 2022-12-29 16:35:23 +08:00
wgzAIIT
a7bdd89097 Merge pull request 'add e22 test demo on edu-riscv64' (#2) from develop into prepare_for_master 2022-12-28 14:52:42 +08:00
wgzAIIT
32bf012d9a add e22 test demo on edu-riscv64 2022-12-28 14:44:16 +08:00
wagweigen
ce60710fe6 add exception.c and irq entry function 2022-12-23 16:28:39 +08:00
WuZheng
9f6419e5f6 fix dvp-read problem caused by driver adaptation 2022-12-23 09:09:54 +08:00
wlyu
4edf73254e support i2c and fixed no shell bug 2022-12-21 18:36:30 +08:00
Liu_Weichao
b933e0decb fix spi6 io define error on hc32f4a0 board 2022-12-21 12:07:47 +08:00
WuZheng
0b5c6b0f9f fix bugs that e220 initialize death 2022-12-20 15:15:35 +08:00
wgzAIIT
6b4097b941 Merge pull request 'merge code' (#1) from develop into prepare_for_master 2022-12-20 11:07:48 +08:00
wgzAIIT
d57552e223 add e22、ch376 usb fuction、lora e220 and wifi esp8285 for edu-riscv64 on nuttx 2022-12-20 11:04:19 +08:00
Wang_Weigen
4f7f98b0e9 add armv7-a start file 2022-12-19 16:33:25 +08:00
WuZheng
27cc89bcef update readme.md for know framwork 2022-12-19 14:24:35 +08:00
WuZheng
38c4419ef9 add KPU driver and resource in XiZi for edu-riscv64 2022-12-19 14:13:54 +08:00
Liu_Weichao
bc014769f5 1、fix modbus_tcp socket bug;2、fix ch438 init error on xidatong-arm32 board 2022-12-16 10:58:26 +08:00
WuZheng
4e1bc3bf04 add readme for yolo framework 2022-12-15 16:17:31 +08:00
WuZheng
5761bd0916 primarily unify dvp APIs with rt 2022-12-15 15:51:46 +08:00
WuZheng
186790f5ec fix bugs camera buff unstable 2022-12-15 10:36:56 +08:00
WuZheng
1864f39dd2 fix bugs in multi-blocks read meeting '0xFE' CRCs 2022-12-14 17:35:10 +08:00
Liu_Weichao
59fa5451ca feat add modbus tcp write function and fix modbus tcp bug 2022-12-13 17:25:37 +08:00
WuZheng
5a64507a84 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-12-13 17:04:42 +08:00
Liu_Weichao
56a014fe98 feat add modbus tcp protocol for control framework 2022-12-13 11:19:11 +08:00
Liu_Weichao
9b334f90e0 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-12-13 11:17:38 +08:00
wuzheng
6a89a12c49 temporarily adapt kpu for XiZi 2022-12-12 16:24:54 +08:00
wuzheng
04dc796f95 fix problems in client recv 2022-12-12 16:22:36 +08:00
xuedongliang
a3094c1dd6 repaire the k210 start failed problem caused by float sub operation at boot.S from Wang_weigen
it is OK
2022-12-09 14:22:19 +08:00
wuzheng
2df54e7f41 fix some bugs for sd read 2022-12-09 13:57:01 +08:00
Liu_Weichao
6ef80903ce Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-12-09 13:55:45 +08:00
Wang_Weigen
4f85bc91e5 modify compiler with double float 2022-12-09 13:39:18 +08:00
xuedongliang
5622be48ac add i2c and gpio driver for hc32f4a0 board from Liu_Weichao
it is OK
2022-12-09 11:34:57 +08:00
xuedongliang
669b7f427e Optimize k210 serial port driver for nuttx from Wang_guozhu
it is OK
2022-12-09 11:33:52 +08:00
xuedongliang
b20f041722 add tablestorage for RT-Thread_Fusion_XiUOS from yu
it is OK
2022-12-09 11:33:17 +08:00
xuedongliang
e802403362 support hc32 irq and spi and spi flash from Wang_linyu
it is OK
2022-12-09 11:32:21 +08:00
Wang_Weigen
19b16f7729 repaire the k210 start failed problem caused by float sub operation at boot.S 2022-12-09 11:24:41 +08:00
Liu_Weichao
465241e569 feat add ethernet driver for hc32f4a0 board, compile OK and PHY Loop-Back test OK 2022-12-05 17:46:56 +08:00
Liu_Weichao
dc8244cc5d feat add gpio for hc32f4a0 board 2022-12-05 11:23:56 +08:00
Liu_Weichao
d0902ca37f feat add i2c driver for hc32f4a0 board 2022-12-05 11:01:47 +08:00
wuzheng
6fa996d132 add ethernet test fro edu-riscv64 2022-12-02 11:04:46 +08:00
wuzheng
a782b53423 adapt qs-fs and qs-fx for edu-riscv64 2022-12-01 09:37:43 +08:00
yu
5a3954b726 add tablestorage for RT-Thread_Fusion_XiUOS 2022-11-30 15:27:07 +08:00
Liu_Weichao
0b49dd1a3c feat add melsec protocol for control framework 2022-11-29 17:11:51 +08:00
wlyu
9b83bc586e support hc32 irq and spi and spi flash 2022-11-29 14:16:37 +08:00
wgzAIIT
2757649473 add loransh/defconfig for edu-riscv64 on nuttx 2022-11-29 11:13:08 +08:00
wuzheng
100fe8c2d0 add w5500 test example 2022-11-29 09:30:48 +08:00
wgzAIIT
4fd39c0dd7 Optimize k210 serial port driver for nuttx 2022-11-28 17:39:30 +08:00
wuzheng
d8ac0998b2 fix configure network problem and configure fpio for w5500 2022-11-28 09:38:35 +08:00
wgzAIIT
f1029b81c3 fix compile error for makefile 2022-11-25 13:31:38 +08:00
wgzAIIT
1f97dd3d77 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-11-25 11:01:37 +08:00
xuedongliang
e5bf0cee41 Add camera driver and examples for edu-riscv64 from Wu_zheng
it is OK
2022-11-25 10:25:38 +08:00
xuedongliang
d845bd61b6 feat support control_framework from Liu_Weichao
it is perfect
2022-11-25 10:25:09 +08:00
wuzheng
334d5f1eee Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-11-25 09:50:44 +08:00
wgzAIIT
0125fdf0ef Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-11-25 09:32:07 +08:00
wuzheng
22e35a70aa adapt wifi framework and fix 'strncat' problem 2022-11-25 09:29:37 +08:00
Liu_Weichao
8583ea25b6 feat add control_framework, support fins protocol OK 2022-11-24 17:20:40 +08:00
Liu_Weichao
ba31c9e0f8 feat add control_framework, socket connect OK and delete useless printf 2022-11-24 16:07:41 +08:00
Liu_Weichao
f4b21208e8 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-11-24 16:06:20 +08:00
xuedongliang
2a01ff712d add w5500 support to xidatong-riscv64 and edu-riscv64 from Tu_Yuyang
it is OK
2022-11-24 14:27:29 +08:00
Liu_Weichao
bc47ae644f feat add control_framework, read json file OK 2022-11-24 10:46:54 +08:00
wgzAIIT
31189c2939 add edu-riscv64 board on nuttx 2022-11-23 18:15:53 +08:00
TXuian
1061ce4dff Merge remote-tracking branch 'upstream/prepare_for_master' into prepare_for_master 2022-11-22 08:03:14 -08:00
wuzheng
c1976c8d92 fix errors of naming function 2022-11-22 15:57:33 +08:00
TXuian
0d93a91829 add support to edu. 2022-11-21 19:38:18 -08:00
TXuian
7145cd6920 update w5500 functions. 2022-11-21 19:07:50 -08:00
Liu_Weichao
2a8a11849d feat add control_framework, support fins protocol, add control_io.c and function descriptions 2022-11-22 11:05:57 +08:00
wuzheng
49df162734 add softspi in xidatong-riscv64 2022-11-22 10:20:15 +08:00
Liu_Weichao
5560fc5318 feat add control_framework, support fins protocol, compile OK 2022-11-21 17:20:44 +08:00
wuzheng
987fd6c798 fit touch postion for lvgl 2022-11-21 16:46:46 +08:00
wuzheng
ebc61431bd fit touch position for lcd 2022-11-21 15:59:25 +08:00
wuzheng
7c252bda56 fix touch address error 2022-11-21 14:29:17 +08:00
wuzheng
e31199a104 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-11-21 11:30:48 +08:00
wuzheng
68cdcbdcce improve dvp driver by add one effective mode 2022-11-21 11:12:35 +08:00
wuzheng
06ed03337a add camera driver and examples for edu-riscv64 2022-11-18 20:20:34 +08:00
Liu_Weichao
72e09d82e7 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-11-18 09:52:41 +08:00
xuedongliang
164614a75a add touch for edu-riscv64 board from Wang_weigen
it is OK
2022-11-16 15:23:34 +08:00
xuedongliang
75259c4006 1、support musl libc on nuttx and add test case on xidatong-arm32 2、register lcd device on xidatong-riscv64 on nuttx
it is OK
2022-11-16 15:23:05 +08:00
xuedongliang
992b8f62ab soft-SPI driver for edu-riscv64,which mainly for SDcard. edu-riscv64 examples including filesystem/RS485/gpio/loraE220/RTC from Wu_zheng
it is OK
2022-11-16 15:22:09 +08:00
xuedongliang
afc27bce65 1、support SDIO driver and mount FAT-FS; 2、support SPI driver; 3、support SPI-LoRa driver; 4、fix heap memory error : start from _bss_end and conflict with stack segment
it is OK
2022-11-16 15:21:08 +08:00
Wang_Weigen
96baeb9482 add new files for armv7-a 2022-11-16 10:58:56 +08:00
TXuian
2a07e463f6 add w5500 support 2022-11-15 17:40:51 -08:00
TXuian
629e8893e3 add w5500 support. 2022-11-15 07:45:21 -08:00
wuzheng
f22fbc3c94 example for edu-riscv64:watchdog,lcd and timer 2022-11-15 15:47:48 +08:00
Wang_Weigen
14f0e442ad fix compile error 2022-11-15 14:09:03 +08:00
Liu_Weichao
32c8701391 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-11-14 16:09:47 +08:00
Liu_Weichao
452699ac02 feat add third_party_driver/usb for hc32f4a0 board, support Mount file-system 2022-11-14 16:05:26 +08:00
wgzAIIT
77bae67322 Merge pull request 'merge code' (#20) from develop into prepare_for_master 2022-11-14 15:22:39 +08:00
wgzAIIT
02cbcf2b23 fix touch problem 2022-11-14 15:20:03 +08:00
wgzAIIT
2bfd6c9aaa Merge pull request 'merge code' (#18) from develop into prepare_for_master 2022-11-14 09:56:41 +08:00
wgzAIIT
8bb59ddf3a Resolve kconfig warnning 2022-11-14 09:53:33 +08:00
wuzheng
8c929ba701 rs485 test example 2022-11-11 20:29:35 +08:00
wuzheng
e7175c2745 add edu-riscv64 RTC test example 2022-11-11 17:39:03 +08:00
wuzheng
e746639f8a add edu-riscv64 lora example and fix name problem 2022-11-11 15:32:38 +08:00
Wang_Weigen
d89e018d33 add touch for edu-riscv64 board 2022-11-11 11:13:56 +08:00
wgzAIIT
c7c7e700ca Merge pull request 'merge code' (#16) from develop into prepare_for_master 2022-11-10 14:45:25 +08:00
wgzAIIT
5d6aa56f29 support can and add test case for xidatong-riscv64 on nuttx 2022-11-10 14:37:54 +08:00
wuzheng
00b39cdd55 gpio test sample for edu-riscv64 2022-11-10 10:20:20 +08:00
wuzheng
b8cf052d49 test framework 2022-11-09 20:45:44 +08:00
wuzheng
d3836f1a6f softspi driver and its app test 2022-11-09 19:23:12 +08:00
wgzAIIT
33984d8872 Merge pull request 'merge code' (#15) from develop into prepare_for_master 2022-11-09 18:37:30 +08:00
wgzAIIT
2bc1de068c change ch376_demo.c 2022-11-09 18:07:48 +08:00
wgzAIIT
4f15f1e70b add usbnsh/defconfig and sdnsh/defconfig 2022-11-09 16:48:18 +08:00
wgzAIIT
d6495c03d2 Merge pull request 'merge code' (#14) from develop into prepare_for_master 2022-11-09 08:55:59 +08:00
Liu_Weichao
696c9f6fe0 fix MountUsb function error 2022-11-08 17:02:39 +08:00
Liu_Weichao
9a818b1ef4 feat add third_party_driver/usb for hc32f4a0 board, compile OK 2022-11-08 14:15:23 +08:00
wgzAIIT
b5e08c5d43 support musl libc on nuttx and add test case 2022-11-08 13:57:46 +08:00
Liu_Weichao
636f803b7b modify usb init position into board.c from init.c 2022-11-08 11:27:06 +08:00
wgzAIIT
51ebd8f604 register lcd device on xidatong-riscv64 on nuttx 2022-11-07 16:45:00 +08:00
Liu_Weichao
5f4922866e modify hc32f4a0 console usart as usart3 2022-11-03 09:31:34 +08:00
Liu_Weichao
d0e42a9b51 feat add third_party_driver/spi/lora for hc32f4a0 board, send and receive function OK 2022-11-02 17:23:07 +08:00
Liu_Weichao
107913cb61 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into hc32f4a0_driver 2022-11-02 17:22:06 +08:00
wgzAIIT
7361d1c65f Merge pull request 'merge code' (#10) from develop into prepare_for_master 2022-11-02 15:09:58 +08:00
wgzAIIT
9965ce4c43 register lcd device on riscv64 on nuttx 2022-11-02 14:43:58 +08:00
wgzAIIT
a39bc41597 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into prepare_for_master 2022-11-02 09:34:43 +08:00
wgzAIIT
3352d4be6b add hc32 dir 2022-11-02 09:33:03 +08:00
wgzAIIT
485555b3a2 Merge branch 'prepare_for_master' of https://gitlink.org.cn/wgzAIIT/xiuos into prepare_for_master 2022-11-02 09:18:23 +08:00
wgzAIIT
0bb057c642 register_driver lcd device on riscv64 on nuttx 2022-11-02 09:18:04 +08:00
xuedongliang
094986ac76 modify XiZi_AIoT DIR from Liu_weichao
it is OK
2022-11-01 19:12:01 +08:00
Liu_Weichao
2e383f0c85 modify XiZi_AIoT DIR 2022-11-01 18:33:04 +08:00
xuedongliang
3c7f322fca 1、add edu-riscv64 board for xizi;2、add microkernel dir for xizi
it is OK
2022-11-01 17:48:27 +08:00
Liu_Weichao
0504cf0e48 feat add third_party_driver/spi/lora for hc32f4a0 board, init function OK 2022-11-01 17:40:53 +08:00
Liu_Weichao
234f4fc2ed Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into hc32f4a0_driver 2022-11-01 17:39:40 +08:00
Wang_Weigen
5d0c0f944e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-11-01 17:10:33 +08:00
Wang_Weigen
d2192a0cb1 add microkernel dir for xizi 2022-11-01 17:10:11 +08:00
xuedongliang
8e5c61c487 add wifi esp8285 and lcd driver for xidatong-riscv64 on nuttx
it is OK
2022-11-01 16:42:43 +08:00
xuedongliang
1a846ba3ae support hc32f4a0 on nuttx and hc32f4a0 gpio is ok!
it is OK
2022-11-01 16:41:39 +08:00
wgzAIIT
6ccaf3f928 Merge pull request 'merge code' (#8) from develop into prepare_for_master 2022-10-31 15:27:34 +08:00
Liu_Weichao
2d7d5d121d feat add third_party_driver/spi for hc32f4a0 board, write and read function OK 2022-10-31 15:11:39 +08:00
Liu_Weichao
7a8766a74d Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into hc32f4a0_driver 2022-10-31 15:09:35 +08:00
wgzAIIT
7869538b1d support wifi for xidatong-riscv64 on nuttx 2022-10-28 20:48:05 +08:00
wgzAIIT
f9d4484a57 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-10-27 14:32:49 +08:00
wgzAIIT
15ae618a3b Merge pull request 'merge code' (#7) from develop into prepare_for_master 2022-10-27 14:27:39 +08:00
wgzAIIT
b693f91f30 Optimize lcd driver for xidatong-riscv64 on nuttx 2022-10-27 13:43:01 +08:00
wgzAIIT
c541128122 Optimize lcd driver for xidatong-riscv64 on nuttx 2022-10-27 11:29:47 +08:00
xuedongliang
de947e0942 add 4g、ch376、w5500、gt911 driver for xidatong-riscv64 on nuttx from Wang_guozhu
it is OK
2022-10-25 23:10:24 +08:00
wgzAIIT
4cbb9d5f09 Merge pull request 'merge code' (#3) from develop into prepare_for_master 2022-10-25 18:24:11 +08:00
wgzAIIT
a04a4288a7 add printf point.x and point.y in test case 2022-10-25 18:21:32 +08:00
wlyu
3cddeb1985 support hc32 on nuttx 2022-10-25 18:08:35 +08:00
wgzAIIT
bf916323e8 Merge pull request 'merge code' (#2) from develop into prepare_for_master 2022-10-25 17:45:55 +08:00
wgzAIIT
490d372b47 add touchnsh/defconfig 2022-10-25 17:41:08 +08:00
wlyu
f1515ba075 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-10-25 17:06:58 +08:00
wgzAIIT
2ce43f3a1b Merge pull request 'merge code' (#1) from develop into prepare_for_master 2022-10-25 16:31:27 +08:00
wgzAIIT
6794cb03a8 support touch screen for xidatong-riscv64 on nuttx 2022-10-25 16:27:25 +08:00
Wang_Weigen
166f88fd46 add lcd and spi for edu_riscv64 board 2022-10-25 14:26:33 +08:00
Wang_Weigen
db2faeeba6 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-10-24 10:06:50 +08:00
wgzAIIT
c815bb3b6e support gpio on k210 on nuttx 2022-10-21 18:13:41 +08:00
wgzAIIT
df32ed24ed change nsh_Applicationscmd.c 2022-10-20 16:45:14 +08:00
wgzAIIT
0f2f2028ca Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develp 2022-10-20 16:36:38 +08:00
wgzAIIT
a4f183c62a resolve Conflicts 2022-10-20 16:35:05 +08:00
xuedongliang
a11ff29402 support lcd test on xidatong-arm32 support wifi test on xidatong-arm32 support ethernet test on xidatong-arm32 on nuttx from Wang_linyu
it is OK
2022-10-20 16:13:50 +08:00
Liu_Weichao
e26c93a666 fix heap memory error : start from _bss_end and conflict with stack segment 2022-10-19 14:27:44 +08:00
Liu_Weichao
9802c89fd6 feat add third_party_driver/sdio for hc32f4a0 board 2022-10-18 17:27:30 +08:00
Liu_Weichao
700a07bc84 feat add third_party_driver/spi for hc32f4a0 board, compile OK 2022-10-18 15:03:44 +08:00
Wang_Weigen
f2e633348a add rtc wdt timer for xidatong-riscv64 board 2022-10-18 10:01:39 +08:00
wgzAIIT
64da177d6a Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-10-17 18:21:09 +08:00
wgzAIIT
deb247165a add ch376 and w5500 defconfig 2022-10-17 18:16:28 +08:00
wgzAIIT
b7a3657c83 add w5500 cmd to nuttx shell 2022-10-17 17:22:28 +08:00
Liu_Weichao
37bdc4a33f fix spi CS init param error on aiit-riscv64\K210-emulator\kd233 board 2022-10-17 16:57:18 +08:00
Wang_Weigen
9c15e587c4 add edu-riscv64 board for xizi 2022-10-17 16:14:36 +08:00
Liu_Weichao
c612502cdc Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into control_framework 2022-10-17 14:25:50 +08:00
wgzAIIT
f573bc391c add w5500 for xidatong-riscv64 2022-10-17 11:28:16 +08:00
wgzAIIT
ba84afb179 add w5500 for xidatong-riscv64 2022-10-14 18:08:41 +08:00
wlyu
5c4cf7aba8 merge the code 2022-10-14 16:58:00 +08:00
wlyu
2b099b8bf5 support lcd and wifi and ethernet test on xidatong-arm32 2022-10-14 16:57:30 +08:00
wgzAIIT
256857b6c5 move gpio define to board.h on xidatong-riscv64 2022-10-14 16:57:21 +08:00
xuedongliang
43fdd542da Migrate Mbedtls to support board ok1052-c
it is OK
2022-10-14 16:25:29 +08:00
wlyu
891addbfc0 fixed the bug of wifi test losing parameter 2022-10-13 20:12:02 +08:00
wgzAIIT
b073c38035 add ch376 usb and sd card demo on xidatong-riscv64 2022-10-12 12:40:33 +08:00
wgzAIIT
0f1d2a4868 add ch376 usb demo on xidatong-riscv64 2022-10-11 21:16:40 +08:00
wlyu
a1ddea8e5e optimize extsram test output 2022-10-10 20:43:37 +08:00
wlyu
b65663af4c change extrasram_test name with ExtramTest 2022-10-10 20:21:53 +08:00
wlyu
32fc849390 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-10-10 17:22:30 +08:00
wgzAIIT
540c9a84d5 add esp8285 wifi on nuttx for xidatong-riscv64 2022-10-10 16:23:42 +08:00
wgzAIIT
9fcd539f1b add ch376 for xidatong-riscv64 2022-10-10 09:26:36 +08:00
Liu_Weichao
012fc146cc fix hifive1-emulator compile error : enable work_queen 2022-10-08 14:52:16 +08:00
xuedongliang
0b4a3ec960 support Ch376 for xidatong-riscv64 in XiZi Kernel
it is OK
2022-10-07 11:30:00 +08:00
xuedongliang
7b17d191fb add Ethernet for imxrt1176 from Wang_weigen
it is OK
2022-10-07 11:28:32 +08:00
Ruoqing He
7079f86acb Add SHA1, SHA256, AES CBC and etc. tests for MBed-TLS, modified kconfig to enable selection of
whether to compile test code when build for board ok1052-c.
2022-10-04 03:37:35 -07:00
wlyu
7dc887e516 fixed the bug of compilation following adapter zigbee change 2022-09-28 20:07:54 +08:00
wlyu
ecba6148cb fixed the bug of wifi test on nuttx and remove warning 2022-09-28 19:45:32 +08:00
wlyu
48250b7285 optimize socket demo on nuttx 2022-09-28 15:19:01 +08:00
wgzAIIT
32b54cee33 add GPIO_WIFI_EN register and change PrivSerialIoctl 2022-09-28 14:32:14 +08:00
zhaoyun1215
cd850b90cd support Ch376 for xidatong-riscv64 in XiZi Kernel 2022-09-27 22:47:17 -07:00
wlyu
7052951624 merge codes 2022-09-28 10:33:06 +08:00
wlyu
51f346e935 fixed udp tcp failed to receive and send bug on nuttx 2022-09-28 10:21:11 +08:00
Wang_Weigen
a154353bbe sync the upstream branch 2022-09-28 09:51:12 +08:00
wgzAIIT
3fa418120c support Adapter4G for xidatong-riscv64 on nuttx
support mulan on nuttx
2022-09-28 09:51:01 +08:00
Wang_Weigen
088bf02fbd add ethernet for imxrt1176-sbc board and keep compatible with other boards 2022-09-28 09:15:51 +08:00
wgzAIIT
281389af1c support uart1-uart3 for k210 on Nuttx 2022-09-27 20:54:22 +08:00
xuedongliang
c5872c051e modify XiUOS DIR and feat support PRIV_SHELL_CMD_FUNCTION to fit heterogeneous OS
it is OK
2022-09-27 20:53:06 +08:00
Liu_Weichao
104823e26f add Makefile and Kconfig in Ubiquitous/XiZi-AIoT 2022-09-27 20:44:06 +08:00
Liu_Weichao
e14fa6ff8e modify XiUOS DIR : (1.add plc_demo in APP_Framework/control_app; 2.add industrial_network、industrial_fieldbus and industrial_wlan; 3.add XiZi_AIoT and modify XiZi as XiZi_IIoT.) 2022-09-27 20:39:52 +08:00
wlyu
6603f121c6 support lcd demo on nuttx and optimize lt768 drivers 2022-09-27 18:19:50 +08:00
wlyu
485911f15f support lcd demo on application framework 2022-09-27 14:26:14 +08:00
Liu_Weichao
dbca22a1a6 feat support PRIV_SHELL_CMD_FUNCTION to fit heterogeneous OS 2022-09-26 17:04:04 +08:00
wlyu
96b059cabe Merge branch 'prepare_for_master' of https://gitlink.org.cn/wlyu/xiuos into prepare_for_master 2022-09-26 14:37:23 +08:00
wlyu
dcc91fd4a9 added socket test command on nuttx 2022-09-26 14:36:37 +08:00
wlyu
00c4d601f4 added socket test command on nuttx 2022-09-26 14:24:19 +08:00
xuedongliang
fd69c3d400 support full 100 threads test from TIan_chunyu
it is OK
2022-09-24 22:43:16 +08:00
wlyu
3bc1cffa33 support socket demo on nuttx 2022-09-23 21:19:27 +08:00
wlyu
0ac4dc05fc Merge branch 'prepare_for_master' of https://gitlink.org.cn/wlyu/xiuos into prepare_for_master 2022-09-23 17:42:06 +08:00
wlyu
bcff330830 support extra sdram test 2022-09-23 17:41:36 +08:00
wlyu
853454058f support extra sdram test 2022-09-23 17:10:38 +08:00
wlyu
c4eaff938b support mm command for semc test 2022-09-22 21:16:28 +08:00
wlyu
55c8de20d9 test full 100 threads on XiZi, test is ok 2022-09-21 19:32:18 +08:00
xuedongliang
3bec8f496a support xiwangtong-arm32 board on XiZi from Liu_Weichao
it is OK
2022-09-16 14:30:10 +08:00
xuedongliang
61fee4da26 add is_ext_uart in serial_cfg for framework for nuttx
it is OK
2022-09-16 14:29:41 +08:00
xuedongliang
414c82e83d 1、feat support ch438 function on aiit-riscv64-board and xidatong-riscv64; 2、support uart3 and uart4 on xidatong-arm32 board; 3、delete useless H file on xidatong-riscv64 board。
it is OK
2022-09-16 14:29:18 +08:00
xuedongliang
ea3d2f4410 fit XiUOS to ch32v307. fix i2c for xidatong-arm32. add new interface for sensor information from Tu_yuyang
it is OK
2022-09-16 14:28:34 +08:00
Liu_Weichao
43e14a9d52 feat support hc32f4a0 board in XiZi kernel 2022-09-15 13:55:36 +08:00
Wang_Weigen
85ed3a2c10 repair the debug info of memory manege;repair value definition of msgqueue;add lwip path for imxrt1176-sbc board 2022-09-07 10:59:53 +08:00
Liu_Weichao
6c80a2da18 add board/xiwangtong-arm32 Makefile and path_kernel.mk configure 2022-09-06 14:37:00 +08:00
Liu_Weichao
b5495f108a Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-09-06 14:26:36 +08:00
Wang_Weigen
7c709bfe9f repair the compile error for imxrt1176-sbc 2022-09-06 10:36:00 +08:00
Wang_Weigen
48b454ab70 repair the i2c write function for aiit_riscv64_board 2022-09-06 10:10:59 +08:00
Liu_Weichao
0bacf4bd1d add UART1 Kconfig on aiit-riscv64-board 2022-09-06 09:32:29 +08:00
wgz-code
3833a4277a fix Merge conflict 2022-09-06 09:20:58 +08:00
Liu_Weichao
1fd4e3981d optimize ch438 function on aiit-riscv64-board and xidatong-riscv64 2022-09-05 18:03:09 +08:00
wgz-code
5759661e8c add is_ext_uart in serial_cfg for framework for nuttx 2022-09-05 14:08:12 +08:00
TXuian
587ab693c1 comment debug print of i2c transfer errors. 2022-09-01 18:47:05 -07:00
TXuian
6c6ef02455 comment debug print of i2c transfer errors. 2022-09-01 18:41:54 -07:00
TXuian
15c70aa2b8 fix i2c errors and add sensor interface. 2022-09-01 03:02:37 -07:00
TXuian
c014727e2c fix i2c error, add senser interface. 2022-09-01 02:52:44 -07:00
Liu_Weichao
e4f2c3e5aa support uart3 and uart4 on xidatong-arm32 board 2022-09-01 09:23:49 +08:00
Liu_Weichao
5de4b9eec0 add ch438 for xidatong-riscv64 board 2022-09-01 09:20:15 +08:00
Liu_Weichao
b5b3cb9ca7 change SensorQuantityRead with SensorQuantityReadValue for sensor framework 2022-08-31 10:54:54 +08:00
Liu_Weichao
f55022fc46 delete useless H file on xidatong-riscv64 board 2022-08-31 10:51:14 +08:00
Liu_Weichao
09ff679c4c Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into sensor_485_function 2022-08-30 14:12:53 +08:00
Liu_Weichao
2756937f88 delete useless kd233 kconfig configuration 2022-08-30 14:11:33 +08:00
xuedongliang
5f42111c38 W5500 is supported on the xidatong riscv64 ch438 is supported on the xidatong arm32 lora and bluetooth is supported on the xidatong arm32 from Tian_chunyu
it is OK
2022-08-29 11:59:06 +08:00
xuedongliang
f376e568fd optimize xidatong-riscv64 third_party_driver and connection_framework form Liu_weichao
it is OK
2022-08-29 11:57:43 +08:00
xuedongliang
944225b7ad add imxrt1176-sbc board for xizi from Wang_weigen
it is OK
2022-08-29 11:56:29 +08:00
Liu_Weichao
8df0563e64 add is_ext_uart in serial_cfg for framework 2022-08-26 14:43:27 +08:00
Liu_Weichao
22de65aa20 optimize connection_adapter 4g and bluetooth kconfig 2022-08-25 16:05:03 +08:00
Liu_Weichao
76017d0d0d delete useless config on riscv-board 2022-08-24 17:33:38 +08:00
chunyexixiaoyu
27b546c269 it's verified 2022-08-24 15:15:55 +08:00
Liu_Weichao
6fc09a8864 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-08-24 10:09:43 +08:00
Ruoqing He
4167f1f0f9 Migrate mbedtls to support board ok1052-c.
Signed-off-by: Ruoqing He <farronwatcher@outlook.com>
2022-08-19 21:37:40 -07:00
Wang_Weigen
d5e47d36f4 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-08-19 16:17:35 +08:00
Wang_Weigen
1ce5ee8e8b add imxrt1176-sbc board for xizi 2022-08-19 16:17:19 +08:00
zhujiarui666
125a1d1c61 xiuos\APP_Framework\Framework\connection\bluetooth\hc08:
1.modify uuid
2022-08-15 18:02:59 +08:00
zhujiarui666
8ccf8875ee xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\test_photo\Bluetooth:
1.add test photo
2022-08-15 14:06:59 +08:00
zhujiarui666
48199d551c xiuos\APP_Framework\Framework\connection\bluetooth:
1.add rt-thread msh
2022-08-15 14:05:40 +08:00
zhujiarui666
b5783ca4c5 xiuos\APP_Framework\Framework\connection\bluetooth:
1.add code like setting Tuuid and Suuid
2022-08-15 14:04:39 +08:00
zhujiarui666
1293577e93 xiuos\APP_Framework\Framework\connection\bluetooth:
1.modify the Kconfig file
2022-08-15 14:02:18 +08:00
xuedongliang
afe2a7766d support e220 lora、e22 lora、bluetooth hc08 and musl libc on Nuttx
it is OK
2022-08-11 10:26:04 +08:00
TXuian
0a629fc69d fit XiUOS to ch32v307. 2022-08-08 22:56:32 -07:00
zhujiarui666
50b40bcf1f xiuos\APP_Framework\Framework\connection\lora\e220:
Modify this file again,and if you want to test the lora module,you can find test function in this file
2022-08-09 11:20:33 +08:00
zhujiarui666
0526e73a6a xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\board:
1.add kconfig file
2022-08-09 11:13:13 +08:00
zhujiarui666
c69397a2b7 xiuos\APP_Framework\Framework\connection\lora:
1.test function has been modified
2022-08-09 11:12:44 +08:00
zhujiarui666
83112073a9 xiuos\APP_Framework\Framework\connection\lora:
1.test function has been modified
2022-08-09 11:07:53 +08:00
zhujiarui666
fe21a461a5 xiuos\APP_Framework\Framework\connection\lora\e220:
1.Add Kconfig files and SConscript files related to e220
2022-08-09 11:04:55 +08:00
zhujiarui666
bf9b87a314 xiuos\APP_Framework\Framework\connection\4g:
(1)Modify the msh instructions in 4G Test function
2022-08-09 10:57:55 +08:00
zhujiarui666
252edf1add xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\applications:
1.modify this file to avoid conflict 0f mux related to lora mode config
2022-08-09 10:55:24 +08:00
zhujiarui666
e812b5a49f xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\board:
1.Add ch438.c and ch438.h
2.include test function about ch438,hc08,lora,e18
2022-08-09 10:54:50 +08:00
zhujiarui666
7c30bd3601 xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\test_photo\CH438:
1.zigbee base ch438 receive
2022-08-09 10:54:12 +08:00
zhujiarui666
f9984b5b7d xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\test_photo:
1.Lora send and receive result
2022-08-09 10:53:00 +08:00
TXuian
92a33bff87 fit XiUOS to board ch32v307. 2022-08-08 03:17:26 -07:00
Liu_Weichao
d1d41d3990 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-08-08 10:51:03 +08:00
wgzAIIT
f50ba5292c fix compile warning 2022-08-04 15:56:07 +08:00
wgz-code
8256124e03 fix compile warning 2022-08-04 15:51:22 +08:00
wgzAIIT
88ab1d870d ok 2022-08-04 15:40:57 +08:00
wgzAIIT
ad0132f739 support musl libc on nuttx 2022-08-04 15:34:36 +08:00
zhujiarui666
bfa8c734c4 xiuos\APP_Framework\Framework\connection\lora\e220:
(1)Add Kconfig files and SConscript files related to e220
2022-08-04 14:42:30 +08:00
wgzAIIT
bcaf4ac6fc support e22 on stm32f4discovery 2022-08-04 14:31:42 +08:00
wgz-code
bdec0d6e20 add Mulan PSL v2 for musl on nuttx
fix compile error
2022-08-04 14:09:45 +08:00
chunyexixiaoyu
8f6078d40c W5500 is supported on xidatong-riscv 2022-08-04 14:06:31 +08:00
wgz-code
4bee455984 support musl libc on nuttx for xidatong-arm32 and xidatong-riscv64
fix compile warning

add musl string
2022-08-03 15:48:49 +08:00
Beichen
8fb4c35a35 Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/:Add test folder 2022-08-03 11:26:20 +08:00
Beichen
75a9e76257 Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/:Update the .config、rtconfig.h and Update tcp_client.h and tcp_server.h in the applications folder 2022-08-03 11:23:22 +08:00
Beichen
4a39d325b2 Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/applications/:Add tcp_client.c、 tcp_client.h、tcp_server.c、tcp_server.h and update the SConscript 2022-08-03 10:21:18 +08:00
Beichen
38c2864c73 Ubiquitous/RT-Thread_Fusion_XiUOS/app_match_rt-thread/:Add WIZnet software package which supports W5500 device and update the Kconfig 2022-08-03 09:53:01 +08:00
Beichen
a70a31d282 Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/applications/:Update the main function and add the dependency macro of lcd_test.c in SConscript 2022-08-03 09:39:02 +08:00
wgzAIIT
9da05bd4b1 ok 2022-08-02 15:13:45 +08:00
wgz-code
0de30975aa Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into e22lora 2022-08-02 15:09:07 +08:00
xuedongliang
3ec17025d1 add musl for XiUOS, support arm32 and riscv64 from Tu_yuyang
it is OK
2022-08-01 19:58:58 +08:00
xuedongliang
ba03024617 remove critical area operation in shell task to aviod system lag at xidatong-arm board from Wang_weigen
it is OK
2022-08-01 19:57:57 +08:00
xuedongliang
c6bef5fbec update rt-thread bsp(xidatong riscv)and webnet from Tian_chunyu
it is OK
2022-08-01 19:57:27 +08:00
xuedongliang
1bd7200e44 add xidatong-riscv64 board bsp for nuttx from Wang_guozhu
it is OK
2022-08-01 19:56:51 +08:00
wgzAIIT
357abd6cb0 ok 2022-07-28 14:31:48 +08:00
wgzAIIT
8e5b942427 ok 2022-07-28 14:31:25 +08:00
wgzAIIT
4745f77708 ok 2022-07-28 14:29:18 +08:00
zhr
0b0b4c24ed add g8s sensor support Nuttx on stm32f407-discovery 2022-07-28 14:21:49 +08:00
TXuian
906398da9f fit musl for riscv64 boards. 2022-07-27 05:42:26 -07:00
TXuian
cb4a9d03e0 fit musl for riscv64 boards. 2022-07-27 05:35:56 -07:00
zhr
21dce4f25e add g8s sensor support Nuttx on stm32f407-discovery 2022-07-26 18:43:39 +08:00
TXuian
214cf55603 fit musl lib for arm boards. 2022-07-26 01:08:20 -07:00
Wang_Weigen
d94a57c919 remove critical area operation in shell task to aviod system lag at xidatong-arm board 2022-07-26 14:22:01 +08:00
Liu_Weichao
0927e2e510 fix usb filesystem bug 2022-07-22 19:14:04 +08:00
wlyu
b1d443ee63 merge code 2022-07-22 18:28:04 +08:00
wlyu
4b8e015b26 support lt768 lcd 2022-07-22 18:20:10 +08:00
wlyu
dde22ee0b8 support lt768 lcd 2022-07-22 17:19:28 +08:00
wgzAIIT
d27685965c Merge pull request 'update readme.md' (#83) from xidatong-riscv64 into prepare_for_master 2022-07-19 13:46:20 +08:00
wgzAIIT
931bc172c1 Merge pull request 'update readme.md' (#85) from xidatong-riscv64 into e22lora 2022-07-19 13:46:04 +08:00
wgzAIIT
9c0db7ae2d update readme.md 2022-07-18 16:53:13 +08:00
TXuian
e1999f5af9 add get touch coordinate function to xidatong-riscv64. 2022-07-15 01:26:58 -07:00
TXuian
1818e23744 add get touch coordinate function to xidatong-riscv64. 2022-07-15 01:08:18 -07:00
chunyexixiaoyu
6a9b9fba1a APP_Framework/Applications/: update the webnet version,custom development will can base on the version. 2022-07-14 11:32:52 +08:00
chunyexixiaoyu
b585a6ae92 APP_Framework/Framework/:update the transform.h 2022-07-14 11:29:21 +08:00
chunyexixiaoyu
6133b5de21 Ubiquitous/RT-Thread_Fusion_XiUOS: update the default setting adapt to the webnet 2022-07-14 11:28:04 +08:00
chunyexixiaoyu
7cbccb7eaf Ubiquitous/RT-Thread_Fusion_XiUOS/: add xidatong riscv64 k210 sdk 2022-07-12 18:24:19 +08:00
wgzAIIT
6404f81ca6 update readme.md 2022-07-12 18:18:18 +08:00
wgzAIIT
308d50c640 update readme.md 2022-07-12 18:16:25 +08:00
chunyexixiaoyu
229749707f Ubiquitous/RT-Thread_Fusion_XiUOS/:add xidatong-riscv64 bsp 2022-07-12 17:29:52 +08:00
chunyexixiaoyu
a6a50a06a0 APP_Framework/Framework/:solve the bug compiling 2022-07-12 17:29:21 +08:00
chunyexixiaoyu
4ff3ad23f4 APP_Framework/Framework/:support message queue 2022-07-08 17:27:34 +08:00
chunyexixiaoyu
31d11ad641 APP_Framework/Framework/:update the transform.h ,solve the problem that compiling. 2022-07-08 14:28:46 +08:00
chunyexixiaoyu
da6f795954 Ubiquitous/RT-Thread_Fusion_XiUOS/:update the README.md file. 2022-07-08 14:26:48 +08:00
wgzAIIT
71f00ec06f add readme.md for xidatong-riscv64 2022-07-08 14:11:36 +08:00
wgzAIIT
4570539016 Merge remote-tracking branch 'origin/xidatong-riscv64' into e22lora 2022-07-08 14:07:31 +08:00
wgzAIIT
dbe85523c7 add readme.md for xidatong-riscv64 2022-07-08 14:01:23 +08:00
wgzAIIT
48c49a83ed ok 2022-07-07 19:21:45 +08:00
wgzAIIT
2ac3d0abdf update nuttx10.3.0 2022-07-07 19:15:30 +08:00
wgzAIIT
c85fc70551 ok 2022-07-07 19:00:51 +08:00
wgzAIIT
a079e445f9 ok 2022-07-07 18:58:12 +08:00
wgzAIIT
64c65711a1 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-riscv64 2022-07-07 18:51:33 +08:00
Liu_Weichao
c5a0cbf95e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-07-07 18:22:38 +08:00
wgzAIIT
d9ecebcf9f Delete spaces and blank lines 2022-07-06 14:20:19 +08:00
wgzAIIT
82af485b5f fpioa_get_io_by_function change to k210_fpioa_get_io_by_function 2022-07-06 10:45:26 +08:00
xuedongliang
8eca1f72ff add xidatong-riscv64 board from Wang_weigen
it is OK
2022-07-05 11:13:03 +08:00
Wang_Weigen
74fd934a02 add xidatong-riscv64 board 2022-07-05 10:54:24 +08:00
xuedongliang
b4a92c91f5 update rt-thread bsp(xidatong-arm and aiit-arm32-board) from tian_chunyu
it is OK
2022-07-01 16:13:20 +08:00
xuedongliang
314f162836 Port openPOWERLINK to XiUOS from shi_jia_rui
it is OK
2022-07-01 16:12:49 +08:00
xuedongliang
10b9f4051c repair the task shcedule failed problem of arm,update the assign task before pendsv fault
it is OK
2022-07-01 16:11:49 +08:00
wgzAIIT
d28caa835a Merge pull request 'merge code' (#74) from xidatong-riscv64 into e22lora 2022-06-30 16:47:46 +08:00
wgzAIIT
92960a1c5d k210 support gpio on nuttx 2022-06-30 16:43:02 +08:00
wgzAIIT
f44c9fe442 update to nuttx10.3 2022-06-29 17:37:25 +08:00
wgzAIIT
0b902da332 update to nuttx10.3 2022-06-29 17:27:16 +08:00
wgzAIIT
c47aaa6cba e22lora branch update nuttx10.3 2022-06-29 17:04:02 +08:00
wgzAIIT
da565b079d ok 2022-06-29 16:38:22 +08:00
chunyexixiaoyu
1a6f47cf49 peripheral interface validation work about xidatong-arm 2022-06-28 16:59:23 +08:00
zhujiarui666
ebad51e48a 1.Usbhost Macros in C must be modified
2.Supplement the missing RT thread file
3.Add SConscript file
2022-06-28 16:21:17 +08:00
zhujiarui666
48c2dde093 xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32/test_photo:
1.测试成功文件
2022-06-28 10:56:08 +08:00
zhujiarui666
2c9897e10d xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\board\usb:
1.usb rt-thread缺失支持文件
2.SConscript文件
2022-06-28 10:51:14 +08:00
zhujiarui666
ee79cd0927 xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\board\Kconfig:
1.添加USBHost相关的宏
2022-06-27 16:30:06 +08:00
zhujiarui666
9f0a316c6d xiuos\Ubiquitous\RT-Thread_Fusion_XiUOS\aiit_board\xidatong-arm32\applications\main.c:
1.添加usb测试函数
2022-06-27 16:27:13 +08:00
zhujiarui666
c2d7562f46 xiuos\APP_Framework\Framework\connection\wifi\adapter_wifi.c:
1.添加msh指令
2022-06-27 16:23:41 +08:00
zhujiarui666
109de8911b xiuos\xiuos\xiuos\APP_Framework\Framework\connection\wifi\esp07s_wifi\SConscript:
1.添加SConscript脚本
2022-06-27 16:17:50 +08:00
zhujiarui666
f621522551 xiuos\APP_Framework\Framework\connection\wifi\esp07s_wifi\Kconfig:
1.修改Kconfig文件,增加支持rt-thread部分
2022-06-27 16:16:27 +08:00
zhujiarui666
443c0a414d xiuos\APP_Framework\Framework\connection\4g\adapter_4g.c:
1.添加msh指令,若实际测试此函数中的服务器ip和端口需要修改
2022-06-27 16:10:47 +08:00
zhujiarui666
45ba8d84ee xiuos\APP_Framework\Framework\connection\4g\ec200t\Kconfig:
1.修改Kconfig文件
2022-06-27 16:07:01 +08:00
zhujiarui666
6d77165a86 xiuos\APP_Framework\Framework\connection\4g\ec200t\ec200t.c:
1.重构Ec200tIoctl函数
2.重构Ec200tPowerSet函数,该函数在矽达通中无用(PWRKEY硬件已经拉低,上电自动开机)
2022-06-27 16:05:00 +08:00
wgzAIIT
b517740d32 xidatong-riscv64 support reboot cmd on nuttx 2022-06-27 10:07:34 +08:00
Liu_Weichao
c8fc05a0f9 add xiwangtong-arm32 board on XiZi/board/ 2022-06-24 16:45:15 +08:00
wgzAIIT
c4ab73350b support E18 zigbee for nuttx on xidatong-riscv64 2022-06-24 15:21:50 +08:00
chunyexixiaoyu
3165f2f565 APP_Framework/Applications/: solve the bug that add the submodule. 2022-06-23 16:57:56 +08:00
chunyexixiaoyu
e910d5f237 Ubiquitous/RT-Thread_Fusion_XiUOS/:change the name from "xidatong" to "xidatong-arm32" 2022-06-23 16:49:23 +08:00
chunyexixiaoyu
72f269ea5d lora and temp&humi was supported base on the aiit-arm-board 2022-06-23 16:34:43 +08:00
yl1185
6156314ba7 aiit-arm32-board/test/ test jpg
1.test jpg.
2022-06-23 16:25:29 +08:00
yl1185
3bcbcd6499 connection/lora/sx1278
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 15:03:37 +08:00
yl1185
244fcb9e5d connection/4g/
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 15:01:21 +08:00
yl1185
310282628f transform_layer/rtthread/
1.find a bug about 'PrivSemaphoreObtainWait' when incoming parameter 'NULL' in rtthread .
2.modify transform.c and transform.h
2022-06-23 14:57:36 +08:00
yl1185
81fbf93dd2 Framework/sensor/hs300x
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 14:48:56 +08:00
yl1185
15a8589770 sensor/humidity/ hs300x
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 14:47:11 +08:00
yl1185
635280ab4b app_match_rt-thread/sx1278/sx1278_source/
1.sx1278 driver is ok.
2.connection is ok.
2022-06-23 14:40:49 +08:00
yl1185
2f4e67ae87 app_match_rt-thread/sx1278/sx1278
1.transplant sx1278 source code
2.adapt for rtthread
2022-06-23 14:39:48 +08:00
yl1185
b605bb5bc1 app_match_rt-thread/sx1278/ sx1278
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 14:36:58 +08:00
yl1185
c6e7a6d446 aiit-arm32-board/test/ test jpg
1.humi.jpg and temp.jpg
2022-06-23 14:14:33 +08:00
yl1185
1d023c9504 Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/applications
1.delete useless uart_test.c
2022-06-23 14:12:28 +08:00
yl1185
d5e16cd9ac Ubiquitous/RT-Thread_Fusion_XiUOS/app_match_rt-thread/hs300x driver
1.hs300x driver test is ok.
2022-06-23 14:11:03 +08:00
yl1185
9d1e3b8ef3 Ubiquitous/RT-Thread_Fusion_XiUOS/app_match_rt-thread/ hs300x
1.Kconfig is ok.
2.gcc is ok.
2022-06-23 14:09:50 +08:00
wgzAIIT
31f03a56d6 add GPIO_E18_MODE pin 2022-06-23 09:56:55 +08:00
Jiacheng Shi
c50767094a minor: remove unnecessary changes 2022-06-22 20:10:31 +08:00
Jiacheng Shi
6d73307caf powerlink: remove GPL code 2022-06-22 20:10:31 +08:00
Jiacheng Shi
922a3ceef2 minor: remove devtools.sh 2022-06-22 20:10:31 +08:00
Jiacheng Shi
736189f855 powerlink: implement console-xiuos.c 2022-06-22 20:10:31 +08:00
Jiacheng Shi
320998dee5 powerlink: implement edrv-xiuos.c 2022-06-22 20:10:31 +08:00
Jiacheng Shi
4e4d6ce223 powerlink: fix msleep() 2022-06-22 20:10:31 +08:00
Jiacheng Shi
b0e6e4fe49 minor: fix some bugs 2022-06-22 20:10:31 +08:00
Jiacheng Shi
458a7c5d91 powerlink: run the basic part of demo_cn_console 2022-06-22 20:10:31 +08:00
Jiacheng Shi
68179bec6c powerlink: build demo_mn_console and demo_cn_console 2022-06-22 20:10:27 +08:00
Jiacheng Shi
b7648f0f08 powerlink: build liboplkmn.a and liboplkcn.a 2022-06-22 20:09:24 +08:00
Jiacheng Shi
7e1307a3bb fix: fix the compilation error on cortex-m4-emulator 2022-06-22 20:08:06 +08:00
Jiacheng Shi
1a6e847b6b minor: add devtools.sh 2022-06-22 20:08:06 +08:00
Jiacheng Shi
ed8fda915b powerlink: add openPOWERLINK 2022-06-22 20:08:06 +08:00
Wang_Weigen
578680f6e5 rename board name 'gd32vf103_rvstar' as 'gd32vf103-rvstar' 2022-06-22 17:11:04 +08:00
wgzAIIT
626f2486ef change /dev/gpoutN to /dev/gpioN on xidatong-arm32 2022-06-22 17:03:49 +08:00
Wang_Weigen
bc7913a713 remove compile warning 2022-06-22 16:59:13 +08:00
Wang_Weigen
29a205e467 rename board name 'rv32m1_vega' as 'rv32m1-vega' 2022-06-22 16:42:52 +08:00
wgzAIIT
1d1d394125 change xidatong to xidatong-arm32 on nuttx 10.3.0 2022-06-22 16:35:39 +08:00
Wang_Weigen
42cf1290d1 rename board name 'xidatong' as 'xidatong-arm32' 2022-06-22 15:52:23 +08:00
wgzAIIT
cac43f78bf syslog change to uinfo on xidatong 2022-06-22 15:35:03 +08:00
Wang_Weigen
f5f9dbe59d Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2022-06-22 15:05:16 +08:00
Wang_Weigen
ebf362bc89 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-06-22 14:57:51 +08:00
Wang_Weigen
517825a52f repair the task shcedule failed problem of arm,update the assign task before pendsv fault 2022-06-22 14:57:25 +08:00
wgzAIIT
fc60ae4dbd atti board bsp update to nuttx 10.3 2022-06-22 14:17:52 +08:00
xuedongliang
ad84a842b0 update rt-thread bsp and add webnet from tian_chunyu
it is OK
2022-06-22 13:31:35 +08:00
xuedongliang
677457daac feat support bluetooth and 4g framework on xidatong board
it is OK
2022-06-22 13:29:45 +08:00
wgzAIIT
f7ba07eaea xidatong update to nuttx10.3 2022-06-22 10:58:04 +08:00
wgzAIIT
6bedd6272e change #define FPIOA_CH438_D5 29 2022-06-21 18:36:23 +08:00
wgzAIIT
1ba170c1d2 add Mulan PSL v2 2022-06-20 09:56:50 +08:00
wgzAIIT
284ea0b00f add loransh 2022-06-20 09:24:15 +08:00
wgzAIIT
3e36e1c89f change k210_gpio.c and add btnsh 2022-06-20 09:19:21 +08:00
wgzAIIT
66d30ed255 add xidatong-riscv64 bsp for nuttx 2022-06-17 17:55:30 +08:00
wgzAIIT
4ee205876a update app_match_nuttx for nuttx10.3 2022-06-17 17:12:53 +08:00
wgzAIIT
f2355281b1 update nuttx10.2.0 to nuttx10.3.0 on branch xidatong-riscv64 2022-06-17 14:48:17 +08:00
wgzAIIT
090311b027 delet nuttx 10.2.0 2022-06-17 14:28:52 +08:00
chunyexixiaoyu
76039a8f02 APP_Framework/Applications/: add the webnet submodule. 2022-06-15 09:26:58 +08:00
chunyexixiaoyu
87fade218f APP_Framework/Applications/:add the compiling file about submodule 2022-06-15 09:14:51 +08:00
chunyexixiaoyu
876a6c8ff1 APP_Framework/Framework/:update ethernet driver and update the connection files,and the mcu can communicate with the ethernet module correctly, but the module can't connect the local server. 2022-06-15 09:14:51 +08:00
chunyexixiaoyu
888d981f8f APP_Framework/Framework/:add enthernet SConscript file. 2022-06-15 09:14:50 +08:00
chunyexixiaoyu
582a5a4043 APP_Framework/Framework/: solve the bug about link 2022-06-15 09:14:50 +08:00
yl1185
8845864e46 connection/nbiot/ nb verify
1.modify macro control for rt-thread
2.gcc is ok.
2022-06-15 09:14:50 +08:00
yl1185
8f86dddd57 connection/nbiot/ nb verify
1.SConscript is ok
2.modify Kconfig
2022-06-15 09:14:49 +08:00
chunyexixiaoyu
8b82b0cb65 APP_Framework/Framework/:update the transform layer about rt-thread. 2022-06-15 09:14:49 +08:00
chunyexixiaoyu
65d7a2b1a0 APP_Framework/Applications/:update the configuration file. 2022-06-15 09:14:48 +08:00
Liu_Weichao
f0f1b1c988 delete error description and wrong define 2022-06-14 16:43:00 +08:00
Liu_Weichao
b3d51efc13 fix pin_mux compile error 2022-06-14 14:46:18 +08:00
Liu_Weichao
8e1f0e1af0 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-06-14 14:39:48 +08:00
Wang_Weigen
7b94b5369e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-06-14 10:54:20 +08:00
Wang_Weigen
5f49d2ba87 add config for queue manage 2022-06-14 10:54:08 +08:00
wgzAIIT
0c5d9c69d1 merge code 2022-06-13 19:16:56 +08:00
xuedongliang
5af3bceb66 fix: make XiZi compile on macOS
It is OK
2022-06-13 16:33:11 +08:00
xuedongliang
1f5d4ac765 add lcd driver for xidatong-arm
It is OK
2022-06-13 16:32:06 +08:00
xuedongliang
fabd29aef6 add lcd driver for xidatong
It is OK
2022-06-13 16:31:35 +08:00
wgzAIIT
6fa7044678 change nsh_Applicationscmd.c 2022-06-10 15:23:31 +08:00
wgzAIIT
24bf772c3f ok 2022-06-10 15:15:13 +08:00
wgzAIIT
2b35970b06 reverrt nsh_Applicationscmd.c 2022-06-10 15:13:54 +08:00
wgzAIIT
222024d857 Re add submodule for nuttx 2022-06-10 15:05:41 +08:00
wgzAIIT
b0b4ea61bb Re add submodule for nuttx 2022-06-10 14:55:47 +08:00
wgzAIIT
e67810a7f6 change submodule on nuttx 2022-06-10 14:45:45 +08:00
wgzAIIT
a5bdaad121 ok 2022-06-10 14:37:56 +08:00
wlyu
e72b6aa7c5 Merge branch 'ok1052' of https://gitlink.org.cn/wgzAIIT/xiuos into ok1052 2022-06-10 13:50:04 +08:00
wlyu
a6f5a5f79d support wifi module for nuttx on xidatong 2022-06-10 13:47:05 +08:00
wlyu
44e0057f2d support wifi module for nuttx on xidatong 2022-06-09 18:48:13 +08:00
Liu_Weichao
80e08450fe fix compile error include watchdog and uart configure error 2022-06-08 11:09:50 +08:00
Liu_Weichao
c14f2f73e0 feat support uart8 and ec200t device on xidatong board 2022-06-08 10:41:21 +08:00
wgzAIIT
f5f8fbb38b OK 2022-06-08 09:47:41 +08:00
wgzAIIT
9f0da7fdbf OK 2022-06-08 09:46:52 +08:00
Wang_Weigen
5ed641a8fe add note 2022-06-07 17:02:35 +08:00
Wang_Weigen
8c23dc14d6 optimize the lvgl of minimal configuration 2022-06-07 17:00:20 +08:00
Wang_Weigen
4d20855da3 Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2022-06-07 09:59:29 +08:00
wlyu
e0a47613c3 support E18 zigbee for nuttx 2022-06-07 09:58:19 +08:00
wlyu
7be59f8417 fixed touchscreen x y wrong value and optimize codes 2022-06-02 19:00:51 +08:00
Wang_Weigen
7607282f2a delete usless info 2022-06-02 17:41:59 +08:00
Wang_Weigen
d57d8e0a4d repair the timeout problem of i2c interrupt for xidatong 2022-06-02 15:53:24 +08:00
wgzAIIT
0a2ef3aba3 OK 2022-06-02 10:54:58 +08:00
wgzAIIT
f1e103ce2f Merge pull request 'merge code from ok1052' (#57) from ok1052 into prepare_for_master
OK
2022-06-02 10:52:50 +08:00
wlyu
7ea3b595c2 support lcd and touchscreen 2022-06-01 16:08:53 +08:00
Wang_Weigen
fefbc902f1 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-06-01 11:19:54 +08:00
Wang_Weigen
c6c0a0f71b modify stack size of lvgl demo 2022-05-30 16:34:29 +08:00
Wang_Weigen
ad309f90c1 delete info 2022-05-30 16:33:03 +08:00
Wang_Weigen
2bd07aa244 1、add i2c driver for xidatong;2、add touch driver for xidatong;3、add input device for lvgl;4、repair interrupt for m7;5、repair startup sequence for xidatong 2022-05-30 16:19:38 +08:00
wgzAIIT
a62208c1c6 add timeout for adapter_lora.c PrivSemaphoreObtainWait function 2022-05-24 16:36:05 +08:00
wgzAIIT
6f6860618e Merge branch 'prepare_for_master' into e22lora 2022-05-24 16:34:03 +08:00
wgzAIIT
a9410bd9b1 add timeout for adapter_lora.c PrivSemaphoreObtainWait function 2022-05-24 16:29:46 +08:00
Runji Wang
b9d2ccee80 make XiZi compile on macOS
Signed-off-by: Runji Wang <wangrunji0408@163.com>
2022-05-23 17:52:49 +08:00
wgzAIIT
8d036c46ce change e22.c for open function 2022-05-23 15:45:48 +08:00
wgzAIIT
a8f36fd085 upport e220 for stm32f4discovery on nuttx 2022-05-20 16:45:33 +08:00
wgzAIIT
36db2b9e9f add #include <termios.h> in nuttx/transform.h 2022-05-20 15:16:35 +08:00
wgzAIIT
a39b8907e9 set CONFIG_SERIAL_TERMIOS=y on nsh/defconfig 2022-05-20 15:13:24 +08:00
wgzAIIT
fb2dd71136 add e22 demo on stm32/stm32f4discovery board 2022-05-20 11:31:14 +08:00
wgzAIIT
40f20e65f1 stm32f4discovery support goio device 2022-05-19 14:33:43 +08:00
wgzAIIT
e9ba0966f2 fix sem bug in function PrivSemaphoreObtainWait for nuttx 2022-05-18 17:21:04 +08:00
wgzAIIT
60e35914a5 fix sem bug in function PrivSemaphoreObtainWait for nuttx 2022-05-18 17:19:47 +08:00
wgzAIIT
9567f88b03 test e220 lora with AdapterLoraTest 2022-05-18 17:01:59 +08:00
wgzAIIT
04ec9ca069 test e220 lora with AdapterLoraTest 2022-05-18 13:36:39 +08:00
Liu_Weichao
dadfdb85a3 feat support bluetooth on xidatong bsp 2022-05-17 17:05:40 +08:00
wgzAIIT
1e57c60542 support hc08 on xidatong、change ch438 on nuttx 2022-05-17 15:49:17 +08:00
wgzAIIT
85374ebcd0 set CONFIG_NSH_FILEIOSIZE=32768 for usb and sdcard 2022-05-16 17:56:04 +08:00
wgzAIIT
36f4e3bfb8 sd card and usb delete romfs on xidatong 2022-05-16 14:28:04 +08:00
wgzAIIT
07723b25ef Modify comments of adapter_4g.c 2022-05-16 10:33:50 +08:00
wgzAIIT
7056725c66 support hc08 on xidatong 2022-05-13 16:19:30 +08:00
wgzAIIT
53a70c5234 ch438 on nuttx: If a port is checked, the port will be initialized. Otherwise, the interrupt of the port will be disabled. 2022-05-13 14:02:23 +08:00
wgzAIIT
36f5981036 ch438 on nuttx: If a port is checked, the port will be initialized. Otherwise, the interrupt of the port will be disabled. 2022-05-13 14:00:01 +08:00
wgzAIIT
e32ff95bbb ok 2022-05-12 17:59:02 +08:00
wgzAIIT
43e8a941e2 change char to uint8_t on ch438 2022-05-12 17:57:20 +08:00
wgzAIIT
3994c3a4a4 Change the Chinese Notes to English notes in imxrt_ch438.h 2022-05-12 16:52:52 +08:00
wgzAIIT
1334d0e4b2 Change the Chinese Notes to English notes in imxrt_ch438.h 2022-05-12 16:01:05 +08:00
wgzAIIT
302bf4e1cc ok 2022-05-12 13:55:53 +08:00
wgzAIIT
7fca4e84a4 ok
add CH438_EXTUART_BAUD to menuconfig
2022-05-12 13:49:54 +08:00
wgzAIIT
b6407cb68b add CH438_EXTUART_BAUD to menuconfig 2022-05-12 13:39:27 +08:00
wgzAIIT
00e0a48ee7 add g_uart_selected array for ch438 2022-05-12 11:00:55 +08:00
wgzAIIT
94eef33468 ok 2022-05-11 18:18:34 +08:00
wgzAIIT
2487e9ef26 ok 2022-05-11 18:17:53 +08:00
wgzAIIT
52aa3c5abd use work_queue instead of pthread_create on ch438 to get Interrupt status 2022-05-11 18:14:41 +08:00
wgzAIIT
14a198fe5a Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ch438 2022-05-11 14:43:07 +08:00
wgzAIIT
5873feb442 support e220 for xidatong on nuttx 2022-05-11 14:40:52 +08:00
wgzAIIT
88ef0ad96c change ch438 on nuttx 2022-05-11 10:33:02 +08:00
wgzAIIT
cfebd3357b change ch438 on nuttx 2022-05-11 09:01:53 +08:00
wgzAIIT
f106ac7c43 add loraopen to cmd 2022-05-10 17:54:07 +08:00
wgzAIIT
87910b03a4 add ch438_ioctl 2022-05-10 16:39:54 +08:00
Liu_Weichao
3c9347b856 feat add ch438 register clear when receiving interrrupts 2022-05-10 13:43:24 +08:00
wgzAIIT
68d30d3df2 add loransh 2022-05-10 13:26:17 +08:00
wgzAIIT
cd5686de2e change ch438 on nuttx 2022-05-10 11:31:59 +08:00
wgzAIIT
8d6e9532cf task_create to pthread_create on nuttx for ch438 2022-05-09 19:33:27 +08:00
wgzAIIT
ee132df28a change ch438 on nuttx 2022-05-09 17:29:49 +08:00
wgzAIIT
de273145c3 change ch438 on nuttx 2022-05-07 18:18:03 +08:00
wgzAIIT
64109b5120 add ImxrtCh438WriteData for ch438 on nuttx 2022-05-07 15:36:23 +08:00
Wang_Weigen
0267668149 delete unused info 2022-05-07 10:52:36 +08:00
Wang_Weigen
709fbc5a4b sync the upstream 2022-05-07 10:47:23 +08:00
Wang_Weigen
0189de57e7 modify the buf size 2022-05-07 10:44:41 +08:00
chunyexixiaoyu
909f3cc635 APP_Framework/Framework/: solve the problem the rebase cause. 2022-05-07 10:40:13 +08:00
wgzAIIT
2b40ba4d1a ch438 changge mutex and cond 2022-05-07 09:08:22 +08:00
Wang_Weigen
5338598158 add lcd driver for xidatong 2022-05-06 17:53:48 +08:00
xuedongliang
33e3b798b7 feat add watchdog on xidatong board from Liu_Weichao
it is OK
2022-05-06 16:56:58 +08:00
xuedongliang
3c4a7c8f0a update rt-thread bsp(xidatong and aiit-arm32-board) from Tian_Chunyu
it is OK
2022-05-06 16:56:23 +08:00
wgzAIIT
adec8e541c Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ch438 2022-05-06 16:29:25 +08:00
Liu_Weichao
67666c1707 feat add watchdog on xidatong board 2022-05-06 15:58:01 +08:00
yl1185
cb134029d2 aiit_board/aiit-arm32-board/ add test jpg
1.complete bluetooth test
2022-05-06 15:10:46 +08:00
yl1185
ef700c0611 connection/bluetooth/ BT verify
1.baud rate is 9600 not 115200
2.add macro control for rt-thread and xizi
3.bt is ok!
2022-05-06 15:10:45 +08:00
yl1185
d8d11ed58e Framework/connection/bluetooth/ BT verify
1.modify some macros which can cause bugs
2022-05-06 15:10:45 +08:00
chunyexixiaoyu
3c69cb8d14 Ubiquitous/RT-Thread_Fusion_XiUOS/: add reboot function 2022-05-06 15:10:45 +08:00
chunyexixiaoyu
f3d7e7e3d4 Ubiquitous/RT-Thread_Fusion_XiUOS/: add romfs function 2022-05-06 15:10:44 +08:00
chunyexixiaoyu
c271cd16ea Ubiquitous/RT-Thread_Fusion_XiUOS/: solve the problem that output bin bigger than 550MB 2022-05-06 15:10:44 +08:00
chunyexixiaoyu
279757406e APP_Framework/Framework/:solve the bug that compiling when the macro SUPPORT_CONNECTION_FRAMEWORK ' was not been chose 2022-05-06 15:10:44 +08:00
yl1185
525d9d6f11 connection/bluetooth/bluetooth verify
1.write the SConscript
2.modify the config for rt-thread
2022-05-06 15:10:43 +08:00
yl1185
ec446bb44c connection/wifi/wifi verify
1.modify macros which can cause bugs
2.write macro control in xizi and rt-thread
2022-05-06 15:10:43 +08:00
yl1185
50995f3c1f Framework/connection/wifi verify
1.modify type definition in Mutex and Semaphore
2.modify the macro.
2022-05-06 15:03:51 +08:00
yl1185
bf93a554ca Framework/connection/adapter SConscript
1.add SConscript of adapter and adapter_agent
2022-05-06 15:01:46 +08:00
yl1185
8349aa1aa7 Framework/connection/wifi verify
1.write SConscript of hfa21_wifi
2.modify Kconfig
2022-05-06 15:01:46 +08:00
wgzAIIT
30d4201b09 add loraopen to cmd 2022-05-06 12:06:34 +08:00
wgzAIIT
522b8848a2 move include files to imxrt_ch438.h on nuttx and change board_ch438_initialize 2022-05-06 10:18:22 +08:00
wgzAIIT
e007b5567d Register ch438 to character driver 2022-05-05 18:22:42 +08:00
wgzAIIT
d18eda5f26 Register ch438 to character driver 2022-05-05 16:08:15 +08:00
wgzAIIT
5aec4f1b1d Update imxrt_ch438.c 2022-04-30 07:09:36 +08:00
wgzAIIT
048c1d0ac4 ch438 read data by port_NUM 2022-04-29 17:58:11 +08:00
wgzAIIT
c0061b66c6 Merge pull request 'merge code' (#39) from prepare_for_master into ch438
ok
2022-04-29 16:56:24 +08:00
wgzAIIT
4c517d283c ch438 Replace sem_t with pthread_cond_t 2022-04-29 16:52:17 +08:00
wgzAIIT
465fe2354f delete defalut support CONFIG_FS_PROCFS 2022-04-29 14:01:54 +08:00
wgzAIIT
49eaf5fc10 support reboot on xidatong 2022-04-29 13:39:03 +08:00
xuedongliang
d04059e356 optimize adapter lora client and gateway function from Liu_Weichao
it is OK
2022-04-29 13:24:31 +08:00
Liu_Weichao
46291764d4 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-04-29 11:02:42 +08:00
Liu_Weichao
cc88f22f14 feat make sure only one lora client connect to the lora gateway at one time 2022-04-29 11:01:26 +08:00
Liu_Weichao
a58e744c45 optimize adapter lora send-receive and add recv-data-error solution 2022-04-28 17:57:20 +08:00
Liu_Weichao
32bce719f6 1、set e220 baud rate 115200;2、add adapter lora client work condition(1:gateway send cmd;2:update automatically。)。 2022-04-27 17:56:51 +08:00
Liu_Weichao
03e120dd0c optimize adapter_lora gateway and client data transfer 2022-04-27 15:09:37 +08:00
wgzAIIT
4d898f8210 enable CONFIG_IMXRT_GPIO3_0_15_IRQ on xidatong 2022-04-27 12:21:36 +08:00
wgzAIIT
26c3159b61 enable CONFIG_IMXRT_GPIO3_0_15_IRQ on xidatong 2022-04-27 12:15:27 +08:00
xuedongliang
fc100708c2 Modify the priority of main function Enable lwip(XiZi) receive timeout, send timeout, and socket forced shutdown from Zhang_caiqian
it is OK
2022-04-26 19:20:18 +08:00
xuedongliang
320f4b40d5 support 4g device、table key autocompletion and cmd history for xidatong from Wang_guozhu
it is OK
2022-04-26 19:19:17 +08:00
wgzAIIT
e3cb9df9b6 change printf to syslog on ch438 2022-04-26 18:27:15 +08:00
wgzAIIT
a09caa272f support e220 for nuttx on xidatong 2022-04-26 18:23:14 +08:00
Liu_Weichao
808f00ade1 feat add sem obtain wait_time and modify e220 lora receive len operation 2022-04-26 17:57:32 +08:00
Liu_Kai
9ac84e7cb4 add ch438 driver and a demo 2022-04-26 17:36:34 +08:00
zhangcaiqian
c4613c8866 Enable LWIP receive timeout, send timeout, and socket forced shutdown 2022-04-26 16:14:13 +08:00
zhangcaiqian
de0aea025b Modify the priority of main function 2022-04-26 16:01:01 +08:00
Wang_Weigen
afc4b58b74 repair the timeout for sem and mutex 2022-04-26 11:27:44 +08:00
wgzAIIT
a337904560 ok 2022-04-26 09:00:41 +08:00
wgzAIIT
8c788f676b Revert "change set E220-400T22S M0 and M1 pin for xidatong"
This reverts commit d62179932b.
2022-04-25 18:40:45 +08:00
wgzAIIT
d62179932b change set E220-400T22S M0 and M1 pin for xidatong 2022-04-25 14:42:26 +08:00
wgzAIIT
770a713179 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ok1052 2022-04-25 11:56:33 +08:00
xuedongliang
03bfe85c2b feat add lora device e220 in connection framework from Liu_Weichao
it is OK
2022-04-25 11:32:22 +08:00
Liu_Weichao
63d26584b7 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-04-25 10:53:35 +08:00
Liu_Weichao
e5296efa91 fix e220 lora send and receive bug using ch438 uart in xidatong board 2022-04-25 10:52:05 +08:00
wgzAIIT
4bfa154ed6 support Start script automatically(romfs) on xidatong 2022-04-25 10:33:42 +08:00
wgzAIIT
8c5c1dcf34 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ok1052 2022-04-25 10:23:58 +08:00
wgzAIIT
8b0deacc4e support table key autocompletion and cmd history on xidatong 2022-04-25 09:47:22 +08:00
xuedongliang
bd1922326e add wifi "esp07s" for xiuos and repair some problems for zigbee from Wang_weigen
it is OK
2022-04-24 18:28:39 +08:00
Liu_Weichao
99b5c0d9a0 lora send and receive p2p ok 2022-04-24 13:54:54 +08:00
Liu_Weichao
e1fe48b96f feat add lora device e220 in connection framework 2022-04-22 15:50:18 +08:00
wgzAIIT
a36ef94337 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ok1052 2022-04-22 11:06:34 +08:00
wgzAIIT
275d2387d4 repair some problems for 4g on xidatong 2022-04-22 10:56:32 +08:00
Wang_Weigen
587c2d595e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-04-21 16:46:15 +08:00
Wang_Weigen
85ff8877d4 1、repair the uart irq problem;2、add wifi esp07s test cmd and repair the socket connect problem 2022-04-21 16:44:28 +08:00
xuedongliang
7b3f1dc95f fix InitBoardMemory and InstallConsole bug for XiZi bsp/board from Liu_Weichao
it is OK
2022-04-20 16:28:33 +08:00
Liu_Weichao
aedd1e046e fix InitBoardMemory and InstallConsole bug for XiZi bsp/board 2022-04-20 16:24:13 +08:00
xuedongliang
82c2dd55fe update bsp in rt-thread from Tian_Chunyu
it is OK
2022-04-20 10:30:29 +08:00
xuedongliang
3aa7e1a8de 1、 feat add lwext4 submodule for XiZi,compile ok; 2、feat add sd card auto-check-attach function for ok1052 and xidatong from Liu_Weichao
it is OK
2022-04-20 10:29:47 +08:00
chunyexixiaoyu
ef878c6890 Merge pull request 'Update bsp of stm32h743_openmv_h7plus' (#25) from WentaoWong/xiuos:dev into dev 2022-04-20 10:02:51 +08:00
wgzAIIT
7f12a1892b support 4g on xidatong 2022-04-19 19:38:11 +08:00
Liu_Weichao
51dbbc2e8d feat add lwext4 fs register 2022-04-19 17:25:37 +08:00
xuedongliang
f46cacc158 support Register gpio as character device on nuttx for xidatong from Wang_guozhu
it is OK
2022-04-19 10:30:29 +08:00
wgzAIIT
f693fa78af add 4g defconfig 2022-04-19 10:06:44 +08:00
WentaoWong
3c42d161c0 Ubiquitous/RT_Thread/: update README of stm32h743_openmv_h7plus 2022-04-19 09:45:46 +08:00
WentaoWong
00c17e9662 Ubiquitous/RT_Thread/: add usbcdc support to stm32h743_openmv_h7plus, vcom console need update rt-thread 2022-04-18 17:12:59 +08:00
WentaoWong
d74cb3bdb6 Ubiquitous/RT_Thread/: add rtc support to stm32h743_openmv_h7plus 2022-04-18 16:47:29 +08:00
WentaoWong
5a6e853712 Ubiquitous/RT_Thread/: add RomFS and RamFS support to stm32h743_openmv_h7plus 2022-04-18 16:46:46 +08:00
WentaoWong
09d7d3cd6b Ubiquitous/RT_Thread/: add sdio support to stm32h743_openmv_h7plus 2022-04-18 16:39:16 +08:00
WentaoWong
b521274b9f Ubiquitous/RT_Thread/: add qsqpi flash support to stm32h743_openmv_h7plus 2022-04-18 16:36:29 +08:00
Wang_Weigen
7d756cd22d Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-04-18 14:59:32 +08:00
Wang_Weigen
92def035b9 Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2022-04-18 13:55:26 +08:00
Wang_Weigen
31c536ef88 1、repair the agent null char parase problem;2、repair the zigbee open failed problem 2022-04-14 17:47:31 +08:00
Wang_Weigen
cd13e10f58 repair the pin read of E18 for zigbee 2022-04-14 15:18:45 +08:00
Wang_Weigen
0605f45908 add wifi esp07s 2022-04-13 17:15:30 +08:00
wlyu
b939838f52 support ethernet for xidatong with configure.sh xidatong:netnsh 2022-04-13 15:02:47 +08:00
wgzAIIT
3bb169ba2b support usb on xidatong
support usb on xidatong
2022-04-13 10:29:43 +08:00
wgzAIIT
ba42c2c601 support usb on xidatong 2022-04-13 10:28:40 +08:00
wgzAIIT
72effb4915 Merge pull request 'move nsh_sdmmc_initialize to imxrt_mmcsd.c for xidatong' (#35) from ok1052 into prepare_for_master
ok
2022-04-12 18:30:58 +08:00
wgzAIIT
e2924875d3 move nsh_sdmmc_initialize to imxrt_mmcsd.c for xidatong 2022-04-12 18:10:50 +08:00
Liu_Weichao
f1d372dcf7 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-04-12 10:05:48 +08:00
wgzAIIT
66bb78620f Merge pull request 'change XIDATONG_SDHC_AUTOMOUNT to XIDATONG_SDIO_AUTOMOUNT for sd card' (#34) from ok1052 into prepare_for_master
ok
2022-04-11 18:57:29 +08:00
wgzAIIT
90d57368d1 change XIDATONG_SDHC_AUTOMOUNT to XIDATONG_SDIO_AUTOMOUNT for sd card 2022-04-11 18:48:15 +08:00
Liu_Weichao
6f859b91db feat add sd card auto-check-attach function for ok1052 and xidatong 2022-04-11 17:56:09 +08:00
wgzAIIT
098ace4b9d Merge pull request 'set E220-400T22S M0 and M1 pin for xidatong' (#33) from ok1052 into prepare_for_master
ok
2022-04-11 15:39:11 +08:00
wgzAIIT
e78af7f85b modifiled nshlib\Kconfig 2022-04-11 15:33:52 +08:00
wgzAIIT
466486b27c modifiled nshlib\Kconfig 2022-04-11 15:29:47 +08:00
wgzAIIT
2f3ac0549e set E220-400T22S M0 and M1 pin for xidatong 2022-04-11 14:27:19 +08:00
wgzAIIT
ea58273811 Merge pull request 'merge code' (#32) from ok1052 into prepare_for_master
support Register gpio as character device on nuttx for xidatong
2022-04-11 13:27:37 +08:00
wgzAIIT
37d316f105 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ok1052 2022-04-11 13:19:41 +08:00
xuedongliang
f25a814f0f support auto mount sd card on nuttx for xidatong & support usb on nuttx for xidatong from Wang_guozhu 2022-04-11 11:27:26 +08:00
xuedongliang
11193c6860 ix Framework/connection/industrial_ethernet/ethercat DIR error from Liu_Weichao
it is OK
2022-04-11 11:26:45 +08:00
xuedongliang
6c1e27c69e added PLC motor test fixed opcua issue during response timeout fixed LWIP semaphore and mutex issue fixed UART1 IRQ issue from Wang_linyu
it is OK
2022-04-11 11:26:07 +08:00
wgzAIIT
72ce9d9023 support Register gpio as character device on nuttx for xidatong 2022-04-08 17:39:29 +08:00
Wang_Weigen
e6d53292ca add esp07s dir and files 2022-04-08 16:52:43 +08:00
wgzAIIT
41632ed9e9 update nuttx transform 2022-04-08 15:27:46 +08:00
wgzAIIT
95c1d7abaa changge nuttx PrivTaskDelay 2022-04-08 15:08:44 +08:00
wgzAIIT
e49af0e48c Merge pull request 'support auto mount usb host on nuttx for xidatong' (#31) from ok1052 into prepare_for_master
support auto mount usb host on nuttx for xidatong
2022-04-08 10:44:04 +08:00
wgzAIIT
10a446060a remove CONFIG_IMXRT_GPIO_IRQ in usbnsh/defconfig 2022-04-08 10:31:24 +08:00
wgzAIIT
d65baebea8 support auto mount usb host on nuttx for xidatong 2022-04-08 09:32:08 +08:00
chunyexixiaoyu
355669e402 Ubiquitous/RT-Thread_Fusion_XiUOS/: update the default configuration(lwip dfs sdram) 2022-04-07 18:28:22 +08:00
chunyexixiaoyu
42416d58ef Ubiquitous/RT-Thread_Fusion_XiUOS/: sd(tf) card driver supported by sdio 2022-04-07 18:23:45 +08:00
chunyexixiaoyu
f42d049cb0 Ubiquitous/RT-Thread_Fusion_XiUOS/:add sdio configuration file in xidatong 2022-04-07 18:18:17 +08:00
chunyexixiaoyu
a6b403984e Ubiquitous/RT-Thread_Fusion_XiUOS/:modify the code in xidatong 2022-04-07 18:16:58 +08:00
wgzAIIT
f70f04689e Merge pull request 'support auto mount sd card on nuttx for imxrt' (#30) from ok1052 into prepare_for_master
ok
2022-04-07 15:28:07 +08:00
wgzAIIT
7621b08585 support auto mount sd card on nuttx for imxrt 2022-04-07 15:08:27 +08:00
Wang_Weigen
c7878e8b8a Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-04-07 10:28:21 +08:00
Wang_Weigen
90f30cf6d2 repair the problem of irq and add mode judge for zigbee 2022-04-07 10:28:09 +08:00
Liu_Weichao
06d163295a fix Framework/connection/industrial_ethernet/ethercat DIR error 2022-04-06 14:33:32 +08:00
chunyexixiaoyu
c868b2d27f It's OK 2022-04-06 10:32:14 +08:00
chunyexixiaoyu
563479f581 Ubiquitous/RT-Thread_Fusion_XiUOS/:update the comments 2022-04-06 10:29:27 +08:00
yl1185
313e1da99a 1.Modify the README.md 2022-04-02 15:08:38 +08:00
yl1185
c4f51c15aa 1.Modify the README.md 2022-04-02 15:04:17 +08:00
yl1185
46a8819b82 Merge remote-tracking branch 'remotes/document/develop' into develop
# Conflicts:
#	Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-arm32-board/README.md
2022-04-02 13:22:31 +08:00
Liu_Weichao
137f2493b7 feat add lwext4 submodule for XiZi 2022-04-02 11:21:07 +08:00
yl1185
fcdb1d8b62 Ubiquitous/RT-Thread/:add atti-arm32-board bsp
1.Modify the peripheral interface of the development board
2.Complete configuration files and build files
3.GCC is supported
2022-04-02 10:51:23 +08:00
yl1185
da9ff9a53a Ubiquitous/RT-Thread/:add atti-arm32-board bsp
1.Modify the peripheral interface of the development board
2.Complete configuration files and build files
3.GCC is supported
2022-04-02 09:57:11 +08:00
wgzAIIT
1666d7619b Merge pull request 'merge code' (#29) from ok1052 into prepare_for_master
ok
2022-04-01 11:11:30 +08:00
wgzAIIT
ea4e901650 add usbnsh/defconfig 2022-04-01 11:07:57 +08:00
wgzAIIT
59f9671c8c change sd defconfig 2022-04-01 10:52:03 +08:00
wgzAIIT
a2921db3f6 change support usb1 to usb2 on xidatong 2022-04-01 10:15:39 +08:00
wgzAIIT
0295b7ca38 backup 9 files from nuttx/arch/arm/src/imxrt/hardware for usb host 2022-04-01 10:10:49 +08:00
wgzAIIT
e5fe777270 Revert "support usb on xidatong"
This reverts commit 82f6abb842.
2022-04-01 10:02:06 +08:00
wgzAIIT
82f6abb842 support usb on xidatong 2022-04-01 09:49:10 +08:00
chunyexixiaoyu
e6101ab1d4 Ubiquitous/RT-Thread_Fusion_XiUOS/:add a test about ethernet transmission rate base phy chip 8720A 2022-03-31 17:24:40 +08:00
chunyexixiaoyu
e6ec715e5c Ubiquitous/RT-Thread_Fusion_XiUOS/: solve the bug that phy chip io has been configured emc cs. 2022-03-31 17:17:45 +08:00
wlyu
267aacc9a3 remove unnecessary debug 2022-03-31 14:03:27 +08:00
wlyu
ec3939ff91 Merge remote-tracking branch 'upstream/prepare_for_master' into prepare_for_master 2022-03-31 13:52:48 +08:00
wlyu
ef28f3057a optimize plc motor test and fix the lwip mutex and sem error 2022-03-31 11:27:16 +08:00
wgzAIIT
b1d4608026 update readme.md 2022-03-31 09:53:16 +08:00
wgzAIIT
056ff991c3 Merge pull request 'merge code' (#26) from ok1052 into prepare_for_master
ok
2022-03-31 09:32:40 +08:00
wgzAIIT
e2e69bf6fc Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong 2022-03-31 09:28:53 +08:00
chunyexixiaoyu
8c76480a97 it's ok 2022-03-30 19:51:39 +08:00
chunyexixiaoyu
4ebcaefa1e Ubiquitous/RT-Thread_Fusion_XiUOS/:solve the problem about submodule(rt-thread version) 2022-03-30 19:44:02 +08:00
xuedongliang
04201290e2 1.update board.c in xidatong board, add macro definition in it 2.add ethernet feature configuration. 3.:add ethernet (lwip) function in xidatong,and test 4.hange name from RT_Thread to RT-Thread_Fusion_XiUOS 5.update documentation from Tian_Chunyu
it is OK
2022-03-30 19:32:05 +08:00
wgzAIIT
b65c353941 Merge pull request 'supprt usb on xidatong' (#25) from prepare_for_master into ok1052
ok
2022-03-30 19:11:58 +08:00
wgzAIIT
0ba458d33c supprt usb on xidatong 2022-03-30 19:10:13 +08:00
wlyu
bb5f82d303 fixed the bug of OPCUA free buffer and uart not response 2022-03-30 18:49:08 +08:00
chunyexixiaoyu
87af9cf75f Ubiquitous/RT-Thread_Fusion_XiUOS/:update documentation. 2022-03-30 18:45:55 +08:00
chunyexixiaoyu
5a0ffaf193 Ubiquitous/RT-Thread_Fusion_XiUOS:change name from RT_Thread to RT-Thread_Fusion_XiUOS 2022-03-30 18:45:54 +08:00
chunyexixiaoyu
658feff666 Ubiquitous/RT_Thread/:add ethernet (lwip) function in xidatong,and test 2022-03-30 18:45:52 +08:00
chunyexixiaoyu
2145cd73f6 Ubiquitous/RT_Thread/:add ethernet feature configuration. 2022-03-30 18:45:52 +08:00
chunyexixiaoyu
30d532f35d Ubiquitous/RT_Thread/:update board.c in xidatong board, add macro definition in it. 2022-03-30 18:45:52 +08:00
wlyu
057a6d6bb4 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2022-03-30 18:33:44 +08:00
xuedongliang
ed3c39c9fd change Nuttx to Nuttx_Fusion_XiUOS from Wang_guozhu
it is OK
2022-03-30 18:23:05 +08:00
xuedongliang
b763062040 fix XiZi/cortex-m4-emulator compile error from Wang_guozhu
it is OK
2022-03-30 18:22:30 +08:00
wgzAIIT
408e9f2292 change Nuttx to Nuttx_Fusion_XiUOS 2022-03-30 18:11:09 +08:00
xuedongliang
5951468186 add Ethernet config for xidatong from Wang_weigen
it is OK
2022-03-30 13:22:46 +08:00
xuedongliang
cd422cab9e xidatong support nuttx.bin and supprt SD card on nuttx from Wang_guozhu
it is OK
2022-03-30 13:22:13 +08:00
Wang_Weigen
5ade2a983d add eth config for xidatong 2022-03-28 17:46:21 +08:00
wgzAIIT
c586edf0da change readme.md 2022-03-28 16:32:37 +08:00
wgzAIIT
88802c0964 Merge pull request 'merge code' (#19) from ok1052 into prepare_for_master
ok
2022-03-28 16:16:08 +08:00
wgzAIIT
ad9b7492ae Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into wgz 2022-03-28 16:06:05 +08:00
wgzAIIT
baae4c7204 xidatong support nuttx.bin 2022-03-28 15:59:22 +08:00
Liu_Weichao
0c0313e0f7 fix APP_Framework/Applications/app_test/test_spi_flash.c license error 2022-03-28 15:58:13 +08:00
Liu_Weichao
03905157ad fix XiZi/cortex-m4-emulator compile error 2022-03-28 15:27:52 +08:00
xuedongliang
1814a2d577 add xidatong bsp on nuttx from Wang_guozhu
it is OK
2022-03-28 14:43:03 +08:00
xuedongliang
a03b4bd13d add semc driver and eth driver from Wang_weigen
it is OK
2022-03-28 14:42:27 +08:00
xuedongliang
6778158db7 feat support ch438 extuart function for xidatong board from Liu_Weichao
it is OK
2022-03-28 14:42:01 +08:00
xuedongliang
f0e6cced1e add xidatong bsp in Rt-thread from Tian_chunyu
it is OK
2022-03-28 14:41:26 +08:00
wgzAIIT
3acf2c227a delete xip 2022-03-28 14:23:03 +08:00
wgzAIIT
6b090b16ff add files 2022-03-28 13:29:32 +08:00
wgzAIIT
0586c3bd07 set mxrt-ok1052 board CONFIG_RAW_BINARY=y 2022-03-28 10:19:16 +08:00
wgzAIIT
c70910b65f add usdhc/defconfig 2022-03-28 09:28:07 +08:00
wgzAIIT
ad657bd2e3 set PIN_USDHC1_CD_GPIO 2022-03-28 09:14:13 +08:00
wgzAIIT
d98c22a750 Merge branch 'ok1052' of https://gitlink.org.cn/wgzAIIT/xiuos into wgz 2022-03-25 12:27:17 +08:00
wgzAIIT
a5cfd6dd91 add readme.md 2022-03-25 12:22:48 +08:00
wgzAIIT
61f7f4b43e remove README.md 2022-03-25 12:17:19 +08:00
wgzAIIT
b0ce2bd9f7 Regenerate submodules nuttx 2022-03-25 11:34:30 +08:00
wgzAIIT
d66f6f9745 Regenerate submodules nuttx 2022-03-25 11:26:23 +08:00
Wang_Weigen
56fbb14dad replace file 'fsl_phy.c' to support LAN8720a 2022-03-24 17:21:14 +08:00
wgzAIIT
8f4e21741a add README.md for xidatong 2022-03-24 17:07:10 +08:00
wgzAIIT
f4ba061911 add README.md for xidatong 2022-03-24 17:06:42 +08:00
wgzAIIT
4a66817343 Merge pull request 'add README.md for xidatong' (#13) from prepare_for_master into ok1052
ok
2022-03-24 17:00:06 +08:00
wgzAIIT
b0205abc95 add README.md for xidatong 2022-03-24 16:54:29 +08:00
wgzAIIT
c214d5e281 Merge pull request 'add xidatong bsp on nuttx' (#12) from ok1052 into prepare_for_master
ok
2022-03-24 16:20:22 +08:00
wgzAIIT
91594e0e87 imxrt1052-ok rename as xidatong 2022-03-24 15:59:34 +08:00
Wang_Weigen
1cf9939cb2 add semc driver and eth driver 2022-03-24 15:28:24 +08:00
Liu_Weichao
59dbe7058b feat support ch438 extuart function for xidatong board 2022-03-24 15:17:47 +08:00
wgzAIIT
76db961420 support sdio on imxrt1052-ok 2022-03-24 11:29:15 +08:00
wlyu
3b8c9a8ed4 format OPUCA codes and optimize demo cases 2022-03-23 19:21:44 +08:00
wgzAIIT
03be73275f Merge pull request 'merge from prepare_for_master' (#11) from prepare_for_master into ok1052
ok
2022-03-23 15:22:09 +08:00
wgzAIIT
3d647fc6e6 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into wgz 2022-03-23 15:16:11 +08:00
wgzAIIT
f14523331c support mulan on nuttx 2022-03-23 15:06:34 +08:00
wgzAIIT
958ad986be Register the character device according to the selected serial port number 2022-03-23 14:34:13 +08:00
wgzAIIT
b92edeecee add Ubiquitous/Nuttx/app_match_nuttx/nuttx/arch/arm/src/imxrt/imxrt_serial.c
add imxrt_serial.c to app_match_nuttx/nuttx/arch/arm/src/imxrt
2022-03-23 14:30:05 +08:00
chunyexixiaoyu
61aff201a6 Ubiquitous/RT_Thread/:add xidatong bsp
1.mdk keil project is supported.
2.gcc is supported.
3.boot image can be configured to be selected or not,if you use mdk keil,please select xip boot image
4. bin and elf files can be load by NXP-MCUBootUtility.exe.
2022-03-23 14:25:35 +08:00
wgzAIIT
b868fb6c8a fix up_registerdump set CONFIG_ARCH_INTERRUPTSTACK=10240 2022-03-23 14:01:13 +08:00
wgzAIIT
034fb66f77 fix up_registerdump set CONFIG_ARCH_INTERRUPTSTACK 2022-03-23 12:06:36 +08:00
Liu_Weichao
79b417f101 delete useless KPrintf in ok1052-c and xidatong board 2022-03-23 10:12:33 +08:00
wgzAIIT
5525c10627 set CONFIG_DEFAULT_SMALL=y for disable the application is put into the background for execution
remove  CONFIG_DEFAULT_SMALL=y
2022-03-23 09:33:38 +08:00
wgzAIIT
0541171749 set CONFIG_DEFAULT_SMALL=y for disable the application is put into the background for execution 2022-03-22 18:09:29 +08:00
xuedongliang
0340217e24 1、feat add xip function for imxrt1052-board;2、feat add ch438 driver for xidatong board from Liu_Weichao
it is OK
2022-03-22 17:26:33 +08:00
xuedongliang
c8197adedf add CH438 driver for rt_thread from Wang_Weigen
it is OK
2022-03-22 17:25:59 +08:00
xuedongliang
5d6d85b068 support PLC socket from Wang_Linyu
it is OK
2022-03-22 17:25:21 +08:00
Liu_Weichao
363a221533 1、feat add xip dir and Flash Bootable Image for ok1052-c and xidatong board link.lds;2、feat add ch438 driver for xidatong board。 2022-03-22 17:17:35 +08:00
wgzAIIT
8a7a7035b3 set CONFIG_SCHED_WAITPID=y for disable the application is put into the background for execution 2022-03-22 17:11:31 +08:00
Wang_Weigen
85dcdfcdaf Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-03-22 16:08:28 +08:00
wlyu
c9455ea442 fixed LWIP bug of exception 2022-03-22 14:21:49 +08:00
Wang_Weigen
be221d902b repair the send peoblem for ch438 2022-03-22 14:00:34 +08:00
wgzAIIT
8aa53e3aad change BOARD_CPU_FREQUENCY to 528000000 2022-03-22 10:06:28 +08:00
wgzAIIT
d9acd0756e Merge pull request 'add qs-fx and qs-fs sensor support Nuttx on stm32f407-discovery' (#10) from prepare_for_master into ok1052
ok
2022-03-21 19:08:29 +08:00
wgzAIIT
40d0320ef8 add qs-fx and qs-fs sensor support Nuttx on stm32f407-discovery 2022-03-21 19:04:18 +08:00
wlyu
f13343bf0f merge codes 2022-03-21 17:29:25 +08:00
wlyu
f74d1dafd7 optimize the codes with lwip and opcua 2022-03-21 16:47:32 +08:00
xuedongliang
e991c64a1d feat support GPIO driver for ok1052-c and xidatong board from Liu_Weichao
it is OK
2022-03-21 16:27:54 +08:00
xuedongliang
c2a34e3690 support lora for aiit-arm32-board on nuttx from Wang_guozhu
it is OK
2022-03-21 16:27:19 +08:00
wgzAIIT
c2a949f6c8 imxrt1052 CHIP_MIMXRT1052DVL6A change CHIP_MIMXRT1052CVL5B 2022-03-21 16:22:33 +08:00
Wang_Weigen
ec7b594345 repair ch438 driver 2022-03-21 16:19:57 +08:00
wlyu
a52854efb6 format the codes with ok1052-c board 2022-03-21 14:48:57 +08:00
wgzAIIT
6886a4d73a changge pin config for chip MIMXRT1052CVL5B 2022-03-21 12:06:29 +08:00
wgzAIIT
64aa3c4962 Merge pull request 'support mulan on nuttx' (#8) from prepare_for_master into ok1052
ok
2022-03-21 09:37:09 +08:00
wgzAIIT
dbca4aa6af support mulan on nuttx 2022-03-21 09:34:32 +08:00
wgzAIIT
1da65160cb support mulan on nuttx 2022-03-18 18:41:32 +08:00
wgzAIIT
dfb7db44fb support mulan on nuttx 2022-03-18 18:27:00 +08:00
wgzAIIT
2f73d551ee remove mxrt-ok1052 board CONFIG_RAW_BINARY=y 2022-03-18 11:31:41 +08:00
Liu_Weichao
be453c9d45 update XiZi README.md and ok1052-c board README.md 2022-03-18 10:09:07 +08:00
wlyu
c61c6dafea Merge branch '0309' of https://gitlink.org.cn/wlyu/xiuos into 0309 2022-03-17 18:33:11 +08:00
wlyu
be61178e44 support json file parse for plc socket demo 2022-03-17 18:30:26 +08:00
wlyu
4843ff9e61 support control json file 2022-03-17 15:33:37 +08:00
wgzAIIT
81f636cfe0 Merge pull request 'merge code to branch ok1052' (#6) from prepare_for_master into ok1052
ok
2022-03-17 14:44:30 +08:00
wgz-code
101e6854c0 set SX127X_DEV_NAME=CONFIG_ADAPTER_SX1278_DRIVER ifdef CONFIG_ADAPTER_SX1278_DRIVER 2022-03-17 14:35:28 +08:00
Liu_Weichao
a38c057cd9 delete useless KPrintf in ok1052-c and xidatong board 2022-03-17 14:14:21 +08:00
Liu_Weichao
0e0564f377 1.feat support GPIO driver for ok1052-c and xidatong board;2.fix ok1052-c board H file description 2022-03-17 14:10:21 +08:00
wgz-code
44124db62c fix bug sx1278 2022-03-17 12:23:25 +08:00
wgz-code
8af64eeb89 git submodule for nuttx10.2.0 2022-03-17 12:12:15 +08:00
wgz-code
63210858e5 support lora for aiit-arm32-board on nuttx 2022-03-17 12:04:33 +08:00
wgz-code
3735f221e0 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into prepare_for_master 2022-03-17 09:35:08 +08:00
wgz-code
1c73eca6e3 remove sx127x.h in app_match_nuttx/nuttx/include/nuttx/wireless/lpwan 2022-03-17 09:13:04 +08:00
wlyu
e5d124231c support plc socket and optimize LWIP test demo cases 2022-03-16 18:34:55 +08:00
xuedongliang
9ffd8fcbbb 1.feat(Ubiquitous/RT_Thread): port micropython on RT-Thread for aiit-board 2.Ubiquitous/RT_Thread/: add bsp of stm32h743_openmv_h7plus from Tian_Chunyu
it is OK
2022-03-16 09:30:55 +08:00
xuedongliang
f5d90cf6b8 fix Ubiquitous/XiZi/board/ok1052-c compile error from Liu_WeiChao
it is OK
2022-03-16 09:29:42 +08:00
xuedongliang
9ae8beaed2 fix a bug of message queue for XiZi,the message queue id is not deleted in the end from Wang_Weigen
it is OK
2022-03-16 09:29:01 +08:00
xuedongliang
96fcdabe42 fix Ubiquitous/XiZi/board/ README.md description from Liu_Weichao
it is OK
2022-03-16 09:28:21 +08:00
Wang_Weigen
fac1c35d38 add extuart port config for rtt 2022-03-15 16:05:51 +08:00
Wang_Weigen
7ebc769017 add pin config for riscv64 board 2022-03-15 16:04:51 +08:00
wgz-code
e69319a1bb add sx127x_demo/sx127x_demo.c to app_match_nuttx 2022-03-15 14:57:13 +08:00
Liu_Weichao
d2c247f4e0 delete useless section in lds and fix brief error 2022-03-15 14:37:46 +08:00
chunyexixiaoyu
041435971b it's verified.
1.uart is ok
2.sdram is ok.
2022-03-15 14:10:22 +08:00
Liu_Weichao
57c22182c2 fead support Ubiquitous/XiZi/board/xidatong bsp 2022-03-15 11:18:55 +08:00
Liu_Weichao
31697c14f2 fix Ubiquitous/XiZi/board/ok1052-c compile error 2022-03-15 11:08:52 +08:00
wgz-code
35ab6fcf8f change LoraDataFormat to SX127xDataFormat for sx127x on nuttx 2022-03-15 09:40:55 +08:00
Wang_Weigen
cb8da02a88 modify default config for aiit-riscv64-board 2022-03-15 09:24:10 +08:00
wgz-code
76a080b130 add LoraDataFormat for sx127x on nuttx 2022-03-14 18:22:11 +08:00
wlyu
68e5436aae remove default config 2022-03-14 18:13:13 +08:00
wgz-code
73c8ee0422 add LoraDataFormat for sx127x on nuttx 2022-03-14 18:11:43 +08:00
Wang_Weigen
fa790d8b03 add submodule for aiit-riscv64-board 2022-03-14 17:38:47 +08:00
Wang_Weigen
24ab7f81cc Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2022-03-14 17:30:21 +08:00
Wang_Weigen
d528464e90 add aiit-riscv64-board for rt-thread 2022-03-14 17:30:12 +08:00
WentaoWong
33a7e0deda Ubiquitous/RT_Thread/: add bsp of stm32h743_openmv_h7plus 2022-03-14 14:58:33 +08:00
wgzAIIT
5b10efa5e7 Merge pull request 'fix bug aiit-arm32-board support sx127x on nuttx' (#4) from prepare_for_master into ok1052
ok
2022-03-14 14:52:01 +08:00
wgz-code
35f1cc5d88 fix bug aiit-arm32-board support sx127x on nuttx 2022-03-14 14:29:44 +08:00
chunyexixiaoyu
0f2714d0ff it's verified,but it's only supported by using rt-thread 2022-03-11 15:03:12 +08:00
Wang_Weigen
cf7b906007 Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2022-03-11 15:00:02 +08:00
Wang_Weigen
67f09231ea fix a bug of message queue for XiZi,the message queue id is not deleted in the end 2022-03-11 14:52:33 +08:00
yangtuo250
f83f073fa0 feat(Ubiquitous/RT_Thread): port micropython on RT-Thread for aiit-board 2022-03-11 14:24:56 +08:00
Liu_Weichao
fe4019668a fix table error in README.md 2022-03-11 13:43:45 +08:00
xuedongliang
73d10380ea support OK1052-C ADC SPI I2C RTC codes ; support PLC control framework from Wang_linyu 2022-03-11 13:38:00 +08:00
Liu_Weichao
29b8834088 modify XiZi DIR description in README.md 2022-03-11 11:26:22 +08:00
Liu_Weichao
16eaea4973 fix Ubiquitous/XiZi/board/ README.md description 2022-03-11 11:15:17 +08:00
wgz-code
acd1cebad3 set USART1 as SERIAL_CONSOLE for aiit-arm32-board on nuttx 2022-03-11 09:49:45 +08:00
wgzAIIT
cbdd2b0885 Merge pull request 'https://gitlink.org.cn/wgzAIIT/wgz-information.git' (#3) from prepare_for_master into ok1052
ok
2022-03-10 19:59:01 +08:00
wgz-code
32e1e2fec0 aiit-arm32-board support sx127x on nuttx 2022-03-10 19:51:41 +08:00
wlyu
52bf15ecac Merge branch '0309' of https://gitlink.org.cn/wlyu/xiuos into 0309 2022-03-09 17:50:28 +08:00
wlyu
58390d6ee4 1. optimize plc relative codes
2. fixed ShowChannel exception
3. optimize RTC codes
4. compatible memory lds with USB
2022-03-09 17:47:53 +08:00
wlyu
b789588fa2 optimize plc relative codes 2022-03-09 16:51:47 +08:00
wlyu
f69edc63ba support rtc SPI I2C eeprom ADC 2022-03-09 16:32:50 +08:00
wlyu
30ab8676f1 merge codes 2022-03-09 16:06:27 +08:00
xuedongliang
07ba66611d feat add sensor device support for sensor framework from Liu_weichao
it is OK
2022-03-09 09:37:19 +08:00
xuedongliang
898135194f feat support nuvoton-m2354 bsp for Ubiquitous/XiZi kernel from Liu_Weichao
it is OK
2022-03-09 09:36:37 +08:00
xuedongliang
5ab2afe54e add embedded database lib (flashdb)
it is OK
2022-03-09 09:35:53 +08:00
xuedongliang
3782798520 move aiit-arm32-board and aiit-riscv64-board to aiit_board、update readme file、and support fft on aiit-riscv64-board for nuttx from Wang_guozhu
it is OK
2022-03-09 09:34:54 +08:00
chunyexixiaoyu
4ffba50c6a verified,it's OK
the PR has beed verified,but there are still some problems, which are explained here:
1.many header files (*math.h)in the Xizi and CMSIS are currently coupled, so cmSIS is not supported in Xizi
2.the lcd driver is not supported in xizi and nuttx
3.the OV2640 driver is not supported in xizi and nuttx.
2022-03-08 16:50:35 +08:00
Liu_Weichao
c6b5d051a3 feat add co2_g8s for sensor framework 2022-03-08 16:39:21 +08:00
Liu_Weichao
68f92a45ed feat add altitude_bmp180 for sensor framework 2022-03-08 16:26:30 +08:00
Liu_Weichao
6be4d4b5ca feat add winddirection_qs_fx and windspeed_qs_fs for sensor framework 2022-03-08 16:15:38 +08:00
Liu_Weichao
2db01c89dd feat support nuvoton-m2354 bsp for Ubiquitous/XiZi kernel 2022-03-08 15:32:51 +08:00
wgz-code
40a12583cc set CONFIG_ADD_NUTTX_FETURES=y on attiboards for nuttx os 2022-03-08 14:53:12 +08:00
wgzAIIT
8d935beafb Merge pull request 'set CONFIG_ADD_NUTTX_FETURES=y on attiboards for nuttx os' (#2) from prepare_for_master into ok1052
ok
2022-03-08 14:51:08 +08:00
wgz-code
4a805adf42 set CONFIG_ADD_NUTTX_FETURES=y on attiboards for nuttx os 2022-03-08 14:49:11 +08:00
wgzAIIT
c6fa34cdb2 Merge pull request 'set CONFIG_CLOCK_MONOTONIC=y on attiboard' (#1) from prepare_for_master into ok1052
ok
2022-03-08 14:10:39 +08:00
wgz-code
f57bed1b8d set CONFIG_CLOCK_MONOTONIC=y on attiboard 2022-03-08 14:07:56 +08:00
wgz-code
1599bb5af7 set CONFIG_CLOCK_MONOTONIC=y on attiboard 2022-03-08 13:59:29 +08:00
wgz-code
aa9d16c64d imxrt-ok1052 board set CONFIG_RAW_BINARY=y 2022-03-08 13:21:48 +08:00
wgz-code
23099c5326 support M7 imxrt-ok1052 board 2022-03-07 18:24:10 +08:00
WentaoWong
d9b539b51d APP_Framework/Applications/:add README of CMSIS-NN vegetable classify example 2022-03-07 09:44:43 +08:00
WentaoWong
06143fb284 APP_Framework/Applications/:add CMSIS-NN vegetable classify example 2022-03-07 09:42:07 +08:00
WentaoWong
4c9a838011 APP_Framework/Applications/:add configuration file about CMSIS-NN vegetable classify example 2022-03-07 09:41:40 +08:00
WentaoWong
b7507101bf APP_Framework/Framework/:solve the error in the configuration files of Tensorflow-lite 2022-03-07 09:40:59 +08:00
chunyexixiaoyu
1c8b10ed74 Ubiquitous/RT_Thread/:update shell name 2022-03-04 16:28:38 +08:00
chunyexixiaoyu
0eb0efc151 APP_Framework/Applications/:add flashdb app source code 2022-03-04 16:00:37 +08:00
chunyexixiaoyu
0ff79809e8 APP_Framework/Applications/:add app flashdb configuration file 2022-03-04 15:59:35 +08:00
wlyu
598f92babb optimize I2C and SPI codes and add rtc module 2022-03-04 15:54:43 +08:00
chunyexixiaoyu
3b377666e2 APP_Framework/Lib:add flashdb source code 2022-03-04 15:47:26 +08:00
chunyexixiaoyu
6909bb2947 APP_Framework/lib/:add embeded database (flashdb) configuration file 2022-03-04 15:45:45 +08:00
wgz-code
a5f48c65b7 move aiit-arm32-board and aiit-riscv64-board to aiit_board 2022-03-04 14:48:58 +08:00
wgz-code
96ecc0324f update readme file 2022-03-04 13:35:33 +08:00
wgz-code
3e687f8337 ADD_XIUOS_FETURES change to #ifdef ADD_XIZI_FETURES 2022-03-04 12:20:20 +08:00
wgz-code
918bed7634 conflict resolution 2022-03-04 12:12:33 +08:00
wgz-code
46a8d5f9e5 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into prepare_for_master 2022-03-04 12:08:33 +08:00
wgz-code
295ffe0486 conflict resolution 2022-03-04 12:07:39 +08:00
wgz-code
233024f3f0 conflict resolution 2022-03-04 11:58:46 +08:00
wgz-code
0501122537 support fft on aiit-riscv64-board for nuttx 2022-03-04 11:14:53 +08:00
wgzAIIT
9946b33530 Update nsh_command.c 2022-03-04 10:06:16 +08:00
wgz-code
57e98cb8af suuport atti-riscv64-board onnuttx 2022-03-03 19:44:52 +08:00
wlyu
06b2ed5235 optimize OPCUA demo and PLC demo and added PLC channel instead of bus 2022-03-03 17:58:14 +08:00
wgz-code
316798e98c support zigbee on nuttx stm32f4discovery 2022-03-03 14:43:51 +08:00
Wang_Weigen
56ab10f0e9 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-03-02 15:39:38 +08:00
Wang_Weigen
ccc9d8e72e add rv32m1 zero riscy jump entry 2022-03-02 15:35:46 +08:00
wgz-code
74683ed165 support hs300x to nuttx10.2.0 2022-03-02 12:36:18 +08:00
xuedongliang
a35e73e7dd update nuttx 10.1.0 to 10.2.0 from Wang_guozhu
it is OK
2022-03-02 11:36:27 +08:00
xuedongliang
777408e1b7 Define the headre and frame structures of EtherCAT. Build testcases based on hfa21 Ethernet. Tested on an old commit 7b82f2a60b, whose AT command agent works.
it is OK
2022-03-02 11:35:28 +08:00
wgz-code
5ba501eae7 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into prepare_for_master 2022-03-02 11:24:53 +08:00
wgz-code
de2144aaa9 update nuttx 10.1.0 to 10.2.0 2022-03-02 11:21:49 +08:00
wgz-code
0e4eaaa67f change nuttx 2022-03-02 11:09:39 +08:00
Forsworns
3cf06cdcd8 Merge branch 'ethercat' into ethercat_resolve 2022-03-01 20:07:21 +08:00
wgz-code
4d6caa6182 APP_Framework support nuttx-10.2.0 2022-03-01 17:57:08 +08:00
xuedongliang
1f041ac321 xiuos:change the .gitmodules file Ubiquitous/RT_Thread/ update README.md and add build.sh file from Tian_Chunyu
it is OK
2022-03-01 17:53:58 +08:00
chunyexixiaoyu
516e6adc5d Ubiquitous/RT_Thread/ update README.md and add build.sh file 2022-03-01 17:28:16 +08:00
chunyexixiaoyu
841fa1b5a4 xiuos:change the .gitmodules file 2022-03-01 16:59:22 +08:00
wgz-code
b916ebb768 add aiit-arm32-board to nuttx 2022-03-01 16:53:46 +08:00
wgz-code
71d77936cc update nuttx 10.1.0 to 10.2.0 2022-03-01 16:40:08 +08:00
wgz-code
3191a295aa remove nuttx 2022-03-01 16:31:23 +08:00
xuedongliang
c796fde261 feat modify XiUOS_Kernel dir from Ubiquitous/XiUOS to Ubiquitous/XiZi from Liu_Weichao
it is OK
2022-03-01 16:00:30 +08:00
Liu_Weichao
ae7c02ad39 feat modify Ubiquitous/feature_yaml/XiZi.yaml file 2022-03-01 14:18:10 +08:00
Liu_Weichao
5078ff66cc feat modify XiUOS_Kernel dir from Ubiquitous/XiUOS to Ubiquitous/XiZi 2022-03-01 14:15:01 +08:00
xuedongliang
f45477ab2a Revise LwIP for control framework Add a PrivGetTickTime API to transform layer Fix compile error on aiit-arm32-board Rollback SerialDevIntRead
it is OK
2022-03-01 09:52:56 +08:00
Forsworns
392591e50d support software-defined ethercat 2022-02-28 10:27:30 +08:00
Forsworns
abe0247e04 forget to remove comments on errorno 2022-02-25 10:24:25 +08:00
Forsworns
9fe5d550b5 revise lwip for control framework 2022-02-24 17:54:41 +08:00
xuedongliang
287cd1bd89 add the NNOM (a Neural Network library specifically for microcontrollers)as a part of knowing framework add a example about nnom. update k210 yolov2 detect procedure from Tian_Chunyu
it is OK
2022-02-24 16:22:37 +08:00
xuedongliang
3b5cdc402c 1、add rv32m1_vega board for xiuos;2、repair the float number printf bug
it is OK
2022-02-24 16:21:22 +08:00
xuedongliang
4f5d2fc070 Build a kernel selector tool in Kconfig/bash/python. Implement a naive recommendation algorithm for it. Automatically generate preferences in YAML. The features described in YAML for each kernel is not stable and is only for demonstration currently. Integrate the tool into the Makefile of XiUOS. Run make kernel_selector in XiUOS directory to verify it 2022-02-24 16:18:37 +08:00
xuedongliang
f1e8216944 1、support sd card driver for ok1052-c board by NXP uSDHC library; 2、support sd card mount for fatfs from Liu_WeiChao
it is OK
2022-02-24 16:15:16 +08:00
wlyu
eb4538e331 support spi module 2022-02-23 17:11:08 +08:00
chunyexixiaoyu
a180b2a53b APP_Framework/Applications/: modify the label in the image.h 2022-02-21 17:34:10 +08:00
chunyexixiaoyu
ff6554b8df verified and add the NNOM (a Neural Network library specifically for microcontrollers)as a part of knowing framework 2022-02-21 15:19:28 +08:00
Wang_Weigen
0f8336c9e7 add file note for vega board 2022-02-18 16:22:45 +08:00
Wang_Weigen
3c8fcd55cc add readme for vega board 2022-02-18 16:01:14 +08:00
WentaoWong
1b047bbabe APP_Framework/Applications/:add NNoM mnist example 2022-02-18 15:52:04 +08:00
WentaoWong
7ece915772 APP_Framework/Applications/:add configuration file about NNoM mnist example 2022-02-18 15:51:51 +08:00
WentaoWong
cde42331ee APP_Framework/Framework/:add NNoM(v0.4.3) source code 2022-02-18 15:51:25 +08:00
WentaoWong
e4393985f8 APP_Framework/Framework/:add Kconfig file and SConscript file about NNoM(v0.4.3) 2022-02-18 14:41:33 +08:00
WentaoWong
48dfa06f79 APP_Framework/Framework/:sovle the name error in the configuration files of CMSIS-NN 2022-02-18 14:38:46 +08:00
Liu_Weichao
9339ffe2fd fix USB write error using fatfs function 2022-02-17 16:29:41 +08:00
Liu_Weichao
84b27692c0 feat support USB HOST for ok1052-c board 2022-02-17 15:18:27 +08:00
Wang_Weigen
691611de34 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop 2022-02-17 11:10:15 +08:00
Wang_Weigen
26e8a1a7e8 repair running error by remove interrupt stack,and repair the uart output problems 2022-02-17 11:10:02 +08:00
wlyu
f942af6c43 remove adc string 2022-02-17 09:25:22 +08:00
wlyu
efd8999988 support adc bus 2022-02-16 18:01:25 +08:00
Forsworns
60cd74e296 chore: kernel selector in Kconfig 2022-02-16 14:49:54 +08:00
wlyu
5185501d72 support PLC bus and clean codes 2022-02-15 17:40:40 +08:00
wlyu
a101e994ff changed demo task name with hump style 2022-02-15 16:12:49 +08:00
wlyu
338f4ad41a support plc demo 2022-02-15 14:24:46 +08:00
chunyexixiaoyu
513cc43f06 APP_Framework/Applications/:solve the bug in the SConscript about compiling 2022-02-15 10:09:04 +08:00
chunyexixiaoyu
f46bf7044a APP_Framework/Framework:update k210 yolov2 detect procedure 2022-02-15 10:07:41 +08:00
wlyu
3bc3577d35 Merge branch '1220' of https://code.gitlink.org.cn/wlyu/xiuos into 1220 2022-02-14 09:41:13 +08:00
wlyu
0c6f013bfd fixed adc compliation error 2022-02-14 09:40:56 +08:00
wlyu
98817fac11 fixed adc compliation error 2022-02-14 09:39:06 +08:00
Liu_Weichao
2ecded6feb set sd device function default off 2022-02-09 09:55:48 +08:00
Liu_Weichao
bd11453657 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into cortex_m7_drivers 2022-02-08 16:55:13 +08:00
Liu_Weichao
d7507bcd6e feat support sdio read/write/configure function 2022-02-08 16:53:47 +08:00
wlyu
521dc56e15 fixed merge fault 2022-01-30 23:39:16 +08:00
wlyu
e8fb3ca4fd Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into 1220 2022-01-30 22:56:05 +08:00
wlyu
5346d8401f support PLC bus and opcua API 2022-01-30 22:51:00 +08:00
Wang_Weigen
d5d7ea74c8 add rega board interrupt process 2022-01-29 15:59:53 +08:00
Wang_Weigen
aa0c438976 add rv32m1_vega for xiuos 2022-01-28 11:06:37 +08:00
xuedongliang
aa27dea6e9 update knowing framework and ov2640 dirver from Tian_Chunyu
it is OK
2022-01-27 22:31:57 +08:00
xuedongliang
dc811358fe move readme.md to nuttx path and fix bug for HCHO_TB600B_WQ_HCHO1OS
it is OK
2022-01-27 22:31:02 +08:00
xuedongliang
b927abfd64 feat support lcd driver for aiit-arm32-board
it is OK
2022-01-27 22:29:59 +08:00
Liu_Weichao
7b32e213ce add sd card driver part for ok1052-c board 2022-01-26 17:14:43 +08:00
chunyexixiaoyu
8fc1462141 Ubiquitous/RT_Thread/: eliminate the Kconfig warning in ov2640 driver 2022-01-25 14:44:27 +08:00
wgzAIIT
7df26b9ce3 move readme.md to nuttx path and fix bug for HCHO_TB600B_WQ_HCHO1OS 2022-01-25 14:15:12 +08:00
chunyexixiaoyu
600d615765 Ubiquitous/RT_Thread/:update stm32f407 lcd driver, support show string. 2022-01-25 11:07:43 +08:00
wlyu
df0404b4cc merge the latest codes 2022-01-24 18:38:19 +08:00
wlyu
1dfcf0edbe support spi module and plc module 2022-01-24 18:30:44 +08:00
Wang_Weigen
672229cd0f repair the bug of float number printf 2022-01-24 14:49:06 +08:00
Liu_Weichao
63ec04cf6e fix xiuos/transform.h code standard problem 2022-01-21 16:03:31 +08:00
wlyu
28cf201808 fixed UDP socket recv and send bug and support I2c Bus registration 2022-01-21 11:14:46 +08:00
chunyexixiaoyu
bf17ef10cb APP_Framework/Applications/: make mnist application running on the stm32f407 board,model data is saved in the flash,note the following points
1. the thread which run the mnist needs 10kb
2. Lwip and useless driver must be not loaded.
3. The entire bin file is close to 1024KB.
2022-01-19 14:53:47 +08:00
Liu_Weichao
3a84b9942b fix lcd display error 2022-01-19 13:56:05 +08:00
Liu_Weichao
2c12cac790 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into aiit_arm_drivers 2022-01-18 17:07:27 +08:00
xuedongliang
d5ff9259a0 resubmit the lvgl code
it is OK
2022-01-18 16:45:20 +08:00
Wang_Weigen
65a3861ea7 resubmit the lvgl code 2022-01-18 16:38:38 +08:00
chunyexixiaoyu
0dee89982a Ubiquitous/RT_Thread/:update the ov2640 driver
1.can choose the output format:rgb565 or jpeg
2.resolution and window size can be configured directly
3.add the test that the lcd can show rgb565 image in time
2022-01-18 16:00:16 +08:00
chunyexixiaoyu
1c5047f47a Ubiquitous/RT_Thread/:change the default orientation of the MCU-ATK screen 2022-01-18 15:56:13 +08:00
wlyu
2115572813 support i2c eeprom and rtc for ok1052-c and remove wrong Copyright 2022-01-18 15:44:07 +08:00
Liu_Weichao
9223e8214e Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into aiit_arm_drivers 2022-01-18 15:06:42 +08:00
xuedongliang
a5066f8a36 1、add lvgl for xiuos;2、add semc and extern sram test for ok-1052;3、add fpu status set
it is OK
2022-01-18 15:01:02 +08:00
Wang_Weigen
bc1d8f574b sync upstream 2022-01-18 14:55:00 +08:00
Liu_Weichao
546edab7f0 feat support lcd driver for aiit-arm32-board 2022-01-18 14:11:55 +08:00
xuedongliang
27657d6219 fixed opcua demo bug and show mac address
it is OK
2022-01-18 13:28:59 +08:00
xuedongliang
0172522463 1、add ADC driver for aiit-arm32-board,but there is no extra IO for adc analog input; 2、add ADC driver for stm32f407-st-discovery board
it is OK
2022-01-18 13:27:52 +08:00
Liu_Weichao
109ad93e9e feat support DMA for aiit-arm32-board and stm32f407-st-discovery uart function 2022-01-17 17:15:19 +08:00
Wang_Weigen
d56a5315dd modify the extern sram size as 32MBytes 2022-01-17 15:43:06 +08:00
wlyu
169c3c3c5d fixed socket bug and optimize with lwip flag and other codes 2022-01-17 15:21:15 +08:00
Wang_Weigen
c88dc282fc add semc and extern sram test for ok-1052 2022-01-17 15:05:42 +08:00
chunyexixiaoyu
bc87a72f5d Ubiquitous/RT_Thread/:add LCD driver in stm32f407_core borad,and find a bug that the FSMC_NE4 gpio had been not configured. 2022-01-13 18:48:06 +08:00
wlyu
c0de7ca44c fixed the bug of lwip IRQ and optimize TCP and OPCUA demo 2022-01-12 18:49:36 +08:00
Wang_Weigen
27a40042f4 add fpu test 2022-01-11 18:17:26 +08:00
Wang_Weigen
3ca98f520d repair the compiler error of lvgl 2022-01-11 17:51:44 +08:00
Wang_Weigen
aa63e53cbc sync upstream branch 2022-01-11 17:13:40 +08:00
Wang_Weigen
c6458f1f1d add lvgl for xiuos 2022-01-11 17:11:17 +08:00
Liu_Weichao
bac136c51d feat support DAC driver for aiit-arm32-board and stm32f407-st-discovery 2022-01-11 16:56:57 +08:00
wlyu
bb0425d1b2 fixed the bug of UaGetInfo 2022-01-10 18:22:44 +08:00
wlyu
51de336db1 remove debug log and optimizing codes 2022-01-10 17:49:37 +08:00
wlyu
6972a14f6d fixed opcua demo exception and added mac address with showip command 2022-01-10 16:21:32 +08:00
Liu_Weichao
d789b66ed2 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into aiit_arm_drivers 2022-01-10 14:10:50 +08:00
Liu_Weichao
2e8383397b feat support ADC driver for aiit-arm32-board and stm32f407-st-discovery 2022-01-10 14:08:58 +08:00
xuedongliang
3a35bee743 support LWIP and demo from Wang_Linyu Liu_Kai Yang Peihao Wang_Weigen
it is OK
2022-01-07 22:00:32 +08:00
wlyu
b6bec0c2b6 fixed the bug that updating ip address and TCP recv fault 2022-01-07 18:56:49 +08:00
wlyu
a49eeaf548 optimize lwip test 2022-01-07 17:02:55 +08:00
wlyu
e2e127bb0e added socket send and recv for udp and tcp 2022-01-07 14:36:57 +08:00
wlyu
877ef9e221 1. fixed IRQ interrupt
2. changed lwip test command
3. merge dns and ping command
4. change test to cmd_lwip
2022-01-07 13:56:54 +08:00
xuedongliang
4179e4910b add hcho1os、iaq10、as830 sensor and tvoc10 sensor support Nuttx from Wang_guozhu
it is OK
2022-01-07 13:55:00 +08:00
wgzAIIT
6bfbbc18f2 add hcho1os sensor support Nuttx 2022-01-07 12:08:14 +08:00
wgzAIIT
c08d854d4b add as830 sensor and tvoc10 sensor support Nuttx 2022-01-07 11:01:46 +08:00
wlyu
ddb889623d change lwip_demo to resoures directory and mkdir socket_demo on connection_app 2022-01-06 21:20:17 +08:00
wlyu
acd53026b0 fixed the exception of close socket and added dhcp and dns demo 2022-01-06 20:37:34 +08:00
wlyu
a0337a42e3 change demo command and support DHCP demo 2022-01-06 15:58:43 +08:00
wlyu
d1d4632292 1. fixed ping exception
2. added tcp send test example
3. added udp [IP] to test udp
2022-01-05 20:05:07 +08:00
wgzAIIT
1f252e418f add iaq10 sensor support Nuttx 2022-01-05 15:40:01 +08:00
Wang_Weigen
37c247f4d7 add lvgl 2022-01-05 15:23:12 +08:00
chunyexixiaoyu
3c291f075f APP_Framework/Framework/:delete the unuseful cmsis flies in tensorflow-lite 2022-01-05 11:08:55 +08:00
chunyexixiaoyu
9904709d70 Ubiquitous/RT_Thread: update the README file 2022-01-05 09:56:54 +08:00
chunyexixiaoyu
7f24c672dd APP_Framework/Framework: cmsis nn used in tflite was replaced with in knowing cmsis_5 dir 2022-01-04 18:36:30 +08:00
chunyexixiaoyu
1bd8927c5d Eliminate the warning "./../../../APP_Framework/Framework/knowing/Kconfig:13:warning: ignoring unsupported character '" 2022-01-04 15:47:14 +08:00
wlyu
d1625c7d84 fixed opcua_demo compilation error 2022-01-01 00:03:18 +08:00
wlyu
37cbb51afa Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into 1220 2021-12-31 23:40:23 +08:00
xuedongliang
711bd5bd15 add hs300x and ps5308 sensor support Nuttx on stm32f407-discovery from Wang_guozhu
it is OK
2021-12-31 17:08:37 +08:00
chunyexixiaoyu
a3db2480a1 it's verified 2021-12-31 16:33:16 +08:00
wlyu
7c0b7367d1 optimize LWIP demo and OPCua demo 2021-12-31 14:37:57 +08:00
wgzAIIT
b342734aad APP_Framework support Nuttx on aiit-arm32-board 2021-12-30 12:19:58 +08:00
wlyu
372c097688 Merge branch '1220' of https://code.gitlink.org.cn/wlyu/xiuos into 1220 2021-12-30 11:25:54 +08:00
wlyu
62dcbef383 optimize lwip demo and ok1052-c directories 2021-12-30 11:25:22 +08:00
wlyu
a672abce6f optimize lwip demo and ok1052-c directories 2021-12-30 11:20:36 +08:00
wgzAIIT
bd31aad3ef add d124 and zg09 sensor support Nuttx on stm32f407-discovery 2021-12-29 16:13:23 +08:00
wgzAIIT
97eccb0b36 Update Make.defs 2021-12-28 19:57:25 +08:00
wgzAIIT
491264e3fc Update Make.defs 2021-12-28 19:56:48 +08:00
wgzAIIT
fb7a0478e5 Update ps5308.c 2021-12-28 19:29:52 +08:00
wgzAIIT
d59acc2e03 add hs300x and ps5308 sensor support Nuttx on stm32f407-discovery 2021-12-28 16:45:44 +08:00
chunyexixiaoyu
17be211288 Merge branch 'wang_dev' into test_pre
solve the Conflicts
# Conflicts:
#	APP_Framework/Framework/knowing/Kconfig
2021-12-24 13:52:24 +08:00
wlyu
8fa0d977a0 Merge branch '1220' of https://code.gitlink.org.cn/wlyu/xiuos into 1220 2021-12-22 19:01:37 +08:00
wlyu
aa43d46953 fixed pull conflict and socket ping test bug 2021-12-22 19:00:56 +08:00
wlyu
2af68252cb fixed pull conflict 2021-12-22 16:09:34 +08:00
wlyu
ebb1321b7c update ping debug commands 2021-12-22 16:04:28 +08:00
wlyu
f98689fc30 change udp test command 2021-12-22 13:48:35 +08:00
wlyu
8992dce241 fixed menu and complilation error 2021-12-22 13:45:52 +08:00
xuedongliang
7ecf1af00f 1、add Framework/connection/industrial_ethernet DIR; 2、add Framework/connection/industrial_fieldbus DIR; 3、add Framework/connection/industrial_wlan DIR from Liu Weichao
it is OK
2021-12-22 13:28:42 +08:00
wlyu
5799b31942 fixed menu and complilation error 2021-12-21 10:20:56 +08:00
wlyu
c20c9c20d2 support OPCUA and LWIP 2021-12-20 16:44:03 +08:00
chunyexixiaoyu
b6bd1de959 APP_Framework/Applications/:eliminate the warning 2021-12-20 16:33:48 +08:00
Liu_Weichao
60442e489a feat Framework/connection/industrial_xxx DIR 2021-12-20 16:14:02 +08:00
chunyexixiaoyu
be4da6f37d Ubiquitous/RT_Thread/:change the path name 2021-12-20 16:05:55 +08:00
wlyu
b4730f3f87 support OPCUA and LWIP 2021-12-20 15:52:05 +08:00
Wang_Weigen
36f2ebbf95 add fpu status set 2021-12-20 15:42:24 +08:00
chunyexixiaoyu
12c9220487 the kmodel load function has been verified 2021-12-20 15:18:13 +08:00
xuedongliang
cb8c68659c 1. add sensor as830 of ch4; 2、repair a bug of requiring password in letter shell
it is OK
2021-12-16 17:40:29 +08:00
yangtuo250
62df72af5b fix(knowing framework/yolov2 region layer): free region layer thresholds 2021-12-16 15:03:37 +08:00
yangtuo250
c782dd26c4 feat(knowing app): remove json config from menuconfig, adding to detect_app arg 2021-12-15 19:05:07 +08:00
yangtuo250
efb28105e8 fix(knowing framework): fix unproperly named k210 detect procedure, specified yolov2 2021-12-15 17:32:07 +08:00
yangtuo250
4640055ab6 fix(knowing app/yolov2): AI address error while sensor output and net input height mismatch 2021-12-15 17:12:34 +08:00
Wang_Weigen
db225df433 add 'TB600B_WQ_HCHO1OS' sensor of hcho to sensor framework 2021-12-15 16:28:51 +08:00
Wang_Weigen
19edea21d7 add 'TB600B_TVOC10' sensor of tvoc to sensor framework 2021-12-15 15:01:30 +08:00
Wang_Weigen
856edb7ec6 add sensor 'TB600B_IAQ10' to sensor framework 2021-12-15 11:10:56 +08:00
yangtuo250
203184e18c fix(bsp/k210): resolve conflict of 235dcb761c path changed 2021-12-14 10:06:53 +00:00
yangtuo250
c07c918150 refactor(knowing app): add common k210 yolov2 detection procedure 2021-12-14 17:43:53 +08:00
yangtuo250
d368db9e76 refactor(knowing apps): yolov2 json parser 2021-12-14 17:43:27 +08:00
chunyexixiaoyu
235dcb761c Ubiquitous/RT_Thread/:change the path name 2021-12-14 17:13:38 +08:00
Wang_Weigen
4a8ac7c02b repair ch4 test 2021-12-14 14:07:09 +08:00
chunyexixiaoyu
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
2021-12-14 13:21:42 +08:00
chunyexixiaoyu
d71c5fcd2f Ubiquitous/RT_Thread/:add romfs file system ,including SD and FLASH directory 2021-12-14 11:11:09 +08:00
Wang_Weigen
e366c8817c repair a bug of inputting password of shell 2021-12-14 10:37:22 +08:00
Wang_Weigen
f2ba792380 sync upstream branch and add 'as830' sensor of ch4 2021-12-14 10:32:17 +08:00
xuedongliang
cc6c459e7b fix APP_Framework bugs,include sensor framework and Applications
it is OK
2021-12-13 14:18:48 +08:00
Liu_Weichao
e9e9080ae0 delete useless DIR connection_app/ and app_test/ 2021-12-10 10:39:37 +08:00
Liu_Weichao
ead80da91f fix that i2c device of sensor framework cannot set i2c address 2021-12-10 10:23:30 +08:00
xuedongliang
c9db5635b0 add framework configuration select from Wang_Weigen 2021-12-09 11:08:00 +08:00
xuedongliang
3397a5245b Add the cortex-m0 support for XiUOS & Fix bugs on M3 and serial device from ysm
it is Perfect
2021-12-09 11:07:15 +08:00
Wang_Weigen
85cbc7717e add framework configuration select 2021-12-09 10:56:25 +08:00
Kiritoy
58060874d6 rebase prepare_for_master branch 2021-12-08 14:52:10 +08:00
Kiritoy
a080d98470 Restore the file directory structure 2021-12-08 14:43:10 +08:00
Kiritoy
4aacf28974 add cortex-m0 support and fix some bugs 2021-12-08 14:43:10 +08:00
xuedongliang
1dfb44a706 1、fix third_party_usb data format bugs; 2、feat riscv64 usb mount file system function.
it is OK
2021-12-07 09:52:09 +08:00
xuedongliang
3306194902 add gd32vf103_rvstar board for xiuos
it is OK
2021-12-07 09:51:12 +08:00
Wang_Weigen
fa1637ffbd sync upstream 2021-12-07 09:47:13 +08:00
Liu_Weichao
c1036ec9a2 Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into xiuos_connection 2021-12-07 09:44:11 +08:00
Liu_Weichao
a7baf1e7ed fix third_party_usb/usbhost data format bugs 2021-12-07 09:43:53 +08:00
xuedongliang
4405b85eae add XiUOS/stm32f103-nano board feature,support uart1 and shell function
It is perfect
2021-12-07 09:31:13 +08:00
Wang_Weigen
b76b1506cd modify board name in readme 2021-12-06 09:58:10 +08:00
Wang_Weigen
b1e7057b17 add bin file flash way of gd32vf103_rvstar in READ.md 2021-12-03 16:47:17 +08:00
chunyexixiaoyu
6816dc023a update .gitmodules file 2021-12-03 16:35:17 +08:00
Wang_Weigen
644f2bbf37 add gd32vf103 'README.md' 2021-12-03 15:38:10 +08:00
Wang_Weigen
19bd5a4705 repair the uart input of gd32fv103_rvstar 2021-12-03 14:07:05 +08:00
chunyexixiaoyu
d99d4e8f52 APP_Framework/Applications/:eliminate some warnings about menuconfig in linux 2021-12-03 13:56:15 +08:00
Wang_Weigen
b1264ad3c9 Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into develop 2021-12-02 15:18:33 +08:00
Wang_Weigen
607b8ca017 transplant development board of gd32vf103_rvstar 2021-12-02 15:17:59 +08:00
Liu_Weichao
a21ca4af2a fix XiUOS/stm32f103-nano board README.md error 2021-12-02 14:21:54 +08:00
Liu_Weichao
a51473d791 Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into xiuos_connection 2021-12-02 11:09:39 +08:00
Liu_Weichao
20b852eb38 add XiUOS/stm32f103-nano board support, feat shell and docs stack-heap-optimize advice 2021-12-02 11:09:17 +08:00
chunyexixiaoyu
60ce72b37a Ubiquitous/RT_Thread/bsp/:fix the problem that the iic parameters were changed when menuconfig 2021-12-02 09:43:59 +08:00
xuedongliang
20bc1e6e8b cortex-m4-emulator support
It is OK
2021-12-01 16:58:59 +08:00
Liu_Weichao
c78ab5242c Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into xiuos_connection 2021-12-01 10:28:26 +08:00
Liu_Weichao
a42f20ab3c add XiUOS/stm32f103-nano board support, task create function has some bugs 2021-12-01 10:27:25 +08:00
bj
668796ee18 技术文档与视频 2021-12-01 10:10:52 +08:00
xuedongliang
2356e42955 update knowing framework and ov2640 driver from Tian Chunyu
it is OK
2021-12-01 09:59:44 +08:00
xuedongliang
3653ac690d it is OK 2021-12-01 09:59:02 +08:00
chunyexixiaoyu
c30ba15c6f Merge branch 'wang_dev' of https://git.trustie.net/chunyexixiaoyu/xiuos into wang_dev 2021-11-30 15:33:45 +08:00
chunyexixiaoyu
0379084f40 Ubiquitous/RT_Thread/:update ov2640 drivers to adapt the hardware,IIC two wires(SCL SDA) switched due to due to hardware design. 2021-11-30 15:23:34 +08:00
chunyexixiaoyu
e70244d75e Add cmsis- nn for ARM board , it has been verified on stm32f407-atk-board
1.Limited by hardware resources(ram 128k),so Lwip can't be compiled.
2.the image used in the demo has to be saved on the board.
2021-11-30 10:35:46 +08:00
Wang_Weigen
4fc79c211a add a tip 2021-11-30 10:34:08 +08:00
Wang_Weigen
ac69e135ca repair a bug of restart main after ota 2021-11-30 10:12:42 +08:00
WentaoWong
49caa6e533 APP_Framework/Applications/:add CMSIS-NN (version 5) cifar10 example 2021-11-29 18:51:34 +08:00
WentaoWong
96ca3b18f1 APP_Framework/Applications/:add configuration file about CMSIS-NN (version 5) cifar10 example 2021-11-29 18:50:53 +08:00
WentaoWong
86cb28ee4f APP_Framework/Framework/:add CMSIS-NN (version 5) source code 2021-11-29 18:49:41 +08:00
WentaoWong
fe06b461ee APP_Framework/Framework/:add Kconfig file and SConscript file about CMSIS-NN (version 5) 2021-11-29 18:48:51 +08:00
Wang_Weigen
1c60efe8a8 add debug info 2021-11-29 17:46:18 +08:00
Wang_Weigen
32cb324324 repair the total bin crc failed problem 2021-11-29 17:33:19 +08:00
Wang_Weigen
592ca413e8 sync with upstream 2021-11-25 14:26:45 +08:00
Wang_Weigen
f24189d7e1 repair ota failed by add mutex protect 2021-11-25 14:24:11 +08:00
Wang_Weigen
9d970e7832 add mutex protection for adapter agent 2021-11-22 17:50:27 +08:00
Wang_Weigen
5a8b6d79aa repair somebug of ota/nbiot/adapter agent 2021-11-20 16:52:16 +08:00
chunyexixiaoyu
e0c78f200b APP_Framework/Applications/:add TJpgDec example,notes the macro definition (WORK_POOL_SIZE),this value depends on the resolution of the image,user set. 2021-11-19 17:56:08 +08:00
xuedongliang
86b1d9c77d support adapter_ethernet and adapter_lora function from Liu Weichao
it is OK
2021-11-19 09:26:54 +08:00
chunyexixiaoyu
e33b0d0264 APP_Framework/Applications/:add configuration file about TJpgDec example 2021-11-18 11:15:16 +08:00
chunyexixiaoyu
2b69d31744 APP_Framework/Framework/:add TJpgDec(Tiny JPEG Decompressor)source code 2021-11-18 11:13:36 +08:00
chunyexixiaoyu
a9ac7efed2 APP_Framework/Framework/:add Kconfig file and SConscript file about TJpgDec(Tiny JPEG Decompressor) 2021-11-18 11:12:36 +08:00
Liu_Weichao
5fe8fb59b2 Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into xiuos_connection 2021-11-17 17:37:24 +08:00
Liu_Weichao
7a172fd136 1、support adapter_lora gateway and client state-machine-model;2、fix aiit-arm32-board usb compile error. 2021-11-17 17:37:04 +08:00
xuedongliang
ca74d5cb93 Add QEMU support for XiUOS based on Cortex-M4
it is OK
2021-11-16 21:48:24 +08:00
Wang_Weigen
251846604a repair ota_server.c 2021-11-16 09:43:54 +08:00
Wang_Weigen
2930757728 add the totle length with the last frame of ota server 2021-11-15 10:12:45 +08:00
Wang_Weigen
25cd73821f fix a bug of malloc big memory failed 2021-11-12 18:24:52 +08:00
Wang_Weigen
eb14677832 1.add an API of finding the first user task in xiuos task manage list; 2.add restart application after ota 2021-11-10 17:31:39 +08:00
Liu_Weichao
c631063b7a support adapter_lora and sx1278 device on aiit-arm32-board 2021-11-10 16:32:17 +08:00
Wang_Weigen
f3d527cf70 delete useless code 2021-11-09 17:18:21 +08:00
Wang_Weigen
b3c770dd26 delete useless code 2021-11-09 17:14:47 +08:00
Wang_Weigen
8609045f2a repair 'mount sd card' 2021-11-09 17:13:07 +08:00
Wang_Weigen
9959ec6470 1.repair the separate compile error;2.modify ota init task 2021-11-09 16:12:07 +08:00
Wang_Weigen
8b2eee0aa0 reapir ota save bin process 2021-11-08 15:56:28 +08:00
Wang_Weigen
224201ba55 add application bin ota function by 4G adapter,this function need save the app bin to sdcard and startup the app from sdcrad 2021-11-05 17:30:00 +08:00
xuedongliang
dfdc29b1d8 add K210 fft test
it is OK
2021-10-26 14:02:07 +08:00
xuedongliang
410178e426 add BC28 of NBIoT for connection adapter
it is OK
2021-10-26 14:01:41 +08:00
bj
471e2d7920 cotex-m4-emulator2 2021-10-26 11:31:19 +08:00
chunyexixiaoyu
e69139c6b9 APP_Framework/Applications/:add k210 fft(fast Fourier transform) example. 2021-10-26 11:24:49 +08:00
chunyexixiaoyu
4c0b05b752 Ubiquitous/RT_Thread/:rt-thread version update to fix the bug that tensflow lite for mcu can't be compiled. 2021-10-22 14:22:47 +08:00
Wang_Weigen
281a3b672a debug nbiot pass with some modification 2021-10-21 15:17:14 +08:00
Liu_Weichao
7b82f2a60b support adapter_ethernet and hfa21 device 2021-10-20 11:13:49 +08:00
bj
2f86d928c6 cortex-m4-emulator 2021-10-19 15:52:43 +08:00
Wang_Weigen
abe138ab27 remove redefinition and repair compile error 2021-10-18 18:17:24 +08:00
Wang_Weigen
9bf26cdbf9 sync wangweigen_master 2021-10-18 18:10:36 +08:00
Wang_Weigen
267528408e repair wait time for 'ATOrderSend',optimize bc28 api 2021-10-18 18:04:46 +08:00
xuedongliang
3f13410d96 support aiit-arm32-board for nuttx
it is OK
2021-10-18 17:55:36 +08:00
xuedongliang
ac588f2fcf support adapter_4g and fix connections bugs
it is OK
2021-10-18 17:55:09 +08:00
xuedongliang
7d5149af24 update k210 bsp and solve lcd display problem
It is OK
2021-10-18 17:54:30 +08:00
wang lingyu
48a19fe349 support aiit-arm32-board 2021-10-15 11:19:33 +08:00
wang lingyu
25221ac786 support aiit-arm32-board for nuttx 2021-10-15 11:09:49 +08:00
Liu_Weichao
06c9c6ecc4 refactor connection directory to follow code standards 2021-10-15 11:05:36 +08:00
Liu_Weichao
8f6cac9797 fix adapter_bluetooth test function bugs 2021-10-15 10:12:19 +08:00
Liu_Weichao
8aac82b1b4 support adapter_4G send and receive data function 2021-10-14 17:25:04 +08:00
chunyexixiaoyu
bea5eda2e0 APP_Framework/Applications:update face detect and instrusion detect ,the version had been tested for long time,and its's stable.
At the same time,rt-thread and kendryte-sdk-source both sub module must be updated.
2021-10-14 14:15:09 +08:00
chunyexixiaoyu
43f19c4b55 Ubiquitous/RT_Thread/: add lcd test example update main.c function when it starts. 2021-10-14 11:21:06 +08:00
chunyexixiaoyu
a184611226 Ubiquitous/RT_Thread/:update K210 bsp base on https://github.com/kendryte/K210-Micropython-OpenMV
Fixed an issue where LCD and RW007 could not be used at the same time
2021-10-14 11:19:40 +08:00
chunyexixiaoyu
0eee31179c Ubiquitous/RT_Thread/:update stm32 configure file and solve ov2640 driver compile bug. 2021-10-14 10:59:18 +08:00
chunyexixiaoyu
ecfbdb207f Ubiquitous/RT_Thread/:update submodule version 2021-10-14 10:47:41 +08:00
Liu_Weichao
ab578dfe0e support 4G adapter and ec200t device 2021-10-13 17:57:34 +08:00
Wang_Weigen
a4f24a29fc add BC28 of nbiot for adapter 2021-10-13 17:22:28 +08:00
xuedongliang
2aa5c0f0ba support adapter_bluetooth and fix at agent bugs
It is OK
2021-10-11 14:06:55 +08:00
Liu_Weichao
a5e97b1431 fix cortex-m3-emulator and hifive emulator compile error 2021-10-11 14:04:37 +08:00
Liu_Weichao
92347f7e29 1、support adapter_bluetooth and hc08 device;2、fix adapter at agent bug。 2021-10-11 10:13:01 +08:00
xuedongliang
b07ad19dc3 add E18 of zigbee with net-group from Wang_weigen
it is OK
2021-10-10 16:06:57 +08:00
Wang_Weigen
ebbb30c763 sync the upstream branch 2021-09-27 17:02:34 +08:00
xuedongliang
58b3e0b6a6 update transform in rt-thread and sensor framework
it is perfect
2021-09-27 16:48:22 +08:00
xuedongliang
a85e9fdb6d optimize connection framework kconfig and makefile; 2、transform connection framework api from user-api to priv-api.
it is OK
2021-09-27 16:47:31 +08:00
Wang_Weigen
626cbb084d add reopen zigbee and modify the stacksize of zigbee receive thread 2021-09-27 16:32:44 +08:00
Wang_Weigen
b0f717bee4 add zigbee e18 receive function 2021-09-26 16:12:09 +08:00
chunyexixiaoyu
51d3a8ab41 APP_Framework/Applications/:add SConscript in sensor_app ,fix header file in voice_d124.c. 2021-09-24 16:32:35 +08:00
chunyexixiaoyu
d7e29f19cc APP_Framework/Framework/:add voice sensor in framework,and update the d124.c file 2021-09-24 16:23:32 +08:00
chunyexixiaoyu
d7cb0876f6 APP_Framework/Framework/:add sensor SConscript and the sensor.c file can be compiled by default 2021-09-24 16:16:57 +08:00
Liu_Weichao
dd5a68916e transform connection framework api from user-api to priv-api 2021-09-24 16:07:22 +08:00
chunyexixiaoyu
d008cbf09f APP_Framework/Applications/:add list function base on rt-thread. 2021-09-24 16:01:40 +08:00
chunyexixiaoyu
2e209ef174 APP_Framework/Applications/:framework initialize in the bsp applications/main.c 2021-09-24 15:54:26 +08:00
chunyexixiaoyu
3fdc18e837 APP_Framework/Framework/:update transform layer in rt-thread. 2021-09-24 15:38:39 +08:00
Wang_Weigen
6be676af78 add e18 of zigbee connection 2021-09-24 15:22:19 +08:00
Wang_Weigen
d14ec3cb12 Merge branch 'master' of https://git.trustie.net/xuos/xiuos into develop 2021-09-22 13:29:15 +08:00
xuedongliang
21e01b2f6b Add DELE function in board
it is OK
2021-09-17 15:36:38 +08:00
xuedongliang
4a07f534d8 modify the api in sensor framework
it is OK
2021-09-17 15:04:44 +08:00
xuedongliang
869e69097f fix two big : fix aiit_board spi_lora bug;fix sensor/voice Kconfig bug
it is OK
2021-09-17 15:04:12 +08:00
Wang_Weigen
d77c1828b2 modify the api in sensor framework 2021-09-14 16:49:54 +08:00
Liu_Weichao
bb93aefe1d 1、fix aiit_board spi_lora bug;2、fix sensor/voice Kconfig bug。 2021-09-14 15:49:28 +08:00
xuedongliang
cd9a3ee143 solve the compile problem of tflite in xiuos
IT is  OK
2021-09-14 14:37:02 +08:00
Wang_Weigen
c3e8810e1a fix bug for voice_D124 2021-09-10 17:52:16 +08:00
Wang_Weigen
ce480336d8 move security to APP_Framework 2021-09-09 18:17:04 +08:00
Wang_Weigen
34ca5a215c mv security to APP_Framework 2021-09-09 18:14:46 +08:00
Wang_Weigen
5b47a83022 solve the compile problem of tflite in xiuos 2021-09-09 18:00:27 +08:00
xuedongliang
55dc35f2de modify sensor framework kconfig function
it  is  OK
2021-09-09 16:26:48 +08:00
Liu_Weichao
7f5192351a modify sensor framework extuart path configure 2021-09-08 16:23:08 +08:00
Liu_Weichao
281482855d modify sensor framework kconfig function 2021-09-08 13:34:25 +08:00
xuedongliang
6fc420e6a3 add filter and ota(model and cfg file)
it is OK
2021-09-07 10:10:25 +08:00
xuedongliang
2e074a4391 add gapuino board of gap8
it is Perfect
2021-09-07 10:08:45 +08:00
Wang_Weigen
6b7a233511 modify author description and fix bug of compiler errors,add readme for gap8 2021-09-03 14:24:41 +08:00
Wang_Weigen
b22f9a3851 fix a bug of uart input problem for gap8 2021-09-02 10:07:46 +08:00
Wang_Weigen
2fcb4ad3ad Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into develop 2021-09-02 10:02:16 +08:00
chunyexixiaoyu
2db749991e APP_Framework/Framework:add http client module in OTA for KPU model downloading 2021-08-31 11:00:34 +08:00
chunyexixiaoyu
6dbbfd804e APP_Framework/Applications/:fix a bug in instrusion_detect.c 2021-08-31 11:00:33 +08:00
chunyexixiaoyu
41b8b3e896 APP_Framework/Framework/:complete one order ordinary kalman filter. 2021-08-31 11:00:33 +08:00
chunyexixiaoyu
d16c698789 APP_Framework/Framework/:complete ordinary mean_filter 2021-08-31 11:00:33 +08:00
chunyexixiaoyu
c251937f9f APP_Framework/Framework/:complete sliding window mean_filter 2021-08-31 11:00:32 +08:00
chunyexixiaoyu
88d7ef83d3 APP_Framework/lib:add comments in queue 2021-08-31 11:00:32 +08:00
chunyexixiaoyu
09d86f55b0 APP_Framework/Framework/: complete one order RC high pass filter. 2021-08-31 11:00:31 +08:00
chunyexixiaoyu
6664b23234 APP_Framework/Framework/: complete one order RC low pass filter. 2021-08-31 11:00:31 +08:00
chunyexixiaoyu
e9af33ca78 APP_Framework/Framework/:add filter module in knowing framework,and complete coding recently 2021-08-31 11:00:31 +08:00
chunyexixiaoyu
d542b4dc9b APP_Framework/Framework/:update kpu-postprocessing/Kconfig file 2021-08-31 11:00:30 +08:00
chunyexixiaoyu
6f9be6d790 APP_Framework/lib/:add queue lib 2021-08-31 11:00:30 +08:00
xuedongliang
af345b75fb optimize adapter funciton by Liu_Weichao
it is OK
2021-08-30 19:51:33 +08:00
xuedongliang
3f9904eb53 update knowing application and framework from Tian_Chunyu
it is OK
2021-08-30 19:50:34 +08:00
Wang_Weigen
198d61918b add gap8 board of riscv for xiuos 2021-08-30 14:05:12 +08:00
Liu_Weichao
da37bf4777 1、add BT 2021-08-30 10:56:48 +08:00
LAPTOP-6JO0PLKH\FigoHu
f87c40f6fb fix a bug in Makefile that prevented removing the '.config' file corrently 2021-08-26 20:34:45 +08:00
chunyexixiaoyu
f6a0c0b0b7 update some documents and add kmodel files 2021-08-16 10:41:56 +08:00
yangtuo250
78387f9b16 fix(knowing app): fix 3 k210 knowing apps according to 'add a interface about k210 dvp image setting' by tian chunyu 2021-08-13 15:07:34 +08:00
yangtuo250
8593dedd37 feat(knowing app): update json config and upload model for 3 k210 apps 2021-08-13 14:42:18 +08:00
yangtuo250
4c1580fab2 docs(knowing framework): add README for YOLOv2 region layer 2021-08-13 14:42:18 +08:00
yangtuo250
5786b7dffc docs(knowing app): add README for face detect 2021-08-13 14:42:18 +08:00
yangtuo250
5b785b0105 docs(knowing app): add README for instrusion detect 2021-08-13 14:42:18 +08:00
yangtuo250
fc825ea557 docs(knowing app): add README for helmet detect 2021-08-13 14:42:18 +08:00
yangtuo250
9a555bc8b5 docs(knowing app): add README for iris_ml_demo 2021-08-13 14:42:18 +08:00
chunyexixiaoyu
6ad0b192e8 Ubiquitous/RT_Thread/: add a interface about k210 dvp image setting. 2021-08-13 14:33:10 +08:00
chunyexixiaoyu
a3d753153c three simple machine learning examples base on iris dataset 2021-08-12 14:53:06 +08:00
yangtuo250
b9d10a7cf1 feat(knowing app): stm32f4 logistic regression iris demo 2021-08-12 00:02:10 +08:00
yangtuo250
be3b3b8016 feat(knowing app): add stm32f4 iris decision tree classifier demo 2021-08-11 17:07:26 +08:00
yangtuo250
9a1a407ea6 feat(knowing app): stm32f4 svc iris demo 2021-08-10 18:02:16 +08:00
chunyexixiaoyu
336c970010 add two application 2021-08-05 15:15:39 +08:00
Liu Yongkai
168e36d09e fix(knowing apps): adapting new cjson lib usage and some little bug fix 2021-08-05 15:05:36 +08:00
Liu Yongkai
21f57bf229 feat(helmet detect): add knowing app helmet detect 2021-08-05 15:05:36 +08:00
Liu Yongkai
2d8147a92b feat(instrusion detect): add knowing app instrusion detect 2021-08-05 15:05:36 +08:00
chunyexixiaoyu
3b74443dac APP_Framework/lib/:add cJSON library 2021-08-04 16:26:37 +08:00
chunyexixiaoyu
1afdd8c056 kpu gets important parameters to run model by reading json file 2021-08-04 10:02:19 +08:00
Liu Yongkai
b3667294ed feat(face_detect): read all parameters from SD card json file 2021-08-04 09:48:36 +08:00
Liu Yongkai
545f1f1b3c fix(yolov2): change static input size to dynamic 2021-08-03 15:43:03 +08:00
Liu Yongkai
af42ebca62 feat(.gitignore): add rtt bsp k210 gitignore & macOS gitignore 2021-08-03 15:37:21 +08:00
xuedongliang
fde280b6a0 wifi adapter on XIUOS/aiit-arm32-board
it is OK
2021-07-30 09:54:14 +08:00
xuedongliang
c4daa1dc44 update knowing framework and application from Tian_Chunyu
it is perfect
2021-07-30 09:53:21 +08:00
Liu_Kai
61cd542d92 add wifi adapter support on XIUOS/aiit-arm32-board 2021-07-28 10:11:15 +08:00
chunyexixiaoyu
bf9d610675 APP_Framework/Applications/:add face detect application 2021-07-21 16:39:36 +08:00
chunyexixiaoyu
1c16e3a463 APP_Framework/Framework/:add kpu postprocessing (yolov2) in knowing file 2021-07-21 15:30:39 +08:00
chunyexixiaoyu
f50dab2bde APP_Framework/Framework/:add rt-thread transform layer 2021-07-21 14:52:09 +08:00
xuedongliang
60e46d0c3b modify connection framework function and DIR from Liu_weichao
it is OK
2021-07-21 14:14:35 +08:00
chunyexixiaoyu
38d2cb3c85 APP_Framework/Framework/:update knowing framework
1.fix some Kconfig file
2.add tensorflow-lite-for-mcu in knowing file
3.add mnist application,note the application cannot be used with RAM less than 500K.
4.the version need to separate application and OS(rtt),later by using add transform layer to solve it.
2021-07-20 14:50:50 +08:00
chunyexixiaoyu
fcd14e038e APP_Framework/:fix some Kconfig file in Applications and Framework. and change know to knowing ,remove uncomfortable file(their location is wrong) 2021-07-14 15:15:57 +08:00
Liu_Weichao
903fca4991 Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into xiuos_connection 2021-07-09 15:44:46 +08:00
xuedongliang
81323fa992 add kconfig for app framework from Wang_Weigen
it is OK
2021-07-09 15:42:14 +08:00
xuedongliang
49533d9e84 add ov2640 driver and rw007 driver from Tian_Chunyu
it is OK
2021-07-09 15:41:36 +08:00
Liu_Weichao
2c9f3f8113 modify connection framework function and dir 2021-07-09 15:41:22 +08:00
Liu_Weichao
d41517ab90 add connection function 2021-06-25 10:20:55 +08:00
chunyexixiaoyu
5b9cbad759 Ubiquitous/RT_Thread: fix lcd drive for k210 ,before lcd drive can't work with spi. 2021-06-21 18:05:57 +08:00
chunyexixiaoyu
fedd6affc9 Ubiquitous/RT_Thread/:add rw007 driver and ov2640 driver 2021-06-21 17:17:51 +08:00
Wang_Weigen
96af003398 add kconfig for application framework 2021-06-18 17:37:03 +08:00
xuedongliang
4510a95e90 add transform layer of xiuos for applications framework from Wang weigen
it is OK
2021-06-17 16:32:46 +08:00
xuedongliang
2886ca5f78 add K210 bsp from Tian Chunyu
it is OK
2021-06-17 16:32:13 +08:00
Liu_Weichao
86ef526303 add APP_Framework/Framework/connection function 2021-06-17 16:18:07 +08:00
Wang_Weigen
fba573cc0b Merge branch 'wang_weigen_master' of https://git.trustie.net/xuos/xiuos into develop 2021-06-17 15:11:48 +08:00
Wang_Weigen
36f3e40c55 add nuttx for develop 2021-06-17 15:07:37 +08:00
Wang_Weigen
f564ef8d28 add user api printf 2021-06-17 14:47:51 +08:00
Wang_Weigen
e603afa739 delete original app contents of xiuos 2021-06-17 14:07:57 +08:00
Wang_Weigen
0e496a791f modify the configuration of app frame 2021-06-17 14:04:50 +08:00
chunyexixiaoyu
223933b6f9 Ubiquitous/RT_Thread/:add K210 bsp 2021-06-16 20:52:57 +08:00
chunyexixiaoyu
1df91a6b3c Ubiquitous/RT_Thread/:import K210 sdk as sub module and change rt-thread version 2021-06-16 20:37:43 +08:00
Liu_Weichao
fc505837b9 add sensor framework 2021-06-16 18:35:33 +08:00
Liu_Weichao
b6b06aa538 Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into sensor 2021-06-16 13:47:48 +08:00
Wang_Weigen
579956c027 Modify framework content 2021-06-16 11:28:44 +08:00
Zhao_Jiasheng
994658c08c Add adapter.c 2021-06-16 11:07:17 +08:00
xuedongliang
13a4c0f813 Add RT_Thread modules in XiUOS
it is Perfect
2021-06-16 09:48:00 +08:00
xuedongliang
0ddb5bfd1f fix a bug of compiler failed from wang weigen
it is OK
2021-06-16 09:46:00 +08:00
xuedongliang
3a7e7dee79 modify nuttx bug about lack of a file from Tang yiwen
it is OK
2021-06-16 09:41:08 +08:00
chunyexixiaoyu
2faece8dc6 Ubiquitous/RT_Thread/:add stm32f407-atk-coreboard bsp in bsp folder. 2021-06-15 19:29:14 +08:00
chunyexixiaoyu
e85b0832e1 Ubiquitous\RT_Thread\:add Kconfig file and SConscript file in drivers folder 2021-06-15 19:27:32 +08:00
chunyexixiaoyu
d73170d1c6 APP_Framework/Applications/:add SConscript file
APP_Framework/Framework/:add SConscript and Kconfig file
2021-06-15 19:15:33 +08:00
chunyexixiaoyu
8de08a5ae1 Ubiquitous/RT_Thread/:add rt-thread as sub modules 2021-06-15 14:26:51 +08:00
TangYiwen123
cd964dff27 add a readme file 2021-06-11 15:47:59 +08:00
TangYiwen123
6d0f2ca39a modify nuttx bug of lack of files 2021-06-11 11:25:07 +08:00
Wang_Weigen
f5ef4304ff fix a bug of compiler failed 2021-06-10 16:20:51 +08:00
xuedongliang
b97a54dbed debug branch for posix transform
it is OK
2021-06-10 15:43:57 +08:00
Zhao_Jiasheng
9158349752 Add APP_Framework Kconfig 2021-06-10 11:41:30 +08:00
xuedongliang
4a7f51a5e9 Add nuttx to the system framework from Tang_yiwen
it is Perfect
2021-06-09 16:28:41 +08:00
xuedongliang
b9a6714ed7 Fix LwIP client bug from Yu_Dongdong
it is OK
2021-06-09 16:27:59 +08:00
Zhao_Jiasheng
e37efc70ce Add sensor, modify makefile 2021-06-09 16:24:37 +08:00
Zhao_Jiasheng
cb87bea665 Add sensor, modify makefile 2021-06-09 16:23:59 +08:00
TangYiwen123
b907bfab1c Add nuttx to the system framework, which is 10.1.0 2021-06-09 14:34:06 +08:00
TangYiwen123
804bd57aa0 Add nuttx to the system framework, which is 10.1.0 2021-06-09 14:33:15 +08:00
Wang_Weigen
dd3694c6b8 add private API of task/sem/mutex 2021-06-08 16:14:15 +08:00
Liu_Weichao
dc455ac70d add driver posix transform 2021-06-08 14:32:58 +08:00
yudongdong
8b1a886e13 Fix Lwip client bug. 2021-06-08 03:15:28 +08:00
yudongdong
82e7002069 Merge branch 'master' into LwIP_software 2021-06-08 02:06:41 +08:00
yudongdong
4caf2266b8 Fix misoperation on task system 2021-06-08 02:03:33 +08:00
Wang_Weigen
8f2bdc034e add posix transform void file 2021-06-07 15:13:32 +08:00
xuedongliang
06c351e27c Adjust directory structure from Zhao_Jiasheng
it is perfect
2021-06-03 17:54:35 +08:00
Zhao_Jiasheng
7f1805e498 Add .gitignore 2021-06-03 17:50:28 +08:00
Zhao_Jiasheng
836eae32c4 Delete .vscode 2021-06-03 17:49:48 +08:00
Zhao_Jiasheng
33388e60ab Adjust directory structure 2021-06-03 17:48:02 +08:00
xuedongliang
7e9c6b16f6 Adjust directory structure from Zhao_Jiasheng
it is perfect
2021-06-03 17:41:42 +08:00
Zhao_Jiasheng
89a2236b18 Adjust directory structure 2021-06-03 17:38:11 +08:00
xuedongliang
92301257f3 Add extern sram support on stm32f407zgt6 for XiUOS
it is perfect
2021-05-29 20:17:57 +08:00
xuedongliang
c079c8f80a And ok1052(cortex m7) board support from Huang_Yuqing
it is perfect
2021-05-29 20:12:57 +08:00
xuedongliang
789ea394c8 Add LwIP network stack from Tang_YiWen and Yu_Dongdong
it is perfect
2021-05-29 20:09:26 +08:00
Liu_Weichao
28503618b5 support ok1052 board 2021-05-29 14:10:33 +08:00
Wang_Weigen
3e65883a7f fix a bug 2021-05-29 14:07:00 +08:00
Zhao_Jiasheng
9f56e71545 Modify User malloc and free 2021-05-29 13:49:11 +08:00
yudongdong
bee2741235 Merge branch 'master' into LwIP_software 2021-05-29 13:46:29 +08:00
Wang_Weigen
54e8b8569b add debug information for extern sram memory 2021-05-29 13:43:39 +08:00
yudongdong
a3cb3fd650 add LwIP network stack 2021-05-29 13:43:31 +08:00
Zhao_Jiasheng
221bd363c9 Finishing fsmc driver 2021-05-29 13:24:05 +08:00
Wang_Weigen
8b2d6082d1 extsram test is ok 2021-05-29 11:58:58 +08:00
Wang_Weigen
0f7d7f446f only for debug 2021-05-28 21:19:07 +08:00
Wang_Weigen
75c879b9e5 Merge branch 'develop' of https://git.trustie.net/wwg666/xiuos into develop 2021-05-28 14:41:38 +08:00
Zhao_Jiasheng
013e3c14cc Add arm fsmc driver 2021-05-28 14:31:48 +08:00
xuedongliang
9fcd9338d3 add spi flash test function for arm from Liu Weichao
it is OK
2021-05-21 23:05:33 +08:00
xuedongliang
0daed4872f fix som bugs as requirements
it is OK
2021-05-21 23:05:01 +08:00
Liu_Weichao
03e646e0d0 Merge branch 'master' of https://git.trustie.net/IACU/xiuos into spi_flash_test 2021-05-19 16:16:33 +08:00
Liu_Weichao
f48da2b6f9 add spi flash test function for arm 2021-05-19 16:15:42 +08:00
Huang_Yuqing
59f6f8d89c Merge branch 'fix_bug' of https://git.trustie.net/huangyuqing/xiuos into fix_bug 2021-05-18 18:45:05 +08:00
xuedongliang
302079ab81 fix bug of smp startup from Wa_Weigen and Huang_Yuqing
it is OK
2021-05-18 18:39:13 +08:00
xuedongliang
4d594e6bc7 add sm3 sm4 sm9 crypto algorithm from Nei_Xuwen
it is OK
2021-05-18 18:38:02 +08:00
xuedongliang
b318eb315c QEMU support for XiUOS based on Cortex-M3 from Hang_Yuqing
it is perfect
2021-05-18 18:37:14 +08:00
Huang_Yuqing
6300cb511b Merge branch 'master' of https://git.trustie.net/xuos/xiuos into qemu-arm 2021-05-18 18:19:09 +08:00
Wang_Weigen
1402fe12e9 fix bug of smp startup 2021-05-18 15:49:27 +08:00
Huang_Yuqing
829f05296a fix some bugs 2021-05-18 09:59:15 +08:00
xuedongliang
86d96159fe add reboot cmd for arm and delete shutcmd from Wang Wei_gen
it is OK
2021-05-17 10:48:03 +08:00
root
e012005b45 add sm3 sm4 sm9 crypto algorithm 2021-05-14 16:34:38 +08:00
Huang_Yuqing
a2d278bb04 QEMU support for XiUOS based on Cortex-M3 2021-05-13 12:33:17 +08:00
Wang_Weigen
ed1010d84b add reboot cmd for arm and delete shutcmd 2021-05-13 10:59:05 +08:00
xuedongliang
9fb9a3a2ec modify shell cmd description in cmd.c from Liu Weichao
it is OK
2021-05-11 18:47:49 +08:00
xuedongliang
fc257d1f8b Add bluetooth function on kd233 from Yu Dongdong
it is OK
2021-05-11 18:46:33 +08:00
xuedongliang
6978a341c5 Add board k210-emulator from Huang Yuqing and Zhao Jiasheng and Wang Weigen
it is perfect
2021-05-10 21:14:23 +08:00
Zhao_Jiasheng
6f7cf059ec Add board k210-emulator 2021-05-10 21:08:42 +08:00
yudongdong
dac189d6cc Merge branch 'bluetooth_feature' of https://git.trustie.net/liza4cn/xiuos into bluetooth_feature 2021-05-10 17:55:57 +08:00
yudongdong
8ccf223eb0 surport bluetooth on f407 2021-05-10 17:43:43 +08:00
yudongdong
340c6fe503 Add bluetooth p2p basic funciton 2021-05-10 17:43:43 +08:00
Liu_Weichao
f90ac499be optimize cmd.c code standard 2021-05-10 17:04:27 +08:00
xuedongliang
0602e09627 Delete redundant perception document from Zhao Jiasheng
it is OK
2021-05-10 15:32:55 +08:00
Zhao_Jiasheng
f65b5652d7 Delete redundant perception document 2021-05-10 15:29:16 +08:00
xuedongliang
a8eb0f1617 add debug cmd for task from Wang Weigen
it is OK
2021-05-10 10:29:48 +08:00
Wang_Weigen
83b223e0db Merge branch 'master' of https://git.trustie.net/xuos/xiuos into develop 2021-05-10 10:07:50 +08:00
xuedongliang
0828327cd0 Repair nbiot demo and sensor apps include from Zhao_Jiasheng
it is OK
2021-05-10 09:58:11 +08:00
Zhao_Jiasheng
e5ec525b13 Merge branch 'nbiot' of https://git.trustie.net/StupidMalphite/xiuos into nbiot 2021-05-10 09:47:47 +08:00
Zhao_Jiasheng
7b3eab0f64 Fixed error in command description 2021-05-10 09:45:45 +08:00
Zhao_Jiasheng
4249cb391e Repair sensor apps and nbiot demo include 2021-05-10 09:45:45 +08:00
yudongdong
fad57ab4dd Merge branch 'master' into bluetooth_feature 2021-05-08 21:44:01 +08:00
Wang_Weigen
c4e0918583 add debug cmd for task/sem/mutex/msgqueue/timer 2021-05-08 18:08:40 +08:00
xuedongliang
1599057195 optimize Shell Cmd ShowBus using node from Liu_Weichao
it is OK
2021-05-08 11:30:11 +08:00
Liu_Weichao
d59964e87f optimize Shell Cmd ShowBus using node 2021-05-08 10:56:14 +08:00
yudongdong
a0fb0006ca Add bluetooth p2p basic funciton 2021-05-07 15:09:52 +08:00
Zhao_Jiasheng
a4dd99c678 Merge branch 'nbiot' of https://git.trustie.net/StupidMalphite/xiuos into nbiot 2021-05-07 13:44:23 +08:00
Zhao_Jiasheng
915c82552d Repair sensor apps and nbiot demo include 2021-05-07 13:43:25 +08:00
Zhao_Jiasheng
3e2b6f6fa9 Repair sensor apps and nbiot demo include 2021-05-07 13:43:07 +08:00
xuedongliang
872f8bc9ca Add LICENSE file from Zhao_Jiasheng
it is perfect
2021-05-06 17:36:13 +08:00
Zhao_Jiasheng
2b3d0be7da Add LICENSE 2021-05-06 17:34:13 +08:00
10660 changed files with 4110543 additions and 124668 deletions

13
.gitignore vendored
View File

@@ -1,8 +1,5 @@
xsconfig.h
xsconfig.mk
.config
.config.old
build
XiUOS.*
*.swp
.vscode
*.vscode
*.o
*libmusl.a
*liblwip.a
.DS_Store

34
.gitmodules vendored Normal file
View File

@@ -0,0 +1,34 @@
[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread"]
path = Ubiquitous/RT-Thread_Fusion_XiUOS/rt-thread
url = https://www.gitlink.org.cn/chunyexixiaoyu/rt-thread.git
[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/kendryte-sdk/kendryte-sdk-source"]
path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source"]
path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/aiit-riscv64-board/kendryte-sdk/kendryte-sdk-source
url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
[submodule "Ubiquitous/XiZi/fs/lwext4/lwext4_submodule"]
path = Ubiquitous/XiZi/fs/lwext4/lwext4_submodule
url = https://gitlink.org.cn/xuos/lwext4_filesystem_support_XiUOS.git
[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/nuttx"]
path = Ubiquitous/Nuttx_Fusion_XiUOS/nuttx
url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx.git
[submodule "Ubiquitous/Nuttx_Fusion_XiUOS/apps"]
path = Ubiquitous/Nuttx_Fusion_XiUOS/apps
url = https://www.gitlink.org.cn/wgzAIIT/incubator-nuttx-apps.git
[submodule "APP_Framework/Applications/webnet/WebNet_XiUOS"]
path = APP_Framework/Applications/webnet/WebNet_XiUOS
url = https://gitlink.org.cn/xuos/WebNet_XiUOS.git
[submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source"]
path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source
url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
[submodule "APP_Framework/lib/lorawan/lora_radio_driver"]
path = APP_Framework/lib/lorawan/lora_radio_driver
url = https://gitlink.org.cn/xuos/lora_radio_driver
[submodule "APP_Framework/lib/lorawan/lorawan_devicenode"]
path = APP_Framework/lib/lorawan/lorawan_devicenode
url = https://gitlink.org.cn/xuos/lorawan_devicenode.git
branch = master
[submodule "APP_Framework/lib/lorawan/lorawan_gateway_single_channel"]
path = APP_Framework/lib/lorawan/lorawan_gateway_single_channel
url = https://gitlink.org.cn/xuos/lorawan_gateway_single_channel.git

View File

@@ -0,0 +1,23 @@
menu "Applications"
menu "config stack size and priority of main task"
config MAIN_KTASK_STACK_SIZE
int "Set main task stack size"
default 1024
config MAIN_KTASK_PRIORITY
int
default 4 if KTASK_PRIORITY_8
default 16 if KTASK_PRIORITY_32
default 85 if KTASK_PRIORITY_256
endmenu
source "$APP_DIR/Applications/ota/Kconfig"
source "$APP_DIR/Applications/app_test/Kconfig"
source "$APP_DIR/Applications/connection_app/Kconfig"
source "$APP_DIR/Applications/control_app/Kconfig"
source "$APP_DIR/Applications/knowing_app/Kconfig"
source "$APP_DIR/Applications/sensor_app/Kconfig"
source "$APP_DIR/Applications/embedded_database_app/Kconfig"
source "$APP_DIR/Applications/webnet/Kconfig"
endmenu

View File

@@ -0,0 +1,7 @@
############################################################################
# APP_Framework/Applications/Make.defs
############################################################################
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Applications
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Applications/general_functions/list
include $(wildcard $(APPDIR)/../../../APP_Framework/Applications/*/Make.defs)

View File

@@ -0,0 +1,44 @@
include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y)
include $(APPDIR)/Make.defs
CSRCS +=
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
SRC_DIR := general_functions app_test
SRC_FILES := main.c
ifeq ($(CONFIG_LIB_LV),y)
SRC_DIR += lv_app
SRC_DIR += tinyttf_app
endif
ifeq ($(CONFIG_APPLICATION_OTA),y)
SRC_DIR += ota
endif
ifeq ($(CONFIG_APPLICATION_SENSOR),y)
SRC_DIR += sensor_app
endif
ifeq ($(CONFIG_APPLICATION_CONNECTION),y)
SRC_DIR += connection_app
endif
ifeq ($(CONFIG_APPLICATION_KNOWING),y)
SRC_DIR += knowing_app
endif
ifeq ($(CONFIG_APPLICATION_CONTROL),y)
SRC_DIR += control_app
endif
ifeq ($(CONFIG_APP_USING_WEBNET),y)
SRC_DIR += webnet
endif
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@@ -0,0 +1,20 @@
import os
Import('RTT_ROOT')
Import('rtconfig')
from building import *
cwd = GetCurrentDir()
SOURCES = ['framework_init.c']
path = [cwd]
objs = []
group = DefineGroup('sensor', SOURCES, depend = [], CPPPATH = [cwd])
objs = objs + group
list = os.listdir(cwd)
for d in list:
path = os.path.join(cwd, d)
if os.path.isfile(os.path.join(path, 'SConscript')):
objs = objs + SConscript(os.path.join(path, 'SConscript'))
Return('objs')

View File

@@ -0,0 +1,310 @@
menu "test app"
menuconfig USER_TEST
bool "Enable application test function "
default n
if USER_TEST
menuconfig USER_TEST_ADC
bool "Config test adc"
default n
if USER_TEST_ADC
if ADD_XIZI_FEATURES
config ADC_DEV_DRIVER
string "Set ADC dev path"
default "/dev/adc1_dev"
endif
endif
menuconfig USER_TEST_DAC
bool "Config test dac"
default n
if USER_TEST_DAC
if ADD_XIZI_FEATURES
config DAC_DEV_DRIVER
string "Set DAC dev path"
default "/dev/dac_dev"
endif
endif
menuconfig USER_TEST_FS
bool "Config test fs with sd or usb"
default n
if USER_TEST_FS
if ADD_XIZI_FEATURES
config FPATH
string "Set test file path"
default "/test_file"
endif
endif
menuconfig USER_TEST_GPIO
select BSP_USING_GPIO
select RESOURCES_PIN
select BSP_USING_LED
select BSP_USING_KEY
bool "Config test gpio with led and key"
default n
if USER_TEST_GPIO
if ADD_XIZI_FEATURES
config GPIO_DEV_DRIVER
string "Set gpio dev path"
default "/dev/pin_dev"
endif
endif
menuconfig USER_TEST_LORA
select BSP_USING_UART
select BSP_USING_GPIO
select RESOURCES_PIN
select BSP_USING_UART2
select BSP_USING_LORA
bool "Config test uart(loraE220)"
default n
if USER_TEST_LORA
if ADD_XIZI_FEATURES
config LORA_UART_DEV_DRIVER
string "Set uart dev path"
default "/dev/uart2_dev2"
config LORA_PIN_DEV_DRIVER
string "Set pin dev path"
default "/dev/pin_dev"
endif
endif
menuconfig USER_TEST_SOCKET
select BSP_USING_LWIP
bool "Config test socket(lwip)"
default n
menuconfig USER_TEST_UART
select BSP_USING_UART
select BSP_USING_UART6
bool "Config test uart"
default n
if USER_TEST_UART
if ADD_XIZI_FEATURES
config UART_DEV_DRIVER
string "Set uart dev path"
default "/dev/usart6_dev6"
endif
endif
menuconfig USER_TEST_RS485
select BSP_USING_UART
select BSP_USING_GPIO
select RESOURCES_PIN
select BSP_USING_UART1
bool "Config test uart(RS485)"
default n
if USER_TEST_RS485
if ADD_XIZI_FEATURES
config RS485_UART_DEV_DRIVER
string "Set uart dev path"
default "/dev/uart1_dev1"
config RS485_PIN_DEV_DRIVER
string "Set pin dev path"
default "/dev/pin_dev"
endif
endif
menuconfig USER_TEST_RTC
select BSP_USING_RTC
bool "Config test rtc"
default n
if USER_TEST_RTC
if ADD_XIZI_FEATURES
config RTC_DEV_DRIVER
string "Set rtc dev path"
default "/dev/rtc_dev"
endif
endif
menuconfig USER_TEST_HWTIMER
select BSP_USING_HWTIMER
select BSP_USING_GPIO
select RESOURCES_PIN
select BSP_USING_LED
bool "Config test hwtimer"
default n
if USER_TEST_HWTIMER
if ADD_XIZI_FEATURES
config HWTIMER_TIMER_DEV_DRIVER
string "Set pin dev path"
default "/dev/timer0_dev0"
config HWTIMER_PIN_DEV_DRIVER
string "Set pin dev path"
default "/dev/pin_dev"
endif
endif
menuconfig USER_TEST_WDT
select BSP_USING_WDT0
bool "Config test watchdog"
default n
if USER_TEST_WDT
if ADD_XIZI_FEATURES
config WDT0_DEV_DRIVER
string "Set wdt dev path"
default "/dev/wdt0_dev0"
endif
endif
menuconfig USER_TEST_LCD_EDU
select BSP_USING_LCD
bool "Config test lcd in PrivOpen"
default n
if USER_TEST_LCD_EDU
if ADD_XIZI_FEATURES
config EDU_LCD_DEV_DRIVER
string "Set lcd dev path"
default "/dev/lcd_dev"
endif
endif
menuconfig USER_TEST_TOUCH
select BSP_USING_TOUCH
bool "Config test touch"
default n
if USER_TEST_TOUCH
if ADD_XIZI_FEATURES
config TOUCH_DEV_DRIVER
string "Set touch dev path"
default "/dev/touch_dev"
config TOUCH_LCD_DEV_DRIVER
string "Set lcd dev path"
default "/dev/lcd_dev"
endif
endif
menuconfig USER_TEST_I2C
select BSP_USING_I2C
bool "Config test i2c"
default n
if USER_TEST_I2C
if ADD_XIZI_FEATURES
config I2C_DEV_DRIVER
string "Set i2c dev path"
default "/dev/i2c1_dev0"
endif
endif
menuconfig USER_TEST_CAN
select BSP_USING_CAN
bool "Config test can"
default n
if USER_TEST_CAN
if ADD_XIZI_FEATURES
config CAN_DEV_DRIVER
string "Set can dev path"
default "/dev/can2_dev1"
endif
endif
menuconfig USER_TEST_CAMERA
select BSP_USING_CAMERA
select BSP_USING_LCD
bool "Config test camera with lcd"
default n
if USER_TEST_CAMERA
if ADD_XIZI_FEATURES
config CAMERA_DEV_DRIVER
string "Set camera dev path"
default "/dev/camera_dev"
config CAMERA_LCD_DEV_DRIVER
string "Set lcd dev path"
default "/dev/lcd_dev"
endif
endif
config USER_TEST_SEMC
bool "Config test semc sdram"
default n
config USER_TEST_LCD
bool "Config test lcd device"
default n
menuconfig USER_TEST_ETHERNET
bool "Config test ethernet only for edu-riscv64"
default n
if USER_TEST_ETHERNET
if ADD_XIZI_FEATURES
choice
prompt "set ethernet role as client or server"
default ETHERNET_AS_SERVER
config ETHERNET_AS_SERVER
bool "test as server"
config ETHERNET_AS_CLIENT
bool "test as client"
endchoice
endif
endif
menuconfig USER_TEST_FLASH
bool "Config test w25q128 device"
default n
if USER_TEST_FLASH
if ADD_XIZI_FEATURES
config FLASH_DEV_DRIVER
string "Set flash dev path"
default "/dev/qspi_W25Q128"
endif
endif
menuconfig USER_TEST_TIMER
bool "Config test soft timer"
default n
menuconfig USER_TEST_HASH
bool "Config test hash"
default n
menuconfig USER_TEST_RADIX
bool "Config test radix tree"
default n
menuconfig USER_TEST_RBTREE
bool "Config test red black tree"
default n
menuconfig USER_TEST_MODBUS_TCP
bool "Config test modbus_tcp"
default n
menuconfig USER_TEST_WEBSERVER
bool "Config test webserver"
default n
menuconfig USER_TEST_MQTTCLIENT
bool "Config test mqtt client"
default n
menuconfig USER_TEST_FTPCLIENT
bool "Config test ftp client"
default n
menuconfig USER_TEST_FTPCLIENT_RISCV
bool "Config test ftp client on riscv"
default n
menuconfig USER_TEST_LORA_P2P
bool "Config test lora p2p"
default n
menuconfig USER_TEST_LORAWAN_SINGLEGW
bool "Config test lorawan single channel gateway"
default n
menuconfig USER_TEST_CANOPEN
bool "Config test CanOpen"
default n
menuconfig USER_TEST_USB_CAMERA
bool "Config test usb camera"
default n
endif
endmenu

View File

@@ -0,0 +1,7 @@
############################################################################
# APP_Framework/Applications/app_test/Make.defs
############################################################################
CONFIGURED_APPS += $(APPDIR)/../../../APP_Framework/Applications/app_test
include $(wildcard $(APPDIR)/../../../APP_Framework/Applications/app_test/*/Make.defs)

View File

@@ -0,0 +1,177 @@
include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FEATURES),y)
include $(APPDIR)/Make.defs
ifeq ($(CONFIG_USER_TEST_SEMC),y)
CSRCS += test_extsram.c
endif
ifeq ($(CONFIG_USER_TEST_LCD),y)
CSRCS += test_lcd.c
endif
ifeq ($(CONFIG_BSP_USING_TOUCH),y)
CSRCS += test_touch.c
endif
ifeq ($(CONFIG_MUSL_LIBC),y)
CSRCS += test_musl.c
endif
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
SRC_FILES := test_shell.c
ifeq ($(CONFIG_USER_TEST_ADC),y)
SRC_FILES += test_adc.c
endif
ifeq ($(CONFIG_USER_TEST_DAC),y)
SRC_FILES += test_dac.c
endif
ifeq ($(CONFIG_USER_TEST_FS),y)
SRC_FILES += test_fs.c
endif
ifeq ($(CONFIG_USER_TEST_SEMC),y)
SRC_FILES += test_extsram.c
endif
ifeq ($(CONFIG_USER_TEST_LCD),y)
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_I2C),y)
ifeq ($(CONFIG_BOARD_EDU_RISCV64_EVB),y)
SRC_FILES += test_i2c_riscv.c
endif
ifeq ($(CONFIG_BOARD_EDU_ARM32_EVB),y)
SRC_FILES += test_i2c_arm.c
endif
endif
ifeq ($(CONFIG_USER_TEST_UART),y)
SRC_FILES += test_uart.c
endif
ifeq ($(CONFIG_USER_TEST_GPIO),y)
SRC_FILES += test_gpio.c
endif
ifeq ($(CONFIG_USER_TEST_LORA),y)
SRC_FILES += test_loraE220.c
endif
ifeq ($(CONFIG_USER_TEST_RTC),y)
SRC_FILES += test_rtc.c
endif
ifeq ($(CONFIG_USER_TEST_RS485),y)
ifeq ($(CONFIG_BOARD_EDU_RISCV64_EVB),y)
SRC_FILES += test_rs485_riscv.c
endif
ifeq ($(CONFIG_BOARD_EDU_ARM32_EVB),y)
SRC_FILES += test_rs485_arm.c
endif
endif
ifeq ($(CONFIG_USER_TEST_HWTIMER),y)
SRC_FILES += test_hwtimer.c
endif
ifeq ($(CONFIG_USER_TEST_LCD_EDU),y)
SRC_FILES += test_lcd_edu.c
endif
ifeq ($(CONFIG_USER_TEST_WDT),y)
SRC_FILES += test_wdt.c
endif
ifeq ($(CONFIG_USER_TEST_TOUCH),y)
SRC_FILES += test_touch.c
endif
ifeq ($(CONFIG_USER_TEST_CAMERA),y)
SRC_FILES += test_camera.c
endif
ifeq ($(CONFIG_USER_TEST_ETHERNET),y)
SRC_FILES += test_ethernet.c
endif
ifeq ($(CONFIG_USER_TEST_FLASH),y)
SRC_FILES += test_flash.c
endif
ifeq ($(CONFIG_USER_TEST_CAN),y)
SRC_FILES += test_can.c
endif
ifeq ($(CONFIG_USER_TEST_TIMER),y)
SRC_FILES += test_timer.c
endif
ifeq ($(CONFIG_USER_TEST_HASH),y)
SRC_FILES += test_hash/test_hash.c
endif
ifeq ($(CONFIG_USER_TEST_RADIX),y)
SRC_FILES += test_radix_tree/test_radix_tree.c
endif
ifeq ($(CONFIG_USER_TEST_RBTREE),y)
SRC_FILES += test_rbtree/test_rbtree.c
endif
ifeq ($(CONFIG_USER_TEST_SOCKET),y)
SRC_FILES += test_socket.c
endif
ifeq ($(CONFIG_USER_TEST_MODBUS_TCP),y)
SRC_DIR += test_modbus_tcp
endif
ifeq ($(CONFIG_USER_TEST_WEBSERVER),y)
SRC_FILES += test_webserver/test_webserver.c
endif
ifeq ($(CONFIG_USER_TEST_MQTTCLIENT),y)
SRC_DIR:= test_mqttclient
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_FTPCLIENT),y)
SRC_FILES += test_ftpclient/test_ftpclient.c test_ftpclient/ftp_client/ftp_client.c\
test_ftpclient/ftp_client/my_socket.c
endif
ifeq ($(CONFIG_USER_TEST_FTPCLIENT_RISCV),y)
SRC_FILES += test_ftpclient_riscv/test_ftpclient_riscv.c
endif
ifeq ($(CONFIG_USER_TEST_LORA_P2P),y)
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_LORAWAN_SINGLEGW),y)
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_CANOPEN),y)
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_USB_CAMERA),y)
SRC_FILES +=
endif
ifeq ($(CONFIG_USER_TEST_FTPCLIENT_FINAL),y)
SRC_FILES += test_ftpclient_final/test_ftpclient_final.c test_ftpclient_final/ftp_client/ftp_client.c test_ftpclient_final/ftp_client/my_socket.c
endif
include $(KERNEL_ROOT)/compiler.mk
endif

View File

@@ -0,0 +1,11 @@
import os
from building import *
Import('RTT_ROOT')
Import('rtconfig')
cwd = GetCurrentDir()
DEPENDS = [""]
SOURCES = ['test_shell.c']
path = [cwd]
objs = DefineGroup('app_test', src = SOURCES, depend = DEPENDS,CPPPATH = path)
Return("objs")

View File

@@ -0,0 +1,58 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_adc.c
* @brief: a application of adc function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2022/1/7
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
void TestAdc(void)
{
int adc_fd;
uint8 adc_channel = 0x1;
uint16 adc_sample = 0;
adc_fd = PrivOpen(ADC_DEV_DRIVER, O_RDWR);
if (adc_fd < 0) {
printf("open adc fd error %d\n", adc_fd);
return;
}
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = ADC_TYPE;
ioctl_cfg.args = &adc_channel;
if (0 != PrivIoctl(adc_fd, OPE_CFG, &ioctl_cfg)) {
printf("ioctl adc fd error %d\n", adc_fd);
PrivClose(adc_fd);
return;
}
for (int i = 0; i < 10; i ++) {
PrivRead(adc_fd, &adc_sample, 2);
printf("adc sample %u mv\n", adc_sample);
PrivTaskDelay(500);
}
PrivClose(adc_fd);
return;
}
PRIV_SHELL_CMD_FUNCTION(TestAdc, a adc test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,120 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_camera.c
* @brief: a application of camera function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2022/12/7
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
static uint16_t image_buff[384000];
void TestCamera(int argc, char *argv[])
{
int frame_counter = 10000;
if (argc > 1)
{
frame_counter = atoi(argv[1]);
}
printf("This test will refresh %d frames\n", frame_counter);
int camera_fd = PrivOpen(CAMERA_DEV_DRIVER, O_RDWR);
if (camera_fd < 0)
{
printf("open camera fd error:%d\n", camera_fd);
return;
}
int lcd_fd = PrivOpen(CAMERA_LCD_DEV_DRIVER, O_RDWR);
if (lcd_fd < 0)
{
printf("open lcd fd error:%d\n", lcd_fd);
return;
}
//configure the camera's output address
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = CAMERA_TYPE;
struct CameraCfg camera_cfg ={
.gain_manu_enable = 0,
.gain = 0xFF,
.window_w = 800,
.window_h = 600,
.output_w = IMAGE_WIDTH,
.output_h = IMAGE_HEIGHT,
.window_xoffset = 0,
.window_yoffset = 0
};
ioctl_cfg.args = &camera_cfg;
if (0 != PrivIoctl(camera_fd, OPE_CFG, &ioctl_cfg))
{
printf("camera pin fd error %d\n", camera_fd);
PrivClose(camera_fd);
return;
}
ioctl_cfg.args = (void *)image_buff;
if (0 != PrivRead(camera_fd, image_buff, NULL_PARAMETER))
{
printf("camera pin fd error %d\n", camera_fd);
PrivClose(camera_fd);
return;
}
printf("address buff is %x\n", image_buff);
LcdWriteParam graph_param;
graph_param.type = LCD_DOT_TYPE;
//clear the LCD
uint16_t back_color[LCD_SIZE];
memset(back_color,0,sizeof(back_color));
for (int i = 0; i < LCD_SIZE; i++)
{
graph_param.pixel_info.pixel_color = &back_color;
graph_param.pixel_info.x_startpos = 0;
graph_param.pixel_info.y_startpos = i;
graph_param.pixel_info.x_endpos = LCD_SIZE -1;
graph_param.pixel_info.y_endpos = i;
PrivWrite(lcd_fd, &graph_param, NULL_PARAMETER);
}
//refresh the LCD using photo of camera
while (frame_counter--)
{
for (int i = 0; i < IMAGE_HEIGHT; i++)
{
graph_param.pixel_info.pixel_color = image_buff + i * IMAGE_WIDTH;
graph_param.pixel_info.x_startpos = 0;
graph_param.pixel_info.y_startpos = i + (LCD_SIZE - IMAGE_HEIGHT) / 2;
graph_param.pixel_info.x_endpos = IMAGE_WIDTH - 1;
graph_param.pixel_info.y_endpos = i + (LCD_SIZE - IMAGE_HEIGHT) / 2;
PrivWrite(lcd_fd, &graph_param, NULL_PARAMETER);
}
}
// close test
PrivClose(lcd_fd);
PrivClose(camera_fd);
printf("The camera test is finished successfully\n");
}
PRIV_SHELL_CMD_FUNCTION(TestCamera, a camera test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,87 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_can.c
* @brief: a application of can function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2023/2/17
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
void TestCAN(void)
{
// config CAN pin(SCL:34.SDA:35) in menuconfig
int can_fd = PrivOpen(CAN_DEV_DRIVER, O_RDWR);
if (can_fd < 0)
{
printf("open can_fd fd error:%d\n", can_fd);
return;
}
printf("CAN open successful!\n");
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = CAN_TYPE;
struct CanDriverConfigure can_config;
can_config.brp = 8U;
can_config.tbs1 = 1U + 8U;
can_config.tbs2 = 4U;
can_config.tsjw = 4U;
can_config.mode = 0U;
ioctl_cfg.args = (void *)&can_config;
if (0 != PrivIoctl(can_fd, OPE_INT, &ioctl_cfg))
{
printf("init can fd error %d\n", can_fd);
PrivClose(can_fd);
return;
}
printf("CAN configure successful!\n");
uint8_t data_buff[64u] = {1,2,3,4,4,3,2,1};
struct CanSendConfigure frame_send;
frame_send.ide=0;
frame_send.stdid = 0x55;
frame_send.rtr=0;
frame_send.data_lenth=8;
frame_send.data = data_buff;
struct CanSendConfigure frame_recv;
uint8_t recv_buff[65U] = {0};
frame_recv.data = recv_buff;
// CAN write
while (1)
{
PrivTaskDelay(500);
PrivWrite(can_fd, &frame_send, NONE);
PrivTaskDelay(500);
PrivRead(can_fd, &frame_recv, NONE);
// if any data has received,Then printf message
if(frame_recv.data_lenth > 0){
printf("ID %08x:%s\n",frame_recv.exdid,frame_recv.data);
}
}
PrivClose(can_fd);
return;
}
PRIV_SHELL_CMD_FUNCTION(TestCAN, a can test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,63 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_dac.c
* @brief: a application of dac function
* @version: 2.0
* @author: AIIT XUOS Lab
* @date: 2022/1/11
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
static pthread_t test_dac_task;
static void *TestDacTask(void *parameter)
{
int dac_fd;
uint16 dac_set_value = 4096 * 10;//sin length
dac_fd = PrivOpen(DAC_DEV_DRIVER, O_RDWR);
if (dac_fd < 0) {
KPrintf("open dac fd error %d\n", dac_fd);
}
struct PrivIoctlCfg ioctl_cfg;
ioctl_cfg.ioctl_driver_type = DAC_TYPE;
ioctl_cfg.args = &dac_set_value;
if (0 != PrivIoctl(dac_fd, OPE_CFG, &ioctl_cfg)) {
KPrintf("ioctl dac fd error %d\n", dac_fd);
PrivClose(dac_fd);
}
while (1) {
//start dac output sin
PrivWrite(dac_fd, NULL, 0);
}
PrivClose(dac_fd);
}
void TestDac(void)
{
pthread_attr_t tid;
tid.schedparam.sched_priority = 20;
tid.stacksize = 4096;
PrivTaskCreate(&test_dac_task, &tid, &TestDacTask, NULL);
PrivTaskStartup(&test_dac_task);
}
PRIV_SHELL_CMD_FUNCTION(TestDac, a dac test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,194 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_ethernet.c
* @brief: a application of ethernet function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2022/12/17
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
#include <socket.h>
#define BUFF_SIZE 128
#define RECV_SIZE 16
#define TCP_PORT 12345
const static uint32_t sn = 0;
#ifdef ETHERNET_AS_SERVER
static int32_t wiz_server_op(uint8_t sn, uint8_t *buf, uint32_t buf_size,
uint16_t port, enum TCP_OPTION opt) {
int32_t ret = 0;
uint16_t size = 0, sentsize = 0;
switch (getSn_SR(sn)) {
case SOCK_ESTABLISHED:
if (getSn_IR(sn) & Sn_IR_CON) {
printf("%d:Connected\r\n", sn);
setSn_IR(sn, Sn_IR_CON);
}
if (opt == SEND_DATA) {
uint32_t sent_size = 0;
memset(buf,0,buf_size);
strcpy(buf,"The message has been recved");
ret = wiz_sock_send(sn, buf, buf_size);
if (ret < 0) {
wiz_sock_close(sn);
return ret;
}
} else if (opt == RECV_DATA) {
uint32_t size = 0;
if ((size = getSn_RX_RSR(sn)) > 0) {
if (size > buf_size) size = buf_size;
memset(buf,0,buf_size);
ret = wiz_sock_recv(sn, buf, size);
printf("Recv message: %s\n",buf);
return ret;
}
}
break;
case SOCK_CLOSE_WAIT:
printf("%d:CloseWait\r\n", sn);
if ((ret = wiz_sock_disconnect(sn)) != SOCK_OK) return ret;
printf("%d:Closed\r\n", sn);
break;
case SOCK_INIT:
printf("%d:Listen, port [%d]\r\n", sn, port);
if ((ret = wiz_sock_listen(sn)) != SOCK_OK) return ret;
break;
case SOCK_CLOSED:
printf("%d:LBTStart\r\n", sn);
if ((ret = wiz_socket(sn, Sn_MR_TCP, port, 0x00)) != sn) return ret;
printf("%d:Opened\r\n", sn);
break;
default:
break;
}
return 0;
}
void TestSocketAsServer(int argc, char *argv[])
{
x_err_t ret;
uint8_t buf[BUFF_SIZE] = {0};
while (1) {
ret = wiz_server_op(0, buf, BUFF_SIZE, TCP_PORT, RECV_DATA);
if (ret > 0) {
wiz_server_op(0, buf, BUFF_SIZE, TCP_PORT, SEND_DATA);
};
}
return ;
}
PRIV_SHELL_CMD_FUNCTION(TestSocketAsServer, a w5500 server test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#elif defined ETHERNET_AS_CLIENT
static uint32_t wiz_client_op(uint8_t sn, uint8_t *buf, uint32_t buf_size,
uint8_t dst_ip[4], uint16_t dst_port,
enum TCP_OPTION opt) {
// assert(buf_size <= g_wiznet_buf_size);
int32_t ret;
switch (getSn_SR(sn)) {
case SOCK_CLOSE_WAIT:
wiz_sock_disconnect(sn);
break;
case SOCK_CLOSED:
wiz_socket(sn, Sn_MR_TCP, 5000, 0x00);
break;
case SOCK_INIT:
KPrintf("[SOCKET CLIENT] sock init.\n");
wiz_sock_connect(sn, dst_ip, dst_port);
break;
case SOCK_ESTABLISHED:
if (getSn_IR(sn) & Sn_IR_CON) {
printf("[SOCKET CLIENT] %d:Connected\r\n", sn);
setSn_IR(sn, Sn_IR_CON);
}
if (opt == SEND_DATA) {
uint32_t sent_size = 0;
ret = wiz_sock_send(sn, buf, buf_size);
if (ret < 0) {
wiz_sock_close(sn);
return ret;
}
} else if (opt == RECV_DATA) {
uint32_t size = 0;
if ((size = getSn_RX_RSR(sn)) > 0) {
if (size > buf_size) size = buf_size;
ret = wiz_sock_recv(sn, buf, size);
if (ret <= 0) return ret;
}
}
break;
default:
break;
}
}
void TestSocketAsClient(int argc, char *argv[])
{
x_err_t ret;
uint8_t buf[BUFF_SIZE] = {0};
uint32_t tmp_ip[4];
uint32_t port;
const uint8_t client_sock = 2;
if(argc<3){
printf("Please enter command like TestSocketAsClient ip:port msg\n");
}
sscanf(argv[1],"%d.%d.%d.%d:%d",tmp_ip,tmp_ip+1,tmp_ip+2,tmp_ip+3,&port);
printf("Client to %d.%d.%d.%d:%d\n",tmp_ip[0],tmp_ip[1],tmp_ip[2],tmp_ip[3],port);
uint8_t destination_ip[4]={0};
for(int i=0;i<4;i++){
destination_ip[i]=tmp_ip[i];
}
while(1){
ret = wiz_client_op(client_sock, argv[2], strlen(argv[2]), destination_ip, port,SEND_DATA);
printf("sizeof:%d\n",strlen(argv[2]));
PrivTaskDelay(1000);
if (ret > 0) {
ret=wiz_client_op(client_sock, buf, BUFF_SIZE, destination_ip, port, RECV_DATA);
printf("read ret is %d\n",ret);
if(ret>0){
printf("client recv msg successfully!\n");
printf("%s\n",buf);
}
};
PrivTaskDelay(1000);
}
return ;
}
PRIV_SHELL_CMD_FUNCTION(TestSocketAsClient, a w5500 client-ip-port-msg test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif
#endif

View File

@@ -0,0 +1,107 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_extsram.c
* @brief: a extsram test application
* @version: 2.0
* @author: AIIT XUOS Lab
* @date: 2022/9/26
*
*/
#include <transform.h>
#include "stdio.h"
/* parameters for sram peripheral */
// /* stm32f4 Bank3:0X68000000 */
// #define SRAM_BANK_ADDR ((uint32_t)0X68000000)
/* OK-1052 semc:0X80000000 */
#define SRAM_BANK_ADDR ((uint32_t)0X80000000)
/* data width: 8, 16, 32 */
#define SRAM_DATA_WIDTH 16
/* sram size */
#define SRAM_SIZE ((uint32_t)0x2000000)
#define TICK_PER_SECOND 100
int ExtsramTest(void)
{
int i = 0;
uint32_t start_time = 0, time_cast = 0;
#if SRAM_DATA_WIDTH == 8
char data_width = 1;
uint8_t data = 0;
#elif SRAM_DATA_WIDTH == 16
char data_width = 2;
uint16_t data = 0;
#else
char data_width = 4;
uint32_t data = 0;
#endif
/* write data */
printf("Writing the %ld bytes data, waiting....\n", SRAM_SIZE);
start_time = PrivGetTickTime();
for (i = 0; i < SRAM_SIZE / data_width; i++)
{
#if SRAM_DATA_WIDTH == 8
*(volatile uint8_t *)(SRAM_BANK_ADDR + i * data_width) = (uint8_t)0x55;
#elif SRAM_DATA_WIDTH == 16
*(volatile uint16_t *)(SRAM_BANK_ADDR + i * data_width) = (uint16_t)0x5555;
#else
*(volatile uint32_t *)(SRAM_BANK_ADDR + i * data_width) = (uint32_t)0x55555555;
#endif
}
time_cast = PrivGetTickTime() - start_time;
printf("Write data success, total time: %ld.%03ldS.\n", time_cast / TICK_PER_SECOND,
time_cast % TICK_PER_SECOND / ((TICK_PER_SECOND * 1 + 999) / 1000));
/* read data */
printf("start Reading and verifying data, waiting....\n");
for (i = 0; i < SRAM_SIZE / data_width; i++)
{
#if SRAM_DATA_WIDTH == 8
data = *(volatile uint8_t *)(SRAM_BANK_ADDR + i * data_width);
if (data != 0x55)
{
printf("SRAM test failed!");
break;
}
#elif SRAM_DATA_WIDTH == 16
data = *(volatile uint16_t *)(SRAM_BANK_ADDR + i * data_width);
if (data != 0x5555)
{
printf("SRAM test failed! data = 0x%x\n",data);
break;
}
#else
data = *(volatile uint32_t *)(SRAM_BANK_ADDR + i * data_width);
if (data != 0x55555555)
{
printf("SRAM test failed!\n");
break;
}
#endif
}
if (i >= SRAM_SIZE / data_width)
{
printf("SRAM test success!\n");
}
return 0;
}
PRIV_SHELL_CMD_FUNCTION(ExtsramTest, a extsram test sample, PRIV_SHELL_CMD_MAIN_ATTR);

View File

@@ -0,0 +1,56 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_flash.c
* @brief: a application of flash function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2022/12/17
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
void TestFlash(void)
{
int fd = open(FLASH_DEV_DRIVER,O_RDWR);
if(fd<0){
printf("fs fd open error:%d\n",fd);
return;
}
struct BusBlockWriteParam flash_writer;
uint8_t read_buff[8] = {1,2,3,4,5,6,7,8};
flash_writer.pos = 0x000000L;
flash_writer.size = 8;
flash_writer.buffer = read_buff;
struct BusBlockReadParam flash_reader;
flash_reader.pos = 0x000000L;
flash_reader.size = 8;
flash_reader.buffer = read_buff;
PrivRead(fd,&flash_reader,NONE);
printf("Read data is:");
for(int i=0;i<flash_writer.size;i++){
printf("%02x ",read_buff[i]);
read_buff[i]++;
}
printf("\n");
PrivWrite(fd,&flash_writer,NONE);
return;
}
PRIV_SHELL_CMD_FUNCTION(TestFlash, a flash test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,83 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_fs.c
* @brief: a application of file_system function
* @version: 1.1
* @author: AIIT XUOS Lab
* @date: 2022/11/17
*/
#include <stdio.h>
#include <string.h>
#include <transform.h>
#ifdef ADD_XIZI_FEATURES
#define MAX_READ_LENGTH 1000
// sd card here is loaded as "/"
void TestFs(void)
{
//open the file in sdcard
int fd = open(FPATH,O_RDWR|O_CREAT);
if(fd<0){
printf("fs fd open error:%d\n",fd);
return;
}
char filewords[MAX_READ_LENGTH];
memset(filewords,0,MAX_READ_LENGTH);
const char *input_words = "these words are going to write in fs\n";
//read and write then close file
int err_flag = read(fd,filewords,MAX_READ_LENGTH);
if(err_flag<0){
printf("read failed,error:%d\n",err_flag);
return;
}
printf("read data is \n%s\n",filewords);
err_flag = write(fd,input_words,strlen(input_words));
if(err_flag<0){
printf("write failed,error:%d\n",err_flag);
return;
}
err_flag = close(fd);
if(err_flag<0){
printf("close failed,error %d\n",err_flag);
return ;
}
//re-open the file and re-read the file
fd = open(FPATH,O_RDWR);
if(fd<0){
printf("fs fd open error:%d\n",fd);
return;
}
err_flag = read(fd,filewords,MAX_READ_LENGTH);
if(err_flag<0){
printf("read failed,error:%d\n",err_flag);
return;
}
printf("read data is \n%s\n",filewords);
err_flag = close(fd);
if(err_flag<0){
printf("close failed,error:%d\n",err_flag);
return;
}
return;
}
PRIV_SHELL_CMD_FUNCTION(TestFs, a sd or usb filesystem test sample, PRIV_SHELL_CMD_MAIN_ATTR);
#endif

View File

@@ -0,0 +1,60 @@
# 初赛一级赛题3基于矽璓已实现的Lwip在ARM上实现FTP协议的Client功能
## 1. 简介
本项目是基于矽璓已实现的Lwip在ARM上实现FTP协议的Client功能
test_ftpclient.h声明了下载10个文件的测试函数
test_ftpclient.c实现了下载10个文件的测试函数
ftp_client文件夹定义了ftp_client的相关类库其中my_socket.h,my_socket.c定义了socket抽象层并基于
Lwip实现了该抽象层ftp_client.h,ftp_client.c实现了ftp登录获取文件大小下载文件等功能
## 2. 数据结构设计说明
- ftp_client.c 的设计
分别定义了发送命令和接收数据的socket和相应的缓冲区并且实现了登录、发送命令、接收响应数据、查找文件大小、进入被动模式、下载文件、关闭ftp客户端等操作
```c
static int m_socket_cmd; // 发送命令的socket文件描述符
static int m_socket_data; // 接收ftp服务器文件的socket文件描述符
static char m_send_buffer[1024]; // 发送缓冲区
static char m_recv_buffer[1024]; // 接收缓冲区
```
## 3. 测试程序说明
- test_ftpclient.c用于测试下载10个文件
连接电脑上的ftp服务器下载10个4KB文件,通过终端日志打印确定文件是否下载成功,以及追踪通信流程和下载进度
```c
void TestFtpClient(int argc, char* argv[])
{
FtpInitCmd();
int ret = FtpLogin("192.168.0.248", 21, "anonymous", "anonymous");
int size;
char *buf;
for(int i = 1;i <= 10;i++){
char fileName[20] = "/file";
char temp[5] = "";
sprintf(temp,"%d",i);
strcat(fileName,temp);
size = FtpFileSize(fileName);
buf = malloc(size);
FtpInitData(); // data socket 每次下载都要重新创建,下载完都要关闭
ret = FtpDownload(fileName, buf, size);
free(buf);
}
FtpQuit();
return;
}
```
## 4. 运行结果(##需结合运行测试截图按步骤说明##
1. 配置开启BSP_USING_LWIP、USER_TEST_FTPCLIENT
![](./img/image.png)
![](./img/image-1.png)
2. 编译
![](./img/image-2.png)
3. 烧写
![](./img/image-3.png)
4. xshell连接串口终端
![](./img/image-4.png)
6. 配置ip
![](./img/image-5.png)
7. 运行TestFtpClient开始下载文件
![](./img/image-6.png)
![](./img/image-7.png)
![](./img/image-8.png)

View File

@@ -0,0 +1,256 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: ftp_client.c
* @brief: ftp client tool
* @version: 1.0
* @author: bdislab_final
* @date: 2023/7/25
* @reference https://kerndev.blog.csdn.net/article/details/89383888
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include "my_socket.h"
#include "ftp_client.h"
static int m_socket_cmd;
static int m_socket_data;
static char m_send_buffer[1024];
static char m_recv_buffer[1024];
static int FtpSendCommand(char *cmd)
{
int ret;
printf("send command: %s\r\n", cmd);
ret = SocketSend(m_socket_cmd, cmd, (int)strlen(cmd));
if(ret < 0)
{
printf("failed to send command: %s\r\n",cmd);
return 0;
}
return 1;
}
static int FtpRecvRespond(char *resp, int len)
{
int ret;
int off;
len -= 1;
for(off=0; off<len; off+=ret)
{
ret = SocketRecv(m_socket_cmd, &resp[off], 1);
if(ret < 0)
{
printf("recv respond error(ret=%d)!\r\n", ret);
return 0;
}
if(resp[off] == '\n')
{
break;
}
}
resp[off+1] = 0;
printf("respond:%s\r\n", resp);
return atoi(resp);
}
static int FtpEnterPasv(char *ipaddr, int *port)
{
int ret;
char *find;
int a,b,c,d;
int pa,pb;
ret = FtpSendCommand("PASV\r\n");
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 227)
{
return 0;
}
find = strrchr(m_recv_buffer, '(');
sscanf(find, "(%d,%d,%d,%d,%d,%d)", &a, &b, &c, &d, &pa, &pb);
sprintf(ipaddr, "%d.%d.%d.%d", a, b, c, d);
*port = pa * 256 + pb;
return 1;
}
int FtpDownload(char *name, char *buf, int len)
{
int i;
int ret;
char ipaddr[32];
int port;
//查询数据地址
ret = FtpEnterPasv(ipaddr, &port);
if(ret != 1)
{
return 0;
}
//连接数据端口
ret = SocketConnect(m_socket_data, ipaddr, port);
if(ret != 1)
{
printf("failed to connect data port\r\n");
return 0;
}
//准备下载
sprintf(m_send_buffer, "RETR %s\r\n", name);
ret = FtpSendCommand(m_send_buffer);
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 150)
{
SocketClose(m_socket_data);
return 0;
}
//开始下载,读取完数据后,服务器会自动关闭连接
for(i=0; i<len; i+=ret)
{
ret = SocketRecv(m_socket_data, ((char *)buf) + i, len);
printf("download %d/%d.\r\n", i + ret, len);
if(ret < 0)
{
printf("download was interrupted.\r\n");
break;
}
}
//下载完成
printf("download %d/%d bytes complete.\r\n", i, len);
printf("====file content====\n");
buf[100] = '\0';
printf("%s\n",buf);
printf("====================\n");
// FILE *fp = NULL;
// fp = fopen(name+1, "wb");
// fwrite(buf,len,1,fp);
// fclose(fp);
SocketClose(m_socket_data);
ret = FtpRecvRespond(m_recv_buffer, 1024);
return (ret==226);
}
int FtpFileSize(char *name)
{
int ret;
int size;
sprintf(m_send_buffer,"SIZE %s\r\n",name);
ret = FtpSendCommand(m_send_buffer);
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 213)
{
return 0;
}
size = atoi(m_recv_buffer + 4);
return size;
}
int FtpLogin(char *addr, int port, char *username, char *password)
{
int ret;
printf("connect...\r\n");
ret = SocketConnect(m_socket_cmd, addr, port);
if(ret != 1)
{
printf("connect server failed!\r\n");
return 0;
}
printf("connect ok.\r\n");
//等待欢迎信息
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 220)
{
printf("bad server, ret=%d!\r\n", ret);
SocketClose(m_socket_cmd);
return 0;
}
printf("login...\r\n");
//发送USER
sprintf(m_send_buffer, "USER %s\r\n", username);
ret = FtpSendCommand(m_send_buffer);
if(ret != 1)
{
SocketClose(m_socket_cmd);
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 331)
{
SocketClose(m_socket_cmd);
return 0;
}
//发送PASS
sprintf(m_send_buffer, "PASS %s\r\n", password);
ret = FtpSendCommand(m_send_buffer);
if(ret != 1)
{
SocketClose(m_socket_cmd);
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 230)
{
SocketClose(m_socket_cmd);
return 0;
}
printf("login success.\r\n");
//设置为二进制模式
ret = FtpSendCommand("TYPE I\r\n");
if(ret != 1)
{
SocketClose(m_socket_cmd);
return 0;
}
ret = FtpRecvRespond(m_recv_buffer, 1024);
if(ret != 200)
{
SocketClose(m_socket_cmd);
return 0;
}
return 1;
}
void FtpQuit(void)
{
FtpSendCommand("QUIT\r\n");
SocketClose(m_socket_cmd);
}
void FtpInitCmd(void)
{
m_socket_cmd = SocketCreate();
}
void FtpInitData(void){
m_socket_data= SocketCreate();
}

View File

@@ -0,0 +1,42 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: ftp_client.h
* @brief: ftp client tool
* @version: 1.0
* @author: bdislab_final
* @date: 2023/7/25
*/
#ifndef FTP_CLIENT_H
#define FTP_CLIENT_H
/* init ftp cmd socket */
void FtpInitCmd(void);
/* init ftp data socket */
void FtpInitData(void);
/* quit ftp */
void FtpQuit(void);
/* fpt login */
int FtpLogin(char *addr, int port, char *username, char *password);
/* get file size */
int FtpFileSize(char *name);
/* ftp download file*/
int FtpDownload(char *name, char *buf, int len);
#endif

View File

@@ -0,0 +1,57 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: my_socket.c
* @brief: a abstract socket api
* @version: 1.0
* @author: bdislab_final
* @date: 2023/7/25
* @reference https://kerndev.blog.csdn.net/article/details/89383888
*/
#include "my_socket.h"
#include <sockets.h>
#include <def.h>
#include <errno.h>
int SocketCreate(void){
return socket(AF_INET,SOCK_STREAM,0);
}
int SocketConnect(int sock, const char *addr, int port){
// unsigned int iRemoteAddr = 0;
struct sockaddr_in stRemoteAddr = {0}; //对端,即目标地址信息
stRemoteAddr.sin_family = AF_INET;
stRemoteAddr.sin_port = htons(port);
stRemoteAddr.sin_addr.s_addr = inet_addr(addr);
// inet_pton(AF_INET, addr, &iRemoteAddr);
// stRemoteAddr.sin_addr.s_addr=iRemoteAddr;
int res = connect(sock,(struct sockaddr *)&stRemoteAddr,sizeof(stRemoteAddr));
if(res == -1){
printf("error:%d\n",errno);
}
return res == 0 ? 1 : 0;
}
int SocketSend(int sock, void *data, int len){
return send(sock,data,len,0);
}
int SocketRecv(int sock, void *data, int len){
return recv(sock,data,len,0);
}
void SocketClose(int sock){
close(sock);
}

View File

@@ -0,0 +1,46 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file my_socket.h
* @brief a abstract socket api
* @version 1.0
* @author bdislab_final
* @date 2023/7/25
*/
#ifndef MYSOCKET_H
#define MYSOCKET_H
#ifdef __cplusplus
extern "C" {
#endif
/* create a socket */
int SocketCreate(void);
/* connect a socket */
int SocketConnect(int sock, const char *addr, int port);
/* send data through socket*/
int SocketSend(int sock, void *data, int len);
/* receive data from socket*/
int SocketRecv(int sock, void *data, int len);
/* close socket*/
void SocketClose(int sock);
#ifdef __cplusplus
}
#endif
#endif

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

View File

@@ -0,0 +1,50 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: test_ftpclient.c
* @brief: a ftpClient test sample
* @version: 1.0
* @author: bdislab_final
* @date: 2023/7/25
*/
#include "test_ftpclient.h"
#include "ftp_client/ftp_client.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <transform.h>
/* test for ftp client */
void TestFtpClient(int argc, char* argv[])
{
FtpInitCmd();
int ret = FtpLogin("192.168.1.248", 21, "anonymous", "anonymous");
int size;
char *buf;
for(int i = 1;i <= 10;i++){
char fileName[20] = "/file";
char temp[5] = "";
sprintf(temp,"%d",i-1);
strcat(fileName,temp);
size = FtpFileSize(fileName);
buf = malloc(size);
FtpInitData(); // data socket 每次下载都要重新创建,下载完都要关闭
ret = FtpDownload(fileName, buf, size);
free(buf);
}
FtpQuit();
return;
}
PRIV_SHELL_CMD_FUNCTION(TestFtpClient, a ftpClient test sample, PRIV_SHELL_CMD_MAIN_ATTR);

View File

@@ -0,0 +1,35 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file test_ftpclient.h
* @brief a ftpClient test sample
* @version 1.0
* @author bdislab_final
* @date 2023/7/25
*/
#ifndef TEST_FTPCLIENT_H
#define TEST_FTPCLIENT_H
#ifdef __cplusplus
extern "C" {
#endif
/* test for ftp client */
void TestFtpClient(int argc, char* argv[]);
#ifdef __cplusplus
}
#endif
#endif

View File

@@ -0,0 +1,135 @@
# 决赛一级赛题3基于初赛一级赛题3在云服务器上实现FTP Server功能
## 1. 简介
本项目是基于赛事提供的云服务器实现FTP协议的Server功能其功能支持至少10个Client端并发向Server端传输4KB大小的文件
支持Server端并发地向至少10个Client端传输4KB大小的文件。
test_ftpclient_final.h声明了多个客户端并发下载文件、并发上传文件的测试函数
test_ftpclient_final.c实现了多个客户端并发下载文件、并发上传文件的测试函数
ftp_client文件夹定义了ftp_client的相关类库其中my_socket.h,my_socket.c定义了socket抽象层并基于
Lwip实现了该抽象层ftp_client.h,ftp_client.c实现了ftp登录获取文件大小下载文件等功能
注意:在赛事提供的云服务器/root/yanglongFTP上有对应服务器代码 ./server运行服务器为了方便查看代码我们讲服务器代码备份存放在ftp_server目录下
## 2. 数据结构设计说明
- ftp_client.c 的设计
分别定义了发送命令和接收数据的socket和相应的缓冲区并且实现了登录、发送命令、接收响应数据、查找文件大小、进入被动模式、下载文件、关闭ftp客户端等操作
```c
static int m_socket_cmd[THREAD_NUM]; // 发送命令的socket文件描述符,THREAD_NUM表示线程数目用来模拟多个客户端并发访问
static int m_socket_data[THREAD_NUM]; // 接收ftp服务器文件的socket文件描述符
static char m_send_buffer[THREAD_NUM][1024]; // 发送缓冲区
static char m_recv_buffer[THREAD_NUM][1024]; // 接收缓冲区
```
- server.c 的设计(具体代码在赛事提供的云服务器的/root/yanglongFTP下)
```c
#define THREAD_NUM 10000 // thread num
static int isBinary = 0; // transmit binary data
static int port = 9992; // service port
static int dataPort = 9993; // the port for file download
static char order[4]; // receive order
static char param[20]; // receive order param
static char *respMessage; // respose message
static int serverFd; // the server fd for deal with order requests
static int dataServerFd; // the server fd for file download
sem_t mutex; // mutex lock
struct Data{ // 线程间通信传输的数据
char fileName[20]; // file name
int type; // 0:download 1:upload
sem_t isDone; // complete file downlaod
sem_t isReady; // 文件准备好了
} data;
```
## 3. 测试程序说明
- test_ftpclient_final.c用于测试多个客户端并发下载文件
通过多线程模拟多个客户端并发访问服务器,通过 TestFtpClient options threads进行测试
其中options=1表示下载options=2表示上传threads表示线程数/模拟的并发客户端数目
```c
/* test for 10 ftp client */
void TestFtpClient(int argc, char* argv[])
{
int options = atoi(argv[1]);
int n = atoi(argv[2]);
pthread_t threads[THREAD_NUM];
for(int i = 0;i < n;++i){
threadIDs[i] = i;
if(options == 1){ // 全部都是下载
pthread_create(&threads[i],NULL,&DownLoad,&threadIDs[i]);
}else if(options == 2){ // 全部都是上传
pthread_create(&threads[i],NULL,&UpLoad,&threadIDs[i]);
}else if(options == 3){ // 随机下载/上传
int r = rand()%2;
if(r == 0){
printf("===============download===============\n");
pthread_create(&threads[i],NULL,&DownLoad,&threadIDs[i]);
}else{
printf("===============upload===============\n");
pthread_create(&threads[i],NULL,&UpLoad,&threadIDs[i]);
}
}
}
return;
}
PRIV_SHELL_CMD_FUNCTION(TestFtpClient, a ftpClient test sample, PRIV_SHELL_CMD_MAIN_ATTR);
```
## 4. 运行结果(##需结合运行测试截图按步骤说明##
1. 配置开启BSP_USING_LWIP、USER_TEST_FTPCLIENT
![](./img/image.png)
![](./img/image-1.png)
![](./img/image-2.png)
2. 编译
![](./img/image-3.png)
3. 烧写
![](./img/image-4.png)
4. xshell连接串口终端并配置ip
![](./img/image-5.png)
5. 通过./server在云服务器运行FTP服务器
![](./img/image-6.png)
6. 运行TestFtpClient 1 10模拟10个客户端并发下载文件
- 客户端日志
![](./img/image-7.png)
![](./img/image-8.png)
![](./img/image-9.png)
![](./img/image-10.png)
![](./img/image-11.png)
![](./img/image-12.png)
![](./img/image-13.png)
![](./img/image-14.png)
![](./img/image-15.png)
![](./img/image-16.png)
- 服务器日志
![](./img/image-17.png)
![](./img/image-18.png)
![](./img/image-19.png)
![](./img/image-20.png)
![](./img/image-21.png)
7. 运行TestFtpClient 2 10模拟10个客户端并发上传文件
- 客户端日志
![](./img/image-22.png)
![](./img/image-23.png)
![](./img/image-24.png)
![](./img/image-25.png)
![](./img/image-26.png)
![](./img/image-27.png)
![](./img/image-28.png)
- 服务器日志
![](./img/image-29.png)
![](./img/image-30.png)
![](./img/image-31.png)
![](./img/image-32.png)
- 上传结果
![](./img/image-33.png)
8. 运行TestFtpClient 3 10模拟10个客户端混合并发下载和上传文件
- 客户端日志
![](./img/image-34.png)
![](./img/image-35.png)
![](./img/image-36.png)
![](./img/image-37.png)
![](./img/image-38.png)
![](./img/image-39.png)
- 服务器日志
![](./img/image-40.png)
![](./img/image-41.png)
![](./img/image-42.png)
- 下载和上传结果
![](./img/image-43.png)
![](./img/image-44.png)

View File

@@ -0,0 +1,299 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: ftp_client.c
* @brief: ftp client tool
* @version: 1.0
* @author: bdislab_final
* @date: 2023/9/16
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include "my_socket.h"
#include "ftp_client.h"
static int m_socket_cmd[THREAD_NUM];
static int m_socket_data[THREAD_NUM];
static char m_send_buffer[THREAD_NUM][1024];
static char m_recv_buffer[THREAD_NUM][1024];
static int FtpSendCommand(int threadID,char *cmd)
{
int ret;
printf("send command: %s,threadID=%d\r\n", cmd,threadID);
ret = SocketSend(m_socket_cmd[threadID], cmd, (int)strlen(cmd));
if(ret < 0)
{
printf("failed to send command: %s\r\n",cmd);
return 0;
}
return 1;
}
static int FtpRecvRespond(int threadID,char *resp, int len)
{
int ret;
int off;
len -= 1;
for(off=0; off<len; off+=ret)
{
ret = SocketRecv(m_socket_cmd[threadID], &resp[off], 1);
if(ret < 0)
{
printf("recv respond error(ret=%d)!\r\n", ret);
return 0;
}
if(resp[off] == '\n')
{
break;
}
}
resp[off+1] = 0;
printf("respond:%s,threadID=%d\r\n", resp,threadID);
return atoi(resp);
}
static int FtpEnterPasv(int threadID,char *ipaddr, int *port)
{
int ret;
char *find;
int a,b,c,d;
int pa,pb;
ret = FtpSendCommand(threadID,"PASV\r\n");
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 227)
{
return 0;
}
find = strrchr(m_recv_buffer[threadID], '(');
sscanf(find, "(%d,%d,%d,%d,%d,%d)", &a, &b, &c, &d, &pa, &pb);
sprintf(ipaddr, "%d.%d.%d.%d", a, b, c, d);
*port = pa * 256 + pb;
return 1;
}
int FtpUpload(int threadID,char *name, void *buf, int len)
{
int ret;
char ipaddr[32];
int port;
//查询数据地址
ret=FtpEnterPasv(threadID,ipaddr, &port);
if(ret != 1)
{
return 0;
}
ret=SocketConnect(m_socket_data[threadID], ipaddr, port);
if(ret != 1)
{
return 0;
}
//准备上传
sprintf(m_send_buffer[threadID], "STOR %s\r\n", name);
ret = FtpSendCommand(threadID,m_send_buffer[threadID]);
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 150)
{
SocketClose(m_socket_data[threadID]);
return 0;
}
//开始上传
ret = SocketSend(m_socket_data[threadID], buf, len);
if(ret != len)
{
printf("send data error!\r\n");
SocketClose(m_socket_data[threadID]);
return 0;
}
SocketClose(m_socket_data[threadID]);
//上传完成,等待回应
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
return (ret==226);
}
int FtpDownload(int threadID,char *name, void *buf, int len)
{
int i;
int ret;
char ipaddr[32];
int port;
//查询数据地址
ret = FtpEnterPasv(threadID,ipaddr, &port);
if(ret != 1)
{
return 0;
}
printf("m_socket_data[threadID]=%d,threadID=%d\n",m_socket_data[threadID],threadID);
//连接数据端口
ret = SocketConnect(m_socket_data[threadID], ipaddr, port);
if(ret != 1)
{
printf("failed to connect data port\r\n");
return 0;
}
//准备下载
sprintf(m_send_buffer[threadID], "RETR %s\r\n", name);
ret = FtpSendCommand(threadID,m_send_buffer[threadID]);
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 150)
{
SocketClose(m_socket_data[threadID]);
return 0;
}
//开始下载,读取完数据后,服务器会自动关闭连接
for(i=0; i<len; i+=ret)
{
ret = SocketRecv(m_socket_data[threadID], ((char *)buf) + i, len);
printf("download %d/%d.,threadID=%d\r\n", i + ret, len,threadID);
if(ret < 0)
{
printf("download was interrupted.\r\n");
break;
}
}
//下载完成
printf("download %d/%d bytes complete.,threadID=%d\r\n", i, len,threadID);
// FILE *fp = NULL;
// fp = fopen(name+1, "wb");
// fwrite(buf,len,1,fp);
// fclose(fp);
SocketClose(m_socket_data[threadID]);
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
return (ret==226);
}
int FtpFileSize(int threadID,char *name)
{
int ret;
int size;
sprintf(m_send_buffer[threadID],"SIZE %s\r\n",name);
ret = FtpSendCommand(threadID,m_send_buffer[threadID]);
if(ret != 1)
{
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 213)
{
return 0;
}
size = atoi(m_recv_buffer[threadID] + 4);
return size;
}
int FtpLogin(int threadID,char *addr, int port, char *username, char *password)
{
int ret;
printf("connect...,threadID=%d\r\n",threadID);
ret = SocketConnect(m_socket_cmd[threadID], addr, port);
if(ret != 1)
{
printf("connect server failed!\r\n");
return 0;
}
printf("connect ok.,threadID=%d\r\n",threadID);
//等待欢迎信息
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 220)
{
printf("bad server, ret=%d!\r\n", ret);
SocketClose(m_socket_cmd[threadID]);
return 0;
}
printf("login...threadID=%d\r\n",threadID);
//发送USER
sprintf(m_send_buffer[threadID], "USER %s\r\n", username);
ret = FtpSendCommand(threadID,m_send_buffer[threadID]);
if(ret != 1)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 331)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
//发送PASS
sprintf(m_send_buffer[threadID], "PASS %s\r\n", password);
ret = FtpSendCommand(threadID,m_send_buffer[threadID]);
if(ret != 1)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 230)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
printf("login success.threadID=%d\r\n",threadID);
//设置为二进制模式
ret = FtpSendCommand(threadID,"TYPE I\r\n");
if(ret != 1)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
ret = FtpRecvRespond(threadID,m_recv_buffer[threadID], 1024);
if(ret != 200)
{
SocketClose(m_socket_cmd[threadID]);
return 0;
}
return 1;
}
void FtpQuit(int threadID)
{
FtpSendCommand(threadID,"QUIT\r\n");
SocketClose(m_socket_cmd[threadID]);
}
void FtpInitCmd(int threadID)
{
m_socket_cmd[threadID] = SocketCreate();
}
void FtpInitData(int threadID){
m_socket_data[threadID]= SocketCreate();
}

View File

@@ -0,0 +1,46 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: ftp_client.h
* @brief: ftp client tool
* @version: 1.0
* @author: bdislab_final
* @date: 2023/9/16
*/
#ifndef FTP_CLIENT_H
#define FTP_CLIENT_H
#define THREAD_NUM 10
/* init ftp cmd socket */
void FtpInitCmd(int threadID);
/* init ftp data socket */
void FtpInitData(int threadID);
/* quit ftp */
void FtpQuit(int threadID);
/* fpt login */
int FtpLogin(int threadID,char *addr, int port, char *username, char *password);
/* get file size */
int FtpFileSize(int threadID,char *name);
/* ftp download file*/
int FtpDownload(int threadID,char *name, void *buf, int len);
/*ftp upload*/
int FtpUpload(int threadID,char *name, void *buf, int len);
#endif

View File

@@ -0,0 +1,55 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: my_socket.c
* @brief: a abstract socket api
* @version: 1.0
* @author: bdislab_final
* @date: 2023/9/16
*/
#include "my_socket.h"
#include <sockets.h>
#include <def.h>
#include <errno.h>
#include <string.h>
int SocketCreate(void){
return socket(AF_INET,SOCK_STREAM,0);
}
int SocketConnect(int sock, const char *addr, int port){
// unsigned int iRemoteAddr = 0;
struct sockaddr_in stRemoteAddr = {0}; //对端,即目标地址信息
stRemoteAddr.sin_family = AF_INET;
stRemoteAddr.sin_port = htons(port);
stRemoteAddr.sin_addr.s_addr = inet_addr(addr);
int res = connect(sock,(struct sockaddr *)&stRemoteAddr,sizeof(stRemoteAddr));
if(res == -1){
printf("error:%d,str error:%s\n",errno,strerror(errno));
}
return res == 0 ? 1 : 0;
}
int SocketSend(int sock, void *data, int len){
return send(sock,data,len,0);
}
int SocketRecv(int sock, void *data, int len){
return recv(sock,data,len,0);
}
void SocketClose(int sock){
close(sock);
}

View File

@@ -0,0 +1,46 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file my_socket.h
* @brief a abstract socket api
* @version 1.0
* @author bdislab_final
* @date 2023/9/16
*/
#ifndef MYSOCKET_H
#define MYSOCKET_H
#ifdef __cplusplus
extern "C" {
#endif
/* create a socket */
int SocketCreate(void);
/* connect a socket */
int SocketConnect(int sock, const char *addr, int port);
/* send data through socket*/
int SocketSend(int sock, void *data, int len);
/* receive data from socket*/
int SocketRecv(int sock, void *data, int len);
/* close socket*/
void SocketClose(int sock);
#ifdef __cplusplus
}
#endif
#endif

View File

@@ -0,0 +1,5 @@
#!/bin/bash
for i in {1..10}
do
dd if=/dev/zero of="file$i" bs=4K count=1
done

View File

@@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

View File

@@ -0,0 +1,251 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: server.c
* @brief: a ftpserver
* @version: 1.0
* @author: bdislab_final
* @date: 2023/10/11
*/
#include <stdio.h>
#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <unistd.h>
#include <pthread.h>
#include <semaphore.h>
#include <errno.h>
#define THREAD_NUM 10000 // thread num
static int isBinary = 0; // transmit binary data
static int port = 9992; // service port
static int dataPort = 9993; // the port for file download
static char order[4]; // receive order
static char param[20]; // receive order param
static char *respMessage; // respose message
static int serverFd; // the server fd for deal with order requests
static int dataServerFd; // the server fd for file download
sem_t mutex; // mutex lock
struct Data{ // 线程间通信传输的数据
char fileName[20]; // file name
int type; // 0:download 1:upload
sem_t isDone; // complete file downlaod
sem_t isReady; // 文件准备好了
} data;
void RecvData(int clientFd,char param[20]){
recv(clientFd,param,20,0);
for(int i = 0;i < 20;++i){
if(param[i] == '\r'){
param[i] = '\0';
return;
}
}
return;
}
void SendMessage(int clientFd, char * respMessage){
int len = 0;
while(respMessage[len] != '\n'){
len++;
}
send(clientFd,respMessage,len+1,0);
}
int CreateServer(int port,int type) {
int serverFd = 0;
struct sockaddr_in serverAddr = {0};
socklen_t socklen = 0;
serverFd = socket(AF_INET, SOCK_STREAM, 0);
if(0 > serverFd)
{
printf("创建socket失败\n");
return 0;
}
if(type == 0){
printf("in ftp server:serverFd=%d\n",serverFd);
}else{
printf("in ftp data server:serverFd=%d\n",serverFd);
}
serverAddr.sin_family = AF_INET;
serverAddr.sin_port = htons(port);
serverAddr.sin_addr.s_addr=htonl(INADDR_ANY);
if(0 > bind(serverFd, (void *)&serverAddr, sizeof(serverAddr)))
{
printf("绑定失败!\n");
return 0;
}
if(0 > listen(serverFd, 1024))
{
printf("监听失败!\n");
return 0;
}
return serverFd;
}
// receive file's data
void* UpLoadServer(void * args){
int clientFd = *(int *) args;
char buf[4096];
int ret = recv(clientFd,buf,4096,0);
printf("ret=%d,errno=%d\n",ret,errno);
FILE * file = fopen(data.fileName,"wb");
fwrite(buf,4096,1,file);
fclose(file);
printf("upload complete for client: clientFd=%d,tid=%ld\n",clientFd,pthread_self());
// notify for file download complete
sem_post(&data.isDone);
close(clientFd);
}
// send file's data
void* DownLoadServer(void * args){
int clientFd = *(int *) args;
char buf[4096];
FILE * file = fopen(data.fileName,"rb");
fread(buf,4096,1,file);
send(clientFd,buf,sizeof(buf),0);
fclose(file);
printf("download complete for client: clientFd=%d,tid=%ld\n",clientFd,pthread_self());
// notify for file download complete
sem_post(&data.isDone);
close(clientFd);
}
// accept a client and new a thread for downlaod/upload
void* DataServer(void * args){
dataServerFd = CreateServer(dataPort,1);
while(1){
// wait for a filename
sem_wait(&data.isReady);
struct sockaddr_in clientAdrr = {0};
int socketLen = sizeof(clientAdrr);
int clientFd = accept(dataServerFd,(struct sockaddr *)&clientAdrr,&socketLen);
pthread_t thread;
if(data.type == 0){ // download
printf("accept a client for file download: clientFd=%d,tid=%ld\n",clientFd,pthread_self());
pthread_create(&thread,NULL,&DownLoadServer,&clientFd);
}else if(data.type == 1){ // upload
printf("accept a client for file upload: clientFd=%d,tid=%ld\n",clientFd,pthread_self());
pthread_create(&thread,NULL,&UpLoadServer,&clientFd);
}
// release lock
sem_post(&mutex);
}
}
// deal with order requests
void* OrderServer(void * args){
int clientFd = *(int *)args;
printf("in OrderServer thread: tid=%ld\n",pthread_self());
// order format: USER anonymous\r\n
// response code format: 213 4096\r\n
while(1){
recv(clientFd,order,4,0);
printf("order=%s,tid=%ld\n",order,pthread_self());
if(strcmp(order,"USER") == 0){
RecvData(clientFd,param);
if(strcmp(param," anonymous") == 0){
respMessage = "331 Please specify the password.\r\n";
SendMessage(clientFd,respMessage);
}
}else if(strcmp(order,"PASS") == 0){
RecvData(clientFd,param);
if(strcmp(param," anonymous") == 0){
respMessage = "230 Login successful.\r\n";
SendMessage(clientFd,respMessage);
printf("login successful in clientFd %d,tid=%ld\n",clientFd,pthread_self());
}
}else if(strcmp(order,"TYPE") == 0){
RecvData(clientFd,param);
if(strcmp(param," I") == 0){
isBinary = 1;
respMessage = "200 Switching to Binary mode.\r\n";
SendMessage(clientFd,respMessage);
}
}else if(strcmp(order,"SIZE") == 0){
RecvData(clientFd,param);
respMessage = "213 4096\r\n";
SendMessage(clientFd,respMessage);
}else if(strcmp(order,"PASV") == 0){
sem_wait(&mutex); // 锁竞争
sem_init(&data.isDone,0,0);
RecvData(clientFd,param);
char buf[50];
sprintf(buf,"227 Entering passive mode (8,140,53,225,%d,%d).\r\n",dataPort/256,dataPort%256);
respMessage = buf;
SendMessage(clientFd,respMessage);
}else if(strcmp(order,"RETR") == 0){
RecvData(clientFd,param);
sprintf(data.fileName,"./data/%s",param+2);
data.type = 0;
// notify the thread of waiting fileName
sem_post(&data.isReady);
char buf[70];
sprintf(buf,"150 Opening Binary mode data connection for %s (4096 bytes).\r\n",param+1);
respMessage = buf;
SendMessage(clientFd,respMessage);
// wait for download complete
printf("wait for download complete,tid=%ld\n",pthread_self());
sem_wait(&data.isDone);
respMessage = "226 Transfer complete.\r\n";
SendMessage(clientFd,respMessage);
}else if(strcmp(order,"STOR") == 0){
RecvData(clientFd,param);
sprintf(data.fileName,"./out/%s",param+1);
data.type = 1;
// notify the thread of waiting fileName
sem_post(&data.isReady);
char buf[70];
sprintf(buf,"150 Opening Binary mode data connection for %s (4096 bytes).\r\n",param+1);
respMessage = buf;
SendMessage(clientFd,respMessage);
// wait for upload complete
printf("wait for upload complete,tid=%ld\n",pthread_self());
sem_wait(&data.isDone);
respMessage = "226 Transfer complete.\r\n";
SendMessage(clientFd,respMessage);
}
else if(strcmp(order,"QUIT") == 0){
printf("close clientFd=%d,tid=%ld\n",clientFd,pthread_self());
close(clientFd);
break;
}
}
return NULL;
}
int main(){
serverFd = CreateServer(port,0);
sem_init(&data.isReady,0,0);
sem_init(&mutex,0,1);
pthread_t thread;
pthread_create(&thread,NULL,&DataServer,NULL);
int clientFds[THREAD_NUM];
int i = 0;
while(1){
struct sockaddr_in clientAdrr = {0};
int socketLen = sizeof(clientAdrr);
clientFds[i] = accept(serverFd,(struct sockaddr *)&clientAdrr,&socketLen);
printf("accept a client:fd=%d\n",clientFds[i]);
respMessage = "220 (myFtpServer 1.0)\r\n";
SendMessage(clientFds[i],respMessage);
printf("send welcome message successfully.\n");
pthread_t thread;
pthread_create(&thread,NULL,&OrderServer,&clientFds[i]);
i++;
}
return 0;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Some files were not shown because too many files have changed in this diff Show More