Merge branch 'control_framework' of https://git.trustie.net/IACU/xiuos into control_framework

APP_Framework/Applications/control_app/plc_demo/Makefile

@@ -1,3 +1,3 @@
-SRC_DIR := advantech beckhoff br delta mitsubishi omron schneider siemens
+SRC_DIR := advantech beckhoff br delta mitsubishi omron schneider siemens xinje
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/control_app/plc_demo/omron/Makefile

@@ -1,3 +1,3 @@
-SRC_FILES := omron_cj2m.c omron_nj501.c omron_nx102.c
+SRC_FILES := omron_cj2m.c omron_nj501.c omron_nx102.c omron_cp1h.c omron_cp1l.c
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/control_app/plc_demo/omron/omron_cp1h.c

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 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 omron_cj2m.c
+ * @brief PLC OMRON CJ2M app
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2022.9.27
+ */
+

APP_Framework/Applications/control_app/plc_demo/omron/omron_cp1l.c

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 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 omron_.cp1l.c
+ * @brief PLC OMRON CP1L app
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2023.2.10
+ */
+#include <control.h>
+
+void ControlOmronCP1LTest(void)
+{
+    int i = 0;
+    uint16_t read_data_length = 0;
+    uint8_t read_data[1024] = {0};
+    ControlProtocolType fins_protocol = ControlProtocolFind();
+    if (NULL == fins_protocol) {
+        printf("%s get fins protocol %p failed\n", __func__, fins_protocol);
+        return;
+    }
+
+    printf("%s get fins protocol %p successfull\n", __func__, fins_protocol);
+
+    if (CONTROL_REGISTERED == fins_protocol->protocol_status) {
+        ControlProtocolOpen(fins_protocol);
+
+        for (;;) {
+            read_data_length = ControlProtocolRead(fins_protocol, read_data, sizeof(read_data));
+            printf("%s read [%d] fins data %d using receipe file\n", __func__, i, read_data_length);
+            i++;
+            PrivTaskDelay(100000);
+        }
+
+        //ControlProtocolClose(fins_protocol);
+    }
+}
+PRIV_SHELL_CMD_FUNCTION(ControlOmronCP1LTest, Omron Plc FINS Demo, PRIV_SHELL_CMD_MAIN_ATTR);

APP_Framework/Applications/control_app/plc_demo/schneider/m241_recipe.json

@@ -0,0 +1,30 @@
+{
+    "device_id": 1,
+    "device_name": "m241",
+    "communication_type": 1,
+    "serial_config": {
+        "station": 1,
+        "baud_rate": 9600,
+        "data_bits": 8,
+        "stop_bits": 1,
+        "check_mode": 3
+    },
+    "protocol_type": 3,
+    "read_period": 100,
+    "read_item_list": [
+        {
+            "value_name": "MW0",
+            "value_type": 3,
+            "function_code": 3,
+            "start_address": 0,
+            "quantity": 1
+        },
+        {
+            "value_name": "MW1",
+            "value_type": 3,
+            "function_code": 3,
+            "start_address": 1,
+            "quantity": 1
+        }
+    ]
+}

APP_Framework/Applications/control_app/plc_demo/schneider/schneider_m241.c

@@ -15,9 +15,50 @@
  * @brief PLC SCHNEIDER M241 app
  * @version 3.0
  * @author AIIT XUOS Lab
- * @date 2022.9.27
+ * @date 2023.2.1
  */
 
-
+#include <control.h>
+
+extern int Adapter4GActive(void);
+
+void ControlM241Test(void)
+{
+    int i, j = 0;
+    int read_data_length = 0;
+    uint8_t read_data[128] = {0};
+
+    #ifdef CONNECTION_ADAPTER_4G
+        Adapter4GActive();
+    #endif
+
+    ControlProtocolType modbus_rtu_protocol = ControlProtocolFind();
+    if (NULL == modbus_rtu_protocol) {
+        printf("%s get modbus rtu protocol %p failed\n", __func__, modbus_rtu_protocol);
+        return;
+    }
+
+    printf("%s get modbus rtu protocol %p successfull\n", __func__, modbus_rtu_protocol);
+
+    if (CONTROL_REGISTERED == modbus_rtu_protocol->protocol_status) {
+        ControlProtocolOpen(modbus_rtu_protocol);
+
+        for (;;) {
+            read_data_length = ControlProtocolRead(modbus_rtu_protocol, read_data, sizeof(read_data));
+            printf("%s read [%d] modbus rtu data %d using receipe file\n", __func__, i, read_data_length);
+            if (read_data_length) {
+                for (j = 0; j < read_data_length; j ++) {
+                    printf("j %d data 0x%x\n", j, read_data[j]);
+                }
+            }
+            i++;
+            memset(read_data, 0, sizeof(read_data));
+            PrivTaskDelay(10000);
+        }
+
+        //ControlProtocolClose(modbus_rtu_protocol);
+    }
+}
+PRIV_SHELL_CMD_FUNCTION(ControlM241Test, Schneider M241 Demo, PRIV_SHELL_CMD_MAIN_ATTR);
 
 

APP_Framework/Applications/control_app/plc_demo/xinje/Makefile

@@ -0,0 +1,3 @@
+SRC_FILES := xsdh-60a32-e.c xdh-60t4-e.c
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/control_app/plc_demo/xinje/xdh-60t4-e.c

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022 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 mitsubishi_fx3u.c
+ * @brief PLC MITSUBISHI FX3U app
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2023.2.1
+ */
+

APP_Framework/Applications/control_app/plc_demo/xinje/xsdh-60a32-e.c

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 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 mitsubishi_fx3u.c
+ * @brief PLC MITSUBISHI FX3U app
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2023.3.1
+ */