3977 changed files with 325717 additions and 901094 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -22,6 +22,9 @@
 [submodule "Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source"]
 	path = Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/kendryte-sdk/kendryte-sdk-source
 	url = https://www.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git
+[submodule "APP_Framework/lib/lorawan/lora_radio_driver"]
+	path = APP_Framework/lib/lorawan/lora_radio_driver
+	url = https://gitlink.org.cn/xuos/lora_radio_driver
 [submodule "APP_Framework/lib/lorawan/lorawan_devicenode"]
 	path = APP_Framework/lib/lorawan/lorawan_devicenode
 	url = https://gitlink.org.cn/xuos/lorawan_devicenode.git
--- a/APP_Framework/Applications/Kconfig
+++ b/APP_Framework/Applications/Kconfig
@ -20,5 +20,4 @@ menu "Applications"
    source "$APP_DIR/Applications/sensor_app/Kconfig"
    source "$APP_DIR/Applications/embedded_database_app/Kconfig"
    source "$APP_DIR/Applications/webnet/Kconfig"
-    source "$APP_DIR/Applications/webserver/Kconfig"
 endmenu
--- a/APP_Framework/Applications/Makefile
+++ b/APP_Framework/Applications/Makefile
@ -39,10 +39,6 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
    ifeq ($(CONFIG_APP_USING_WEBNET),y)
        SRC_DIR += webnet
    endif
-    
-    ifeq ($(CONFIG_APPLICATION_WEBSERVER),y)
-        SRC_DIR += webserver
-    endif

    include $(KERNEL_ROOT)/compiler.mk
 endif
--- a/APP_Framework/Applications/app_test/Kconfig
+++ b/APP_Framework/Applications/app_test/Kconfig
@ -281,7 +281,6 @@ menu "test app"
            menuconfig USER_TEST_MQTTCLIENT
                bool "Config test mqtt client"
                default n
-                select LIB_USING_CJSON

            menuconfig USER_TEST_FTPCLIENT
                bool "Config test ftp client"
--- a/APP_Framework/Applications/app_test/Makefile
+++ b/APP_Framework/Applications/app_test/Makefile
@ -150,9 +150,7 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
    endif

 	ifeq ($(CONFIG_USER_TEST_FTPCLIENT_RISCV),y)
-        ifeq ($(CONFIG_BSP_USING_W5500),y)
-            SRC_FILES += test_ftpclient_riscv/test_ftpclient_riscv.c
-        endif 
+        SRC_FILES += test_ftpclient_riscv/test_ftpclient_riscv.c
    endif

    ifeq ($(CONFIG_USER_TEST_LORA_P2P),y)
--- a/APP_Framework/Applications/app_test/test_4g_ec200a.c
+++ b/APP_Framework/Applications/app_test/test_4g_ec200a.c
@ -1,162 +0,0 @@
-/*
-* Copyright (c) 2020 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 test_4g_ec200a.c
- * @brief Implement the connection 4G function, using QUECTEL EC200A device
- * @version 1.1
- * @author AIIT XUOS Lab
- * @date 2023.10.15
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <transform.h>
-
-#ifdef ADD_XIZI_FEATURES
-
-char *trans_data = "{\"saleid\": \"52330000MJ87322565\", \"gateid\": \"10100001011\", \"type\": \"report\", \"time\": \"2023-06-15 17:22:00\", \"sequence\": \"268\", \"source\": \"da\", \"meter\": [{\"id\": \"T100106\", \"status\": \"1\", \"name\": \"T100106\", \"values\": {}}]}\r\n";
-// const char chk_buad[] = {"AT+IPR?\r\n"};
-const char set_mode[] = {"AT+QMTCFG=\"recv/mode\",0,0,1\r\n"};
-// const char set_cfg[] = {"AT+QMTCFG=\"aliauth\",0,\"k0celEMx5DK\",\"test_device\",\"411aa14c0dc671f7ee869adced442d13\"\r\n"};
-const char set_server[] = {"AT+QMTOPEN=0,\"xyheqmx.e3.luyouxia.net\",13333\r\n"};
-// const char set_server[] = {"AT+QMTOPEN=0,\"iot-060a7p7c.mqtt.iothub.aliyuncs.com\",1883\r\n"};
-const char set_conn[] = {"AT+QMTCONN=0,\"quectel\",\"test\",\"test123456\"\r\n"};
-// const char set_conn[] = {"AT+QMTCONN=0,\"sysoul\"\r\n"};
-// const char set_get[] = {"AT+QMTSUB=0,1,\"/get\",0\r\n"};
-// const char set_reply[] = {"AT+QMTPUBEX=0,0,0,0,\"/reply\",1000\r\n"};
-char recv_buf[100] = {0};
-int buf_len = 0;
-
-
-void Test4G(void)
-{
-    int quectel_fd = PrivOpen(ADAPTER_QUECTEL_DRIVER, O_RDWR);
-    if (quectel_fd < 0) {
-        printf("open quectel fd error:%d\n", quectel_fd);
-        return;
-    }
-    printf("quectel fopen success\n");
-
-    struct SerialDataCfg quectel_cfg;
-    memset(&quectel_cfg, 0, sizeof(struct SerialDataCfg));
-    quectel_cfg.serial_baud_rate = BAUD_RATE_115200;
-    quectel_cfg.serial_data_bits = DATA_BITS_8;
-    quectel_cfg.serial_stop_bits = STOP_BITS_1;
-    quectel_cfg.serial_parity_mode = PARITY_NONE;
-    quectel_cfg.serial_bit_order = BIT_ORDER_LSB;
-    quectel_cfg.serial_invert_mode = NRZ_NORMAL;
-    // quectel_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
-    quectel_cfg.serial_buffer_size = 1024;
-    quectel_cfg.serial_timeout = 1000;
-    quectel_cfg.is_ext_uart = 0;
-    // quectel_cfg.ext_uart_no = ADAPTER_QUECTEL_DRIVER_EXT_PORT;
-    // quectel_cfg.port_configure = PORT_CFG_INIT;
-
-    struct PrivIoctlCfg ioctl_cfg;
-    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
-    ioctl_cfg.args = &quectel_cfg;
-    if (0 != PrivIoctl(quectel_fd, OPE_INT, &ioctl_cfg)) {
-        printf("ioctl quectel fd error %d\n", quectel_fd);
-        PrivClose(quectel_fd);
-        return;
-    }
-
-    printf("4G module set\n");
-
-    // memset(recv_buf, 0, sizeof(recv_buf));
-    // printf("chk_buad: %s\n", chk_buad);
-    // printf("chk_buad_len: %d\n", strlen(chk_buad));
-    // PrivWrite(quectel_fd, chk_buad, strlen(chk_buad));
-    // PrivTaskDelay(30);
-    // buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-    // printf("buf_len: %d\n", buf_len);
-    // printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-    // PrivTaskDelay(1000);
-
-    memset(recv_buf, 0, sizeof(recv_buf));
-    printf("set_mode: %s\n", set_mode);
-    printf("set_mode_len: %d\n", strlen(set_mode));
-    PrivWrite(quectel_fd, set_mode, strlen(set_mode));
-    PrivTaskDelay(30);
-    buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-    printf("buf_len: %d\n", buf_len);
-    printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-    PrivTaskDelay(1000);
-
-    // memset(recv_buf, 0, sizeof(recv_buf));
-    // printf("set_cfg: %s\n", set_cfg);
-    // printf("set_cfg_len: %d\n", strlen(set_cfg));
-    // PrivWrite(quectel_fd, set_cfg, strlen(set_cfg));
-    // PrivTaskDelay(30);
-    // buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-    // printf("buf_len: %d\n", buf_len);
-    // printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-    // PrivTaskDelay(1000);
-
-    memset(recv_buf, 0, sizeof(recv_buf));
-    printf("set_server: %s\n", set_server);
-    printf("set_server_len: %d\n", strlen(set_server));
-    PrivWrite(quectel_fd, set_server, strlen(set_server));
-    PrivTaskDelay(30);
-    buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-    printf("buf_len: %d\n", buf_len);
-    printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-    PrivTaskDelay(1000);
-    
-    memset(recv_buf, 0, sizeof(recv_buf));
-    printf("set_conn: %s\n", set_conn);
-    printf("set_conn_len: %d\n", strlen(set_conn));
-    PrivWrite(quectel_fd, set_conn, strlen(set_conn));
-    PrivTaskDelay(30);
-    buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-    printf("buf_len: %d\n", buf_len);
-    printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-    PrivTaskDelay(1000);
-
-    while (1) {
-        printf("start send\n");
-        char set_reply[50] = {"AT+QMTPUBEX=0,0,0,0,\"/reply\","};
-        char data_len_str[20];
-        sprintf(data_len_str, "%d", strlen(trans_data));
-        printf("data_len_str: %s\n", data_len_str);
-        strcat(set_reply, data_len_str);
-        strcat(set_reply, "\r\n");
-
-        memset(recv_buf, 0, sizeof(recv_buf));
-        printf("set_reply: %s\n", set_reply);
-        printf("set_reply_len: %d\n", strlen(set_reply));
-        PrivWrite(quectel_fd, set_reply, strlen(set_reply));
-        PrivTaskDelay(30);
-        buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-        printf("buf_len: %d\n", buf_len);
-        printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-        PrivTaskDelay(500);
-       
-        memset(recv_buf, 0, sizeof(recv_buf));
-        printf("send_data: %s\n", trans_data);
-        printf("send_data_len: %d\n", strlen(trans_data));
-        PrivWrite(quectel_fd, trans_data, strlen(trans_data));
-        PrivTaskDelay(30);
-        buf_len = PrivRead(quectel_fd, recv_buf, sizeof(recv_buf));
-        printf("buf_len: %d\n", buf_len);
-        printf("[%s] Info: Recv from uart: %s\n", __func__, recv_buf);
-        PrivTaskDelay(5000);
-    }
-
-    PrivClose(quectel_fd);
-    
-    return;
-}
-
-PRIV_SHELL_CMD_FUNCTION(Test4G, a quectel test sample, PRIV_SHELL_CMD_MAIN_ATTR);
-#endif
--- a/APP_Framework/Applications/app_test/test_can.c
+++ b/APP_Framework/Applications/app_test/test_can.c
@ -18,7 +18,6 @@
 * @date:    2023/2/17
 */
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <transform.h>
 #ifdef ADD_XIZI_FEATURES
