Commit Graph

716 Commits

Author SHA1 Message Date
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
wgzAIIT 69d86ef4e4 Merge pull request 'merge code' (#29) from prepare_for_master into mqtt 2023-07-27 09:16:57 +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
Liu_Weichao 077a4e1276 fix 2023 open source pr conflict 2 2023-07-26 17:54:47 +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
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 5baf461e48 Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into mqtt 2023-07-20 16:30:51 +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
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
jqy1988 2638268135 add connect framework freemodbus lib 2023-07-03 13:38:58 +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 9995980a1a 1.fix AT cmd framework bug
2.add mqtt support in the tool directory
2023-06-15 16:52:52 +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 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 d60a3475f6 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into develop 2023-06-06 09:47:36 +08:00
wgzAIIT 938d46d5d9 Modify the tcp server to send 1024 bytes each time 2023-05-31 16:28:08 +08:00
wgzAIIT 7ba883affe modify data length for 4g translation 2023-05-29 19:43:59 +08:00
Yao15921243763 f82d6d0c24 2023_open_source_contest_warmup_1st_issue1 2023-05-26 11:30:56 +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 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
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
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
Wien.b c4510ba3e1 add xinje and schneider readme 2023-05-11 19:43:39 -07:00
xuedongliang 48decbe80f fix compile bug for test apps from Mo_jiayang
it is OK
2023-05-10 10:12:52 +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
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
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
Jeremy 692e010e0d fix compile bug 2023-04-20 18:02:50 +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
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 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
Liu_Weichao 95b049e636 feat support lorawan_devicenode submodule 2023-03-31 14:14:54 +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
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 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
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 27ad06f4c1 readme update in cmsis-nn demo 2023-02-27 17:18:35 +08:00
wuzheng d7e72942b5 cmsis runtime complement for XiZi 2023-02-27 14:19:04 +08:00
wuzheng 9b3c321150 add makefiles to adapt nnom and cmsis-nn for xizi 2023-02-24 15:47:49 +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 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
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
wuzheng e6fa8a2603 code simplified and delete some unused 2023-02-06 16:34:46 +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
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
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
Liu_Weichao 8001b07341 fix Calculte error 2023-01-10 17:49:20 +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
Liu_Weichao e4742a480c feat add modbus uart protocol for control framework, compile OK 2023-01-04 17:14:01 +08:00
Liu_Weichao 6010fe5654 feat add melsec tcp protocol for control framework, compile OK 2022-12-29 16:35:23 +08:00
WuZheng 0b5c6b0f9f fix bugs that e220 initialize death 2022-12-20 15:15:35 +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
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
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
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
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
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
Liu_Weichao 0b49dd1a3c feat add melsec protocol for control framework 2022-11-29 17:11:51 +08:00
wuzheng 100fe8c2d0 add w5500 test example 2022-11-29 09:30:48 +08:00
wgzAIIT f1029b81c3 fix compile error for makefile 2022-11-25 13:31:38 +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
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 bc47ae644f feat add control_framework, read json file OK 2022-11-24 10:46:54 +08:00
wuzheng c1976c8d92 fix errors of naming function 2022-11-22 15:57:33 +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 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 06ed03337a add camera driver and examples for edu-riscv64 2022-11-18 20:20: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