Commit Graph

1169 Commits

Author SHA1 Message Date
Liu_Weichao a7d3e92357 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into connection 2023-11-28 16:55:16 +08:00
Liu_Weichao 8a8a513cf1 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into connection 2023-11-28 11:10:45 +08:00
jqy1988 e5e654988b 1.add panasonic fpxh plc test app 2.add panasonic fpxh plc readme file 2023-11-24 10:23:24 +08:00
jqy1988 81924837dd Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into control 2023-11-22 15:54:15 +08:00
wgzAIIT a92dc71ce4 Modify the header file to include 2023-11-21 08:40:57 +08:00
wgz d0bf9c9564 add Mulan PSL v2 2023-11-20 21:11:55 +08:00
wgzAIIT b2fef14aef Update flash_for_ota.h 2023-11-20 20:23:46 +08:00
wgzAIIT 8c1423f50e modify ota function dir 2023-11-20 17:10:28 +08:00
wgzAIIT 55ce48e0ba Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-11-20 14:36:31 +08:00
Liu_Weichao 6d7250d4fd modify ota dir to fix conflict 2023-11-20 13:21:15 +08:00
Liu_Weichao 94d3d37a19 feat add 4G function for xishutong-arm32 board 2023-11-20 10:36:47 +08:00
Liu_Weichao 88e8cc4193 modify ota function dir 2023-11-20 10:31:04 +08:00
Liu_Weichao 270d2b9ea3 feat add xishutong-arm32 board for XiZi kernel 2023-11-20 10:22:08 +08:00
wgzAIIT ba81c73a06 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-11-20 08:31:29 +08:00
IACU 50d8ff5488 feat add Ubiquitous/XiZi_Micro DIR and delete useless yaml files from Liu_Weichao
it is ok
2023-11-17 19:43:27 +08:00
TXuian e0e314e301 Add xishutong-arm32 BSP 2023-11-16 17:07:42 +08:00
wgzAIIT af33a3289c Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-11-13 15:12:37 +08:00
Liu_Weichao b2ab878a33 Merge branch 'connection' of https://gitlink.org.cn/IACU/xiuos into connection 2023-11-13 11:05:33 +08:00
TXuian 0f2e05aed4 Add mongoose 2023-11-09 17:25:03 +08:00
TXuian 71e3c8a654 Add mongoose, add xishutong-arm32. 2023-11-09 17:21:13 +08:00
huang 892bef64e9 解决CJson编译及LWIP不能访问外网问题 2023-11-06 13:59:26 +08:00
Liu_Weichao 79d627a969 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into connection 2023-11-02 15:50:32 +08:00
wgzAIIT 9b3f219b01 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-11-02 15:18:23 +08:00
Liu_Weichao d255ffaee5 Merge branch 'master' of https://gitlink.org.cn/IACU/xiuos 2023-11-01 16:45:13 +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
Wien.b b82bdaea6b move freemodbus tcp server from control to connetion 2023-10-16 02:34:04 -07:00
jqy1988 9a210fa9db fix temminal and plc communication err 103 2023-10-13 15:07:04 +08:00
Liu_Weichao 6db0eccbe5 feat add Ubiquitous/XiZi_Micro DIR and delete useless yaml files 2023-10-13 13:54:23 +08:00
wgzAIIT e90c465a23 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-10-13 09:39:45 +08:00
Liu_Weichao 719b02a3e7 feat support freemodbus from [https://github.com/RT-Thread-packages/freemodbus/tree/master:a7a61d5], compile OK 2023-10-12 20:04:13 +08:00
Liu_Weichao 2b44a0c6fb feat add dev_recv_callback for uart in APP_Framework 2023-10-12 19:58:24 +08:00
wgz-code c96376ea25 Merge branch 'xidatong-arm32' into jerryscript 2023-10-12 14:30:03 +08:00
wgz-code 37764d4501 delete unused files 2023-10-12 14:19:27 +08:00
wgzAIIT 267707c920 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-10-12 10:34:03 +08:00
wgzAIIT 29b15812b7 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-10-12 10:30:30 +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
Wien.b 51299c6b79 add CIP Protocol 2023-10-11 02:22:00 -07:00
huang 3f1be486cf remove aiot 2023-10-11 17:20:52 +08:00
huang c17c899ea7 add m7 readme 2023-10-11 17:08:19 +08:00
wgzAIIT fa439abd68 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-10-11 17:03:32 +08:00
Wien.b 242c7d66d2 Merge remote-tracking branch 'upstream/prepare_for_master' into prepare_for_master 2023-10-11 01:56:03 -07:00
wgzAIIT 4f4bbc1d68 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-10-11 16:51:55 +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
Wien.b 62e3006e1a add frermodbustcp server 2023-10-11 01:29:22 -07:00
Liu_Weichao f962cf6919 fix timer bug in posix_support for XiZi kernel 2023-10-11 09:34:14 +08:00
wgzAIIT 8c86c3c574 Merge remote-tracking branch 'origin/xidatong-arm32' into jerryscript 2023-10-07 15:06:04 +08:00
wgzAIIT dbfa37bf44 add ota error_message for platform 2023-10-07 14:57:40 +08:00
wgzAIIT 29853ef76d Merge branch 'xidatong-arm32' into jerryscript 2023-10-07 10:34:44 +08:00
wgzAIIT 5b62808e28 add ota error_message for platform 2023-10-07 10:05:46 +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
wgzAIIT 987622d1e3 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-09-26 17:08:55 +08:00
wgzAIIT a473111e5d Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into xidatong-arm32 2023-09-26 17:05:26 +08:00
wgzAIIT 3437bfdc19 Merge pull request 'merge code' (#63) from xidatong-arm32 into jerryscript 2023-09-26 17:03:15 +08:00
wgzAIIT 98587d876d Optimize ota progress display 2023-09-26 16:06:51 +08:00
huang e745fc9129 aiot cache codes 2023-09-26 10:33:24 +08:00
wgzAIIT 6bbf1e2c4c Merge pull request 'merge code' (#61) from xidatong-arm32 into jerryscript 2023-09-25 09:18:26 +08:00
wgzAIIT c2abf66f23 OTA prints prompt message when upgrade is not required 2023-09-22 15:04:10 +08:00
wgzAIIT d14272c55f Merge remote-tracking branch 'origin/xidatong-arm32' into jerryscript 2023-09-21 13:45:21 +08:00
wgzAIIT aa3e6c9370 1、Optimize mqtt transfer speed 3k/s
2、add json file to sd card by mqtt
3、check the sd card is mounted successfully
2023-09-21 13:40:19 +08:00
wgzAIIT f7d0b0925c Merge pull request 'merge code' (#59) from xidatong-arm32 into jerryscript 2023-09-21 11:13:15 +08:00
wgzAIIT b41a1709c6 json file download needs to check whether the sd card is mounted successfully 2023-09-21 11:10:36 +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
wgzAIIT 0b1489cfed Merge pull request 'merge code' (#56) from xidatong-arm32 into jerryscript 2023-09-20 16:11:36 +08:00
wgzAIIT 9fd61d3d2a 1、Optimize mqtt transfer speed 3k/s
2、add json file to sd card by mqtt
2023-09-20 14:37:42 +08:00
wgzAIIT 60a7835ef8 Modify the return value of the mqtt function 2023-09-19 09:22:26 +08:00
wgzAIIT 5ef61d14b1 1、Verify file size before ota file transfer
2、update MQTT connection parameter configuration
2023-09-18 18:28:01 +08:00
wgzAIIT 474557a5ac 1、Optimize ota Bootloader function
2、add reboot after flash copy
2023-09-14 16:07:16 +08:00
wgzAIIT e61ffc4589 Optimize ota transfer function 2023-09-12 09:32:14 +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
wgzAIIT e8061577da Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into jerryscript 2023-09-11 10:12:03 +08:00
wgzAIIT 652e5789a7 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-arm32 2023-09-11 10:05:37 +08:00
IACU 83681208ec ota project related from Wang_guozhu
it is OK
2023-09-11 10:04:00 +08:00
wgzAIIT 5da9a9c4ae 1、Optimize transmission string matching rules
2、change Kconfig for mqtt and ota
2023-09-08 17:32:43 +08:00
wgzAIIT 117789121e Optimize ota transfer function 2023-09-08 10:08:26 +08:00
wgzAIIT bad8dc0fc2 1、add support xiuos platform for ota
2、change Kconfig for mqtt and Modify variable name
3、change ota functions for support xiuos platform
2023-09-07 16:53:20 +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
wgzAIIT f24a0f2d47 change Kconfig for JerryScript 2023-09-05 15:23:21 +08: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
wgzAIIT 29499a1ec3 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into jerryscript 2023-08-29 11:01:41 +08:00
Liu_Weichao 5bb0f2aaf5 add plc data store function for control framework 2023-08-28 16:15:32 +08:00
wgzAIIT 2ae328c773 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into jerryscript 2023-08-28 08:41: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
涂煜洋 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 23b938f242 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-08-24 10:16:43 +08:00
Jiang Yufan 0f32060aea Fix: mergebin.py generate .bin file according to board 2023-08-23 13:53:04 +08:00
Jiang Yufan 48c40541f9 I2C driver update 2023-08-22 14:47: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 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
wgzAIIT 9e031ecee0 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into jerryscript 2023-08-17 19:15:34 +08: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
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
涂煜洋 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
涂煜洋 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
Liu_Weichao 5f642507b4 fix adc/dac funciton error on edu-arm32 baord 2023-08-09 15:10:11 +08:00
wgzAIIT 544b0bcba4 Merge pull request 'merge code' (#40) from prepare_for_master into jerryscript 2023-08-09 12:16:28 +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 bb0fb51e7e support jerryscript on edu-arm32 board and add test case 2023-08-09 10:29:03 +08:00
wgzAIIT fa2c91e690 1、git submodule add jerryscript v2.4.0
2、support JerryScript on XiZi for stm32f407-st-discovery board and cortex-m4-emulator
2023-08-08 15:02:48 +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
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
涂煜洋 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
涂煜洋 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
涂煜洋 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
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
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
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