Commit Graph

1628 Commits

Author SHA1 Message Date
wgzAIIT a868ed3238 Merge pull request 'merge code' (#43) from mqtt into xidatong-arm32 2023-08-09 12:19:03 +08:00
wgzAIIT 20113601e7 Merge pull request 'merge code' (#41) from prepare_for_master into xidatong-arm32 2023-08-09 12:16:22 +08:00
wgzAIIT ed67ff5c62 Merge pull request 'merge code' (#42) from prepare_for_master into mqtt 2023-08-09 12:16:16 +08:00
xxq250 8c1ad40f81 Update README.md 2023-08-09 11:13:42 +08:00
xxq250 5510123098 更新 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md' 2023-08-09 11:09:53 +08:00
xxq250 d6e7637128 更新 'Ubiquitous/XiZi_IIoT/board/cortex-m4-emulator/README.md' 2023-08-09 11:09:00 +08:00
xxq250 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
wgzAIIT e2edd918c3 Merge pull request 'merge code' (#37) from mqtt into xidatong-arm32 2023-08-08 14:26:42 +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 91ddfea1ed Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-arm32 2023-08-08 08:57:35 +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 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
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
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
Liu_Weichao 3efe663ee0 update lorawan submodule commit 2023-08-03 15:40:11 +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
wgzAIIT 2e4eb538b9 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-arm32 2023-07-28 09:09:04 +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 4d56788af3 Merge branch 'mqtt' into xidatong-arm32 2023-07-27 11:06:05 +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
wgzAIIT 0f5546a679 Merge pull request 'merge code' (#33) from prepare_for_master into xidatong-arm32 2023-07-27 10:48:21 +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 b580f6b377 Merge pull request 'merge code' (#30) from prepare_for_master into xidatong-arm32 2023-07-27 09:16:48 +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