Commit Graph

71 Commits

Author SHA1 Message Date
Wien.b cd759ccc83 Merge branch 'prepare_for_master' of https://gitlink.org.cn/xuos/xiuos into prepare_for_master 2023-12-26 22:10:09 -08:00
wien.b cfe2cece57 Modify the CAN display problem 2023-12-20 17:43:45 +08:00
wien.b 76868729bf delete useless file 2023-12-20 14:10:41 +08:00
Liu_Weichao 3378579d9e 1、fix uart dev_recv_callback not init error;2、fix app_test compile error. 2023-11-28 11:11:53 +08:00
Wien.b d3c7d7ce9f add three PLC test demo and readme 2023-11-23 23:23:08 -08:00
Wien.b b82bdaea6b move freemodbus tcp server from control to connetion 2023-10-16 02:34:04 -07:00
Liu_Weichao d4b47088d2 update lorawan submodule, fix create event bug 2023-10-12 19:56:32 +08:00
Wien.b a247de691c modify CIP stack overflow 2023-10-12 00:46:15 -07:00
Wien.b 51299c6b79 add CIP Protocol 2023-10-11 02:22:00 -07:00
Wien.b 242c7d66d2 Merge remote-tracking branch 'upstream/prepare_for_master' into prepare_for_master 2023-10-11 01:56:03 -07:00
Wien.b 38481e2ae2 modify s7 read value num 2023-10-11 01:39:36 -07:00
Liu_Weichao 58fe8fc887 feat support set task name using PrivTaskCreate in XiZi 2023-09-27 17:05:27 +08:00
Liu_Weichao 5bb0f2aaf5 add plc data store function for control framework 2023-08-28 16:15:32 +08:00
Liu_Weichao 1c775d42f6 fix adapter lora bug on edu-arm32 board 2023-08-24 14:38:24 +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 cf85c4b99c fix ADD_XIZI_FETURES/ADD_NUTTX_FETURES/ADD_RTTHREAD_FETURES error 2023-06-20 13:20:41 +08: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
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 2b3f3de22e feat add control device struct in control framework 2023-04-18 17:05:11 +08: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
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
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 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 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
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
Liu_Weichao 59fa5451ca feat add modbus tcp write function and fix modbus tcp bug 2022-12-13 17:25:37 +08:00
Liu_Weichao 56a014fe98 feat add modbus tcp protocol for control framework 2022-12-13 11:19:11 +08:00
Liu_Weichao 0b49dd1a3c feat add melsec protocol for control framework 2022-11-29 17:11:51 +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
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
Liu_Weichao 5560fc5318 feat add control_framework, support fins protocol, compile OK 2022-11-21 17:20:44 +08:00
Wang_Weigen a154353bbe sync the upstream branch 2022-09-28 09:51:12 +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
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
Liu_Weichao dbca22a1a6 feat support PRIV_SHELL_CMD_FUNCTION to fit heterogeneous OS 2022-09-26 17:04:04 +08:00
wlyu 267aacc9a3 remove unnecessary debug 2022-03-31 14:03:27 +08:00
wlyu ef28f3057a optimize plc motor test and fix the lwip mutex and sem error 2022-03-31 11:27:16 +08:00
wlyu bb5f82d303 fixed the bug of OPCUA free buffer and uart not response 2022-03-30 18:49:08 +08:00
wlyu 3b8c9a8ed4 format OPUCA codes and optimize demo cases 2022-03-23 19:21:44 +08:00
wlyu f74d1dafd7 optimize the codes with lwip and opcua 2022-03-21 16:47:32 +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