@ -55,34 +54,28 @@ void TestCAN(void)
    }
    printf("CAN configure successful!\n");

-    uint8_t data_buff[64u] = "12344321";
+    uint8_t data_buff[64u] = {1,2,3,4,4,3,2,1};
    struct CanSendConfigure frame_send;
    frame_send.ide=0;
    frame_send.stdid = 0x55;
    frame_send.rtr=0;
    frame_send.data_lenth=8;
+    frame_send.data = data_buff;

    struct CanSendConfigure frame_recv;
-    uint8_t recv_buff[64u] = {};
+    uint8_t recv_buff[65U] = {0};
    frame_recv.data = recv_buff;

    // CAN write
    while (1)
    {
-        // PrivTaskDelay(500);
-        // PrivWrite(can_fd, &frame_send, NONE);
-        // PrivTaskDelay(500);
+        PrivTaskDelay(500);
+        PrivWrite(can_fd, &frame_send, NONE);
+        PrivTaskDelay(500);
        PrivRead(can_fd, &frame_recv, NONE);
        // if any data has received,Then printf message
        if(frame_recv.data_lenth > 0){
-            printf("ID %08x : \n",frame_recv.exdid);
-            for(int i = 0; i < frame_recv.data_lenth; i ++) {
-                printf("0x%x ", frame_recv.data[i]);
-            }
-            printf("\n");
-
-            frame_send.data = recv_buff;
-            PrivWrite(can_fd, &frame_send, NONE);
+            printf("ID %08x:%s\n",frame_recv.exdid,frame_recv.data);
        }
    }

--- a/APP_Framework/Applications/app_test/test_ethernet.c
+++ b/APP_Framework/Applications/app_test/test_ethernet.c
@ -22,7 +22,6 @@
 #include <transform.h>
 #ifdef ADD_XIZI_FEATURES

-#ifdef BSP_USING_W5500
 #include <socket.h>

 #define BUFF_SIZE 128
@ -190,6 +189,6 @@ PRIV_SHELL_CMD_FUNCTION(TestSocketAsClient, a w5500 client-ip-port-msg test samp


 #endif
-#endif
+

 #endif
--- a/APP_Framework/Applications/app_test/test_hwtimer.c
+++ b/APP_Framework/Applications/app_test/test_hwtimer.c
@ -22,7 +22,7 @@
 #include <transform.h>
 #ifdef ADD_XIZI_FEATURES

-#define BSP_LED_PIN 134
+#define BSP_LED_PIN 29
 #define NULL_PARAMETER 0

 static uint16_t pin_fd=0;
@ -30,7 +30,6 @@ static struct PinStat pin_led;

 void LedFlip(void *parameter)
 {
-    printf("%s val %d time %d\n", __func__, pin_led.val, PrivGetTickTime());
    pin_led.pin = BSP_LED_PIN;
    pin_led.val = !pin_led.val;
    PrivWrite(pin_fd, &pin_led, NULL_PARAMETER);
@ -38,7 +37,7 @@ void LedFlip(void *parameter)

 void TestHwTimer(void)
 {
-    uint32_t period_ms = 500;
+    x_ticks_t period = 1;
    
    pin_fd = PrivOpen(HWTIMER_PIN_DEV_DRIVER, O_RDWR);
    if(pin_fd<0) {
@ -76,7 +75,7 @@ void TestHwTimer(void)
        return;
    }    

-    ioctl_cfg.args = (void *)&period_ms;
+    ioctl_cfg.args = (void *)&period;
    if (0 != PrivIoctl(timer_fd, OPE_CFG, &ioctl_cfg)) {
        printf("timer pin fd error %d\n", pin_fd);
        PrivClose(pin_fd);
--- a/APP_Framework/Applications/app_test/test_loraE220.c
+++ b/APP_Framework/Applications/app_test/test_loraE220.c
@ -98,7 +98,6 @@ void TestLora(int argc, char *argv[])
    uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
    uart_cfg.serial_timeout = 1000;
    uart_cfg.is_ext_uart = 0;
-    uart_cfg.dev_recv_callback = NULL;

    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
    ioctl_cfg.args = (void *)&uart_cfg;
--- a/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c
+++ b/APP_Framework/Applications/app_test/test_lora_net_final/lora_driver/e220.c
@ -62,7 +62,6 @@ static struct SerialDataCfg serial_cfg =
    .serial_buffer_size = SERIAL_RB_BUFSZ,
    .serial_timeout = E220_DAFAULT_SERIAL_TIMEOUT,     // 串口超时配置
    .is_ext_uart = 0,
-    .dev_recv_callback = NULL,
 };

 enum LoraMode current_mode = -1;                       // 当前模块处于什么模式
--- a/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c
+++ b/APP_Framework/Applications/app_test/test_mqttclient/test_mqttclient.c
@ -569,7 +569,7 @@ int32_t MQTTMsgPublish(int32_t sock, char *topic, int8_t qos, uint8_t* msg)
 		uint8_t buf[MSG_MAX_LEN];
 		int32_t buflen = sizeof(buf),len;
 		MQTTString topicString = MQTTString_initializer;
-	  uint16_t packid = 0,packetidbk = 0;
+	  uint16_t packid = 0,packetidbk;
 	
 		//填充主题
 	  topicString.cstring = (char *)topic;
--- a/APP_Framework/Applications/app_test/test_rs485_arm.c
+++ b/APP_Framework/Applications/app_test/test_rs485_arm.c
@ -138,7 +138,6 @@ void Test485(void)
    uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
    uart_cfg.serial_timeout = -1;
    uart_cfg.is_ext_uart = 0;
-    uart_cfg.dev_recv_callback = NULL;

    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
    ioctl_cfg.args = (void *)&uart_cfg;
--- a/APP_Framework/Applications/app_test/test_rs485_riscv.c
+++ b/APP_Framework/Applications/app_test/test_rs485_riscv.c
@ -70,7 +70,6 @@ void Test485(void)
    uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
    uart_cfg.serial_timeout = 1000;
    uart_cfg.is_ext_uart = 0;
-    uart_cfg.dev_recv_callback = NULL;

    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
    ioctl_cfg.args = (void *)&uart_cfg;
--- a/APP_Framework/Applications/app_test/test_socket.c
+++ b/APP_Framework/Applications/app_test/test_socket.c
@ -76,12 +76,10 @@ struct IperfParam {
 static void* TestIperfServer(void* param)
 {
    struct IperfParam* iperf_param = (struct IperfParam*)param;
-    int sock = socket(AF_INET, SOCK_STREAM, 6);
+    int sock = socket(AF_INET, SOCK_STREAM, 0);
    if (sock < 0) {
        printf("[%s] Err: Can't create socker.\n", __func__);
        return NULL;
-    } else {
-        printf("[%s] Info Create server socket %d\n", __func__, sock);
    }

    uint8_t* recv_data = (uint8_t*)malloc(IPERF_BUFSZ);
@ -123,9 +121,8 @@ static void* TestIperfServer(void* param)
        socklen_t sin_size = sizeof(struct sockaddr_in);
        struct sockaddr_in client_addr;
        int connection = accept(sock, (struct sockaddr*)&client_addr, &sin_size);
-        printf("[%s] Info: New client connected from (%s, %d), connect: %d\n", __func__,
-            inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port),
-            connection);
+        printf("[%s] Info: New client connected from (%s, %d)\n", __func__,
+            inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));

        int flag = 1;
        setsockopt(connection,
@ -144,8 +141,8 @@ static void* TestIperfServer(void* param)
                    inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
                break;
            } else if (bytes_received < 0) {
-                KPrintf("recv error: %d, client: (%s, %d)\n",
-                    bytes_received, inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
+                KPrintf("recv error, client: (%s, %d)\n",
+                    inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
                break;
            }

@ -261,6 +258,8 @@ enum IperfParamEnum {

 void TestSocket(int argc, char* argv[])
 {
+    lwip_config_tcp(0, lwip_ipaddr, lwip_netmask, lwip_gwaddr);
+
    static char usage_info[] = "Run either a iperf server or iperf client.";
    static char program_info[] = "Lwip socket test task, a simple iperf.";
    static const char* const usages[] = {
--- a/APP_Framework/Applications/app_test/test_timer.c
+++ b/APP_Framework/Applications/app_test/test_timer.c
@ -23,13 +23,12 @@
 void TimerFunction(union sigval sig_val)
 {
    static int cnt = 0;
-    printf("%s cnt %d ms %d\n", __func__, cnt++, PrivGetTickTime());
+    printf("%s cnt %d\n", __func__, cnt++);
 }

 void TestTimer(void)
 {
    int ret = 0;
-    static int count = 0;
    int timer_flags;
    timer_t timer_id;
    struct sigevent evp;
@ -41,9 +40,7 @@ void TestTimer(void)
    evp.sigev_notify_function = TimerFunction;
    evp.sigev_notify_attributes = &timer_flags;

-    count++;
-
-    ret = PrivTimerCreate(count, &evp, &timer_id);
+    ret = timer_create(CLOCK_REALTIME, &evp, &timer_id);
    if (ret < 0) {
        printf("%s create timer failed ret %d\n", __func__, ret);
        return;
@ -51,14 +48,14 @@ void TestTimer(void)

    struct itimerspec value; 
    //active time interval
-    value.it_interval.tv_sec = 0; 
-    value.it_interval.tv_nsec = 1000000 * 10;
+    value.it_interval.tv_sec = 2; 
+    value.it_interval.tv_nsec = 0;

    //first timer set time 
    value.it_value.tv_sec = 2; 
    value.it_value.tv_nsec = 0; 

-    ret = PrivTimerModify(timer_id, 1, &value, NULL);
+    ret = timer_settime(timer_id, 1, &value, NULL);
    if (ret < 0) { 
        printf("%s set timer time failed ret %d\n", __func__, ret);
        return;
--- a/APP_Framework/Applications/app_test/test_uart.c
+++ b/APP_Framework/Applications/app_test/test_uart.c
@ -68,7 +68,6 @@ void TestUart(int argc, char* argv[])
    uart_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
    uart_cfg.serial_timeout = -1;
    uart_cfg.is_ext_uart = 0;
-    uart_cfg.dev_recv_callback = NULL;

    struct PrivIoctlCfg ioctl_cfg;
    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
--- a/APP_Framework/Applications/connection_app/Makefile
+++ b/APP_Framework/Applications/connection_app/Makefile
@ -15,10 +15,6 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y)
 		SRC_DIR += socket_demo
 	endif

-	ifeq ($(CONFIG_CONNECTION_ADAPTER_FREEMODBUSTCP),y)
-		SRC_DIR += freemodbus_tcp_slave
-	endif
-
    include $(KERNEL_ROOT)/compiler.mk
 endif

--- a/APP_Framework/Applications/connection_app/freemodbus_tcp_slave/Makefile
+++ b/APP_Framework/Applications/connection_app/freemodbus_tcp_slave/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := tcpserver_sample.c 
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/connection_app/freemodbus_tcp_slave/slave_sample.c
+++ b/APP_Framework/Applications/connection_app/freemodbus_tcp_slave/slave_sample.c
@ -1,259 +0,0 @@
-/*
- * FreeModbus Libary: Win32 Demo Application
- * Copyright (C) 2006 Christian Walter <wolti@sil.at>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * File: $Id$
- */
-
- /**********************************************************
- *	Linux TCP support.
- *	Based on Walter's project. 
- *	Modified by Steven Guo <gotop167@163.com>
- ***********************************************************/
-
-/* ----------------------- Standard C Libs includes --------------------------*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <pthread.h>
-#include <signal.h>
-#include <transform.h>
-#include "lwip/sys.h"
-#include "lwip/sockets.h"
-
-/* ----------------------- Modbus includes ----------------------------------*/
-#include "mb.h"
-#include "mbport.h"
-
-/* ----------------------- Defines ------------------------------------------*/
-#define PROG            "freemodbus"
-
-#define REG_INPUT_START 1000
-#define REG_INPUT_NREGS 4
-#define REG_HOLDING_START 2000
-#define REG_HOLDING_NREGS 10
-
-/* ----------------------- Static variables ---------------------------------*/
-static USHORT   usRegInputStart = REG_INPUT_START;
-static USHORT   usRegInputBuf[REG_INPUT_NREGS];
-static USHORT   usRegHoldingStart = REG_HOLDING_START;
-static USHORT   usRegHoldingBuf[REG_HOLDING_NREGS];
-static pthread_mutex_t xLock;
-static enum ThreadState
-{
-    STOPPED,
-    RUNNING,
-    SHUTDOWN
-} ePollThreadState;
-
-/* ----------------------- Static functions ---------------------------------*/
-static BOOL     bCreatePollingThread( void );
-static enum ThreadState eGetPollingThreadState( void );
-static void     eSetPollingThreadState( enum ThreadState eNewState );
-static void* pvPollingThread( void *pvParameter );
-int LWIPConnectSocket(uint16_t port);
-
-/* ----------------------- Start implementation -----------------------------*/
-int MBSlave()
-{
-    int             iExitCode;
-    CHAR            cCh;
-    BOOL            bDoExit;
-    usRegHoldingBuf[5] = 123;
-    usRegHoldingBuf[7] = 234;
-
-    printf("%s ip %d.%d.%d.%d mask %d.%d.%d.%d gw %d.%d.%d.%d\n", __func__, 
-    192, 168, 250, 233,
-    255, 255, 255, 255,
-    192, 168, 250, 1);
-    uint8_t local_ip[4] = {192,168,250,233};
-    uint8_t gateway[4] = {192,168,250,1};
-    uint8_t netmask[4] = {255,255,255,0};
-    lwip_config_tcp(0, local_ip, netmask, gateway);
-    printf("%s LWIPInit done\n", __func__);
-
-    if( eMBTCPInit( MB_TCP_PORT_USE_DEFAULT ) != MB_ENOERR )
-    {
-        fprintf( stderr, "%s: can't initialize modbus stack!\r\n", PROG );
-        iExitCode = EXIT_FAILURE;
-    }
-    else
-    {
-        eSetPollingThreadState( STOPPED );
-        /* CLI interface. */
-        if( bCreatePollingThread(  ) != TRUE )
-        {
-            printf(  "Can't start protocol stack! Already running?\r\n"  );
-        }
-    }
-    printf("%d %d %s\n",sizeof(usRegHoldingBuf),__LINE__,__func__);
-    
-    while(1)
-    {
-        for(int i =0; i<sizeof(usRegHoldingBuf)/2;i++)
-        {
-            printf("poll recv is %3d\n", usRegHoldingBuf[i]);
-            MdelayKTask(100);
-        }
-    }
-    return iExitCode;
-}
-
-PRIV_SHELL_CMD_FUNCTION(MBSlave, a Mtcp server Demo, PRIV_SHELL_CMD_MAIN_ATTR);  
-
-
-BOOL bCreatePollingThread( void )
-{
-    BOOL            bResult;
-	pthread_t       xThread;
-    if( eGetPollingThreadState(  ) == STOPPED )
-    {
-        if( pthread_create( &xThread, NULL, pvPollingThread, NULL ) != 0 )
-        {
-            /* Can't create the polling thread. */
-            bResult = FALSE;
-        }
-        else
-        {
-            bResult = TRUE;
-        }
-    }
-    else
-    {
-        bResult = FALSE;
-    }
-    return bResult;
-}
-
-
-void* pvPollingThread( void *pvParameter )
-{
-    eSetPollingThreadState( RUNNING );
-
-    if( eMBEnable(  ) == MB_ENOERR )
-    {
-        do
-        {
-            if( eMBPoll(  ) != MB_ENOERR )
-                break;
-        }
-        while( eGetPollingThreadState(  ) != SHUTDOWN );
-    }
-
-    ( void )eMBDisable(  );
-
-    eSetPollingThreadState( STOPPED );
-
-    return 0;
-}
-
-enum ThreadState eGetPollingThreadState(  )
-{
-    enum ThreadState eCurState;
-
-    ( void )pthread_mutex_lock( &xLock );
-    eCurState = ePollThreadState;
-    ( void )pthread_mutex_unlock( &xLock );
-
-    return eCurState;
-}
-
-void eSetPollingThreadState( enum ThreadState eNewState )
-{
-    ( void )pthread_mutex_lock( &xLock );
-    ePollThreadState = eNewState;
-    ( void )pthread_mutex_unlock( &xLock );
-}
-
-eMBErrorCode eMBRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs )
-{
-    eMBErrorCode    eStatus = MB_ENOERR;
-    int             iRegIndex;
-
-    if( ( usAddress >= REG_INPUT_START )
-        && ( usAddress + usNRegs <= REG_INPUT_START + REG_INPUT_NREGS ) )
-    {
-        iRegIndex = ( int )( usAddress - usRegInputStart );
-        while( usNRegs > 0 )
-        {
-            *pucRegBuffer++ = ( unsigned char )( usRegInputBuf[iRegIndex] >> 8 );
-            *pucRegBuffer++ = ( unsigned char )( usRegInputBuf[iRegIndex] & 0xFF );
-            iRegIndex++;
-            usNRegs--;
-        }
-    }
-    else
-    {
-        eStatus = MB_ENOREG;
-    }
-
-    return eStatus;
-}
-
-eMBErrorCode eMBRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode )
-{
-    eMBErrorCode    eStatus = MB_ENOERR;
-    int             iRegIndex;
-
-    if( ( usAddress >= REG_HOLDING_START ) &&
-        ( usAddress + usNRegs <= REG_HOLDING_START + REG_HOLDING_NREGS ) )
-    {
-        iRegIndex = ( int )( usAddress - usRegHoldingStart );
-        switch ( eMode )
-        {
-            /* Pass current register values to the protocol stack. */
-        case MB_REG_READ:
-            while( usNRegs > 0 )
-            {
-                *pucRegBuffer++ = ( UCHAR ) ( usRegHoldingBuf[iRegIndex] >> 8 );
-                *pucRegBuffer++ = ( UCHAR ) ( usRegHoldingBuf[iRegIndex] & 0xFF );
-                iRegIndex++;
-                usNRegs--;
-            }
-            break;
-
-            /* Update current register values with new values from the
-             * protocol stack. */
-        case MB_REG_WRITE:
-            while( usNRegs > 0 )
-            {
-                usRegHoldingBuf[iRegIndex] = *pucRegBuffer++ << 8;
-                usRegHoldingBuf[iRegIndex] |= *pucRegBuffer++;
-                iRegIndex++;
-                usNRegs--;
-            }
-        }
-    }
-    else
-    {
-        eStatus = MB_ENOREG;
-    }
-    return eStatus;
-}
-
-
-eMBErrorCode eMBRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode )
-{
-    return MB_ENOREG;
-}
-
-eMBErrorCode eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete )
-{
-    return MB_ENOREG;
-}
--- a/APP_Framework/Applications/control_app/plc_demo/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/Makefile
@ -1,3 +1,3 @@
-SRC_DIR := advantech beckhoff br delta mitsubishi omron schneider siemens ge xinje inovance keyence panasonic fatek ab abb koyo
+SRC_DIR := advantech beckhoff br delta mitsubishi omron schneider siemens ge xinje inovance keyence

 include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/ab/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := ab_l30erm.c ab_micro850.c
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/ab/README_ab_850.md
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/README_ab_850.md
@ -1,91 +0,0 @@
-# AB_850通信测试
-
-[TOC]
-
-## 通信接线及参数设置
-
-* 网口
-
-  *Mosbus TCP协议，IP：192.168.250.56，Port：502
-
-## 存储区
-
- 存储区D区
-
-## JSON配方设计
-
-* AB_850类型PLC需要配置控制器映射
-
-  ![](./image/modbus映射.png)
-  
-* 共测试Word和real共2种类型数据,real型数据有2个Word组成，以下为JSON文件解释。
-
-  - ```json
-    {
-        "device_id": 1,                     //设备ID默认是1，此参数无效
-        "device_name": "AB_850",            //设备名称，自定义
-        "communication_type": 0,            //通讯协议类型 0是以太网，1是串口 
-        "socket_config": {                  //以太网配置
-            "plc_ip": "192.168.250.56",     //PLC的IP地址
-            "local_ip": "192.168.250.233",   //矽达通IP地址设定
-            "gateway": "192.168.250.1",     //矽达通的网关地址设定
-            "netmask": "255.255.255.0",     //矽达通子网掩码设定
-            "port":502                      //端口号设定
-            },
-        "protocol_type": 2,                 //通讯协议，2代表modbus-tcp协议
-        "read_period": 100,                 //交互周期ms
-        "read_item_list": [
-            {
-                "value_name": "CON_DATA[0]",  //变量名称，自定义
-                "value_type": 1,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 1,   //功能码。1是读线圈
-            	"start_address": 0,   //起始地址
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "CON_DATA[1]",  //变量名称，自定义
-                "value_type": 1,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 1,   //功能码。1是读
-            	"start_address": 1,   //起始地址偏移1位106*8+1=849
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "CON_INT",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 2,   //起始地址偏移2位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "CON_ARRAY[0]_1",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 3,   //起始地址偏移3位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "CON_ARRAY[0]_2",  //变量名称，自定义,CON_ARRAY[0]_1和CON_ARRAY[0]_2组成real型数据
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 4,   //起始地址偏移4位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            }
-        ]
-    }
-    ```
-
-## 通信测试
-
- (1) 新增1个通信demo，命名为ab_micro850.c；
-
- (2) 复制modbus_tcp样例代码程序到ab_micro850.c文件中；
-
- (3) void **ControlAB850Test**(void) 更改函数名；
-
- (4) PRIV_SHELL_CMD_FUNCTION(**ControlAB850Test**, AB Plc micro850 Demo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令；
-
- (5) 剪裁配置完成后，用过烧写器下载至矽数通中，重启后完成测试。
-
-
-
- 
--- a/APP_Framework/Applications/control_app/plc_demo/ab/README_ab_l300erm.md
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/README_ab_l300erm.md
@ -1,71 +0,0 @@
-# AB_L30ERM通信测试
-
-[TOC]
-
-## 通信接线及参数设置
-
-* 网口
-
-  *Ethernet/ip协议，IP：192.168.250.57，Port：44818
-
-## 存储区
-
- Ethernet/ip协议是根据变量名称搜索寄存器地址
-
-## JSON配方设计
-
-* 本实例共测试Word和real共2种类型数据，以下为JSON文件解释。
-
-  - ```json
-    {
-        "device_id": “ab_l30”,              //
-        "device_name": "robot",            //设备名称，自定义
-        "communication_type": 0,            //通讯协议类型 0是以太网，1是串口 
-        "socket_config": {                  //以太网配置
-            "plc_ip": "192.168.250.37",     //PLC的IP地址
-            "local_ip": "192.168.250.123",   //矽达通IP地址设定
-            "gateway": "192.168.250.1",     //矽达通的网关地址设定
-            "netmask": "255.255.255.0",     //矽达通子网掩码设定
-            "port":502                      //端口号设定
-            },
-        "protocol_type": 12,                 //通讯协议，12代表ethernet/ip协议
-        "read_period": 100,                 //交互周期ms
-        "read_item_list": [
-            {
-                "value_name": "L30_SPEED",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-            	"wordlen": "WORD",    //以WORD方式传输
-                "amount": 1           //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "L30_TORQUE",  //变量名称，自定义
-                "value_type": 9,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-            	"wordlen": 2,        //以WORD方式传输
-                "amount": 1          //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "D",     //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-            	"wordlen": 3,         //以WORD方式传输
-                "amount": 1           //默认是1，代表读取1个数据类型长度
-            }
-        ]
-    }
-    ```
-  
-
-## 通信测试
-
- (1) 新增1个通信demo，命名为ab_l30erm.c；
-
- (2) 复制modbus_tcp样例代码程序到ab_l30erm.c文件中；
-
- (3) void **ControlABL30Test**(void) 更改函数名；
-
- (4) PRIV_SHELL_CMD_FUNCTION(**ControlABL30Test**, AB Plc l30ermDemo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令；
-
- (5) 剪裁配置完成后，用过烧写器下载至矽数通中，重启后完成测试。
-
-
-
- 
--- a/APP_Framework/Applications/control_app/plc_demo/ab/ab_l30erm.c
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/ab_l30erm.c
@ -1,48 +0,0 @@
-/*
- * 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 ab_l30.c
- * @brief PLC ABB L30 app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.8.27
- */
-
-#include <control.h>
-
-void ControlABL30Test(void)
-{
-    int i = 0;
-    uint16_t read_data_length = 0;
-    uint8_t read_data[1024] = {0};
-    ControlProtocolType CIP_protocol = ControlProtocolFind();
-    if (NULL == CIP_protocol) {
-        printf("%s get CIP protocol %p failed\n", __func__, CIP_protocol);
-        return;
-    }
-
-    printf("%s get CIP protocol %p successfull\n", __func__, CIP_protocol);
-    if (CONTROL_REGISTERED == CIP_protocol->protocol_status) {
-        ControlProtocolOpen(CIP_protocol);
-
-        for (;;) {
-            read_data_length = ControlProtocolRead(CIP_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] CIP data %d using receipe file\n", __func__, i, read_data_length);
-            i++;
-            PrivTaskDelay(1000);
-        }
-
-        //ControlProtocolClose(CIP_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlABL30Test, Ab Plc CIP Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/ab/ab_micro850.c
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/ab_micro850.c
@ -1,52 +0,0 @@
-/*
- * 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 ab_micro850.c
- * @brief PLC AB MICRO850 app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.10.5
- */
-
-#include <control.h>
-
-void ControlAB850Test(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlAB850Test, AB Plc MICRO850 Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/ab/image/L30ERM.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/image/L30ERM.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/ab/image/MICRO850.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/image/MICRO850.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/ab/image/modbus映射.png
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/image/modbus映射.png
--- a/APP_Framework/Applications/control_app/plc_demo/ab/json/test_recipe_L30.json
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/json/test_recipe_L30.json
@ -1,34 +0,0 @@
-{
-    "device_id": "ab_l30",
-    "device_name": "robot",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.57",
-        "local_ip": "192.168.250.123",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.255.0",
-        "port": 44818
-    },
-    "protocol_type": 12,
-    "read_period": 100,
-    "read_item_list": [
-        {
-            "value_name": "L30_SPEED",
-            "value_type": 3,
-            "wordlen": "WORD",
-            "amount": 1
-        },
-        {
-            "value_name": "L30_TORQUE",
-            "value_type": 9,
-            "wordlen": "WORD",
-            "amount": 1
-        },
-       {
-            "value_name": "D",
-            "value_type": 3,
-            "wordlen": "WORD",
-            "amount": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/ab/json/test_recipe_ab_850.json
+++ b/APP_Framework/Applications/control_app/plc_demo/ab/json/test_recipe_ab_850.json
@ -1,51 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "AB_850",
-	"communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.32",
-		"local_ip": "192.168.250.56",
-        "gateway": "192.168.250.1",
-		"netmask": "255.255.255.0",
-        "port": 502
-    },
-    "protocol_type": 2,
-    "read_period": 100,
-    "read_item_list": [
-        {
-            "value_name": "D106.0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 848,
-            "quantity": 1
-        },
-        {
-            "value_name": "D106.1",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address":849,
-            "quantity": 1
-        },
-        {
-            "value_name": "D100",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 100,
-            "quantity": 1
-        },
-        {
-            "value_name": "D102",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 102,
-            "quantity": 1
-        },
-        {
-            "value_name": "D103",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 103,
-            "quantity": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/abb/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/abb/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := abb_pm5630.c
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/abb/README.md
+++ b/APP_Framework/Applications/control_app/plc_demo/abb/README.md
@ -1,87 +0,0 @@
-# ABB通信测试
-
-[TOC]
-
-## 通信接线及参数设置
-
-* 网口
-
-  *Mosbus TCP协议，IP：192.168.250.58，Port：502
-
-## 存储区
-
- 存储区MW区
-
-## JSON配方设计
-
-* 共测试Word和real共2种类型数据,real型数据有2个Word组成，以下为JSON文件解释。
-
-  - ```json
-    {
-        "device_id": 1,                     //设备ID默认是1，此参数无效
-        "device_name": "ABB_PM5630",        //设备名称，自定义
-        "communication_type": 0,            //通讯协议类型 0是以太网，1是串口 
-        "socket_config": {                  //以太网配置
-            "plc_ip": "192.168.250.58",     //PLC的IP地址
-            "local_ip": "192.168.250.233",   //矽达通IP地址设定
-            "gateway": "192.168.250.1",     //矽达通的网关地址设定
-            "netmask": "255.255.255.0",     //矽达通子网掩码设定
-            "port":502                      //端口号设定
-            },
-        "protocol_type": 2,                 //通讯协议，2代表modbus-tcp协议
-        "read_period": 100,                 //交互周期ms
-        "read_item_list": [
-            {
-                "value_name": "MW0",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 0,   //起始地址
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "MW1",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 1,   //起始地址偏移1位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "MW10",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 10,   //起始地址偏移10位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "MD20_1",  //变量名称，自定义
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 20,   //起始地址偏移20位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            },
-            {
-                "value_name": "MD20_2",  //变量名称，自定义,MD20_1和MD20_2组成real型数据
-                "value_type": 3,      //变量类型，BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9
-                "function_code": 3,   //功能码。3是读
-            	"start_address": 21,   //起始地址偏移21位
-                "data_length": 1      //默认是1，代表读取1个数据类型长度
-            }
-        ]
-    }
-    ```
-
-## 通信测试
-
- (1) 新增1个通信demo，命名为abb_pm5630.c；
-
- (2) 复制modbus_tcp样例代码程序到abb_pm5630.c文件中；
-
- (3) void **ControlABBPM5630Test**(void) 更改函数名；
-
- (4) PRIV_SHELL_CMD_FUNCTION(**ControlABBPM5630Test**, ABB Plc PM5630 Demo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令；
-
- (5) 剪裁配置完成后，用过烧写器下载至矽数通中，重启后完成测试。
-
-
-
- 
--- a/APP_Framework/Applications/control_app/plc_demo/abb/abb_pm5630.c
+++ b/APP_Framework/Applications/control_app/plc_demo/abb/abb_pm5630.c
@ -1,52 +0,0 @@
-/*
- * 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 abb_pm5630.c
- * @brief PLC ABB pm5630 app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.10.20
- */
-
-#include <control.h>
-
-void ControlABBPM5630Test(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlABBPM5630Test, ABB Plc PM5630 Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/abb/image/ABB_PM5630.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/abb/image/ABB_PM5630.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/abb/json/test_recipe_abb_PM5630.json
+++ b/APP_Framework/Applications/control_app/plc_demo/abb/json/test_recipe_abb_PM5630.json
@ -1,51 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "ABB_PM5630",
-	"communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.32",
-		"local_ip": "192.168.250.58",
-        "gateway": "192.168.250.1",
-		"netmask": "255.255.255.0",
-        "port": 502
-    },
-    "protocol_type": 2,
-    "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
-        },
-        {
-            "value_name": "MW10",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 10,
-            "quantity": 1
-        },
-		{
-            "value_name": "MD20_1",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address":20,
-            "quantity": 1
-        },
-		{
-            "value_name": "MD20_2",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address":21,
-            "quantity": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/br/image/Br
+++ b/APP_Framework/Applications/control_app/plc_demo/br/image/Br
--- a/APP_Framework/Applications/control_app/plc_demo/br/json/test_recipe_br_ppc2100.json
+++ b/APP_Framework/Applications/control_app/plc_demo/br/json/test_recipe_br_ppc2100.json
--- a/APP_Framework/Applications/control_app/plc_demo/delta/README.md
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/README.md
@ -1,48 +1,22 @@
-# 台达 PLC与矽达通ARM通信测试
+# 台达 DVP通信测试

 [TOC]

-## 台达DVP与矽达通ARM通信处测试
-
-### 通信接线及参数设置
+## 通信接线及参数设置

 * 网口
  * 通过自带 RJ45 网口连接
  * 网口参数：IP：192.168.250.27  Port：502
  * 测试的协议:Modbus TCP

-### 存储区
+## 存储区

 - 含M，D，X，Y。台达PLC中 各存储区地址和Modbus地址有明确的对应表，详见台达DVP协议解析测试文档。

-### 通信测试
+## 通信测试

 -  共测试BOOL，INT16，INT32，FLOAT 共四种类型数据。
 -  测试D区，M区和Y区。



-## 台达AS332T与矽达通ARM通信处测试
-
-### 通信接线及参数设置
-
-* 网口
-  * 通过自带 RJ45 网口连接
-  * 网口参数：IP：192.168.250.5  Port：502
-  * 测试的协议:Modbus TCP
-
-### 存储区
-
- 含M，D，X，Y。台达PLC中 各存储区地址和Modbus地址有明确的对应表，详见台达AS332T协议解析测试文档。
-
-### 通信测试结果
-
-  共测试BOOL，INT16，INT32，FLOAT 共四种类型数据。
-  测试D区，M区和Y区。
-
-![](./image/recipe.png)
-
-![](./image/test_result1.png)
-
-![](./image/test_result2.png)
-
--- a/APP_Framework/Applications/control_app/plc_demo/delta/delta_as332t.c
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/delta_as332t.c
@ -1,6 +1,4 @@
 /*
- * Copyright (c) 2022 AIIT XUOS Lab
- /*
 * 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.
@ -17,53 +15,9 @@
 * @brief PLC DELTA AS332T app
 * @version 3.0
 * @author AIIT XUOS Lab
- * @date 2022.10.10
+ * @date 2022.9.27
 */

-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlDeltaas332tTest(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-
-#ifdef CONNECTION_ADAPTER_4G
-    Adapter4GActive();
-#endif
-
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlDeltaas332tTest, Delta as332t Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-



--- a/APP_Framework/Applications/control_app/plc_demo/delta/image/delta_as332t.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/image/delta_as332t.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/delta/image/delta_dvp.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/image/delta_dvp.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/delta/image/recipe.png
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/image/recipe.png
--- a/APP_Framework/Applications/control_app/plc_demo/delta/image/test_result1.png
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/image/test_result1.png
--- a/APP_Framework/Applications/control_app/plc_demo/delta/image/test_result2.png
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/image/test_result2.png
--- a/APP_Framework/Applications/control_app/plc_demo/delta/json/test_recipe_delta_as332t_tcp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/json/test_recipe_delta_as332t_tcp.json
@ -1,79 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "DELTA_AS332T_TCP",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.5",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.254.0",
-        "port": 502
-    },
-    "protocol_type": 2,
-    "read_period": 1000,
-  "read_item_list": [
-    {
-      "value_name": "M16",
-      "value_type": 1,
-      "function_code": 1,
-      "start_address": 16,
-      "quantity": 1
-    },
-    {
-      "value_name": "M17",
-      "value_type": 1,
-      "function_code": 1,
-      "start_address": 17,
-      "quantity": 1
-    },
-    {
-      "value_name": "M18",
-      "value_type": 1,
-      "function_code": 1,
-      "start_address": 30,
-      "quantity": 1
-    },
-    {
-      "value_name": "D300",
-      "value_type": 3,
-      "function_code": 3,
-      "start_address": 300,
-      "quantity": 1
-    },
-    {
-      "value_name": "D301",
-      "value_type": 3,
-      "function_code": 3,
-      "start_address": 302,
-      "quantity": 1
-    },
-    {
-      "value_name": "D302",
-      "value_type": 4,
-      "function_code": 3,
-      "start_address": 302,
-      "quantity": 2
-    },
-    {
-      "value_name": "D304",
-      "value_type": 9,
-      "function_code": 3,
-      "start_address": 304,
-      "quantity": 2
-    },
-    {
-      "value_name": "Y1.0",
-      "value_type": 1,
-      "function_code": 1,
-      "start_address": 40976,
-      "quantity": 1
-    },
-    {
-      "value_name": "Y10",
-      "value_type": 3,
-      "function_code": 3,
-      "start_address": 40970,
-      "quantity": 1
-    }
-  ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/delta/json/test_recipe_delta_dvp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/delta/json/test_recipe_delta_dvp.json
--- a/APP_Framework/Applications/control_app/plc_demo/fatek/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/fatek/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := fatek_fbs_24mc_uart.c
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/fatek/Readme.md
+++ b/APP_Framework/Applications/control_app/plc_demo/fatek/Readme.md
@ -1,42 +0,0 @@
-# 永宏通信测试
-
-[TOC]
-
-## 永宏FBs-24MCT2-AC通信测试
-
-### 通信接线及参数设置
-
-* 网口和串口
-  * FBS-24MCT2自带圆口232，用于程序的下载。
-  * 可本体拓展FBs-CBES用于Modbus TCP，永宏私有协议永宏协议等通信。板卡默认IP：192.168.2.3.端口号500，永宏协议
-  * 通过本体拓展FBs-CM22通信模板，可用于Modbus RTU及永宏协议通信。串口接线：+接485A；-接485B。
-  * 串口模块MODBUS RTU通信参数配置：通信速率：9600；数据位：8bit；停止位：1bit；校验：偶校验
-  * 串口模块永宏协议通信参数配置：通信速率：9600；数据位：8bit；停止位：1bit；校验：偶校验
-  * 终端与PLC通信测试，PC编程软件与PLC不能处于联机状态。
-  
-
-### 存储区
-
- 存储区 X，Y，R，D区等。
-
-### 通信测试
-
-  共测试BOOL，INT16等类型数据。
-
-
-  测试Y区，R区及D区数据。
-
-
- 测试截图：
-
-  测试PLC环境搭建：
-
-  ![](./image/FATEK.jpg)
-
-  解析完成的配方为:
-
-  ![](./image/panasonic_fpxh_recipe.png)
-
-  测试结果：
-
-  ![](./image/panasonic_fpxh_communication_test.png)
--- a/APP_Framework/Applications/control_app/plc_demo/fatek/fatek_fbs_24mc_uart.c
+++ b/APP_Framework/Applications/control_app/plc_demo/fatek/fatek_fbs_24mc_uart.c
@ -1,64 +0,0 @@
-/*
- * 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 fatek_fbs_24mc_uart.c
- * @brief PLC fatek fbs app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.11.28
- */
-
-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlFatekFBsUartTest(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(ControlFatekFBsUartTest, fatek fbs uart Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-
--- a/APP_Framework/Applications/control_app/plc_demo/fatek/image/FATEK.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/fatek/image/FATEK.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/fatek/json/test_recipe_fatek_fbs24mc_uart.json
+++ b/APP_Framework/Applications/control_app/plc_demo/fatek/json/test_recipe_fatek_fbs24mc_uart.json
@ -1,37 +0,0 @@
-{
-     "device_id": 1,
-    "device_name": "FATEK_FBSMC24T_RTU",
-    "communication_type": 1,
-    "serial_config": {
-        "station": 1,
-        "baud_rate": 9600,
-        "data_bits": 8,
-        "stop_bits": 1,
-        "check_mode":3
-    },
-    "protocol_type": 3,
-    "read_period": 2000,
-    "read_item_list": [
-        {
-            "value_name": "Y0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 0,
-            "quantity": 1
-        },
-        {
-            "value_name": "D0",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 6000,
-            "quantity": 1
-        },
-        {
-            "value_name": "R10",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 10,
-            "quantity": 1
-        }          
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/ge/img/GE
+++ b/APP_Framework/Applications/control_app/plc_demo/ge/img/GE
--- a/APP_Framework/Applications/control_app/plc_demo/ge/img/GE
+++ b/APP_Framework/Applications/control_app/plc_demo/ge/img/GE
--- a/APP_Framework/Applications/control_app/plc_demo/ge/json/test_recipe_ge_cpe_tcp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/ge/json/test_recipe_ge_cpe_tcp.json
--- a/APP_Framework/Applications/control_app/plc_demo/ge/json/test_recipe_ge_versamax_rtu.json
+++ b/APP_Framework/Applications/control_app/plc_demo/ge/json/test_recipe_ge_versamax_rtu.json
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/Makefile
@ -1,3 +1,3 @@
-SRC_FILES := inovance_am401_cpu1608tn_ethernet.c  inovance_am401_cpu1608tn_uart.c inovance_H3U_cpu3232MT_ethernet.c
+SRC_FILES := inovance_am401_cpu1608tn_ethernet.c  inovance_am401_cpu1608tn_uart.c

 include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/image/inovance_1608TN.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/image/inovance_1608TN.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/inovance_H3U_cpu3232MT_ethernet.c
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/inovance_H3U_cpu3232MT_ethernet.c
@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2024 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 inovance_H3U_cpu3232MT_ethernet.c
- * @brief PLC Inovance H3U-3232MT app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2024.08.06
- */
-
-#include <control.h>
-
-void ControlInovanceH3UCPU3232MTTest(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlInovanceH3UCPU3232MTTest, Inovance PLC N3UCPU3232MT Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_H3U-3232MT_tcp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_H3U-3232MT_tcp.json
@ -1,30 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "Ino_H3U3232MT",
-	"communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.55",
-		"local_ip": "192.168.250.147",
-        "gateway": "192.168.250.252",
-		"netmask": "255.255.255.0",
-        "port": 502
-    },
-    "protocol_type": 2,
-    "read_period": 300,
-    "read_item_list": [
-        {
-            "value_name": "M8000",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 8000,
-            "quantity": 1
-        },
-        {
-            "value_name": "D120",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 120,
-            "quantity": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_am401_tcp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_am401_tcp.json
--- a/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_am401_uart.json
+++ b/APP_Framework/Applications/control_app/plc_demo/inovance/json/test_recipe_inovance_am401_uart.json
--- a/APP_Framework/Applications/control_app/plc_demo/koyo/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/koyo/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := koyo_nk1cpu40.c
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/koyo/image/21573525-8FF0-44F3-BA01-0AF32D1E73D0.png
+++ b/APP_Framework/Applications/control_app/plc_demo/koyo/image/21573525-8FF0-44F3-BA01-0AF32D1E73D0.png
--- a/APP_Framework/Applications/control_app/plc_demo/koyo/koyo_nk1cpu40.c
+++ b/APP_Framework/Applications/control_app/plc_demo/koyo/koyo_nk1cpu40.c
@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2024 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 koyo_nk1cpu40.c
- * @brief PLC AB MICRO850 app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2024.07.03
- */
-
-#include <control.h>
-
-void ControlKoyoNK1CPU40Test(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlKoyoNK1CPU40Test, Koyo Plc NK1CPU40 Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/Makefile
@ -1,3 +1,3 @@
-SRC_FILES := mitsubishi_fx3u.c mitsubishi_fx5u.c mitsubishi_fx2n.c mitsubishi_q02u.c mitsubishi_q06h.c mitsubishi_q03udv.c
+SRC_FILES := mitsubishi_fx3u.c mitsubishi_fx5u.c mitsubishi_fx2n.c mitsubishi_q02u.c

 include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/README.md
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/README.md
@ -1,88 +1,24 @@
-# 三菱通信测试
+# 三菱 FX2N通信测试

 [TOC]

-## 三菱FX2N通信测试
-
-### 通信接线及参数设置
+## 通信接线及参数设置

 * 串口
  * FX2N自带8针圆口422，用于程序的下载。全系列不支持网口，且需购买串口拓展模块FX2N-485-BD用于通信测试。
  * 接线：RDA和SDA短接，引出A；RDB与SDB短接，引出B。
  * 串口模块支持MC-1C协议，通信速率：9600；数据位：7bit；停止位：1bit；校验：偶校验

-### 存储区
+## 存储区

 - 存储区 I，Q，M，D区。

-### 通信测试
+## 通信测试

 -  共测试BOOL，INT16，FLOAT共三种类型数据。


 -  测试M区及D区数据。

-## 三菱Q06H通信测试
-
-### 通信接线及参数设置
-
-* 接口
-  * 首次连接时，可通过CPU自带的串口（打印机方口线）进行程序的下载。
-  * 本次测试通过Q06H拓展的模块QJ71E71_100模块的网口模块进行MC—3E通信测试。
-  * PLC网口模块IP：192.168.250.21 端口号：4000
-
-### 存储区
-
- 存储区 I，Q，M，D区。
-
-### 通信测试
-
-  共测试BOOL，INT16，FLOAT共三种类型数据。


- 测试M区及D区数据。
-
- 测试截图：
-
-  解析完成的配方为
-
-  ![](./image/q06h_recipe.png)
-  
-  测试结果：
-  
-  ![](./image/q06h_communication_test.png)
-
-
-
-## 三菱Q03UDV通信测试
-
-### 通信接线及参数设置
-
-* 接口
-  * 本次测试通过Q03UDV拓展的模块QJ71E71_100模块的网口模块进行MC—3E通信测试。网口模块IP：192.168.250.21 端口号：4000
-  * 本次测试还可通过Q03UDV自身网口进行MC—3E通信测试。网口模块IP：192.168.250.22 端口号：6000
-
-### 存储区
-
- 存储区 I，Q，M，D区。
-
-### 通信测试
-
-  共测试BOOL，INT16，FLOAT共三种类型数据。
-
-
- 测试M区及D区数据。
-
- 测试截图：
-
-  扩展模块解析完成的配方为
-
-  ![](./image/q03udv_recipe.png)
-
-  CPU自带网口解析完成的配方为
-
-  ![](image/Q03udv_recipe_1.png)
-  
-  测试结果：
-  
-  ![](./image/q03udv_communication_test.png)
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/FX2NPLC.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/FX2NPLC.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Fx3UPLC.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Fx3UPLC.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q02UPLC.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q02UPLC.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q03udvPLC.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q03udvPLC.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q03udv_recipe_1.png
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q03udv_recipe_1.png
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q06HPLC.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/Q06HPLC.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q03udv_communication_test.png
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q03udv_communication_test.png
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q03udv_recipe.png
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q03udv_recipe.png
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q06h_communication_test.png
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q06h_communication_test.png
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q06h_recipe.png
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/image/q06h_recipe.png
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_1e.json
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_1e.json
@ -1,368 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "FX3U_MC_1E",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.25",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.254.0",
-        "port": 2000
-    },
-    "protocol_type": 6,
-    "read_period": 2000,
-  "read_item_list": [
-    {
-      "value_name": "启动",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "0",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "停止",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "使能",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "回零",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "3",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "急停",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "4",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "正限位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "5",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "负限位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "6",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "自动运行中",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "20",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "故障",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "21",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "待机",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "22",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "手动模式",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "23",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "自动模式",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "24",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "运行方向",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "25",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "复位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "26",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "备用1",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "27",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "产量",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "0",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型1",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型2",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型3",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "3",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型4",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "4",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型5",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "5",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型6",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "50",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型7",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "51",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型8",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "52",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型9",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "53",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "200",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "加速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "202",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "减速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "204",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "起始位置",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "206",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "终点位置",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "208",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "张力值",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "300",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型1",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "302",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型2",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "304",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型3",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "306",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型4",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "308",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y001",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y002",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y010",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "10",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "D400",
-      "value_type": 4,
-      "device_code": "D",
-      "head_device_number_string": "400",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    }
-
-  ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_3c.json
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_3c.json
@ -1,331 +0,0 @@
-{
-    "device_id": 769,
-    "device_name": "Q02UCPU",
-    "communication_type": 1,
-    "serial_config": {
-         "station": 0,
-        "baud_rate": 19200,
-        "data_bits": 7,
-        "stop_bits": 1,
-        "check_mode": 3
-    },
-    "protocol_type": 10,
-    "read_period": 1000,
-    "read_item_list": [
-        {
-            "value_name": "启动",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "0",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "停止",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "1",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "使能",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "2",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "回零",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "3",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "急停",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "4",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "正限位",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "5",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "负限位",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "6",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "自动运行中",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "20",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "故障",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "21",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "待机",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "22",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "手动模式",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "23",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "自动模式",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "24",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "运行方向",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "25",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "复位",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "26",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "备用1",
-            "value_type": 1,
-            "device_code": "M",
-            "head_device_number_string": "27",
-            "device_points_count": 1,
-            "command_type": 0,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "产量",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "0",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型1",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "1",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型2",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "2",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型3",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "3",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型4",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "4",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型5",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "5",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型6",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "50",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型7",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "51",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型8",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "52",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "整型9",
-            "value_type": 3,
-            "device_code": "D",
-            "head_device_number_string": "53",
-            "device_points_count": 1,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "速度",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "200",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "加速度",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "202",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "减速度",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "204",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "起始位置",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "206",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "终点位置",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "208",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "张力值",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "300",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "浮点型1",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "302",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "浮点型2",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "304",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "浮点型3",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "306",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        },
-        {
-            "value_name": "浮点型4",
-            "value_type": 9,
-            "device_code": "D",
-            "head_device_number_string": "308",
-            "device_points_count": 2,
-            "command_type": 1,
-            "monitoring_timer": 100
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_3e.json
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_3e.json
@ -1,494 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "Q02UCPU_MC_3E",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.21",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.254.0",
-        "port": 4000
-    },
-    "protocol_type": 7,
-    "read_period": 2000,
-  "read_item_list": [
-    {
-      "value_name": "启动",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "0",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "停止",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "使能",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "回零",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "3",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "急停",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "4",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "正限位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "5",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "负限位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "6",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "自动运行中",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "20",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "故障",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "21",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "待机",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "22",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "手动模式",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "23",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "自动模式",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "24",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "运行方向",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "25",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "复位",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "26",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "备用1",
-      "value_type": 1,
-      "device_code": "M",
-      "head_device_number_string": "27",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "产量",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "0",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型1",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型2",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型3",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "3",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型4",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "4",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型5",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "5",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型6",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "50",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型7",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "51",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型8",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "52",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "整型9",
-      "value_type": 3,
-      "device_code": "D",
-      "head_device_number_string": "53",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "200",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "加速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "202",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "减速度",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "204",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "起始位置",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "206",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "终点位置",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "208",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "张力值",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "300",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型1",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "302",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型2",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "304",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型3",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "306",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "浮点型4",
-      "value_type": 9,
-      "device_code": "D",
-      "head_device_number_string": "308",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y001",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y002",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "2",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "Y010",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "10",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "D400",
-      "value_type": 4,
-      "device_code": "D",
-      "head_device_number_string": "400",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "D402",
-      "value_type": 8,
-      "device_code": "D",
-      "head_device_number_string": "402",
-      "device_points_count": 4,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "D406",
-      "value_type": 8,
-      "device_code": "D",
-      "head_device_number_string": "406",
-      "device_points_count": 4,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "B1",
-      "value_type": 1,
-      "device_code": "B",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "B10",
-      "value_type": 1,
-      "device_code": "B",
-      "head_device_number_string": "10",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "B20",
-      "value_type": 1,
-      "device_code": "B",
-      "head_device_number_string": "20",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "W1",
-      "value_type": 3,
-      "device_code": "W",
-      "head_device_number_string": "1",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "W2",
-      "value_type": 4,
-      "device_code": "W",
-      "head_device_number_string": "2",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "W4",
-      "value_type": 9,
-      "device_code": "W",
-      "head_device_number_string": "4",
-      "device_points_count": 2,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "W6",
-      "value_type": 8,
-      "device_code": "W",
-      "head_device_number_string": "6",
-      "device_points_count": 4,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "W22",
-      "value_type": 3,
-      "device_code": "W",
-      "head_device_number_string": "22",
-      "device_points_count": 1,
-      "command_type": 1,
-      "monitoring_timer": 100
-    },
-    {
-      "value_name": "B44",
-      "value_type": 1,
-      "device_code": "B",
-      "head_device_number_string": "44",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 500
-    },
-    {
-      "value_name": "B200",
-      "value_type": 1,
-      "device_code": "B",
-      "head_device_number_string": "200",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 500
-    },
-    {
-      "value_name": "Y100",
-      "value_type": 1,
-      "device_code": "Y",
-      "head_device_number_string": "100",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 500
-    },
-    {
-      "value_name": "X150",
-      "value_type": 1,
-      "device_code": "X",
-      "head_device_number_string": "150",
-      "device_points_count": 1,
-      "command_type": 0,
-      "monitoring_timer": 500
-    }
-
-  ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/mitsubishi_q03udv.c
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/mitsubishi_q03udv.c
@ -1,64 +0,0 @@
-/*
- * 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_q03udv.c
- * @brief PLC MITSUBISHI Q03udv app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.10.30
- */
-
-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlQ03udvTest(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-
-#ifdef CONNECTION_ADAPTER_4G
-    Adapter4GActive();
-#endif
-
-    ControlProtocolType melsec_3e_protocol = ControlProtocolFind();
-    if (NULL == melsec_3e_protocol) {
-        printf("%s get melsec 3e protocol %p failed\n", __func__, melsec_3e_protocol);
-        return;
-    }
-
-    printf("%s get melsec 3e protocol %p successfull\n", __func__, melsec_3e_protocol);
-
-    if (CONTROL_REGISTERED == melsec_3e_protocol->protocol_status) {
-        ControlProtocolOpen(melsec_3e_protocol);
-
-        for (;;) {
-            read_data_length = ControlProtocolRead(melsec_3e_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] melsec 3c 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(melsec_3c_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlQ03udvTest, Mitsubishi Q03udv Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/mitsubishi_q06h.c
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/mitsubishi_q06h.c
@ -1,64 +0,0 @@
-/*
- * 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_q06h.c
- * @brief PLC MITSUBISHI Q06H app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.10.30
- */
-
-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlQ06hTest(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-
-#ifdef CONNECTION_ADAPTER_4G
-    Adapter4GActive();
-#endif
-
-    ControlProtocolType melsec_3e_protocol = ControlProtocolFind();
-    if (NULL == melsec_3e_protocol) {
-        printf("%s get melsec 3e protocol %p failed\n", __func__, melsec_3e_protocol);
-        return;
-    }
-
-    printf("%s get melsec 3e protocol %p successfull\n", __func__, melsec_3e_protocol);
-
-    if (CONTROL_REGISTERED == melsec_3e_protocol->protocol_status) {
-        ControlProtocolOpen(melsec_3e_protocol);
-
-        for (;;) {
-            read_data_length = ControlProtocolRead(melsec_3e_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] melsec 3c 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(melsec_3c_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlQ06hTest, Mitsubishi Q06H Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-
--- a/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_1c.json
+++ b/APP_Framework/Applications/control_app/plc_demo/mitsubishi/json/test_recipe_mc_1c.json
--- a/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_nj501_fins.json
+++ b/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_nj501_fins.json
@ -1,26 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "NJ501",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.22",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.255.0",
-        "port": 9600
-    },
-    "protocol_type": 5,
-    "read_period": 100,
-    "read_item_list": [
-       
-        {
-            "value_name": "整型1",
-            "value_type": 3,
-            "area_char": "D",
-            "data_type": 1,
-            "start_address": 100,
-            "bit_address": 0,
-            "data_length": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/omron/omron_nj501.c
+++ b/APP_Framework/Applications/control_app/plc_demo/omron/omron_nj501.c
@ -18,34 +18,6 @@
 * @date 2022.9.27
 */

-#include <control.h>
-
-void ControlNj501Test(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(ControlNj501Test, Omron Plc FINS Demo, PRIV_SHELL_CMD_MAIN_ATTR);
+


--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/Makefile
@ -1,3 +0,0 @@
-SRC_FILES := panasonic_fpxh_tcp.c panasonic_fpxh_uart.c
-
-include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/Readme.md
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/Readme.md
@ -1,39 +0,0 @@
-# 松下通信测试
-
-[TOC]
-
-## 松下FPXHC40ET通信测试
-
-### 通信接线及参数设置
-
-* 网口和串口
-  * FPXHC40ET自带miniUSB，用于程序的下载。本体自带的串口为RS232。
-  * 本体自带的网口可用于Modbus TCP，Ethernet/IP等通信。目前用于Modbus TCP通信测试，网口IP：192.168.250.51 Port：502
-  * 通过本体拓展FPXH-COM3通信模板，可用于Modbus RTU通信。串口接线：S+接485A；S-接485B。
-  * 串口模块通信参数配置：通信速率：115200；数据位：8bit；停止位：1bit；校验：偶校验
-
-### 存储区
-
- 存储区 X，Y，R，D，L区等。
-
-### 通信测试
-
-  共测试BOOL，INT16等类型数据。
-
-
-  测试Y区，R区及DT区数据。
-
-
- 测试截图：
-
-  测试PLC环境搭建：
-
-  ![](./image/PLC_xidatong.jpg)
-
-  解析完成的配方为:
-
-  ![](./image/panasonic_fpxh_recipe.png)
-
-  测试结果：
-
-  ![](./image/panasonic_fpxh_communication_test.png)
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/image/PLC_xidatong.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/image/PLC_xidatong.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic-fpxh.jpg
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic-fpxh.jpg
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic_fpxh_communication_test.png
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic_fpxh_communication_test.png
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic_fpxh_recipe.png
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/image/panasonic_fpxh_recipe.png
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/json/test_recipe_panasonic_fpxh_tcp.json
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/json/test_recipe_panasonic_fpxh_tcp.json
@ -1,65 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "PANASONIC_FPXH_TCP",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.51",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.1",
-        "netmask": "255.255.254.0",
-        "port": 502
-    },
-    "protocol_type": 2,
-    "read_period": 1000,
-    "read_item_list": [
-        {
-            "value_name": "Y0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 0,
-            "quantity": 1
-        },
-        {
-            "value_name": "R0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address":2048,
-            "quantity": 1
-        },
-        {
-            "value_name": "R100",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 2208,
-            "quantity": 1
-        },
-       {
-            "value_name": "R101",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 2209,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT0",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 0,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT1",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 1,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT200",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 200,
-            "quantity": 1
-        }    
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/json/test_recipe_panasonic_fpxh_uart.json
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/json/test_recipe_panasonic_fpxh_uart.json
@ -1,66 +0,0 @@
-{
-     "device_id": 1,
-    "device_name": "PANASONIC_FPXH_RTU",
-    "communication_type": 1,
-    "serial_config": {
-        "station": 1,
-        "baud_rate": 9600,
-        "data_bits": 8,
-        "stop_bits": 1,
-        "check_mode":3
-    },
-    "protocol_type": 3,
-    "read_period": 2000,
-    "read_item_list": [
-        {
-            "value_name": "Y0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 0,
-            "quantity": 1
-        },
-        {
-            "value_name": "R0",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address":2048,
-            "quantity": 1
-        },
-        {
-            "value_name": "R100",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 2208,
-            "quantity": 1
-        },
-       {
-            "value_name": "R101",
-            "value_type": 1,
-            "function_code": 1,
-            "start_address": 2209,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT0",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 0,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT1",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 1,
-            "quantity": 1
-        },
-        {
-            "value_name": "DT200",
-            "value_type": 3,
-            "function_code": 3,
-            "start_address": 200,
-            "quantity": 1
-        }    
-        
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/panasonic_fpxh_tcp.c
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/panasonic_fpxh_tcp.c
@ -1,64 +0,0 @@
-/*
- * 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 panasonic_fpxh_ethernet.c
- * @brief PLC panasonic fpxh app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.11.22
- */
-
-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlPanasonicFpxhTCPTest(void)
-{
-    int i, j = 0;
-    int read_data_length = 0;
-    uint8_t read_data[128] = {0};
-
-#ifdef CONNECTION_ADAPTER_4G
-    Adapter4GActive();
-#endif
-
-    ControlProtocolType modbus_tcp_protocol = ControlProtocolFind();
-    if (NULL == modbus_tcp_protocol) {
-        printf("%s get modbus tcp protocol %p failed\n", __func__, modbus_tcp_protocol);
-        return;
-    }
-
-    printf("%s get modbus tcp protocol %p successfull\n", __func__, modbus_tcp_protocol);
-
-    if (CONTROL_REGISTERED == modbus_tcp_protocol->protocol_status) {
-        ControlProtocolOpen(modbus_tcp_protocol);
-
-        for (;;) {
-            read_data_length = ControlProtocolRead(modbus_tcp_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] modbus tcp 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_tcp_protocol);
-    }
-}
-PRIV_SHELL_CMD_FUNCTION(ControlPanasonicFpxhTCPTest, panasonic Fpxh TCP Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-
--- a/APP_Framework/Applications/control_app/plc_demo/panasonic/panasonic_fpxh_uart.c
+++ b/APP_Framework/Applications/control_app/plc_demo/panasonic/panasonic_fpxh_uart.c
@ -1,64 +0,0 @@
-/*
- * 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 panasonic_fpxh_uart.c
- * @brief PLC panasonic fpxh app
- * @version 3.0
- * @author AIIT XUOS Lab
- * @date 2023.11.22
- */
-
-#include <control.h>
-
-extern int Adapter4GActive(void);
-
-void ControlPanasonicFpxhUartTest(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(ControlPanasonicFpxhUartTest, panasonic fpxh uart Demo, PRIV_SHELL_CMD_MAIN_ATTR);
-
-
--- a/APP_Framework/Applications/control_app/plc_demo/siemens/Makefile
+++ b/APP_Framework/Applications/control_app/plc_demo/siemens/Makefile
@ -1,3 +1,3 @@
-SRC_FILES := siemens_s7_200_cn.c siemens_s7_200_smart.c  siemens_s7_1200.c siemens_s7_1500.c
+SRC_FILES := siemens_s7_200_cn.c siemens_s7_200_smart.c siemens_s7_300.c siemens_s7_1200.c siemens_s7_1500.c

 include $(KERNEL_ROOT)/compiler.mk
--- a/APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_simens_s71200.json
+++ b/APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_simens_s71200.json
@ -1,25 +0,0 @@
-{
-    "device_id": 1,
-    "device_name": "S7-1215",
-    "communication_type": 0,
-    "socket_config": {
-        "plc_ip": "192.168.250.5",
-        "local_ip": "192.168.250.233",
-        "gateway": "192.168.250.252",
-        "netmask": "255.255.255.0",
-        "port": 102
-    },
-   "protocol_type": 1,
-    "read_period": 100,
-    "read_item_list": [
-        {
-            "value_name": "浮点数",
-            "value_type": 9,
-            "area": "DB",
-            "wordlen": "Real",
-            "db_number": 10,
-            "start": 32,
-            "amount": 1
-        }
-    ]
-}
--- a/APP_Framework/Applications/control_app/plc_demo/siemens/siemens_s7_1200.c
+++ b/APP_Framework/Applications/control_app/plc_demo/siemens/siemens_s7_1200.c
@ -18,28 +18,3 @@
 * @date 2023.3.27
 */

-#include <control.h>
-void ControlS71200Test(void)
-{
-    int i = 0;
-    uint16_t read_data_length = 0;
-    uint8_t read_data[1024] = {0};
-    ControlProtocolType s7_protocol = ControlProtocolFind();
-    if (NULL == s7_protocol) {
-        printf("%s get s7 protocol %p failed\n", __func__, s7_protocol);
-        return;
-    }
-    printf("%s get s7 protocol %p successfull\n", __func__, s7_protocol);
-    if (CONTROL_REGISTERED == s7_protocol->protocol_status) {
-        ControlProtocolOpen(s7_protocol);
-        for (;;) {
-            read_data_length = ControlProtocolRead(s7_protocol, read_data, sizeof(read_data));
-            printf("%s read [%d] s7 data %d using receipe file\n", __func__, i, read_data_length);
-            i++;
-            memset(read_data, 0, sizeof(read_data));
-            PrivTaskDelay(10000);
-        }
-    } 
-}
-
-PRIV_SHELL_CMD_FUNCTION(ControlS71200Test, Siemens Plc S7_1215 Demo, PRIV_SHELL_CMD_MAIN_ATTR);
--- a/APP_Framework/Applications/control_app/plc_demo/siemens/siemens_s7_300.c
+++ b/APP_Framework/Applications/control_app/plc_demo/siemens/siemens_s7_300.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 AIIT XUOS Lab
+ * 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:
@ -10,12 +10,11 @@
 * See the Mulan PSL v2 for more details.
 */

-/// this file is only used for debug
-#pragma once
-#include <stdbool.h>
+/**
+ * @file siemens_s7_300.c
+ * @brief PLC SIEMENS S7-300 app
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2023.3.27
+ */

-#include "printf.h"
-
-bool init_uart_mmio();
-void putc(char c);
-char getc();
--- a/APP_Framework/Applications/main.c
+++ b/APP_Framework/Applications/main.c
@ -22,13 +22,9 @@ extern void ApplicationOtaTaskInit(void);
 extern int OtaTask(void);
 #endif

-#ifdef APPLICATION_WEBSERVER
-extern int webserver(void);
-#endif
-
 int main(void)
 {
-    printf("\nHello, world!\n");
+    printf("Hello, world! \n");
    FrameworkInit();
 #ifdef APPLICATION_OTA
    ApplicationOtaTaskInit();
@ -37,11 +33,6 @@ int main(void)
 #ifdef OTA_BY_PLATFORM
    OtaTask();
 #endif
-
-#ifdef APPLICATION_WEBSERVER
-    webserver();
-#endif
-
    return 0;
 }
 // int cppmain(void);
--- a/Show More
+++ b/Show More