Merge pull request '123123' (#2) from test_pre into prepare_for_master

solve the Conflicts
# Conflicts:
#	APP_Framework/Framework/knowing/Kconfig

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "Ubiquitous/RT_Thread/rt-thread"]
 	path = Ubiquitous/RT_Thread/rt-thread
-	url = https://git.trustie.net/chunyexixiaoyu/rt-thread.git
+	url = https://code.gitlink.org.cn/chunyexixiaoyu/rt-thread.git
 [submodule "Ubiquitous/RT_Thread/bsp/k210/kendryte-sdk/kendryte-sdk-source"]
-	path = Ubiquitous/RT_Thread/bsp/k210/kendryte-sdk/kendryte-sdk-source
-	url = https://git.trustie.net/chunyexixiaoyu/kendryte-sdk-source.git
+	path = Ubiquitous/RT_Thread/aiit_board/k210/kendryte-sdk/kendryte-sdk-source
+	url = https://code.gitlink.org.cn/chunyexixiaoyu/kendryte-sdk-source.git

APP_Framework/Applications/Kconfig

@@ -11,6 +11,8 @@ menu "Applications"
             default 85  if KTASK_PRIORITY_256
     endmenu
 
+    source "$APP_DIR/Applications/ota/Kconfig"
+
     source "$APP_DIR/Applications/app_test/Kconfig"
     source "$APP_DIR/Applications/connection_app/Kconfig"
     source "$APP_DIR/Applications/control_app/Kconfig"

APP_Framework/Applications/Makefile

@@ -1,6 +1,10 @@
-SRC_DIR := general_functions
+SRC_DIR := general_functions app_test 
 
-SRC_FILES := main.c framework_init.c
+SRC_FILES := main.c framework_init.c 
+
+ifeq ($(CONFIG_APPLICATION_OTA),y)
+	SRC_DIR += ota
+endif
 
 ifeq ($(CONFIG_APPLICATION_SENSOR),y)
 	SRC_DIR += sensor_app

APP_Framework/Applications/SConscript

@@ -1,9 +1,15 @@
 import os
 Import('RTT_ROOT')
+Import('rtconfig')
 from building import *
 
 cwd = GetCurrentDir()
+
+SOURCES = ['framework_init.c']
+path =  [cwd]
 objs = []
+group = DefineGroup('sensor', SOURCES, depend = [], CPPPATH = [cwd])
+objs = objs + group
 list = os.listdir(cwd)
 
 for d in list:

APP_Framework/Applications/app_test/Kconfig

@@ -4,14 +4,6 @@ menu "test app"
         default n
 
         if USER_TEST
-            config USER_TEST_LORA_ADHOC
-                bool "Config test lora adhoc"
-                default n
-
-            config USER_TEST_SPI_LORA
-                bool "Config test spi lora"
-                default n
-
             config USER_TEST_SPI_FLASH
                 bool "Config test spi flash"
                 default n

APP_Framework/Applications/app_test/Makefile

@@ -1,13 +1,5 @@
 SRC_FILES := 
 
-ifeq ($(CONFIG_USER_TEST_LORA_ADHOC),y)
-	SRC_FILES += test_adhoc_lora.c
-endif
-
-ifeq ($(CONFIG_USER_TEST_SPI_LORA),y)
-	SRC_FILES += test_spi_lora.c
-endif
-
 ifeq ($(CONFIG_USER_TEST_SPI_FLASH),y)
 	SRC_FILES += test_spi_flash.c
 endif

APP_Framework/Applications/app_test/sd_card_mount.c

@@ -1,41 +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 sd_card_mount.c
- * @brief Mount SD card when opened SDIO
- * @version 1.0
- * @author AIIT XUOS Lab
- * @date 2021.04.19
- */
-
-#include "user_api/switch_api/user_api.h"
-#include <stdio.h>
-
-#if defined(FS_VFS)
-#include <iot-vfs.h>
-
-/**
- * @description: Mount SD card
- * @return 0
- */
-int  MountSDCard(void)
-{
-    if (MountFilesystem(SDIO_BUS_NAME, SDIO_DEVICE_NAME, SDIO_DRIVER_NAME, FSTYPE_FATFS, "/") == 0)
-        DBG("sd card mount to '/'");
-    else
-        SYS_WARN("sd card mount to '/' failed!");
-    
-    return 0;
-}
-#endif
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),MountSDCard, MountSDCard,  MountSDCard );

APP_Framework/Applications/app_test/spi_sd_card_mount.c

@@ -1,46 +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 spi_sd_card_mount.c
- * @brief Mount SD card when opened SPI SD card
- * @version 1.0
- * @author AIIT XUOS Lab
- * @date 2021.04.01
- */
-
-#include "user_api/switch_api/user_api.h"
-#include <stdio.h>
-
-#if defined(FS_VFS)
-#include <iot-vfs.h>
-
-/**
- * @description: Mount SD card
- * @return 0
- */
-int MountSDCard(void)
-{
-    struct Bus *spi_bus;
-    spi_bus = BusFind(SPI_BUS_NAME_1);
-
-    if (NONE == SpiSdInit(spi_bus, SPI_1_DEVICE_NAME_0, SPI_1_DRV_NAME, SPI_SD_NAME)) {
-        KPrintf("MountSDCard SpiSdInit error!\n");
-        return 0;
-    }
-    
-    if (EOK == MountFilesystem(SPI_BUS_NAME_1, SPI_SD_NAME, SPI_1_DRV_NAME, FSTYPE_FATFS, "/"))
-        KPrintf("SPI SD card fatfs mounted\n");
-
-    return 0;
-}
-#endif

APP_Framework/Applications/app_test/test_adhoc_lora.c

@@ -1,20 +0,0 @@
-#include <xiuos.h>
-
-extern void net_lora_client(int argc, char *argv[]);
-extern void net_lora_gateway(int argc, char *argv[]);
-
-void demo_lora_adhoc()
-{
-	#ifdef CONNECTION_COMMUNICATION_SET_AS_LORA_CLIENT
-		char pgk_count[32];
-		char* param[3];
-		param[0] = "xxx";
-		param[1] = CONNECTION_COMMUNICATION_LORA_CLIENT_NAME;
-		itoa(CONNECTION_COMMUNICATION_LORA_CLIENT_PKG_COUNT, pgk_count, 10);
-		param[2] = pgk_count;
-		net_lora_client(2, param);
-	#endif
-	#ifdef CONNECTION_COMMUNICATION_SET_AS_LORA_GATEWAY
-		net_lora_gateway(0, 0);
-	#endif
-}

APP_Framework/Applications/connection_app/Makefile

@@ -1,3 +1,3 @@
-SRC_DIR :=wifi_demo
+SRC_DIR :=
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/connection_app/adhoc_lora_demo/client.c

@@ -1,108 +0,0 @@
-#include <user_api.h>
-#include <string.h>
-#include <xs_adapter_lora.h>
-#include <xs_adapter_manager.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-char client_name[DEVNAME_LEN_MAX] = "lora_dev_123";
-
-void success_cb(void *param)
-{
-    printf("success_cb, param = %s\n", param);
-}
-
-void invert_param(void *param)
-{
-    printf("success_cb02 invoke, invert bool param.\n");
-    bool *bparam = (bool *)param;
-    if (*bparam)
-    {
-        *bparam = false;
-    }
-    else
-    {
-        *bparam = true;
-    }
-}
-
-void net_lora_client(int argc, char *argv[])
-{
-    int pkg_count = 10;
-    if (argc >= 1)
-    {
-        memset(client_name, 0, DEVNAME_LEN_MAX);
-        strncpy(client_name, argv[1], strlen(argv[1]));
-        printf("lora client set clientName(%s).\n", client_name);
-    }
-    
-    if (argc >= 2)
-    {
-        pkg_count = atoi(argv[2]);
-        printf("lora client set pkg_count(%d).\n", pkg_count);
-    }
-
-    // 1.Create an adapter for a specific agreement (LORA)
-    static struct AdapterLora lora_adapter;
-    memset(&lora_adapter, 0, sizeof(lora_adapter));
-    struct AdapterDone lora_example_done = {
-        .NetAiitOpen = LoraAdapterOpen,
-        .NetAiitClose = LoraAdapterCose,
-        .NetAiitSend = LoraAdapterSendc2g,
-        .NetAiitReceive = NULL,
-        .NetAiitJoin = LoraAdapterJoin,
-        .NetAiitIoctl = NULL,
-    };
-    lora_adapter.parent.done = lora_example_done; // Bind adapter operation
-    lora_adapter.name = client_name;     // Set adapter name
-    lora_adapter.spi_lora_fd = -1;      // Set adapter information
-    lora_adapter.deve_ui = "xxx";
-    lora_adapter.app_key = "yyy";
-
-    // 2.Register the adapter in the list
-    LoraAdapterInit();
-    LoraAdapterRegister((adapter_t)&lora_adapter);
-
-    // 3.Find from the list of registered adapters
-    adapter_t padapter = LoraAdapterFind(client_name);
-    if (NONE == padapter)
-    {
-        printf("adapter find failed!\n");
-        return;
-    }
-
-    // 4.Open adapter
-    if (0 != padapter->done.NetAiitOpen(padapter))
-    {
-        printf("adapter open failed!\n");
-        return;
-    }
-
-    // 5.Join the specified network segment as client
-    printf("NetAiitJoin start. \n");
-    padapter->done.NetAiitJoin(padapter, ROLE_TYPE_SLAVE, CONNECTION_COMMUNICATION_LORA_NET_ID);
-    printf("NetAiitJoin end. \n");
-
-    // 6.Point to point sending data to gateway
-    int i = 0;
-    while (i < pkg_count)
-    {
-        char data[120] = {0};
-        sprintf(data, "*****  I am %s, data_num = %d ******" ,client_name, i);
-        
-        bool v = false;
-        padapter->done.NetAiitSend(padapter, data, strlen(data) + 1, true, 10000, 0, invert_param, &v, NULL);
-        while (!v) // Asynchronous analog synchronization
-        {
-            UserTaskDelay(100);
-        }
-        printf("send success(main thread)... %s\n" ,data);
-
-        i++;
-        UserTaskDelay(800); // Contract interval
-    }
-    printf("all pkg send success(main thread), quit.\n");
-    
-    padapter->done.NetAiitClose(padapter);
-    printf("client quit.\n");
-}

APP_Framework/Applications/connection_app/adhoc_lora_demo/gateway.c

@@ -1,63 +0,0 @@
-#include <user_api.h>
-#include <string.h>
-#include <xs_klist.h>
-#include <xs_adapter_lora.h>
-#include <xs_adapter_manager.h>
-
-extern DoubleLinklistType online_user_head;
-
-void net_lora_gateway(int argc, char *argv[])
-{
-    // 1.New specific agreement (LORA) adapter
-    static struct AdapterLora lora_adapter;
-    memset(&lora_adapter, 0, sizeof(lora_adapter));
-    struct AdapterDone lora_example_done = {
-        .NetAiitOpen = LoraAdapterOpen,
-        .NetAiitClose = NULL,
-        .NetAiitSend = NULL,
-        .NetAiitReceive = LoraAdapterReceive,
-        .NetAiitJoin = LoraAdapterJoin,
-        .NetAiitIoctl = NULL,
-    };
-    lora_adapter.parent.done = lora_example_done; // Bind adapter operation
-    lora_adapter.name = "lora_dev_456"; // Set adapter name
-    lora_adapter.spi_lora_fd = -1; // Set adapter information
-    lora_adapter.deve_ui = "xxx";
-    lora_adapter.app_key = "yyy";
-
-    // 2.Register the adapter in the list
-    LoraAdapterInit();
-    LoraAdapterRegister((adapter_t)&lora_adapter);
-
-    // 3.Find from the list of registered adapters
-    adapter_t padapter = LoraAdapterFind("lora_dev_456");
-    if (NONE == padapter)
-    {
-        printf("adapter find failed!\n");
-        return;
-    }
-
-    // 4.Open adapter
-    if (0 != padapter->done.NetAiitOpen(padapter))
-    {
-        printf("adapter open failed!\n");
-        return;
-    }
-
-    // 5.Join the specified network segment as gateway
-    padapter->done.NetAiitJoin(padapter, ROLE_TYPE_MASTER, CONNECTION_COMMUNICATION_LORA_NET_ID);
-}
-
-
-
-static void net_lora_connectedlist(int argc, char *argv[])
-{
-    DoubleLinklistType* pNode;
-    printf("******** connected users *********\n");
-    DOUBLE_LINKLIST_FOR_EACH(pNode, &online_user_head)
-    {
-        OnlineUser* pUser =CONTAINER_OF(pNode, OnlineUser, link);
-        printf("%s\n", pUser->user_name);
-    }
-    printf("*********************************\n");
-}

APP_Framework/Applications/connection_app/bluetooth_demo/Makefile

@@ -1,3 +0,0 @@
-SRC_FILES :=  bluetooth_receive_demo.c bluetooth_send_demo.c
-#   zigbee_send_demo.c zigbee_receive_demo.c
-include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/connection_app/bluetooth_demo/bluetooth_receive_demo.c

@@ -1,88 +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:    bluetooth_receive_demo.c
-* @brief:   using bluetooth to receive message
-* @version: 1.0
-* @author:  AIIT XUOS Lab
-* @date:    2021/4/30
-*
-*/
-#include <xs_adapter_bluetooth.h>   
-#include <string.h>
-#include <xs_klist.h>
-#include <xs_adapter_manager.h>
-#include <user_api.h>
-#include <string.h>
-static int re_sem;
-
-static int buff_sem;
-
-
-/*Critical zone protection function for*/
-void BluetoothWait(char *rev_buffer)
-{
-    while(1){  
-        if (strlen(rev_buffer)>1){
-            UserSemaphoreAbandon(re_sem);
-            break;
-        }
-    }
-
-}
-
-
-/* receive message from another bluetooth device*/    
-void BluetoothReceiveDemo(int argc, char *argv[])
-{
-    adapter_t padapter = BluetoothAdapterFind("Bluetooth");
-    if (NONE == padapter){
-        KPrintf("adapter find failed!\n");
-        return;
-    }
-    /*Open adapter*/
-    if (0 != padapter->done.NetAiitOpen(padapter)){
-        KPrintf("adapter open failed!\n");
-        return;
-    }
-
-
-    char rev_buffer[NAME_NUM_MAX];    
-    /* Initialize semaphore */
-    re_sem = UserSemaphoreCreate(0);
-    /* receive buffer from serial port */
-    padapter->done.NetAiitReceive(padapter,rev_buffer,strlen(rev_buffer),10000,false,NULL);
-    BluetoothWait(rev_buffer);
-    UserSemaphoreObtain(re_sem,-1);
-
-
-    printf("\n");
-    for (int i=0;i<strlen(rev_buffer);i++)
-    {     
-        if(rev_buffer[i] != 0Xff)
-            printf("%c",rev_buffer[i]);    
-              
-    }
-    printf("\n");
-    
-    
-    
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-BluetoothReceiveDemo, BluetoothReceiveDemo,  bluetooth receive function );
-#endif
-
-
-
-

APP_Framework/Applications/connection_app/bluetooth_demo/bluetooth_send_demo.c

@@ -1,65 +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:    bluetooth_send_demo.c
-* @brief:   using bluetooth to send message
-* @version: 1.0
-* @author:  AIIT XUOS Lab
-* @date:    2021/4/30
-*
-*/
-#include <xs_adapter_bluetooth.h>   
-#include <string.h>
-#include <xs_klist.h>
-#include <xs_adapter_manager.h>
-#include <string.h>
-#include <user_api.h>
-adapter_t padapter;
-/* a demo function to send message through command line using bluetooth*/
-/* first open bluetooth to start demo*/
-void BluetoothOpenDemo()
-{
-    /*Find from the list of registered adapters*/
-    // adapter_t padapter = BluetoothAdapterFind("Bluetoot");
-    padapter = BluetoothAdapterFind("Bluetooth");
-    if (NONE == padapter){
-        printf("adapter find failed!\n");
-        return;
-    }
-
-    /*Open adapter*/
-    if (0 != padapter->done.NetAiitOpen(padapter)){
-        printf("adapter open failed!\n");
-        return;
-    }
-
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-BluetoothOpenDemo, BluetoothOpenDemo,  bluetooth send function );
-#endif
-
-void BluetoothSendDemo(int argc, char *argv[])
-{
-    /*Find from the list of registered adapters*/
-    bool v = false;
-    padapter->done.NetAiitSend(padapter, argv[1], strlen(argv[1]) ,true,10000,0, NULL,&v,NULL);
-        
-
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-BluetoothSendDemo, BluetoothSendDemo,  bluetooth send function );
-#endif
-
-

APP_Framework/Applications/connection_app/ethernet_demo/ethernet_demo.c

@@ -1,197 +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 ethernet_demo.c
- * @brief Demo for ethernet function
- * @version 1.0
- * @author AIIT XUOS Lab
- * @date 2021.04.22
- */
-#include <string.h>
-#include <user_api.h>
-#include <xs_adapter_manager.h>
-#include <xs_adapter_at_ethernet.h>
-
-static bool opened = false;
-
-void OpenEthernetMsg()
-{
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-}
-
-
-void SendEthernetMsg(int argc, char *argv[])
-{
-    char ethernet_msg[128];
-    if (argc >= 1){
-        memset(ethernet_msg, 0, 128);
-        strncpy(ethernet_msg, argv[1], strlen(argv[1]));
-        printf("SendEthernetMsg(%s).\n", ethernet_msg);
-    }
-
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    at_adapter->parent.done.NetAiitSend(&at_adapter->parent, ethernet_msg, strlen(ethernet_msg), true, 1000, 0, NULL, NULL, NULL);
-}
-
-void RecvEthernetMsg()
-{
-    char ethernet_recv_msg[128];
-    memset(ethernet_recv_msg, 0, sizeof(ethernet_recv_msg));
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    while (1){
-        memset(ethernet_recv_msg, 0, sizeof(ethernet_recv_msg));
-        if (EOK == at_adapter->parent.done.NetAiitReceive(&at_adapter->parent, ethernet_recv_msg, 128, 40000, true, NULL))
-            printf("ethernet_recv_msg (%s)\n", ethernet_recv_msg);
-        else
-            printf("ethernet_recv_msg failed .\n");
-    }
-}
-
-void DhcpEthernet()
-{
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    printf("Waiting for msg...\n");
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    if (EOK != at_adapter->atdone.ATOperateDHCP(at_adapter, 1))
-        printf("EthernetNetstat failed \n");
-}
-
-void PingEthernet()
-{
-    char ethernet_recv_msg[128];
-    memset(ethernet_recv_msg, 0, sizeof(ethernet_recv_msg));
-
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    printf("Waiting for msg...\n");
-    struct PingResult result;
-    char *ip_str = "192.168.250.250";
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    if (EOK == at_adapter->atdone.ATPing(at_adapter, ip_str, &result))
-        printf("EthernetPing success (%s)\n", result.ip_addr.ipv4);
-    else
-        printf("EthernetPing failed \n");
-}
-
-void SetUpEthernet()
-{
-    char ethernet_recv_msg[128];
-    memset(ethernet_recv_msg, 0, sizeof(ethernet_recv_msg));
-
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    printf("Waiting for msg...\n");
-    struct PingResult result;
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    if (EOK == at_adapter->atdone.ATOperateUp(at_adapter))
-        printf("EthernetSetUp success (%s)\n", result.ip_addr.ipv4);
-    else
-        printf("EthernetSetUp failed \n");
-}
-
-void NetstatEthernet()
-{
-    struct AdapterAT *at_adapter = ATAdapterFind(ETHERNET_ADAPTER_ID);
-    if (!at_adapter)
-        printf("ATAdapterFind failed .\n");
-
-    printf("Waiting for msg...\n");
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    if (EOK != at_adapter->atdone.ATNetstat(at_adapter))
-        printf("EthernetNetstat failed \n");
-}
-
-void AtTestCmdEthernet(int argc, char *argv[])
-{
-    char cmd[64];
-    if (argc >= 1){
-        memset(cmd, 0, sizeof(cmd));
-        strncpy(cmd, argv[1], strlen(argv[1]));
-        printf("AT cmd send(%s).\n", cmd);
-    }
-
-    strcat(cmd,"\r");
-    struct AdapterAT* at_adapter =  ATAdapterFind(ETHERNET_ADAPTER_ID);
-
-    if (!opened){
-        opened = true;
-        at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-    }
-
-    printf("Waiting for msg...\n");
-
-    // Send hfa21 handshake, start cmd mode.
-    ATOrderSend(at_adapter->agent, REPLY_TIME_OUT, NULL, "+++");
-    UserTaskDelay(100);
-
-    ATOrderSend(at_adapter->agent, REPLY_TIME_OUT, NULL, "a");
-
-    UserTaskDelay(2500);
-
-    ATOrderSend(at_adapter->agent,REPLY_TIME_OUT, NULL,cmd);
-    UserTaskDelay(2500);
-
-    ATOrderSend(at_adapter->agent,REPLY_TIME_OUT, NULL,"AT+Z\r");
-    UserTaskDelay(5000);
-    
-}

APP_Framework/Applications/connection_app/nbiot_demo/nbiot_demo.c

@@ -1,56 +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 nbiot_demo.c
- * @brief Demo for NBIoT function
- * @version 1.0
- * @author AIIT XUOS Lab
- * @date 2021.04.22
- */
-
-#include <string.h>
-#include <user_api.h>
-#include <xs_adapter_at_agent.h>
-#include <xs_adapter_manager.h>
-#include <xs_adapter_at_nbiot.h>
-
-extern void RegisterAdapterNBIoT(void);
-
-void NbiotEnable(void)
-{
-    struct AdapterAT* at_adapter =  ATAdapterFind(NBIOT_ADAPTER_ID);
-
-    UserTaskDelay(5000);
-    
-    at_adapter->parent.done.NetAiitOpen(&at_adapter->parent);
-
-    printf("Waiting for msg...\n");
-
-    at_adapter->atdone.ATSocketCreate(at_adapter, 1, SOCKET_TYPE_STREAM, NET_TYPE_AF_INET);
-    UserTaskDelay(1000);
-
-    struct AddressIpv4 addr;
-    addr.ipv4 = IpTint("115.236.53.226");
-    at_adapter->atdone.ATSocketConnect(at_adapter, 1, addr, 8989, 0);
-
-    int socket_fd = 1;
-    int count = 0;
-
-    while (1) {
-        UserTaskDelay(1000);
-        at_adapter->parent.done.NetAiitSend((struct Adapter *)at_adapter, "AB30313233", 5, 0, 0, 0, 0, 0, &socket_fd);
-        count++;
-        if (count == 10)
-            break;
-    }
-}

APP_Framework/Applications/connection_app/wifi_demo/wifi_demo.c

@@ -1,223 +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 wifi_demo.c
- * @brief Demo for wifi function
- * @version 1.0
- * @author AIIT XUOS Lab
- * @date 2021.04.22
- */
-
-#include <at_agent.h>
-#include <adapter.h>
-
-void SendWiftMsg(int argc, char *argv[])
-{
-    char wifi_msg[128];
-    int len;
-    if (argc >= 1) {
-        memset(wifi_msg, 0, 128);
-        strncpy(wifi_msg, argv[1], (len = strlen(argv[1])));
-        printf("SendWiftMsg(%s).\n", wifi_msg);
-    }
-
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-    AdapterDeviceOpen(adapter);
-
-    AdapterDeviceSend(adapter, wifi_msg, len);
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(0), SendWiftMsg, SendWiftMsg, SendWiftMsg);
-
-void RecvWifiMsg()
-{
-    char wifi_recv_msg[128];
-    memset(wifi_recv_msg, 0, sizeof(wifi_recv_msg));
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    AdapterDeviceOpen(adapter);
-
-    while (1) {
-        memset(wifi_recv_msg, 0, sizeof(wifi_recv_msg));
-        if (EOK == AdapterDeviceRecv(adapter, wifi_recv_msg, 128)) {
-            printf("wifi_recv_msg (%s)\n", wifi_recv_msg);
-        } else {
-            printf("wifi_recv_msg failed .\n");
-        }
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), RecvWifiMsg, RecvWifiMsg, RecvWifiMsg);
-
-void SetUpWifi()
-{
-    char wifi_recv_msg[128];
-    int baud_rate = BAUD_RATE_57600;
-    memset(wifi_recv_msg, 0, sizeof(wifi_recv_msg));
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-    AdapterDeviceOpen(adapter);
-    AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
-    if (EOK == AdapterDeviceSetUp(adapter)) {
-        printf("SetUpWifi success \n");
-    } else {
-        printf("SetUpWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), SetUpWifi, SetUpWifi, SetUpWifi);
-
-void SetDownWifi()
-{
-    char wifi_recv_msg[128];
-    memset(wifi_recv_msg, 0, sizeof(wifi_recv_msg));
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-
-    AdapterDeviceOpen(adapter);
-
-    if (EOK == AdapterDeviceSetDown(adapter)) {
-        printf("SetDownWifi success \n");
-    } else {
-        printf("SetDownWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), SetDownWifi, SetDownWifi, SetDownWifi);
-
-void SetAddrWifi()
-{
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-
-    AdapterDeviceOpen(adapter);
-
-    if(EOK == AdapterDeviceSetAddr(adapter, "192.168.66.253", "255.255.255.0", "192.168.66.1")){
-        printf("SetAddrWifi success \n");
-    } else {
-        printf("SetAddrWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), SetAddrWifi, SetAddrWifi, SetAddrWifi);
-
-void PingWifi()
-{
-    char wifi_recv_msg[128];
-    memset(wifi_recv_msg, 0, sizeof(wifi_recv_msg));
-
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-    //www.baidu.com
-    char *ip_str = "36.152.44.95";
-
-    AdapterDeviceOpen(adapter);
-
-    if (EOK == AdapterDevicePing(adapter, ip_str)) {
-        printf("PingWifi success \n");
-    } else {
-        printf("PingWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), PingWifi, PingWifi, PingWifi);
-
-void NetstatWifi()
-{
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-
-    AdapterDeviceOpen(adapter);
-
-    if (EOK == AdapterDeviceNetstat(adapter)) {
-        printf("NetstatWifi success \n");
-    } else {
-        printf("NetstatWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), NetstatWifi, NetstatWifi, NetstatWifi);
-
-int ConnectWifi()
-{
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-
-    const char *ip = "192.168.66.33";
-    const char *port = "12345";
-    enum NetRoleType net_role = CLIENT;
-    enum IpType ip_type = IPV4;
-
-    if (!adapter) {
-        printf("ATAdapterFind failed .\n");
-    }
-
-    printf("Waiting for msg...\n");
-
-    AdapterDeviceOpen(adapter);
-
-    if (EOK == AdapterDeviceConnect(adapter, net_role, ip, port, ip_type)) {
-        printf("ConnectWifi success \n");
-    } else {
-        printf("ConnectWifi failed \n");
-    }
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0), ConnectWifi, ConnectWifi, ConnectWifi);
-
-void AtTestCmdWifi(int argc, char *argv[])
-{
-    char cmd[64];
-    if (argc >= 1) {
-        memset(cmd, 0, sizeof(cmd));
-        strncpy(cmd, argv[1], strlen(argv[1]));
-        printf("AT cmd send(%s).\n", cmd);
-    }
-
-    strcat(cmd,"\r");
-    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_WIFI_NAME);
-    // AdapterDeviceOpen(adapter);
-
-    printf("Waiting for msg...\n");
-
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "+++");
-    UserTaskDelay(100);
-
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "a");
-
-    UserTaskDelay(2500);
-
-    ATOrderSend(adapter->agent,REPLY_TIME_OUT, NULL,cmd);
-    UserTaskDelay(2500);
-
-    ATOrderSend(adapter->agent,REPLY_TIME_OUT, NULL,"AT+Z\r");
-    UserTaskDelay(5000);
-}
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(0), AtTestCmdWifi, AtTestCmdWifi, AtTestCmdWifi);

APP_Framework/Applications/connection_app/zigbee_demo/Makefile

@@ -1,3 +0,0 @@
-SRC_FILES :=  zigbee_receive_demo.c
-#   zigbee_send_demo.c zigbee_receive_demo.c
-include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/connection_app/zigbee_demo/zigbee_receive_demo.c

@@ -1,88 +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:    zigbee_receive_demo.c
-* @brief:   using zigbee to receive message
-* @version: 1.0
-* @author:  AIIT XUOS Lab
-* @date:    2021/4/30
-*
-*/
-#include <xs_adapter_zigbee.h>   
-#include <string.h>
-#include <xs_klist.h>
-#include <xs_adapter_manager.h>
-#include <user_api.h>
-#include <string.h>
-static int re_sem;
-
-static int buff_sem;
-
-
-/*Critical zone protection function for*/
-void ZigbeeWait(char *rev_buffer)
-{
-    while(1){  
-        if (strlen(rev_buffer)>1){
-            UserSemaphoreAbandon(re_sem);
-            break;
-        }
-    }
-
-}
-
-
-/* receive message from another zigbee device*/    
-void ZigbeeReceiveDemo(int argc, char *argv[])
-{
-    adapter_t padapter = ZigbeeAdapterFind("zigbee");
-    if (NONE == padapter){
-        KPrintf("adapter find failed!\n");
-        return;
-    }
-    /*Open adapter*/
-    if (0 != padapter->done.NetAiitOpen(padapter)){
-        KPrintf("adapter open failed!\n");
-        return;
-    }
-
-
-    char rev_buffer[NAME_NUM_MAX];    
-    /* Initialize semaphore */
-    re_sem = UserSemaphoreCreate(0);
-    /* receive buffer from serial port */
-    padapter->done.NetAiitReceive(padapter,rev_buffer,strlen(rev_buffer),10000,false,NULL);
-    ZigbeeWait(rev_buffer);
-    UserSemaphoreObtain(re_sem,-1);
-
-
-    printf("\n");
-    for (int i=0;i<strlen(rev_buffer);i++)
-    {     
-        if(rev_buffer[i] != 0Xff)
-            printf("%c",rev_buffer[i]);    
-              
-    }
-    printf("\n");
-    
-    
-    
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-ZigbeeReceiveDemo, ZigbeeReceiveDemo,  zigbee receive function );
-#endif
-
-
-
-

APP_Framework/Applications/connection_app/zigbee_demo/zigbee_send_demo.c

@@ -1,65 +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:    zigbee_send_demo.c
-* @brief:   using zigbee to send message
-* @version: 1.0
-* @author:  AIIT XUOS Lab
-* @date:    2021/4/30
-*
-*/
-#include <xs_adapter_zigbee.h>   
-#include <string.h>
-#include <xs_klist.h>
-#include <xs_adapter_manager.h>
-#include <string.h>
-#include <user_api.h>
-adapter_t padapter;
-/* a demo function to send message through command line using zigbee*/
-/* first open zigbee to start demo*/
-void ZigbeeOpenDemo()
-{
-    /*Find from the list of registered adapters*/
-    // adapter_t padapter = ZigbeeAdapterFind("zigbee");
-    padapter = ZigbeeAdapterFind("zigbee");
-    if (NONE == padapter){
-        printf("adapter find failed!\n");
-        return;
-    }
-
-    /*Open adapter*/
-    if (0 != padapter->done.NetAiitOpen(padapter)){
-        printf("adapter open failed!\n");
-        return;
-    }
-
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-ZigbeeOpenDemo, ZigbeeOpenDemo,  zigbee send function );
-#endif
-
-void ZigbeeSendDemo(int argc, char *argv[])
-{
-    /*Find from the list of registered adapters*/
-    bool v = false;
-    padapter->done.NetAiitSend(padapter, argv[1], strlen(argv[1]) ,true,10000,0, NULL,&v,NULL);
-        
-
-}
-#ifndef SEPARATE_COMPILE
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN),
-ZigbeeSendDemo, ZigbeeSendDemo,  zigbee send function );
-#endif
-
-

APP_Framework/Applications/framework_init.c

@@ -11,19 +11,28 @@
 */
 #include <stdio.h>
 #include <string.h>
-#include <user_api.h>
+#include <transform.h>
 
 extern int SensorFrameworkInit(void);
 extern int AdapterFrameworkInit(void);
 
 extern int Adapter4GInit(void);
+extern int AdapterNbiotInit(void);
+extern int AdapterBlueToothInit(void);
 extern int AdapterWifiInit(void);
+extern int AdapterEthernetInit(void);
+extern int AdapterZigbeeInit(void);
+extern int AdapterLoraInit(void);
 
 extern int D124VoiceInit(void);
 extern int Hs300xTemperatureInit(void);
 extern int Hs300xHumidityInit(void);
 extern int Ps5308Pm1_0Init(void);
 extern int Zg09Co2Init(void);
+extern int As830Ch4Init(void);
+extern int Tb600bIaq10IaqInit(void);
+extern int Tb600bTvoc10TvocInit(void);
+extern int Tb600bWqHcho1osInit(void);
 
 typedef int (*InitFunc)(void);
 struct InitDesc
@@ -84,16 +93,47 @@ static struct InitDesc sensor_desc[] =
 	{ "zg09_co2", Zg09Co2Init },
 #endif
 
+#ifdef SENSOR_AS830
+	{ "ch4_as830", As830Ch4Init },
+#endif
+
+#ifdef SENSOR_TB600B_IAQ10
+	{ "iaq_tb600b_iaq10", Tb600bIaq10IaqInit },
+#endif
+
+#ifdef SENSOR_TB600B_TVOC10
+	{ "tvoc_tb600b_tvoc10", Tb600bTvoc10TvocInit },
+#endif
+
+#ifdef SENSOR_TB600B_WQ_HCHO1OS
+	{ "tvoc_tb600b_wq_hcho1os", Tb600bWqHcho1osInit },
+#endif
+
 	{ "NULL", NULL },
 };
 
 static struct InitDesc connection_desc[] = 
 {
-#ifdef ADAPTER_4G
-	{ "4G adpter", Adapter4GInit},
+#ifdef CONNECTION_ADAPTER_4G
+	{ "4G adapter", Adapter4GInit},
 #endif
-#ifdef ADAPTER_WIFI
-	{ "Wifi adpter", AdapterWifiInit},
+#ifdef CONNECTION_ADAPTER_NB
+	{ "NB adpter", AdapterNbiotInit},
+#endif
+#ifdef CONNECTION_ADAPTER_ZIGBEE
+	{ "zigbee adapter", AdapterZigbeeInit},
+#endif
+#ifdef CONNECTION_ADAPTER_BLUETOOTH
+	{ "bluetooth adapter", AdapterBlueToothInit},
+#endif
+#ifdef CONNECTION_ADAPTER_WIFI
+	{ "wifi adapter", AdapterWifiInit},
+#endif
+#ifdef CONNECTION_ADAPTER_ETHERNET
+	{ "ethernet adapter", AdapterEthernetInit},
+#endif
+#ifdef CONNECTION_ADAPTER_LORA
+	{ "lora adapter", AdapterLoraInit},
 #endif
 	{ "NULL", NULL },
 };

APP_Framework/Applications/general_functions/list/SConscript

@@ -0,0 +1,11 @@
+import os
+from building import * 
+Import('RTT_ROOT')
+Import('rtconfig')
+cwd = GetCurrentDir()
+DEPENDS = [""]
+
+SOURCES = ['double_list.c'] + ['single_list.c']
+path =  [cwd]
+objs = DefineGroup('list', src = SOURCES, depend = DEPENDS,CPPPATH = path) 
+Return("objs") 

APP_Framework/Applications/general_functions/list/list.h

@@ -23,7 +23,7 @@
 #define __LIST_H__
 
 #include "libc.h"
-
+#include<stddef.h>
 #ifdef __cplusplus
 extern "C" {
 #endif

APP_Framework/Applications/knowing_app/Kconfig

@@ -5,9 +5,11 @@ menu "knowing app"
         
     if APPLICATION_KNOWING
         source "$APP_DIR/Applications/knowing_app/mnist/Kconfig" 
-        source "$APP_DIR/Applications/knowing_app/face_detect/Kconfig" 
-        source "$APP_DIR/Applications/knowing_app/instrusion_detect/Kconfig" 
-        source "$APP_DIR/Applications/knowing_app/helmet_detect/Kconfig" 
+        source "$APP_DIR/Applications/knowing_app/k210_detect_entry/Kconfig" 
         source "$APP_DIR/Applications/knowing_app/iris_ml_demo/Kconfig" 
+        source "$APP_DIR/Applications/knowing_app/k210_fft_test/Kconfig" 
+        source "$APP_DIR/Applications/knowing_app/image_processing/Kconfig" 
+        source "$APP_DIR/Applications/knowing_app/cmsis_5_demo/Kconfig" 
+ 
     endif 
 endmenu

APP_Framework/Applications/knowing_app/cmsis_5_demo/Kconfig

@@ -0,0 +1,16 @@
+menuconfig USING_CMSIS_5_DEMOAPP
+        bool "CMSIS-5 demo app"
+        depends on USING_USING_CMSIS_5_NN
+        default n
+
+    if USING_CMSIS_5_DEMOAPP
+
+        config USING_CMSIS_5_NN_DEMOAPP
+            bool "Using CMSIS-5 NN demo app"
+            select USING_IMAGE_PROCESSING
+            select IMAGE_PROCESSING_USING_TJPGD
+            default n
+
+    endif
+
+

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/README.md

@@ -0,0 +1,14 @@
+# CMSIS-NN cifar10 example
+
+The model of this example is from [[ARM-software](https://github.com/ARM-software)/**[ML-examples](https://github.com/ARM-software/ML-examples)**] and can be deployed on Arm Cortex-M CPUs using [CMSIS-NN](https://github.com/ARM-software/CMSIS_5).
+
+## Requirements:
+- CMSIS-NN in Framework/knowing/cmsis_5
+- TJpgDec in Framework/knowing/image_processing
+- Enough stack size (recommend 10240) for finsh thread which can be changed in "RT-Thread Components->Command shell->finsh shell" by menuconfig.
+
+## To run this demo:
+- Place the photo where you want
+- Run demo by type the command
+  ``` 
+  cmsisnn_demo /path/to/photo

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/SConscript

@@ -0,0 +1,18 @@
+from building import *
+import os
+
+cwd = GetCurrentDir()
+
+src = Split('''
+model/m4/nn.c
+demo/cmsisnn_demo.c
+''')
+
+path = [
+    cwd + '/model/m4',
+    cwd + '/demo'
+    ]
+
+group = DefineGroup('CMSISNN-cifar10', src, depend = ['USING_CMSIS_5_DEMOAPP'], CPPPATH = path)
+
+Return('group')

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/demo/cmsisnn_demo.c

@@ -0,0 +1,157 @@
+#include <transform.h>
+#include <tjpgd.h>
+#include "../model/m4/nn.h"
+
+#define WORK_POOL_SIZE (4 * 1024 + 32)
+
+const char *cifar10_label[] = {"Plane", "Car", "Bird", "Cat", "Deer", "Dog", "Frog", "Horse", "Ship", "Truck"};
+
+int get_top_prediction(q7_t *predictions)
+{
+  int max_ind = 0;
+  int max_val = -128;
+  for (int i = 0; i < 10; i++)
+  {
+    if (max_val < predictions[i])
+    {
+      max_val = predictions[i];
+      max_ind = i;
+    }
+  }
+  return max_ind;
+}
+
+int cmsisnn_inference(uint8_t *input_data)
+{
+  q7_t output_data[10];
+  run_nn((q7_t *)input_data, output_data);
+  arm_softmax_q7(output_data, IP1_OUT_DIM, output_data);
+  int top_ind = get_top_prediction(output_data);
+  printf("\rPrediction: %s \r\n", cifar10_label[top_ind]);
+  return top_ind;
+}
+
+typedef struct
+{
+  FILE *fp;
+  uint8_t *fbuf;
+  uint16_t wfbuf;
+} IODEV;
+
+unsigned int in_func_cmsisnn(JDEC *jd, uint8_t *buff, unsigned int nbyte)
+{
+  IODEV *dev = (IODEV *)jd->device;
+
+  if (buff)
+  {
+    return (uint16_t)fread(buff, 1, nbyte, dev->fp);
+  }
+  else
+  {
+    return fseek(dev->fp, nbyte, SEEK_CUR) ? 0 : nbyte;
+  }
+}
+
+int out_func_cmsisnn(JDEC *jd, void *bitmap, JRECT *rect)
+{
+  IODEV *dev = (IODEV *)jd->device;
+  uint8_t *src, *dst;
+  uint16_t y, bws, bwd;
+
+  if (rect->left == 0)
+  {
+    printf("\r%lu%%", (rect->top << jd->scale) * 100UL / jd->height);
+  }
+
+  src = (uint8_t *)bitmap;
+  dst = dev->fbuf + 3 * (rect->top * dev->wfbuf + rect->left);
+  bws = 3 * (rect->right - rect->left + 1);
+  bwd = 3 * dev->wfbuf;
+  for (y = rect->top; y <= rect->bottom; y++)
+  {
+    memcpy(dst, src, bws);
+    src += bws;
+    dst += bwd;
+  }
+
+  return 1;
+}
+
+int cmsisnn_demo(int argc, char *argv[])
+{
+  void *work;
+  JDEC jdec; 
+  JRESULT res; 
+  IODEV devid; 
+
+  if (argc < 2)
+  {
+    printf("Jpeg_Dec illegal arguments ...\n");
+    return -1;
+  }
+
+  devid.fp = fopen(argv[1], "r+");
+  if (!devid.fp)
+  {
+    printf("Jpeg_Dec open the file failed...\n");
+    return -1;
+  }
+
+  work = malloc(WORK_POOL_SIZE);
+  if (work == NULL)
+  {
+    printf("Jpeg_Dec work malloc failed...\n");
+    res = -1;
+    goto __exit;
+  }
+
+  res = jd_prepare(&jdec, in_func_cmsisnn, work, WORK_POOL_SIZE, &devid);
+  if (res == JDR_OK)
+  {
+    printf("Image dimensions: %u by %u. %u bytes used.\n", jdec.width, jdec.height, 3100 - jdec.sz_pool);
+
+    devid.fbuf = malloc(3 * jdec.width * jdec.height);
+    if (devid.fbuf == NULL)
+    {
+      printf("Jpeg_Dec devid.fbuf malloc failed, need to use %d Bytes ...\n", 3 * jdec.width * jdec.height);
+      res = -1;
+      goto __exit;
+    }
+    devid.wfbuf = jdec.width;
+
+    res = jd_decomp(&jdec, out_func_cmsisnn, 0);
+    if (res == JDR_OK)
+    {
+      printf("\rDecompress success \n");
+    }
+    else
+    {
+      printf("Failed to decompress: rc=%d\n", res);
+    }
+
+    cmsisnn_inference(devid.fbuf);
+
+    if (devid.fbuf != NULL)
+    {
+      free(devid.fbuf);
+    }
+  }
+  else
+  {
+    printf("Failed to prepare: rc=%d\n", res);
+  }
+
+__exit:
+  if (work != NULL)
+  {
+    free(work);
+  }
+
+  fclose(devid.fp);
+
+  return res;
+}
+
+#ifdef __RT_THREAD_H__
+MSH_CMD_EXPORT(cmsisnn_demo, cifar10 demo and filename should be followed);
+#endif

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m4/nn.c

@@ -0,0 +1,46 @@
+#include "nn.h"
+
+// Timer t;
+
+static uint8_t mean[DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM] = MEAN_DATA;
+
+static q7_t conv1_wt[CONV1_IN_CH*CONV1_KER_DIM*CONV1_KER_DIM*CONV1_OUT_CH] = CONV1_WT;
+static q7_t conv1_bias[CONV1_OUT_CH] = CONV1_BIAS;
+
+static q7_t conv2_wt[CONV2_IN_CH*CONV2_KER_DIM*CONV2_KER_DIM*CONV2_OUT_CH] = CONV2_WT;
+static q7_t conv2_bias[CONV2_OUT_CH] = CONV2_BIAS;
+
+static q7_t conv3_wt[CONV3_IN_CH*CONV3_KER_DIM*CONV3_KER_DIM*CONV3_OUT_CH] = CONV3_WT;
+static q7_t conv3_bias[CONV3_OUT_CH] = CONV3_BIAS;
+
+static q7_t ip1_wt[IP1_IN_DIM*IP1_OUT_DIM] = IP1_WT;
+static q7_t ip1_bias[IP1_OUT_DIM] = IP1_BIAS;
+
+//Add input_data and output_data in top main.cpp file
+//uint8_t input_data[DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM];
+//q7_t output_data[IP1_OUT_DIM];
+
+q7_t col_buffer[3200];
+q7_t scratch_buffer[40960];
+
+void mean_subtract(q7_t* image_data) {
+  for(int i=0; i<DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM; i++) {
+    image_data[i] = (q7_t)__SSAT( ((int)(image_data[i] - mean[i]) >> DATA_RSHIFT), 8);
+  }
+}
+
+void run_nn(q7_t* input_data, q7_t* output_data) {
+  q7_t* buffer1 = scratch_buffer;
+  q7_t* buffer2 = buffer1 + 32768;
+  mean_subtract(input_data);
+  arm_convolve_HWC_q7_RGB(input_data, CONV1_IN_DIM, CONV1_IN_CH, conv1_wt, CONV1_OUT_CH, CONV1_KER_DIM, CONV1_PAD, CONV1_STRIDE, conv1_bias, CONV1_BIAS_LSHIFT, CONV1_OUT_RSHIFT, buffer1, CONV1_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_maxpool_q7_HWC(buffer1, POOL1_IN_DIM, POOL1_IN_CH, POOL1_KER_DIM, POOL1_PAD, POOL1_STRIDE, POOL1_OUT_DIM, col_buffer, buffer2);
+  arm_relu_q7(buffer2, RELU1_OUT_DIM*RELU1_OUT_DIM*RELU1_OUT_CH);
+  arm_convolve_HWC_q7_fast(buffer2, CONV2_IN_DIM, CONV2_IN_CH, conv2_wt, CONV2_OUT_CH, CONV2_KER_DIM, CONV2_PAD, CONV2_STRIDE, conv2_bias, CONV2_BIAS_LSHIFT, CONV2_OUT_RSHIFT, buffer1, CONV2_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_relu_q7(buffer1, RELU2_OUT_DIM*RELU2_OUT_DIM*RELU2_OUT_CH);
+  arm_avepool_q7_HWC(buffer1, POOL2_IN_DIM, POOL2_IN_CH, POOL2_KER_DIM, POOL2_PAD, POOL2_STRIDE, POOL2_OUT_DIM, col_buffer, buffer2);
+  arm_convolve_HWC_q7_fast(buffer2, CONV3_IN_DIM, CONV3_IN_CH, conv3_wt, CONV3_OUT_CH, CONV3_KER_DIM, CONV3_PAD, CONV3_STRIDE, conv3_bias, CONV3_BIAS_LSHIFT, CONV3_OUT_RSHIFT, buffer1, CONV3_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_relu_q7(buffer1, RELU3_OUT_DIM*RELU3_OUT_DIM*RELU3_OUT_CH);
+  arm_avepool_q7_HWC(buffer1, POOL3_IN_DIM, POOL3_IN_CH, POOL3_KER_DIM, POOL3_PAD, POOL3_STRIDE, POOL3_OUT_DIM, col_buffer, buffer2);
+  arm_fully_connected_q7_opt(buffer2, ip1_wt, IP1_IN_DIM, IP1_OUT_DIM, IP1_BIAS_LSHIFT, IP1_OUT_RSHIFT, ip1_bias, output_data, (q15_t*)col_buffer);
+}

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m4/nn.h

@@ -0,0 +1,12 @@
+#ifndef __NN_H__
+#define __NN_H__
+
+// #include "mbed.h"
+#include "arm_math.h"
+#include "parameter.h"
+#include "weights.h"
+#include "arm_nnfunctions.h"
+
+void run_nn(q7_t* input_data, q7_t* output_data);
+
+#endif

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m4/parameter.h

@@ -0,0 +1,69 @@
+#define DATA_OUT_CH 3
+#define DATA_OUT_DIM 32
+
+#define CONV1_IN_DIM 32
+#define CONV1_IN_CH 3
+#define CONV1_KER_DIM 5
+#define CONV1_PAD 2
+#define CONV1_STRIDE 1
+#define CONV1_OUT_CH 32
+#define CONV1_OUT_DIM 32
+
+#define POOL1_IN_DIM 32
+#define POOL1_IN_CH 32
+#define POOL1_KER_DIM 3
+#define POOL1_STRIDE 2
+#define POOL1_PAD 0
+#define POOL1_OUT_DIM 16
+
+#define RELU1_OUT_CH 32
+#define RELU1_OUT_DIM 16
+
+#define CONV2_IN_DIM 16
+#define CONV2_IN_CH 32
+#define CONV2_KER_DIM 5
+#define CONV2_PAD 2
+#define CONV2_STRIDE 1
+#define CONV2_OUT_CH 16
+#define CONV2_OUT_DIM 16
+
+#define RELU2_OUT_CH 16
+#define RELU2_OUT_DIM 16
+
+#define POOL2_IN_DIM 16
+#define POOL2_IN_CH 16
+#define POOL2_KER_DIM 3
+#define POOL2_STRIDE 2
+#define POOL2_PAD 0
+#define POOL2_OUT_DIM 8
+
+#define CONV3_IN_DIM 8
+#define CONV3_IN_CH 16
+#define CONV3_KER_DIM 5
+#define CONV3_PAD 2
+#define CONV3_STRIDE 1
+#define CONV3_OUT_CH 32
+#define CONV3_OUT_DIM 8
+
+#define RELU3_OUT_CH 32
+#define RELU3_OUT_DIM 8
+
+#define POOL3_IN_DIM 8
+#define POOL3_IN_CH 32
+#define POOL3_KER_DIM 3
+#define POOL3_STRIDE 2
+#define POOL3_PAD 0
+#define POOL3_OUT_DIM 4
+
+#define IP1_IN_DIM 512
+#define IP1_OUT_DIM 10
+
+#define DATA_RSHIFT 0
+#define CONV1_BIAS_LSHIFT 0
+#define CONV1_OUT_RSHIFT 11
+#define CONV2_BIAS_LSHIFT 0
+#define CONV2_OUT_RSHIFT 8
+#define CONV3_BIAS_LSHIFT 0
+#define CONV3_OUT_RSHIFT 8
+#define IP1_BIAS_LSHIFT 5
+#define IP1_OUT_RSHIFT 7

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m7/nn.c

@@ -0,0 +1,46 @@
+#include "nn.h"
+
+// Timer t;
+
+static uint8_t mean[DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM] = MEAN_DATA;
+
+static q7_t conv1_wt[CONV1_IN_CH*CONV1_KER_DIM*CONV1_KER_DIM*CONV1_OUT_CH] = CONV1_WT;
+static q7_t conv1_bias[CONV1_OUT_CH] = CONV1_BIAS;
+
+static q7_t conv2_wt[CONV2_IN_CH*CONV2_KER_DIM*CONV2_KER_DIM*CONV2_OUT_CH] = CONV2_WT;
+static q7_t conv2_bias[CONV2_OUT_CH] = CONV2_BIAS;
+
+static q7_t conv3_wt[CONV3_IN_CH*CONV3_KER_DIM*CONV3_KER_DIM*CONV3_OUT_CH] = CONV3_WT;
+static q7_t conv3_bias[CONV3_OUT_CH] = CONV3_BIAS;
+
+static q7_t ip1_wt[IP1_IN_DIM*IP1_OUT_DIM] = IP1_WT;
+static q7_t ip1_bias[IP1_OUT_DIM] = IP1_BIAS;
+
+//Add input_data and output_data in top main.cpp file
+//uint8_t input_data[DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM];
+//q7_t output_data[IP1_OUT_DIM];
+
+q7_t col_buffer[6400];
+q7_t scratch_buffer[40960];
+
+void mean_subtract(q7_t* image_data) {
+  for(int i=0; i<DATA_OUT_CH*DATA_OUT_DIM*DATA_OUT_DIM; i++) {
+    image_data[i] = (q7_t)__SSAT( ((int)(image_data[i] - mean[i]) >> DATA_RSHIFT), 8);
+  }
+}
+
+void run_nn(q7_t* input_data, q7_t* output_data) {
+  q7_t* buffer1 = scratch_buffer;
+  q7_t* buffer2 = buffer1 + 32768;
+  mean_subtract(input_data);
+  arm_convolve_HWC_q7_RGB(input_data, CONV1_IN_DIM, CONV1_IN_CH, conv1_wt, CONV1_OUT_CH, CONV1_KER_DIM, CONV1_PAD, CONV1_STRIDE, conv1_bias, CONV1_BIAS_LSHIFT, CONV1_OUT_RSHIFT, buffer1, CONV1_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_maxpool_q7_HWC(buffer1, POOL1_IN_DIM, POOL1_IN_CH, POOL1_KER_DIM, POOL1_PAD, POOL1_STRIDE, POOL1_OUT_DIM, col_buffer, buffer2);
+  arm_relu_q7(buffer2, RELU1_OUT_DIM*RELU1_OUT_DIM*RELU1_OUT_CH);
+  arm_convolve_HWC_q7_fast(buffer2, CONV2_IN_DIM, CONV2_IN_CH, conv2_wt, CONV2_OUT_CH, CONV2_KER_DIM, CONV2_PAD, CONV2_STRIDE, conv2_bias, CONV2_BIAS_LSHIFT, CONV2_OUT_RSHIFT, buffer1, CONV2_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_relu_q7(buffer1, RELU2_OUT_DIM*RELU2_OUT_DIM*RELU2_OUT_CH);
+  arm_avepool_q7_HWC(buffer1, POOL2_IN_DIM, POOL2_IN_CH, POOL2_KER_DIM, POOL2_PAD, POOL2_STRIDE, POOL2_OUT_DIM, col_buffer, buffer2);
+  arm_convolve_HWC_q7_fast(buffer2, CONV3_IN_DIM, CONV3_IN_CH, conv3_wt, CONV3_OUT_CH, CONV3_KER_DIM, CONV3_PAD, CONV3_STRIDE, conv3_bias, CONV3_BIAS_LSHIFT, CONV3_OUT_RSHIFT, buffer1, CONV3_OUT_DIM, (q15_t*)col_buffer, NULL);
+  arm_relu_q7(buffer1, RELU3_OUT_DIM*RELU3_OUT_DIM*RELU3_OUT_CH);
+  arm_avepool_q7_HWC(buffer1, POOL3_IN_DIM, POOL3_IN_CH, POOL3_KER_DIM, POOL3_PAD, POOL3_STRIDE, POOL3_OUT_DIM, col_buffer, buffer2);
+  arm_fully_connected_q7_opt(buffer2, ip1_wt, IP1_IN_DIM, IP1_OUT_DIM, IP1_BIAS_LSHIFT, IP1_OUT_RSHIFT, ip1_bias, output_data, (q15_t*)col_buffer);
+}

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m7/nn.h

@@ -0,0 +1,12 @@
+#ifndef __NN_H__
+#define __NN_H__
+
+// #include "mbed.h"
+#include "arm_math.h"
+#include "parameter.h"
+#include "weights.h"
+#include "arm_nnfunctions.h"
+
+void run_nn(q7_t* input_data, q7_t* output_data);
+
+#endif

APP_Framework/Applications/knowing_app/cmsis_5_demo/cmsisnn-cifar10/model/m7/parameter.h

@@ -0,0 +1,69 @@
+#define DATA_OUT_CH 3
+#define DATA_OUT_DIM 32
+
+#define CONV1_IN_DIM 32
+#define CONV1_IN_CH 3
+#define CONV1_KER_DIM 5
+#define CONV1_PAD 2
+#define CONV1_STRIDE 1
+#define CONV1_OUT_CH 32
+#define CONV1_OUT_DIM 32
+
+#define POOL1_IN_DIM 32
+#define POOL1_IN_CH 32
+#define POOL1_KER_DIM 3
+#define POOL1_STRIDE 2
+#define POOL1_PAD 0
+#define POOL1_OUT_DIM 16
+
+#define RELU1_OUT_CH 32
+#define RELU1_OUT_DIM 16
+
+#define CONV2_IN_DIM 16
+#define CONV2_IN_CH 32
+#define CONV2_KER_DIM 5
+#define CONV2_PAD 2
+#define CONV2_STRIDE 1
+#define CONV2_OUT_CH 32
+#define CONV2_OUT_DIM 16
+
+#define RELU2_OUT_CH 32
+#define RELU2_OUT_DIM 16
+
+#define POOL2_IN_DIM 16
+#define POOL2_IN_CH 32
+#define POOL2_KER_DIM 3
+#define POOL2_STRIDE 2
+#define POOL2_PAD 0
+#define POOL2_OUT_DIM 8
+
+#define CONV3_IN_DIM 8
+#define CONV3_IN_CH 32
+#define CONV3_KER_DIM 5
+#define CONV3_PAD 2
+#define CONV3_STRIDE 1
+#define CONV3_OUT_CH 64
+#define CONV3_OUT_DIM 8
+
+#define RELU3_OUT_CH 64
+#define RELU3_OUT_DIM 8
+
+#define POOL3_IN_DIM 8
+#define POOL3_IN_CH 64
+#define POOL3_KER_DIM 3
+#define POOL3_STRIDE 2
+#define POOL3_PAD 0
+#define POOL3_OUT_DIM 4
+
+#define IP1_IN_DIM 1024
+#define IP1_OUT_DIM 10
+
+#define DATA_RSHIFT 0
+#define CONV1_BIAS_LSHIFT 0
+#define CONV1_OUT_RSHIFT 9
+#define CONV2_BIAS_LSHIFT 0
+#define CONV2_OUT_RSHIFT 9
+#define CONV3_BIAS_LSHIFT 0
+#define CONV3_OUT_RSHIFT 9
+#define IP1_BIAS_LSHIFT 3
+#define IP1_OUT_RSHIFT 5

APP_Framework/Applications/knowing_app/face_detect/Kconfig

@@ -1,8 +0,0 @@
-config FACE_DETECT
-    bool "enable apps/face detect"
-    depends on BOARD_K210_EVB
-	depends on DRV_USING_OV2640
-	depends on USING_KPU_POSTPROCESSING
-	depends on USING_YOLOV2
-    select LIB_USING_CJSON
-    default n

APP_Framework/Applications/knowing_app/face_detect/face_detect.c

@@ -1,373 +0,0 @@
-#include <transform.h>
-#ifdef LIB_USING_CJSON
-#include <cJSON.h>
-#endif
-#include "region_layer.h"
-#define ANCHOR_NUM 5
-#define STACK_SIZE (128 * 1024)
-#define JSON_FILE_PATH "/kmodel/detect.json"
-#define JSON_BUFFER_SIZE (4 * 1024)
-
-// params from json
-static float anchor[ANCHOR_NUM * 2] = {};
-static int net_output_shape[3] = {};
-static int net_input_size[2] = {};
-static int sensor_output_size[2] = {};
-static char kmodel_path[127] = "";
-static int kmodel_size = 0;
-static float obj_thresh[20] = {};
-static float nms_thresh = 0.0;
-static char labels[20][32] = {};
-static int class_num = 0;
-
-#define THREAD_PRIORITY_FACE_D (11)
-static pthread_t facetid = 0;
-static void *thread_face_detcet_entry(void *parameter);
-static int g_fd = 0;
-static int kmodel_fd = 0;
-static int if_exit = 0;
-static unsigned char *showbuffer = NULL;
-static unsigned char *kpurgbbuffer = NULL;
-
-static _ioctl_shoot_para shoot_para_t = {0};
-unsigned char *model_data = NULL;  // kpu data  load memory
-unsigned char *model_data_align = NULL;
-
-kpu_model_context_t face_detect_task;
-static region_layer_t face_detect_rl;
-static obj_info_t face_detect_info;
-volatile uint32_t g_ai_done_flag;
-
-static void ai_done(void *ctx) { g_ai_done_flag = 1; }
-
-static void param_parse()
-{
-    int fin;
-    char buffer[JSON_BUFFER_SIZE] = "";
-    // char *buffer;
-    // if (NULL != (buffer = (char*)malloc(JSON_BUFFER_SIZE * sizeof(char)))) {
-    //     memset(buffer, 0, JSON_BUFFER_SIZE * sizeof(char));
-    // } else {
-    //     printf("Json buffer malloc failed!");
-    //     exit(-1);
-    // }
-    int array_size;
-    cJSON *json_obj;
-    cJSON *json_item;
-    cJSON *json_array_item;
-
-    fin = open(JSON_FILE_PATH, O_RDONLY);
-    if (!fin) {
-        printf("Error open file %s", JSON_FILE_PATH);
-        exit(-1);
-    }
-    read(fin, buffer, sizeof(buffer));
-    close(fin);
-
-    // read json string
-    json_obj = cJSON_Parse(buffer);
-    // free(buffer);
-    char *json_print_str = cJSON_Print(json_obj);
-    printf("Json file content: \n%s\n", json_print_str);
-    cJSON_free(json_print_str);
-    // get anchors
-    json_item = cJSON_GetObjectItem(json_obj, "anchors");
-    array_size = cJSON_GetArraySize(json_item);
-    if (ANCHOR_NUM * 2 != array_size) {
-        printf("Expect anchor size: %d, got %d in json file", ANCHOR_NUM * 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d anchors from json file\n", ANCHOR_NUM);
-    }
-    for (int i = 0; i < ANCHOR_NUM * 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        anchor[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, anchor[i]);
-    }
-    // net_input_size
-    json_item = cJSON_GetObjectItem(json_obj, "net_input_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect net_input_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_input_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_input_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_input_size[i]);
-    }
-    // net_output_shape
-    json_item = cJSON_GetObjectItem(json_obj, "net_output_shape");
-    array_size = cJSON_GetArraySize(json_item);
-    if (3 != array_size) {
-        printf("Expect net_output_shape: %d, got %d in json file", 3, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_output_shape from json file\n", 3);
-    }
-    for (int i = 0; i < 3; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_output_shape[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_output_shape[i]);
-    }
-    // sensor_output_size
-    json_item = cJSON_GetObjectItem(json_obj, "sensor_output_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect sensor_output_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d sensor_output_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        sensor_output_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, sensor_output_size[i]);
-    }
-    // kmodel_path
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_path");
-    memcpy(kmodel_path, json_item->valuestring, strlen(json_item->valuestring));
-    printf("Got kmodel_path: %s\n", kmodel_path);
-    // kmodel_size
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_size");
-    kmodel_size = json_item->valueint;
-    printf("Got kmodel_size: %d\n", kmodel_size);
-    // labels
-    json_item = cJSON_GetObjectItem(json_obj, "labels");
-    class_num = cJSON_GetArraySize(json_item);
-    if (0 >= class_num) {
-        printf("No labels!");
-        exit(-1);
-    } else {
-        printf("Got %d labels\n", class_num);
-    }
-    for (int i = 0; i < class_num; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        memcpy(labels[i], json_array_item->valuestring, strlen(json_array_item->valuestring));
-        printf("%d: %s\n", i, labels[i]);
-    }
-    // obj_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "obj_thresh");
-    array_size = cJSON_GetArraySize(json_item);
-    if (class_num != array_size) {
-        printf("label number and thresh number mismatch! label number : %d, obj thresh number %d", class_num, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d obj_thresh\n", array_size);
-    }
-    for (int i = 0; i < array_size; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        obj_thresh[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, obj_thresh[i]);
-    }
-    // nms_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "nms_thresh");
-    nms_thresh = json_item->valuedouble;
-    printf("Got nms_thresh: %f\n", nms_thresh);
-
-    cJSON_Delete(json_obj);
-    return;
-}
-
-void face_detect()
-{
-    int ret = 0;
-    int result = 0;
-    int size = 0;
-    param_parse();
-    g_fd = open("/dev/ov2640", O_RDONLY);
-    if (g_fd < 0) {
-        printf("open ov2640 fail !!");
-        return;
-    }
-    _ioctl_set_dvp_reso set_dvp_reso = {sensor_output_size[1], sensor_output_size[0]};
-    ioctl(g_fd, IOCTRL_CAMERA_SET_DVP_RESO, &set_dvp_reso);
-    showbuffer = (unsigned char *)malloc(sensor_output_size[0] * sensor_output_size[1] * 2);
-    if (NULL == showbuffer) {
-        close(g_fd);
-        printf("showbuffer apply memory fail !!");
-        return;
-    }
-    kpurgbbuffer = (unsigned char *)malloc(net_input_size[0] * net_input_size[1] * 3);
-    if (NULL == kpurgbbuffer) {
-        close(g_fd);
-        free(showbuffer);
-        printf("kpurgbbuffer apply memory fail !!");
-        return;
-    }
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        free(showbuffer);
-        free(kpurgbbuffer);
-        close(g_fd);
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-    memset(showbuffer, 0, sensor_output_size[0] * sensor_output_size[1] * 2);
-    memset(kpurgbbuffer, 0, net_input_size[0] * net_input_size[1] * 3);
-    shoot_para_t.pdata = (unsigned int *)(showbuffer);
-    shoot_para_t.length = (size_t)(sensor_output_size[0] * sensor_output_size[1] * 2);
-    /*
-        load memory
-    */
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-    if (kmodel_fd < 0) {
-        printf("open kmodel fail");
-        close(g_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    } else {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-            close(g_fd);
-            close(kmodel_fd);
-            free(showbuffer);
-            free(kpurgbbuffer);
-            free(model_data);
-            return;
-
-        } else {
-            printf("read kmodel success \n");
-        }
-    }
-    unsigned char *model_data_align = (unsigned char *)(((unsigned int)model_data + 255) & (~255));
-    dvp_set_ai_addr((uint32_t)kpurgbbuffer, (uint32_t)(kpurgbbuffer + net_input_size[0] * net_input_size[1]),
-                    (uint32_t)(kpurgbbuffer + net_input_size[0] * net_input_size[1] * 2));
-    if (kpu_load_kmodel(&face_detect_task, model_data_align) != 0) {
-        printf("\nmodel init error\n");
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    }
-    face_detect_rl.anchor_number = ANCHOR_NUM;
-    face_detect_rl.anchor = anchor;
-    face_detect_rl.threshold = malloc(class_num * sizeof(float));
-    for (int idx = 0; idx < class_num; idx++) {
-        face_detect_rl.threshold[idx] = obj_thresh[idx];
-    }
-    face_detect_rl.nms_value = nms_thresh;
-    result = region_layer_init(&face_detect_rl, net_output_shape[0], net_output_shape[1], net_output_shape[2],
-                               net_input_size[1], net_input_size[0]);
-    printf("region_layer_init result %d \n\r", result);
-    size_t stack_size = STACK_SIZE;
-    pthread_attr_t attr;                      /* 线程属性 */
-    struct sched_param prio;                  /* 线程优先级 */
-    prio.sched_priority = 8;                  /* 优先级设置为 8 */
-    pthread_attr_init(&attr);                 /* 先使用默认值初始化属性 */
-    pthread_attr_setschedparam(&attr, &prio); /* 修改属性对应的优先级 */
-    pthread_attr_setstacksize(&attr, stack_size);
-
-    /* 创建线程 1, 属性为 attr，入口函数是 thread_entry，入口函数参数是 1 */
-    result = pthread_create(&facetid, &attr, thread_face_detcet_entry, NULL);
-    if (0 == result) {
-        printf("thread_face_detcet_entry successfully!\n");
-    } else {
-        printf("thread_face_detcet_entry failed! error code is %d\n", result);
-        close(g_fd);
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(face_detect, face detect task);
-#endif
-
-static void *thread_face_detcet_entry(void *parameter)
-{
-    extern void lcd_draw_picture(uint16_t x1, uint16_t y1, uint16_t width, uint16_t height, uint32_t * ptr);
-    printf("thread_face_detcet_entry start!\n");
-    int ret = 0;
-    // sysctl_enable_irq();
-    while (1) {
-        // memset(showbuffer,0,320*240*2);
-        g_ai_done_flag = 0;
-        ret = ioctl(g_fd, IOCTRL_CAMERA_START_SHOT, &shoot_para_t);
-        if (RT_ERROR == ret) {
-            printf("ov2640 can't wait event flag");
-            rt_free(showbuffer);
-            close(g_fd);
-            pthread_exit(NULL);
-            return NULL;
-        }
-        kpu_run_kmodel(&face_detect_task, kpurgbbuffer, DMAC_CHANNEL5, ai_done, NULL);
-        while (!g_ai_done_flag)
-            ;
-        float *output;
-        size_t output_size;
-        kpu_get_output(&face_detect_task, 0, (uint8_t **)&output, &output_size);
-        face_detect_rl.input = output;
-        region_layer_run(&face_detect_rl, &face_detect_info);
-/* display result */
-#ifdef BSP_USING_LCD
-        for (int face_cnt = 0; face_cnt < face_detect_info.obj_number; face_cnt++) {
-            draw_edge((uint32_t *)showbuffer, &face_detect_info, face_cnt, 0xF800, (uint16_t)sensor_output_size[1],
-                      (uint16_t)sensor_output_size[0]);
-            printf("%d: (%d, %d, %d, %d) cls: %s conf: %f\t", face_cnt, face_detect_info.obj[face_cnt].x1,
-                   face_detect_info.obj[face_cnt].y1, face_detect_info.obj[face_cnt].x2, face_detect_info.obj[face_cnt].y2,
-                   labels[face_detect_info.obj[face_cnt].class_id], face_detect_info.obj[face_cnt].prob);
-        }
-        if (0 != face_detect_info.obj_number) printf("\n");
-        lcd_draw_picture(0, 0, (uint16_t)sensor_output_size[1], (uint16_t)sensor_output_size[0], (unsigned int *)showbuffer);
-#endif
-        usleep(1);
-        if (1 == if_exit) {
-            if_exit = 0;
-            printf("thread_face_detcet_entry exit");
-            pthread_exit(NULL);
-        }
-    }
-}
-
-void face_detect_delete()
-{
-    if (showbuffer != NULL) {
-        int ret = 0;
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        printf("face detect task cancel!!! ret %d ", ret);
-        if_exit = 1;
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(face_detect_delete, face detect task delete);
-#endif
-
-void kmodel_load(unsigned char *model_data)
-{
-    int kmodel_fd = 0;
-    int size = 0;
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-
-    if (kmodel_fd >= 0) {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-
-        } else {
-            printf("read kmodel success");
-        }
-    } else {
-        free(model_data);
-        printf("open kmodel fail");
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(kmodel_load, kmodel load memory);
-#endif

APP_Framework/Applications/knowing_app/helmet_detect/Kconfig

@@ -1,8 +0,0 @@
-config HELMET_DETECT
-    bool "enable apps/helmet detect"
-    depends on BOARD_K210_EVB
-	depends on DRV_USING_OV2640
-	depends on USING_KPU_POSTPROCESSING
-	depends on USING_YOLOV2
-    select LIB_USING_CJSON
-    default n

APP_Framework/Applications/knowing_app/helmet_detect/README.md

@@ -1,167 +0,0 @@
-# Helmet detection demo
-
-### A helmet and head without helmet object detection task demo. Running MobileNet-yolo on K210-based edge devices.
-
----
-
-## Training
-
-### Enviroment preparation
-
-Model generated by [aXeleRate](https://forgeplus.trustie.net/projects/yangtuo250/aXeleRate) and converted to kmodel by [nncase](https://github.com/kendryte/nncase/tree/v0.1.0-rc5).
-
-```shell
-# master branch for MobileNetv1-yolov2 and unstable branch to test MobileNetv1(v2)-yolov2(v3)
-git clone https://git.trustie.net/yangtuo250/aXeleRate.git (-b unstable)
-cd aXeleRate
-pip install -r requirments.txt && pip install -e .
-```
-
-### training config setting
-
-Example [config](https://forgeplus.trustie.net/projects/yangtuo250/aXeleRate/tree/master/configs/detector.json), some hyper-parameters:
-
-- architecture: backbone, MobileNet7_5 for default, MobileNet1_0(α = 1.0) and above cannot run on K210 because of OOM on feature map in master branch. For unstable branch MobileNetV2_1_0 is OK.
-
-- input_size: fixed model input size, single integer for height equals to width, otherwise a list([height, width]).
-- anchors: yolov2 anchor(for master) or anchor scaled to 1.0(for unstable), can be generate by [darknet](https://github.com/AlexeyAB/darknet).
-- labels: labels of all classes.
-- train(valid)_image(annot)_folder: path of images and annoations for training and validation.
-- saved_folder: path for trainig result storage(models, checkpoints, logs ...).
-
-Mine config for unstable:
-```json
-{
-    "model": {
-        "type": "Detector",
-        "architecture": "MobileNetV2_1_0",
-        "input_size": [
-            224,
-            320
-        ],
-        "anchors": [
-            [
-                [
-                    0.1043,
-                    0.1560
-                ],
-                [
-                    0.0839,
-                    0.3036
-                ],
-                [
-                    0.1109,
-                    0.3923
-                ],
-                [
-                    0.1378,
-                    0.5244
-                ],
-                [
-                    0.2049,
-                    0.6673
-                ]
-            ]
-        ],
-        "labels": [
-            "human"
-        ],
-        "obj_thresh": 0.5,
-        "iou_thresh": 0.45,
-        "coord_scale": 1.0,
-        "class_scale": 0.0,
-        "object_scale": 5.0,
-        "no_object_scale": 3.0
-    },
-    "weights": {
-        "full": "",
-        "backend": ""
-    },
-    "train": {
-        "actual_epoch": 2000,
-        "train_image_folder": "mydata/human/Images/train",
-        "train_annot_folder": "mydata/human/Annotations/train",
-        "train_times": 2,
-        "valid_image_folder": "mydata/human/Images/val",
-        "valid_annot_folder": "mydata/human/Annotations/val",
-        "valid_times": 1,
-        "valid_metric": "precision",
-        "batch_size": 32,
-        "learning_rate": 2e-5,
-        "saved_folder": "mydata/human/results",
-        "first_trainable_layer": "",
-        "augmentation": true,
-        "is_only_detect": false,
-        "validation_freq": 5,
-        "quantize": false,
-        "class_weights": [1.0]
-    },
-    "converter": {
-        "type": [
-            "k210"
-        ]
-    }
-}
-```
-
-*(For more detailed config usage, please refer to original aXeleRate repo.)*
-
-### data preparation
-
-Please refer to [VOC format](https://towardsdatascience.com/coco-data-format-for-object-detection-a4c5eaf518c5), path as config above.
-
-### train it!
-
-```shell
-python -m aXeleRate.train -c PATH_TO_YOUR_CONFIG
-```
-
-### model convert
-
-Please refer to [nncase repo](https://github.com/kendryte/nncase/tree/v0.1.0-rc5).
-
----
-
-## Deployment
-
-### compile and burn
-
-Use `(scons --)menuconfig` in bsp folder *(Ubiquitous/RT_Thread/bsp/k210)*, open:
-
-- More Drivers --> ov2640 driver
-- Board Drivers Config --> Enable LCD on SPI0
-- Board Drivers Config --> Enable SDCARD (spi1(ss0))
-- Board Drivers Config --> Enable DVP(camera)
-- RT-Thread Components --> POSIX layer and C standard library --> Enable pthreads APIs
-- APP_Framework --> Framework --> support knowing framework --> kpu model postprocessing --> yolov2 region layer
-- APP_Framework --> Applications --> knowing app --> enable apps/helmet detect
-
-`scons -j(n)` to compile and burn in by *kflash*.
-
-### json config and kmodel
-
-Copy json config for deployment o SD card */kmodel*. Example config file is *helmet.json* in this directory. Something to be modified:
-
-- net_input_size: same as *input_size* in training config file, but array only.
-- net_output_shape: final feature map size, can be found in **nncase** output.
-- sensor_output_size: image height and width from camera.
-- kmodel_size: kmodel size shown in file system.
-- anchors: same as *anchor* in training config file(multi-dimention anchors flatten to 1 dim).
-- labels: same as *label* in training config file.
-- obj_thresh: array, object threshold of each label.
-- nms_thresh: NMS threshold of boxes.
-
-Copy final kmodel to SD card */kmodel* either.
-
----
-
-## Run
-
-In serial terminal, `helmet_detect` to start a detection thread, `helmet_detect_delete` to stop it. Detection results can be found in output.
-
----
-
-## TODO
-
-- [ ] Fix LCD real-time result display.
-- [ ] Test more object detection backbone and algorithm(like yolox).

APP_Framework/Applications/knowing_app/helmet_detect/helmet_detect.c

@@ -1,380 +0,0 @@
-#include <transform.h>
-#ifdef LIB_USING_CJSON
-#include <cJSON.h>
-#endif
-#include "region_layer.h"
-#define ANCHOR_NUM 5
-#define STACK_SIZE (128 * 1024)
-#define JSON_FILE_PATH "/kmodel/helmet.json"
-#define JSON_BUFFER_SIZE (4 * 1024)
-
-// params from json
-static float anchor[ANCHOR_NUM * 2] = {};
-static int net_output_shape[3] = {};
-static int net_input_size[2] = {};
-static int sensor_output_size[2] = {};
-static char kmodel_path[127] = "";
-static int kmodel_size = 0;
-static float obj_thresh[20] = {};
-static float nms_thresh = 0.0;
-static char labels[20][32] = {};
-static int class_num = 0;
-
-#define THREAD_PRIORITY_HELMET_D (11)
-static pthread_t helmettid = 0;
-static void *thread_helmet_detect_entry(void *parameter);
-static int g_fd = 0;
-static int kmodel_fd = 0;
-static int if_exit = 0;
-static unsigned char *showbuffer = NULL;
-static unsigned char *kpurgbbuffer = NULL;
-
-static _ioctl_shoot_para shoot_para_t = {0};
-unsigned char *model_data = NULL;  // kpu data  load memory
-unsigned char *model_data_align = NULL;
-
-kpu_model_context_t helmet_detect_task;
-static region_layer_t helmet_detect_rl;
-static obj_info_t helmet_detect_info;
-volatile uint32_t g_ai_done_flag;
-
-static void ai_done(void *ctx) { g_ai_done_flag = 1; }
-
-static void param_parse()
-{
-    int fin;
-    char buffer[JSON_BUFFER_SIZE] = "";
-    // char *buffer;
-    // if (NULL != (buffer = (char*)malloc(JSON_BUFFER_SIZE * sizeof(char)))) {
-    //     memset(buffer, 0, JSON_BUFFER_SIZE * sizeof(char));
-    // } else {
-    //     printf("Json buffer malloc failed!");
-    //     exit(-1);
-    // }
-    int array_size;
-    cJSON *json_obj;
-    cJSON *json_item;
-    cJSON *json_array_item;
-
-    fin = open(JSON_FILE_PATH, O_RDONLY);
-    if (!fin) {
-        printf("Error open file %s", JSON_FILE_PATH);
-        exit(-1);
-    }
-    read(fin, buffer, sizeof(buffer));
-    close(fin);
-
-    // read json string
-    json_obj = cJSON_Parse(buffer);
-    // free(buffer);
-    char *json_print_str = cJSON_Print(json_obj);
-    printf("Json file content: \n%s\n", json_print_str);
-    cJSON_free(json_print_str);
-    // get anchors
-    json_item = cJSON_GetObjectItem(json_obj, "anchors");
-    array_size = cJSON_GetArraySize(json_item);
-    if (ANCHOR_NUM * 2 != array_size) {
-        printf("Expect anchor size: %d, got %d in json file", ANCHOR_NUM * 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d anchors from json file\n", ANCHOR_NUM);
-    }
-    for (int i = 0; i < ANCHOR_NUM * 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        anchor[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, anchor[i]);
-    }
-    // net_input_size
-    json_item = cJSON_GetObjectItem(json_obj, "net_input_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect net_input_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_input_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_input_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_input_size[i]);
-    }
-    // net_output_shape
-    json_item = cJSON_GetObjectItem(json_obj, "net_output_shape");
-    array_size = cJSON_GetArraySize(json_item);
-    if (3 != array_size) {
-        printf("Expect net_output_shape: %d, got %d in json file", 3, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_output_shape from json file\n", 3);
-    }
-    for (int i = 0; i < 3; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_output_shape[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_output_shape[i]);
-    }
-    // sensor_output_size
-    json_item = cJSON_GetObjectItem(json_obj, "sensor_output_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect sensor_output_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d sensor_output_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        sensor_output_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, sensor_output_size[i]);
-    }
-    // kmodel_path
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_path");
-    memcpy(kmodel_path, json_item->valuestring, strlen(json_item->valuestring));
-    printf("Got kmodel_path: %s\n", kmodel_path);
-    // kmodel_size
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_size");
-    kmodel_size = json_item->valueint;
-    printf("Got kmodel_size: %d\n", kmodel_size);
-    // labels
-    json_item = cJSON_GetObjectItem(json_obj, "labels");
-    class_num = cJSON_GetArraySize(json_item);
-    if (0 >= class_num) {
-        printf("No labels!");
-        exit(-1);
-    } else {
-        printf("Got %d labels\n", class_num);
-    }
-    for (int i = 0; i < class_num; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        memcpy(labels[i], json_array_item->valuestring, strlen(json_array_item->valuestring));
-        printf("%d: %s\n", i, labels[i]);
-    }
-    // obj_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "obj_thresh");
-    array_size = cJSON_GetArraySize(json_item);
-    if (class_num != array_size) {
-        printf("label number and thresh number mismatch! label number : %d, obj thresh number %d", class_num, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d obj_thresh\n", array_size);
-    }
-    for (int i = 0; i < array_size; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        obj_thresh[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, obj_thresh[i]);
-    }
-    // nms_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "nms_thresh");
-    nms_thresh = json_item->valuedouble;
-    printf("Got nms_thresh: %f\n", nms_thresh);
-
-    cJSON_Delete(json_obj);
-    return;
-}
-
-void helmet_detect()
-{
-    int ret = 0;
-    int result = 0;
-    int size = 0;
-    param_parse();
-    g_fd = open("/dev/ov2640", O_RDONLY);
-    if (g_fd < 0) {
-        printf("open ov2640 fail !!");
-        return;
-    }
-    _ioctl_set_dvp_reso set_dvp_reso = {sensor_output_size[1], sensor_output_size[0]};
-    ioctl(g_fd, IOCTRL_CAMERA_SET_DVP_RESO, &set_dvp_reso);
-    showbuffer = (unsigned char *)malloc(sensor_output_size[0] * sensor_output_size[1] * 2);
-    if (NULL == showbuffer) {
-        close(g_fd);
-        printf("showbuffer apply memory fail !!");
-        return;
-    }
-    kpurgbbuffer = (unsigned char *)malloc(net_input_size[0] * net_input_size[1] * 3);
-    if (NULL == kpurgbbuffer) {
-        close(g_fd);
-        free(showbuffer);
-        printf("kpurgbbuffer apply memory fail !!");
-        return;
-    }
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        free(showbuffer);
-        free(kpurgbbuffer);
-        close(g_fd);
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-    memset(showbuffer, 0, sensor_output_size[0] * sensor_output_size[1] * 2);
-    memset(kpurgbbuffer, 127, net_input_size[0] * net_input_size[1] * 3);
-    shoot_para_t.pdata = (unsigned int *)(showbuffer);
-    shoot_para_t.length = (size_t)(sensor_output_size[0] * sensor_output_size[1] * 2);
-    /*
-        load memory
-    */
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-    if (kmodel_fd < 0) {
-        printf("open kmodel fail");
-        close(g_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    } else {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-            close(g_fd);
-            close(kmodel_fd);
-            free(showbuffer);
-            free(kpurgbbuffer);
-            free(model_data);
-            return;
-
-        } else {
-            printf("read kmodel success \n");
-        }
-    }
-    unsigned char *model_data_align = (unsigned char *)(((unsigned int)model_data + 255) & (~255));
-    dvp_set_ai_addr((uint32_t)(kpurgbbuffer + net_input_size[1] * (net_input_size[0] - sensor_output_size[0])),
-                    (uint32_t)(kpurgbbuffer + net_input_size[1] * (net_input_size[0] - sensor_output_size[0]) +
-                               net_input_size[0] * net_input_size[1]),
-                    (uint32_t)(kpurgbbuffer + net_input_size[0] * net_input_size[1] * 2 +
-                               net_input_size[1] * (net_input_size[0] - sensor_output_size[0])));
-    if (kpu_load_kmodel(&helmet_detect_task, model_data_align) != 0) {
-        printf("\nmodel init error\n");
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    }
-    helmet_detect_rl.anchor_number = ANCHOR_NUM;
-    helmet_detect_rl.anchor = anchor;
-    helmet_detect_rl.threshold = malloc(class_num * sizeof(float));
-    for (int idx = 0; idx < class_num; idx++) {
-        helmet_detect_rl.threshold[idx] = obj_thresh[idx];
-    }
-    helmet_detect_rl.nms_value = nms_thresh;
-    result = region_layer_init(&helmet_detect_rl, net_output_shape[0], net_output_shape[1], net_output_shape[2],
-                               net_input_size[1], net_input_size[0]);
-    printf("region_layer_init result %d \n\r", result);
-    size_t stack_size = STACK_SIZE;
-    pthread_attr_t attr;                      /* 线程属性 */
-    struct sched_param prio;                  /* 线程优先级 */
-    prio.sched_priority = 8;                  /* 优先级设置为 8 */
-    pthread_attr_init(&attr);                 /* 先使用默认值初始化属性 */
-    pthread_attr_setschedparam(&attr, &prio); /* 修改属性对应的优先级 */
-    pthread_attr_setstacksize(&attr, stack_size);
-
-    /* 创建线程 1, 属性为 attr，入口函数是 thread_entry，入口函数参数是 1 */
-    result = pthread_create(&helmettid, &attr, thread_helmet_detect_entry, NULL);
-    if (0 == result) {
-        printf("thread_helmet_detect_entry successfully!\n");
-    } else {
-        printf("thread_helmet_detect_entry failed! error code is %d\n", result);
-        close(g_fd);
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(helmet_detect, helmet detect task);
-#endif
-
-static void *thread_helmet_detect_entry(void *parameter)
-{
-    extern void lcd_draw_picture(uint16_t x1, uint16_t y1, uint16_t width, uint16_t height, uint32_t * ptr);
-    printf("thread_helmet_detect_entry start!\n");
-    int ret = 0;
-    // sysctl_enable_irq();
-    while (1) {
-        // memset(showbuffer,0,320*240*2);
-        g_ai_done_flag = 0;
-        ret = ioctl(g_fd, IOCTRL_CAMERA_START_SHOT, &shoot_para_t);
-        if (RT_ERROR == ret) {
-            printf("ov2640 can't wait event flag");
-            rt_free(showbuffer);
-            close(g_fd);
-            pthread_exit(NULL);
-            return NULL;
-        }
-        kpu_run_kmodel(&helmet_detect_task, kpurgbbuffer, DMAC_CHANNEL5, ai_done, NULL);
-        while (!g_ai_done_flag)
-            ;
-        float *output;
-        size_t output_size;
-        kpu_get_output(&helmet_detect_task, 0, (uint8_t **)&output, &output_size);
-        helmet_detect_rl.input = output;
-        region_layer_run(&helmet_detect_rl, &helmet_detect_info);
-/* display result */
-#ifdef BSP_USING_LCD
-        for (int helmet_cnt = 0; helmet_cnt < helmet_detect_info.obj_number; helmet_cnt++) {
-            // draw_edge((uint32_t *)showbuffer, &helmet_detect_info, helmet_cnt, 0xF800,
-            // (uint16_t)sensor_output_size[1],
-            //           (uint16_t)sensor_output_size[0]);
-            printf("%d: (%d, %d, %d, %d) cls: %s conf: %f\t", helmet_cnt, helmet_detect_info.obj[helmet_cnt].x1,
-                   helmet_detect_info.obj[helmet_cnt].y1, helmet_detect_info.obj[helmet_cnt].x2,
-                   helmet_detect_info.obj[helmet_cnt].y2, labels[helmet_detect_info.obj[helmet_cnt].class_id],
-                   helmet_detect_info.obj[helmet_cnt].prob);
-        }
-        if (0 != helmet_detect_info.obj_number) {
-            printf("\n");
-        }
-        lcd_draw_picture(0, 0, (uint16_t)sensor_output_size[1], (uint16_t)sensor_output_size[0], (unsigned int *)showbuffer);
-#endif
-        usleep(1);
-        if (1 == if_exit) {
-            if_exit = 0;
-            printf("thread_helmet_detect_entry exit");
-            pthread_exit(NULL);
-        }
-    }
-}
-
-void helmet_detect_delete()
-{
-    if (showbuffer != NULL) {
-        int ret = 0;
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        printf("helmet detect task cancel!!! ret %d ", ret);
-        if_exit = 1;
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(helmet_detect_delete, helmet detect task delete);
-#endif
-
-void kmodel_load(unsigned char *model_data)
-{
-    int kmodel_fd = 0;
-    int size = 0;
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-
-    if (kmodel_fd >= 0) {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-
-        } else {
-            printf("read kmodel success");
-        }
-    } else {
-        free(model_data);
-        printf("open kmodel fail");
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(kmodel_load, kmodel load memory);
-#endif

APP_Framework/Applications/knowing_app/image_processing/Kconfig

@@ -0,0 +1,6 @@
+menuconfig USING_IMAGE_PROCESSING_APP
+    bool "image processing app "
+    default n
+if USING_IMAGE_PROCESSING_APP
+        source "$APP_DIR/Applications/knowing_app/image_processing/TJpgDec_APP/Kconfig" 
+endif

APP_Framework/Applications/knowing_app/image_processing/SConscript

@@ -0,0 +1,14 @@
+import os
+Import('RTT_ROOT')
+from building import *
+
+cwd = GetCurrentDir()
+objs = []
+list = os.listdir(cwd)
+
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        objs = objs + SConscript(os.path.join(path, 'SConscript'))
+
+Return('objs')

APP_Framework/Applications/knowing_app/image_processing/TJpgDec_APP/Kconfig

@@ -0,0 +1,4 @@
+config IMAGE_PROCESSING_TJPGDEC_APP
+    bool "image processing apps/TJpgDec(example)"
+    select IMAGE_PROCESSING_USING_TJPGD
+    default n

APP_Framework/Applications/knowing_app/image_processing/TJpgDec_APP/SConscript

@@ -1,9 +1,9 @@
-from building import *
-
-cwd     = GetCurrentDir()
-src     = Glob('*.c') + Glob('*.cpp')
-CPPPATH = [cwd]
-
-group = DefineGroup('Applications', src, depend = ['INSTRUSION_DETECT'], LOCAL_CPPPATH = CPPPATH)
-
-Return('group')
+from building import *
+
+cwd     = GetCurrentDir()
+src     = Glob('*.c') + Glob('*.cpp')
+CPPPATH = [cwd]
+
+group = DefineGroup('TJpgDec(example)', src, depend = ['IMAGE_PROCESSING_TJPGDEC_APP'], LOCAL_CPPPATH = CPPPATH)
+
+Return('group')

APP_Framework/Applications/knowing_app/image_processing/TJpgDec_APP/tjpgd_example.c

@@ -0,0 +1,151 @@
+#include <transform.h>
+#include <tjpgd.h>
+#define WORK_POOL_SIZE (4*1024+32)//This value depends on the resolution of the image
+
+/* User defined device identifier */
+typedef struct {
+    FILE *fp;          /* File pointer for input function */
+    uint8_t *fbuf;     /* Pointer to the frame buffer for output function */
+    uint16_t wfbuf;    /* Width of the frame buffer [pix] */
+} IODEV;
+
+
+/*------------------------------*/
+/* User defined input funciton  */
+/*------------------------------*/
+
+unsigned int in_func (JDEC* jd, uint8_t* buff, unsigned int nbyte)
+{
+    IODEV *dev = (IODEV*)jd->device;   /* Device identifier for the session (5th argument of jd_prepare function) */
+
+
+    if (buff) {
+        /* Read bytes from input stream */
+        return (uint16_t)fread(buff, 1, nbyte, dev->fp);
+    } else {
+        /* Remove bytes from input stream */
+        return fseek(dev->fp, nbyte, SEEK_CUR) ? 0 : nbyte;
+    }
+}
+
+
+/*------------------------------*/
+/* User defined output funciton */
+/*------------------------------*/
+
+int out_func (JDEC* jd, void* bitmap, JRECT* rect)
+{
+    IODEV *dev = (IODEV*)jd->device;
+    uint8_t *src, *dst;
+    uint16_t y, bws, bwd;
+
+
+    /* Put progress indicator */
+    if (rect->left == 0) {
+        printf("\r%lu%%", (rect->top << jd->scale) * 100UL / jd->height);
+    }
+
+    /* Copy the decompressed RGB rectanglar to the frame buffer (assuming RGB888 cfg) */
+    src = (uint8_t*)bitmap;
+    dst = dev->fbuf + 3 * (rect->top * dev->wfbuf + rect->left);  /* Left-top of destination rectangular */
+    bws = 3 * (rect->right - rect->left + 1);     /* Width of source rectangular [byte] */
+    bwd = 3 * dev->wfbuf;                         /* Width of frame buffer [byte] */
+    for (y = rect->top; y <= rect->bottom; y++) {
+        memcpy(dst, src, bws);   /* Copy a line */
+        src += bws; dst += bwd;  /* Next line */
+    }
+
+    return 1;    /* Continue to decompress */
+}
+
+
+/*------------------------------*/
+/* Program Jpeg_Dec             */
+/*------------------------------*/
+
+int Jpeg_Dec (int argc, char* argv[])
+{
+    void *work;       /* Pointer to the decompressor work area */
+    JDEC jdec;        /* Decompression object */
+    JRESULT res;      /* Result code of TJpgDec API */
+    IODEV devid;      /* User defined device identifier */
+
+    /* Open a JPEG file */
+    if (argc < 2)
+    {
+        printf("Jpeg_Dec illegal arguments ...\n");
+        return -1;
+    }
+
+    devid.fp = fopen(argv[1], "r+");
+    if (!devid.fp)
+    {
+        printf("Jpeg_Dec open the file failed...\n");
+        return -1;
+    }
+
+    /* Allocate a work area for TJpgDec */
+    work = malloc(WORK_POOL_SIZE);
+    if(work == NULL)
+    {
+        printf("Jpeg_Dec work malloc failed...\n");
+        res = -1;
+        goto __exit;
+    }
+
+    /* Prepare to decompress */
+    res = jd_prepare(&jdec, in_func, work, WORK_POOL_SIZE, &devid);
+    if (res == JDR_OK)
+    {
+        /* Ready to dcompress. Image info is available here. */
+        printf("Image dimensions: %u by %u. %u bytes used.\n", jdec.width, jdec.height, 3100 - jdec.sz_pool);
+
+        devid.fbuf = malloc(3 * jdec.width * jdec.height); /* Frame buffer for output image (assuming RGB888 cfg) */
+        if(devid.fbuf == RT_NULL)
+        {
+            printf("Jpeg_Dec devid.fbuf malloc failed, need to use %d Bytes ...\n", 3 * jdec.width * jdec.height);
+            res = -1;
+            goto __exit;
+        }
+        devid.wfbuf = jdec.width;
+
+        res = jd_decomp(&jdec, out_func, 0);   /* Start to decompress with 1/1 scaling */
+        if (res == JDR_OK) {
+            /* Decompression succeeded. You have the decompressed image in the frame buffer here. */
+            printf("\rOK  \n");
+            // for(int j = 0; j<3 * jdec.width * jdec.height;j++)
+            // {
+            //     printf("%d,",*(devid.fbuf+j));
+            // }
+            
+        }
+        else
+        {
+            printf("Failed to decompress: rc=%d\n", res);
+        }
+
+        if(devid.fbuf != NULL)
+        {
+            free(devid.fbuf);    /* Discard frame buffer */
+        }
+
+    }
+    else
+    {
+        printf("Failed to prepare: rc=%d\n", res);
+    }
+
+__exit:
+    if(work != NULL)
+    {
+        free(work);             /* Discard work area */
+    }
+
+    fclose(devid.fp);       /* Close the JPEG file */
+
+    return res;
+}
+#ifdef __RT_THREAD_H__
+MSH_CMD_EXPORT(Jpeg_Dec, Jpeg Decode Test);
+#endif
+

APP_Framework/Applications/knowing_app/instrusion_detect/Kconfig

@@ -1,8 +0,0 @@
-config INSTRUSION_DETECT
-    bool "enable apps/instrusion detect"
-    depends on BOARD_K210_EVB
-	depends on DRV_USING_OV2640
-	depends on USING_KPU_POSTPROCESSING
-	depends on USING_YOLOV2
-    select LIB_USING_CJSON
-    default n

APP_Framework/Applications/knowing_app/instrusion_detect/README.md

@@ -1,5 +0,0 @@
-# Instrusion detect demo
-
-### A human object detection task demo. Running MobileNet-yolo on K210-based edge devices.
-
-***Training, deployment and running, please see helmet_detect***

APP_Framework/Applications/knowing_app/instrusion_detect/instrusion_detect.c

@@ -1,381 +0,0 @@
-#include <transform.h>
-#ifdef LIB_USING_CJSON
-#include <cJSON.h>
-#endif
-#include "region_layer.h"
-#define ANCHOR_NUM 5
-#define STACK_SIZE (128 * 1024)
-#define JSON_FILE_PATH "/kmodel/human.json"
-#define JSON_BUFFER_SIZE (4 * 1024)
-
-// params from json
-static float anchor[ANCHOR_NUM * 2] = {};
-static int net_output_shape[3] = {};
-static int net_input_size[2] = {};
-static int sensor_output_size[2] = {};
-static char kmodel_path[127] = "";
-static int kmodel_size = 0;
-static float obj_thresh[20] = {};
-static float nms_thresh = 0.0;
-static char labels[20][32] = {};
-static int class_num = 0;
-
-#define THREAD_PRIORITY_HUMAN_D (11)
-static pthread_t instrusiontid = 0;
-static void *thread_instrusion_detect_entry(void *parameter);
-static int g_fd = 0;
-static int kmodel_fd = 0;
-static int if_exit = 0;
-static unsigned char *showbuffer = NULL;
-static unsigned char *kpurgbbuffer = NULL;
-
-static _ioctl_shoot_para shoot_para_t = {0};
-unsigned char *model_data = NULL;  // kpu data  load memory
-unsigned char *model_data_align = NULL;
-
-kpu_model_context_t instrusion_detect_task;
-static region_layer_t instrusion_detect_rl;
-static obj_info_t instrusion_detect_info;
-volatile uint32_t g_ai_done_flag;
-
-static void ai_done(void *ctx) { g_ai_done_flag = 1; }
-
-static void param_parse()
-{
-    int fin;
-    char buffer[JSON_BUFFER_SIZE] = "";
-    // char *buffer;
-    // if (NULL != (buffer = (char*)malloc(JSON_BUFFER_SIZE * sizeof(char)))) {
-    //     memset(buffer, 0, JSON_BUFFER_SIZE * sizeof(char));
-    // } else {
-    //     printf("Json buffer malloc failed!");
-    //     exit(-1);
-    // }
-    int array_size;
-    cJSON *json_obj;
-    cJSON *json_item;
-    cJSON *json_array_item;
-
-    fin = open(JSON_FILE_PATH, O_RDONLY);
-    if (!fin) {
-        printf("Error open file %s", JSON_FILE_PATH);
-        exit(-1);
-    }
-    read(fin, buffer, sizeof(buffer));
-    close(fin);
-
-    // read json string
-    json_obj = cJSON_Parse(buffer);
-    // free(buffer);
-    char *json_print_str = cJSON_Print(json_obj);
-    printf("Json file content: \n%s\n", json_print_str);
-    cJSON_free(json_print_str);
-    // get anchors
-    json_item = cJSON_GetObjectItem(json_obj, "anchors");
-    array_size = cJSON_GetArraySize(json_item);
-    if (ANCHOR_NUM * 2 != array_size) {
-        printf("Expect anchor size: %d, got %d in json file", ANCHOR_NUM * 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d anchors from json file\n", ANCHOR_NUM);
-    }
-    for (int i = 0; i < ANCHOR_NUM * 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        anchor[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, anchor[i]);
-    }
-    // net_input_size
-    json_item = cJSON_GetObjectItem(json_obj, "net_input_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect net_input_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_input_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_input_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_input_size[i]);
-    }
-    // net_output_shape
-    json_item = cJSON_GetObjectItem(json_obj, "net_output_shape");
-    array_size = cJSON_GetArraySize(json_item);
-    if (3 != array_size) {
-        printf("Expect net_output_shape: %d, got %d in json file", 3, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d net_output_shape from json file\n", 3);
-    }
-    for (int i = 0; i < 3; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        net_output_shape[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, net_output_shape[i]);
-    }
-    // sensor_output_size
-    json_item = cJSON_GetObjectItem(json_obj, "sensor_output_size");
-    array_size = cJSON_GetArraySize(json_item);
-    if (2 != array_size) {
-        printf("Expect sensor_output_size: %d, got %d in json file", 2, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d sensor_output_size from json file\n", 2);
-    }
-    for (int i = 0; i < 2; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        sensor_output_size[i] = json_array_item->valueint;
-        printf("%d: %d\n", i, sensor_output_size[i]);
-    }
-    // kmodel_path
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_path");
-    memcpy(kmodel_path, json_item->valuestring, strlen(json_item->valuestring));
-    printf("Got kmodel_path: %s\n", kmodel_path);
-    // kmodel_size
-    json_item = cJSON_GetObjectItem(json_obj, "kmodel_size");
-    kmodel_size = json_item->valueint;
-    printf("Got kmodel_size: %d\n", kmodel_size);
-    // labels
-    json_item = cJSON_GetObjectItem(json_obj, "labels");
-    class_num = cJSON_GetArraySize(json_item);
-    if (0 >= class_num) {
-        printf("No labels!");
-        exit(-1);
-    } else {
-        printf("Got %d labels\n", class_num);
-    }
-    for (int i = 0; i < class_num; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        memcpy(labels[i], json_array_item->valuestring, strlen(json_array_item->valuestring));
-        printf("%d: %s\n", i, labels[i]);
-    }
-    // obj_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "obj_thresh");
-    array_size = cJSON_GetArraySize(json_item);
-    if (class_num != array_size) {
-        printf("label number and thresh number mismatch! label number : %d, obj thresh number %d", class_num, array_size);
-        exit(-1);
-    } else {
-        printf("Got %d obj_thresh\n", array_size);
-    }
-    for (int i = 0; i < array_size; i++) {
-        json_array_item = cJSON_GetArrayItem(json_item, i);
-        obj_thresh[i] = json_array_item->valuedouble;
-        printf("%d: %f\n", i, obj_thresh[i]);
-    }
-    // nms_thresh
-    json_item = cJSON_GetObjectItem(json_obj, "nms_thresh");
-    nms_thresh = json_item->valuedouble;
-    printf("Got nms_thresh: %f\n", nms_thresh);
-
-    cJSON_Delete(json_obj);
-    return;
-}
-
-void instrusion_detect()
-{
-    int ret = 0;
-    int result = 0;
-    int size = 0;
-    param_parse();
-    g_fd = open("/dev/ov2640", O_RDONLY);
-    if (g_fd < 0) {
-        printf("open ov2640 fail !!");
-        return;
-    }
-    _ioctl_set_dvp_reso set_dvp_reso = {sensor_output_size[1], sensor_output_size[0]};
-    ioctl(g_fd, IOCTRL_CAMERA_SET_DVP_RESO, &set_dvp_reso);
-    showbuffer = (unsigned char *)malloc(sensor_output_size[0] * sensor_output_size[1] * 2);
-    if (NULL == showbuffer) {
-        close(g_fd);
-        printf("showbuffer apply memory fail !!");
-        return;
-    }
-    kpurgbbuffer = (unsigned char *)malloc(net_input_size[0] * net_input_size[1] * 3);
-    if (NULL == kpurgbbuffer) {
-        close(g_fd);
-        free(showbuffer);
-        printf("kpurgbbuffer apply memory fail !!");
-        return;
-    }
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        free(showbuffer);
-        free(kpurgbbuffer);
-        close(g_fd);
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-    memset(showbuffer, 0, sensor_output_size[0] * sensor_output_size[1] * 2);
-    memset(kpurgbbuffer, 127, net_input_size[0] * net_input_size[1] * 3);
-    shoot_para_t.pdata = (unsigned int *)(showbuffer);
-    shoot_para_t.length = (size_t)(sensor_output_size[0] * sensor_output_size[1] * 2);
-    /*
-        load memory
-    */
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-    if (kmodel_fd < 0) {
-        printf("open kmodel fail");
-        close(g_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    } else {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-            close(g_fd);
-            close(kmodel_fd);
-            free(showbuffer);
-            free(kpurgbbuffer);
-            free(model_data);
-            return;
-
-        } else {
-            printf("read kmodel success \n");
-        }
-    }
-    unsigned char *model_data_align = (unsigned char *)(((unsigned int)model_data + 255) & (~255));
-    dvp_set_ai_addr((uint32_t)(kpurgbbuffer + net_input_size[1] * (net_input_size[0] - sensor_output_size[0])),
-                    (uint32_t)(kpurgbbuffer + net_input_size[1] * (net_input_size[0] - sensor_output_size[0]) +
-                               net_input_size[0] * net_input_size[1]),
-                    (uint32_t)(kpurgbbuffer + net_input_size[0] * net_input_size[1] * 2 +
-                               net_input_size[1] * (net_input_size[0] - sensor_output_size[0])));
-    if (kpu_load_kmodel(&instrusion_detect_task, model_data_align) != 0) {
-        printf("\nmodel init error\n");
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        return;
-    }
-    instrusion_detect_rl.anchor_number = ANCHOR_NUM;
-    instrusion_detect_rl.anchor = anchor;
-    instrusion_detect_rl.threshold = malloc(class_num * sizeof(float));
-    for (int idx = 0; idx < class_num; idx++) {
-        instrusion_detect_rl.threshold[idx] = obj_thresh[idx];
-    }
-    instrusion_detect_rl.nms_value = nms_thresh;
-    result = region_layer_init(&instrusion_detect_rl, net_output_shape[0], net_output_shape[1], net_output_shape[2],
-                               net_input_size[1], net_input_size[0]);
-    printf("region_layer_init result %d \n\r", result);
-    size_t stack_size = STACK_SIZE;
-    pthread_attr_t attr;                      /* 线程属性 */
-    struct sched_param prio;                  /* 线程优先级 */
-    prio.sched_priority = 8;                  /* 优先级设置为 8 */
-    pthread_attr_init(&attr);                 /* 先使用默认值初始化属性 */
-    pthread_attr_setschedparam(&attr, &prio); /* 修改属性对应的优先级 */
-    pthread_attr_setstacksize(&attr, stack_size);
-
-    /* 创建线程 1, 属性为 attr，入口函数是 thread_entry，入口函数参数是 1 */
-    result = pthread_create(&instrusiontid, &attr, thread_instrusion_detect_entry, NULL);
-    if (0 == result) {
-        printf("thread_instrusion_detect_entry successfully!\n");
-    } else {
-        printf("thread_instrusion_detect_entry failed! error code is %d\n", result);
-        close(g_fd);
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(instrusion_detect, instrusion detect task);
-#endif
-
-static void *thread_instrusion_detect_entry(void *parameter)
-{
-    extern void lcd_draw_picture(uint16_t x1, uint16_t y1, uint16_t width, uint16_t height, uint32_t * ptr);
-    printf("thread_instrusion_detect_entry start!\n");
-    int ret = 0;
-    // sysctl_enable_irq();
-    while (1) {
-        // memset(showbuffer,0,320*240*2);
-        g_ai_done_flag = 0;
-        ret = ioctl(g_fd, IOCTRL_CAMERA_START_SHOT, &shoot_para_t);
-        if (RT_ERROR == ret) {
-            printf("ov2640 can't wait event flag");
-            rt_free(showbuffer);
-            close(g_fd);
-            pthread_exit(NULL);
-            return NULL;
-        }
-        kpu_run_kmodel(&instrusion_detect_task, kpurgbbuffer, DMAC_CHANNEL5, ai_done, NULL);
-        while (!g_ai_done_flag)
-            ;
-        float *output;
-        size_t output_size;
-        kpu_get_output(&instrusion_detect_task, 0, (uint8_t **)&output, &output_size);
-        instrusion_detect_rl.input = output;
-        region_layer_run(&instrusion_detect_rl, &instrusion_detect_info);
-/* display result */
-
-        for (int instrusion_cnt = 0; instrusion_cnt < instrusion_detect_info.obj_number; instrusion_cnt++) {
-            // draw_edge((uint32_t *)showbuffer, &instrusion_detect_info, instrusion_cnt, 0xF800,
-            // (uint16_t)sensor_output_size[1],
-            //           (uint16_t)sensor_output_size[0]);
-            printf("%d: (%d, %d, %d, %d) cls: %s conf: %f\t", instrusion_cnt, instrusion_detect_info.obj[instrusion_cnt].x1,
-                   instrusion_detect_info.obj[instrusion_cnt].y1, instrusion_detect_info.obj[instrusion_cnt].x2,
-                   instrusion_detect_info.obj[instrusion_cnt].y2, labels[instrusion_detect_info.obj[instrusion_cnt].class_id],
-                   instrusion_detect_info.obj[instrusion_cnt].prob);
-        }
-        if (0 != instrusion_detect_info.obj_number) {
-            printf("\n");
-        }
-#ifdef BSP_USING_LCD
-        lcd_draw_picture(0, 0, (uint16_t)sensor_output_size[1], (uint16_t)sensor_output_size[0], (unsigned int *)showbuffer);
-#endif
-        usleep(1);
-        if (1 == if_exit) {
-            if_exit = 0;
-            printf("thread_instrusion_detect_entry exit");
-            pthread_exit(NULL);
-        }
-    }
-}
-
-void instrusion_detect_delete()
-{
-    if (showbuffer != NULL) {
-        int ret = 0;
-        close(g_fd);
-        close(kmodel_fd);
-        free(showbuffer);
-        free(kpurgbbuffer);
-        free(model_data);
-        printf("instrusion detect task cancel!!! ret %d ", ret);
-        if_exit = 1;
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(instrusion_detect_delete, instrusion detect task delete);
-#endif
-
-void kmodel_load(unsigned char *model_data)
-{
-    int kmodel_fd = 0;
-    int size = 0;
-    kmodel_fd = open(kmodel_path, O_RDONLY);
-
-    model_data = (unsigned char *)malloc(kmodel_size + 255);
-    if (NULL == model_data) {
-        printf("model_data apply memory fail !!");
-        return;
-    }
-    memset(model_data, 0, kmodel_size + 255);
-
-    if (kmodel_fd >= 0) {
-        size = read(kmodel_fd, model_data, kmodel_size);
-        if (size != kmodel_size) {
-            printf("read kmodel error size %d\n", size);
-
-        } else {
-            printf("read kmodel success");
-        }
-    } else {
-        free(model_data);
-        printf("open kmodel fail");
-    }
-}
-#ifdef __RT_THREAD_H__
-MSH_CMD_EXPORT(kmodel_load, kmodel load memory);
-#endif

APP_Framework/Applications/knowing_app/iris_ml_demo/iris_ml_demo.c

@@ -19,7 +19,8 @@ void simple_CSV_read()
     fin = open(CSV_PATH, O_RDONLY);
     if (!fin) {
         printf("Error open file %s", CSV_PATH);
-        exit(-1);
+        // exit(-1);
+        return;
     }
     read(fin, buffer, sizeof(buffer));
     close(fin);

APP_Framework/Applications/knowing_app/k210_detect_entry/Kconfig

@@ -0,0 +1,10 @@
+config K210_DETECT_ENTRY
+    bool "enable apps/k210 yolov2 detect entry"
+    depends on BOARD_K210_EVB
+	depends on DRV_USING_OV2640
+	depends on USING_KPU_PROCESSING
+	depends on USING_YOLOV2
+	depends on USING_YOLOV2_JSONPARSER
+	depends on USING_K210_YOLOV2_DETECT
+    select LIB_USING_CJSON
+    default n

APP_Framework/Applications/knowing_app/k210_detect_entry/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('Applications', src, depend = ['FACE_DETECT'], LOCAL_CPPPATH = CPPPATH)
+group = DefineGroup('Applications', src, depend = ['USING_K210_YOLOV2_DETECT'], LOCAL_CPPPATH = CPPPATH)
 
 Return('group')

APP_Framework/Applications/knowing_app/k210_detect_entry/face.json

@@ -24,7 +24,6 @@
 		6.718375,
 		9.01025
 	],
-	"kmodel_path": "/kmodel/detect.kmodel",
 	"kmodel_size": 388776,
 	"obj_thresh": [
 		0.7

APP_Framework/Applications/knowing_app/k210_detect_entry/helmet.json

@@ -24,11 +24,10 @@
 		2.1128,
 		3.184
 	],
-	"kmodel_path": "/kmodel/helmet.kmodel",
 	"kmodel_size": 2714044,
 	"obj_thresh": [
 		0.7,
-		0.9
+		0.99
 	],
 	"labels": [
 		"head",

APP_Framework/Applications/knowing_app/k210_detect_entry/instrusion.json

@@ -24,10 +24,9 @@
 		2.049,
 		4.6711
 	],
-	"kmodel_path": "/kmodel/human.kmodel",
 	"kmodel_size": 2713236,
 	"obj_thresh": [
-		0.55
+		0.7
 	],
 	"labels": [
 		"human"

APP_Framework/Applications/knowing_app/k210_detect_entry/k210_detect_entry.c

@@ -0,0 +1,16 @@
+#include "k210_yolov2_detect.h"
+static void detect_app(int argc, char *argv[])
+{
+    if (2 != argc) {
+        printf("Usage: detect_app <ABSOLUTE_CONFIG_JSON_PATH>");
+    } else {
+        k210_detect(argv[1]);
+    }
+
+    return;
+}
+// clang-format off
+#ifdef __RT_THREAD_H__
+MSH_CMD_EXPORT(detect_app, k210 detect app usage: detect_app <ABSOLUTE_CONFIG_JSON_PATH>);
+#endif
+// clang-format on

APP_Framework/Applications/knowing_app/k210_fft_test/Kconfig

@@ -0,0 +1,3 @@
+config K210_FFT_TEST
+    bool "enable apps/k210 fft test"
+    default n

APP_Framework/Applications/knowing_app/k210_fft_test/SConscript

@@ -4,6 +4,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('Applications', src, depend = ['HELMET_DETECT'], LOCAL_CPPPATH = CPPPATH)
+group = DefineGroup('Applications', src, depend = ['K210_FFT_TEST'], LOCAL_CPPPATH = CPPPATH)
 
 Return('group')

APP_Framework/Applications/knowing_app/k210_fft_test/fft_soft.c

@@ -0,0 +1,101 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "fft_soft.h"
+
+#define PI 3.14159265358979323846
+complex add(complex a, complex b)
+{
+    complex ret = {a.real + b.real, a.imag + b.imag};
+    return ret;
+}
+
+complex sub(complex a, complex b)
+{
+    complex ret = {a.real - b.real, a.imag - b.imag};
+    return ret;
+}
+
+complex mul(complex a, complex b)
+{
+    complex ret = {a.real * b.real - a.imag * b.imag, a.real * b.imag + a.imag * b.real};
+    return ret;
+}
+
+void bitrev(complex *data, int n)
+{
+    int j = 0;
+    int m = 0;
+    for (int i = 0; i < n; i++)
+    {
+        if (j > i)
+            SWAP(data[i], data[j]);
+        m = n / 2;
+        while (j >= m && m != 0)
+        {
+            j -= m;
+            m >>= 1;
+        }
+        j += m;
+    }
+}
+
+void fft_soft(complex *data, int n)
+{
+    int M = 0;
+    for (int i = n; i > 1; i = i >> 1, M++);
+
+    bitrev(data, n);
+
+    for (int m = 0; m < M; m++)
+    {
+        int K = n >> (m + 1);
+        for (int k = 0; k < K; k++)
+        {
+            int J = 2 << m;
+            int base = k * J;
+            for (int j = 0; j < J / 2; j++)
+            {
+                int t = base + j;
+                complex w = {cos(-2 * PI * j * K / n), sin(-2 * PI * j * K / n)};
+                complex wn = mul(data[t + J / 2], w);
+                complex temp = data[t];
+                data[t] = add(data[t], wn);
+                data[t + J / 2] = sub(temp, wn); 
+            }
+        }
+    }
+}
+
+void ifft_soft(complex *data, int n)
+{
+    int M = 0;
+    for (int i = n; i > 1; i = i >> 1, M++);
+
+    bitrev(data, n);
+
+    for (int m = 0; m < M; m++)
+    {
+        int K = n >> (m + 1);
+        for (int k = 0; k < K; k++)
+        {
+            int J = 2 << m;
+            int base = k * J;
+            for (int j = 0; j < J / 2; j++)
+            {
+                int t = base + j;
+                complex w = {cos(2 * PI * j * K / n), sin(2 * PI * j * K / n)};
+                complex wn = mul(data[t + J / 2], w);
+                complex temp = data[t];
+                data[t] = add(data[t], wn);
+                data[t + J / 2] = sub(temp, wn); 
+            }
+        }
+    }
+
+    for (int i = 0; i < n; i++)
+    {
+        data[i].real /= n;
+        data[i].imag /= n;
+    }
+}

APP_Framework/Applications/knowing_app/k210_fft_test/fft_soft.h

@@ -0,0 +1,14 @@
+#ifndef _FFT_SOFT_H
+#define _FFT_SOFT_H
+
+#include <stdint.h>
+
+#define SWAP(a, b) do {complex t = (a); (a) = (b); (b) = t;} while(0)
+
+typedef struct{double real, imag;} complex;
+
+void fft_soft(complex *data, int n);
+void ifft_soft(complex *data, int n);
+void show(complex *data, int n);
+
+#endif /* _FFT_SOFT_H */

APP_Framework/Applications/knowing_app/k210_fft_test/fft_test.c

@@ -0,0 +1,159 @@
+/* Copyright 2018 Canaan Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <transform.h>
+#include <math.h>
+#include "encoding.h"
+#include "dmac.h"
+#include "fft.h"
+#include "encoding.h"
+#include "sysctl.h"
+#include "fft_soft.h"
+
+#define FFT_N               512U
+#define FFT_FORWARD_SHIFT   0x0U
+#define FFT_BACKWARD_SHIFT  0x1ffU
+#define PI                  3.14159265358979323846
+
+typedef enum _complex_mode
+{
+    FFT_HARD = 0,
+    FFT_SOFT = 1,
+    FFT_COMPLEX_MAX,
+} complex_mode_t;
+
+int16_t real[FFT_N];
+int16_t imag[FFT_N];
+float hard_power[FFT_N];
+float soft_power[FFT_N];
+float hard_angel[FFT_N];
+float soft_angel[FFT_N];
+uint64_t fft_out_data[FFT_N / 2];
+uint64_t buffer_input[FFT_N];
+uint64_t buffer_output[FFT_N];
+uint64_t cycle[FFT_COMPLEX_MAX][FFT_DIR_MAX];
+
+uint16_t get_bit1_num(uint32_t data)
+{
+    uint16_t num;
+    for (num = 0; data; num++)
+        data &= data - 1;
+    return num;
+}
+
+void k210_fft_test(void)
+{
+    int32_t i;
+    float tempf1[3];
+    fft_data_t *output_data;
+    fft_data_t *input_data;
+    uint16_t bit1_num = get_bit1_num(FFT_FORWARD_SHIFT);
+    complex_hard_t data_hard[FFT_N] = {0};
+    complex data_soft[FFT_N] = {0};
+    for (i = 0; i < FFT_N; i++)
+    {
+        tempf1[0] = 0.3 * cosf(2 * PI * i / FFT_N + PI / 3) * 256;
+        tempf1[1] = 0.1 * cosf(16 * 2 * PI * i / FFT_N - PI / 9) * 256;
+        tempf1[2] = 0.5 * cosf((19 * 2 * PI * i / FFT_N) + PI / 6) * 256;
+        data_hard[i].real = (int16_t)(tempf1[0] + tempf1[1] + tempf1[2] + 10);
+        data_hard[i].imag = (int16_t)0;
+        data_soft[i].real = data_hard[i].real;
+        data_soft[i].imag = data_hard[i].imag;
+    }
+    for (int i = 0; i < FFT_N / 2; ++i)
+    {
+        input_data = (fft_data_t *)&buffer_input[i];
+        input_data->R1 = data_hard[2 * i].real;
+        input_data->I1 = data_hard[2 * i].imag;
+        input_data->R2 = data_hard[2 * i + 1].real;
+        input_data->I2 = data_hard[2 * i + 1].imag;
+    }
+    cycle[FFT_HARD][FFT_DIR_FORWARD] = read_cycle();
+    fft_complex_uint16_dma(DMAC_CHANNEL0, DMAC_CHANNEL1, FFT_FORWARD_SHIFT, FFT_DIR_FORWARD, buffer_input, FFT_N, buffer_output);
+    cycle[FFT_HARD][FFT_DIR_FORWARD] = read_cycle() - cycle[FFT_HARD][FFT_DIR_FORWARD];
+    cycle[FFT_SOFT][FFT_DIR_FORWARD] = read_cycle();
+    fft_soft(data_soft, FFT_N);
+    cycle[FFT_SOFT][FFT_DIR_FORWARD] = read_cycle() - cycle[FFT_SOFT][FFT_DIR_FORWARD];
+    for (i = 0; i < FFT_N / 2; i++)
+    {
+        output_data = (fft_data_t*)&buffer_output[i];
+        data_hard[2 * i].imag = output_data->I1 ;
+        data_hard[2 * i].real = output_data->R1 ;
+        data_hard[2 * i + 1].imag = output_data->I2 ;
+        data_hard[2 * i + 1].real = output_data->R2 ;
+    }
+
+    for (i = 0; i < FFT_N; i++)
+    {
+        hard_power[i] = sqrt(data_hard[i].real * data_hard[i].real + data_hard[i].imag * data_hard[i].imag) * 2;
+        soft_power[i] = sqrt(data_soft[i].real * data_soft[i].real + data_soft[i].imag * data_soft[i].imag) * 2;
+    }
+
+    printf("\n[hard fft real][soft fft real][hard fft imag][soft fft imag]\n");
+    for (i = 0; i < FFT_N / 2; i++)
+        printf("%3d:%7d %7d %7d %7d\n",
+                i, data_hard[i].real, (int32_t)data_soft[i].real, data_hard[i].imag, (int32_t)data_soft[i].imag);
+
+    printf("\nhard power  soft power:\n");
+    printf("%3d : %f  %f\n", 0, hard_power[0] / 2 / FFT_N * (1 << bit1_num), soft_power[0] / 2 / FFT_N);
+    for (i = 1; i < FFT_N / 2; i++)
+        printf("%3d : %f  %f\n", i, hard_power[i] / FFT_N * (1 << bit1_num), soft_power[i] / FFT_N);
+
+    printf("\nhard phase  soft phase:\n");
+    for (i = 0; i < FFT_N / 2; i++)
+    {
+        hard_angel[i] = atan2(data_hard[i].imag, data_hard[i].real);
+        soft_angel[i] = atan2(data_soft[i].imag, data_soft[i].real);
+        printf("%3d : %f  %f\n", i, hard_angel[i] * 180 / PI, soft_angel[i] * 180 / PI);
+    }
+
+    for (int i = 0; i < FFT_N / 2; ++i)
+    {
+        input_data = (fft_data_t *)&buffer_input[i];
+        input_data->R1 = data_hard[2 * i].real;
+        input_data->I1 = data_hard[2 * i].imag;
+        input_data->R2 = data_hard[2 * i + 1].real;
+        input_data->I2 = data_hard[2 * i + 1].imag;
+    }
+    cycle[FFT_HARD][FFT_DIR_BACKWARD] = read_cycle();
+    fft_complex_uint16_dma(DMAC_CHANNEL0, DMAC_CHANNEL1, FFT_BACKWARD_SHIFT, FFT_DIR_BACKWARD, buffer_input, FFT_N, buffer_output);
+    cycle[FFT_HARD][FFT_DIR_BACKWARD] = read_cycle() - cycle[FFT_HARD][FFT_DIR_BACKWARD];
+    cycle[FFT_SOFT][FFT_DIR_BACKWARD] = read_cycle();
+    ifft_soft(data_soft, FFT_N);
+    cycle[FFT_SOFT][FFT_DIR_BACKWARD] = read_cycle() - cycle[FFT_SOFT][FFT_DIR_BACKWARD];
+    for (i = 0; i < FFT_N / 2; i++)
+    {
+        output_data = (fft_data_t*)&buffer_output[i];
+        data_hard[2 * i].imag = output_data->I1 ;
+        data_hard[2 * i].real = output_data->R1 ;
+        data_hard[2 * i + 1].imag = output_data->I2 ;
+        data_hard[2 * i + 1].real = output_data->R2 ;
+    }
+    printf("\n[hard ifft real][soft ifft real][hard ifft imag][soft ifft imag]\n");
+    for (i = 0; i < FFT_N / 2; i++)
+        printf("%3d:%7d  %7d %7d %7d\n",
+                i, data_hard[i].real, (int32_t)data_soft[i].real, data_hard[i].imag, (int32_t)data_soft[i].imag);
+
+    printf("[hard fft test] [%d bytes] forward time = %ld us, backward time = %ld us\n",
+            FFT_N,
+            cycle[FFT_HARD][FFT_DIR_FORWARD]/(sysctl_clock_get_freq(SYSCTL_CLOCK_CPU)/1000000),
+            cycle[FFT_HARD][FFT_DIR_BACKWARD]/(sysctl_clock_get_freq(SYSCTL_CLOCK_CPU)/1000000));
+    printf("[soft fft test] [%d bytes] forward time = %ld us, backward time = %ld us\n",
+            FFT_N,
+            cycle[FFT_SOFT][FFT_DIR_FORWARD]/(sysctl_clock_get_freq(SYSCTL_CLOCK_CPU)/1000000),
+            cycle[FFT_SOFT][FFT_DIR_BACKWARD]/(sysctl_clock_get_freq(SYSCTL_CLOCK_CPU)/1000000));
+}
+#ifdef __RT_THREAD_H__
+MSH_CMD_EXPORT(k210_fft_test,k210 fft test );
+#endif

APP_Framework/Applications/main.c

@@ -12,14 +12,18 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <user_api.h>
+// #include <user_api.h>
+#include <transform.h>
 
 extern int FrameworkInit();
-
+extern void ApplicationOtaTaskInit(void);
 int main(void)
 {
-	printf("Hello, world!\n");
+	printf("Hello, world! \n");
 	FrameworkInit();
+#ifdef APPLICATION_OTA
+	ApplicationOtaTaskInit();
+#endif
     return 0;
 }
 // int cppmain(void);

APP_Framework/Applications/ota/Kconfig

@@ -0,0 +1,7 @@
+menu "ota app "
+    menuconfig APPLICATION_OTA
+        bool "Using app bin ota"
+        default n
+
+
+endmenu

APP_Framework/Applications/ota/Makefile

@@ -1,3 +1,3 @@
-SRC_FILES := hfa21.c
+SRC_FILES := ota.c
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Applications/ota/README.md

@@ -0,0 +1,19 @@
+# OTA README
+
+xiuos当前的ota功能允许应用bin文件可以通过4G实现远程的bin文件更新（限制：1、bin文件存放在设备SD卡并且应用从SD卡启动；2、暂且支持4G实现；3、暂时只支持aiit终端;4、只支持xiuos内核）。
+
+## 文件说明
+
+| 名称 | 说明 |
+| -- | -- |
+| ota.c| xiuos设备OTA代码 |
+| ota_server.c | pc服务端的实例代码供参考 |
+
+
+## 使用说明
+xiuos的应用bin文件更新依赖上层的adapter框架，因此需要在menuconfig同时配置以下选项：
+1、ota开关APPLICATION_OTA打开；
+2、adapter的4G功能开关；
+3、拆分的应用启动SEPARATE_COMPILE开关从SD卡启动的配置开关APP_STARTUP_FROM_SDCARD。
+
+

APP_Framework/Applications/ota/ota.c

@@ -0,0 +1,411 @@
+
+/*
+* 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:    ota.c
+* @brief:   a application ota task of system
+* @version: 1.0
+* @author:  AIIT XUOS Lab
+* @date:    2021/11/3
+*
+*/
+#include <transform.h>
+#include <adapter.h>
+
+extern int main(void);
+
+struct ota_header_t
+{
+    int16 frame_flag;          ///< frame start flag 2 Bytes
+    uint8 dev_type;            ///< device type
+    uint8 burn_mode;           ///< data burn way
+    uint32 total_len;          ///< send data total length caculated from each frame_len 
+    uint32 dev_hid;            ///< device hardware version
+    uint32 dev_sid;            ///< device software version
+    char resv[8];             ///< reserve
+};
+
+struct ota_frame_t
+{
+    uint32 frame_id;           ///< Current frame id
+    uint32 frame_len;          ///< Current frame data length
+    char   frame_data[64];    ///< Current frame data,max length 64
+    uint32 crc;                ///< Current frame data crc
+};
+
+struct ota_data
+{
+    struct ota_header_t header;
+    struct ota_frame_t frame;
+    char end[4];
+};
+
+pthread_t ota_task;
+pthread_t restart_main;
+
+/**
+ * @description: CRC16 check
+ * @param data data buffer
+ * @param length data length
+ * @return check code
+ */
+uint32_t OtaCrc16(uint8_t * data, uint32_t length)
+{
+    int j;
+    unsigned int reg_crc=0xFFFF;
+    printf("crc data length[%d] Bytes,",length);
+
+    while (length--) {
+        reg_crc ^= *data++;
+        for (j=0;j<8;j++) {
+            if(reg_crc & 0x01)
+                reg_crc=reg_crc >>1 ^ 0xA001;
+            else
+                reg_crc=reg_crc >>1;
+        }
+    }
+    printf(" crc = [0x%x]\n",reg_crc);
+    return reg_crc;
+}
+
+uint32_t FileCrc16(uint8_t * data, uint32_t length, unsigned int last_crc)
+{
+    int j;
+    //printf("crc data length[%d] Bytes,",length);
+ 
+    while (length--) {
+        last_crc ^= *data++;
+        for (j=0;j<8;j++) {
+            if(last_crc & 0x01)
+                last_crc = last_crc >>1 ^ 0xA001;
+            else
+                last_crc = last_crc >>1;
+        }
+    }
+
+    //printf(" crc = [0x%x]\n",last_crc);
+
+    return last_crc;
+}
+
+
+static int SaveAppBin(int fd, char* buf, int len)
+{
+    int ret = 0;
+    int fd_t = 0;
+    fd_t = open( BOARD_APP_NAME, O_RDWR | O_APPEND);
+    ret = write(fd, buf, len);
+    if(ret < 0){
+        printf("fd = %d write buf len[%d] failed.ret = %d\n",fd_t,len,ret);
+    }
+    else
+    {
+        printf("fd[%d] write buf length[%d] done.\n",fd_t,ret);
+    }
+    
+    close(fd_t);
+}
+
+static int CrcFileCheck(uint32 crc_check, unsigned long total_len)
+{
+    int ret = 0;
+    int fd = 0;
+    int len = 0;
+    char *buf = NULL;
+    unsigned int last_crc = 0xffff;
+    unsigned long already_crc_length = 0;
+    
+    fd = open( BOARD_APP_NAME, O_RDONLY );
+    if(fd < 0){
+        printf("open %s bin failed.\n",BOARD_APP_NAME);
+        return -1;
+    }
+
+    buf = PrivMalloc(128);
+    if(NULL == buf)
+    {
+        printf("malloc failed.\n");
+        close(fd);
+        return 0;
+    }
+
+    /* crc check every 1024 Bytes until crc all the total file */
+    while(already_crc_length != total_len)
+    {
+        memset(buf , 0 , 128);
+        len = read(fd, buf, 128);
+        if(len < 0)
+        {
+            printf("file read failed.ret = %d\n",len);
+            ret = -1;
+            break;
+        }
+        
+        last_crc = FileCrc16(buf, len, last_crc);
+        already_crc_length += len;
+        printf("read len[%d] Bytes,already_crc_length[%d]\n",len,already_crc_length);
+    }
+    
+
+    if (last_crc != crc_check)
+    {
+       printf("file crc error!!! last crc[%x] != check[%x]\n",last_crc,crc_check);
+       ret =-1;
+    }
+
+    PrivFree(buf);
+    close(fd);
+
+    return ret;
+}
+
+static void RestartApplication(void)
+{
+    pthread_attr_t attr;
+    attr.schedparam.sched_priority = 10;
+    attr.stacksize = 2048;
+
+    while(1) 
+    {
+        unsigned long pid = PrivUserTaskSearch();
+        if ((pid > 0) && (pid != pthread_self())) 
+        {
+            printf("kill usertask pid[%d]\n",pid);
+            PrivTaskDelete(pid, 0);
+            PrivTaskDelay(1000); /* NOTE:this delay will make a schedule and recycle all user task */
+        } 
+        else 
+        {
+            break;
+        }
+    }
+    printf("restart main.\n");
+    PrivTaskCreate(&restart_main, &attr, (void *)main, NULL);
+}
+static int OtaDataRecv(struct Adapter* adapter)
+{
+    struct ota_data recv_msg;
+    char reply[16] = {0};
+    int ret = 0;
+    int try_times = 10;
+    int fd = 0;
+    int frame_cnt = 0;
+
+    fd = open( BOARD_APP_NAME, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+    if(fd < 0)
+    {
+        printf("open %s failed\n",BOARD_APP_NAME);
+        return -1;
+    }
+    close(fd);
+
+    while(1) {
+        memset(&recv_msg, 0, sizeof(struct ota_data));
+        printf("recv msg...\n");
+        ret = AdapterDeviceRecv(adapter, &recv_msg, sizeof(struct ota_data));
+        if(ret >= 0 && recv_msg.header.frame_flag == 0x5A5A) 
+        {
+            if(0 == strncmp("aiit_ota_end",recv_msg.frame.frame_data, strlen("aiit_ota_end"))) 
+            {
+                printf("total [%d]frames [%d]Bytes crc[%x],receive successful,\n",frame_cnt,recv_msg.header.total_len,recv_msg.frame.crc);
+                if(0 != CrcFileCheck(recv_msg.frame.crc, recv_msg.header.total_len))
+                {
+                    printf("crc check %s bin failed.please try again.\n", BOARD_APP_NAME);
+                    ret = -1;
+                    break;
+                }
+                PrivTaskDelay(500);
+                printf("tolal file crc done.send ok\n");
+                memset(reply, 0, 16);
+                memcpy(reply, "ok", strlen("ok"));
+
+                AdapterDeviceSend(adapter, reply, strlen(reply));
+                ret = 0;
+                break;
+            }
+            frame_cnt = recv_msg.frame.frame_id;
+
+            if(0 == strncmp("wait_ok_timeout",recv_msg.frame.frame_data, strlen("wait_ok_timeout"))) 
+            {
+                printf("go to send ok again.\n");
+                goto send_ok_again;
+                
+            }
+
+            if (recv_msg.frame.crc == OtaCrc16(recv_msg.frame.frame_data,recv_msg.frame.frame_len))
+            {
+                printf("save current [%d] frame,length[%d] Bytes.\n",frame_cnt,recv_msg.frame.frame_len);
+                for(int i = 0; i < recv_msg.frame.frame_len;i++ ){
+                    printf(" %x ",*((char *)&recv_msg.frame.frame_data + i));
+                }
+                printf("\n");
+                SaveAppBin(fd, recv_msg.frame.frame_data, recv_msg.frame.frame_len);
+            }  
+            else 
+            {
+                printf("current [%d] frame crc check failed,try again!\n",frame_cnt);
+                goto try_again;
+            }
+            
+send_ok_again:
+            memset(reply, 0, 16);
+            memcpy(reply, "ok", strlen("ok"));
+            // PrivTaskDelay(100);
+
+            ret = AdapterDeviceSend(adapter, reply, strlen(reply));
+            if(ret < 0){
+                printf("send ok failed.\n");
+                goto send_ok_again;
+            }
+            printf("send reply[%s] done.\n",reply);
+            try_times = 10;
+            continue;
+        } 
+        else 
+        {
+try_again:
+            if(try_times == 0)
+            {
+                printf("oops!!! current [%d] frame try 10 times failed,break out!\n",frame_cnt);
+                ret = -1;
+                break;
+            }
+            memset(reply, 0, 16);
+            memcpy(reply, "retry", strlen("retry"));
+            printf("[%d] frame receive failed. retry\n",frame_cnt);
+            AdapterDeviceSend(adapter, reply, strlen(reply));
+            try_times--;
+            continue;
+        }
+    }
+    close(fd);
+
+    if(0 == ret) {
+        printf("ota file done,start application.\n");
+        RestartApplication();
+    }
+    return ret;
+}
+
+static void *OtaKTaskEntry(void *parameter)
+{
+    struct ota_data recv_msg;
+    char reply[16] = {0};
+    int baud_rate = BAUD_RATE_115200;
+    int len = 0;
+    int ret = 0;
+
+    struct Adapter* adapter =  AdapterDeviceFindByName("4G");
+    uint8 server_addr[64] = "115.238.53.61";
+    uint8 server_port[64] = "9898";
+
+    adapter->socket.socket_id = 0;
+
+    AdapterDeviceOpen(adapter);
+    AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
+    AdapterDeviceConnect(adapter, CLIENT, server_addr, server_port, IPV4);
+
+    /* using nbiot as connection way*/
+
+//     struct Adapter* adapter =  AdapterDeviceFindByName("nbiot");
+
+//     while(1)
+//     {
+//         int connect_times = 5;
+//         ret = AdapterDeviceOpen(adapter);
+//         if(ret < 0)
+//         {
+//            printf("open adapter failed\n");
+//            continue;
+//         }
+
+// connect_again:
+//         connect_times--;   
+//         ret = AdapterDeviceConnect(adapter, 1, "115.238.53.61","9898",1);
+//         if(ret < 0)
+//         {
+//             if(connect_times > 0){
+//                 goto connect_again;
+//             }
+//             else
+//             {
+//                 AdapterDeviceClose(adapter);
+//                 continue;
+//             }
+//         }
+//         break;
+//     }
+    PrivTaskDelay(5000);
+    while(1)
+    {
+        memset(&recv_msg, 0, sizeof(struct ota_data));
+        /* step1: Confirm the start signal of transmission*/
+        printf("waiting for start msg...\n");
+        ret = AdapterDeviceRecv(adapter, &recv_msg, sizeof(struct ota_data));
+        for(int i = 0; i < sizeof(struct ota_data);i++ ){
+            printf(" %x ",*((char *)&recv_msg + i));
+        }
+        printf("\n");
+        if(ret >= 0 && recv_msg.header.frame_flag == 0x5A5A) 
+        {
+            if (0 == strncmp("aiit_ota_start",recv_msg.frame.frame_data, strlen("aiit_ota_start"))) 
+            {
+                memset(reply, 0, 16);
+                memcpy(reply, "ready", strlen("ready"));
+                // PrivTaskDelay(3000);
+                printf("receive start signal,send [ready] signal to server\n");
+send_ready_again:
+                ret = AdapterDeviceSend(adapter, reply, strlen(reply));
+                if(ret < 0)
+                {
+                    goto send_ready_again;
+                }
+                PrivTaskDelay(3000);
+                printf("start receive ota file.\n");
+                /* step2: start receive source bin file of application*/
+                ret = OtaDataRecv(adapter);
+                if (0 != ret)
+                {
+                    memset(reply, 0, 16);
+                    memcpy(reply, "ota_restart", strlen("ota_restart"));
+                    AdapterDeviceSend(adapter, reply, strlen(reply));
+                    continue;
+                } 
+                else
+                {
+                    break;
+                }
+            }
+        }
+        else
+        {
+            memset(reply, 0, 16);
+            memcpy(reply, "notready", strlen("notready"));
+            printf("ota status:not ready\n");
+            ret = AdapterDeviceSend(adapter, reply, strlen(reply));
+        }
+        PrivTaskDelay(3000); /* check ota signal every 5s */
+    }
+    AdapterDeviceClose(adapter);
+    
+}
+
+void ApplicationOtaTaskInit(void)
+{   
+    pthread_attr_t attr;
+    attr.schedparam.sched_priority = 20;
+    attr.stacksize = 4096;
+
+    PrivTaskCreate(&ota_task, &attr, OtaKTaskEntry, NULL);
+
+}

APP_Framework/Applications/ota/ota_server.c

@@ -0,0 +1,364 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <pthread.h>
+#include <time.h>
+
+#include <sys/types.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <netdb.h>
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+typedef int BOOL;
+#define true 1
+#define false 0
+
+int serverfd;//服务器socket
+int clientfd[100000];//客户端的socketfd,100个元素，clientfd[0]~clientfd[99]
+int size = 99999;//用来控制进入聊天室的人数为50以内
+int PORT = 9898;//端口号
+typedef struct sockaddr meng;
+
+struct ota_header_t
+{
+    int16_t frame_flag;          ///< frame start flag 2 Bytes
+    uint8_t dev_type;            ///< device type
+    uint8_t burn_mode;           ///< data burn way
+    uint32_t total_len;          ///< send data total length caculated from each frame_len 
+    uint32_t dev_hid;            ///< device hardware version
+    uint32_t dev_sid;            ///< device software version
+    char resv[8];               ///< reserve
+};
+
+struct ota_frame_t
+{
+    uint32_t frame_id;           ///< Current frame id
+    uint32_t frame_len;          ///< Current frame data length
+    char     frame_data[64];       ///< Current frame data,max length 224
+    uint32_t crc;                ///< Current frame data crc
+};
+
+struct ota_data
+{
+    struct ota_header_t header;
+    struct ota_frame_t frame;
+    char end[4];
+};
+
+pthread_t ota_ktask;
+
+/**
+ * @description: CRC16 check
+ * @param data data buffer
+ * @param length data length
+ * @return check code
+ */
+uint32_t OtaCrc16(uint8_t * data, uint32_t length)
+{
+    int j;
+    unsigned int reg_crc=0xFFFF;
+
+    printf("crc data length[%d] Bytes,",length);
+
+    while (length--) {
+        reg_crc ^= *data++;
+        for (j=0;j<8;j++) {
+            if(reg_crc & 0x01)
+                reg_crc=reg_crc >>1 ^ 0xA001;
+            else
+                reg_crc=reg_crc >>1;
+        }
+    }
+    printf(" crc = [0x%x]\n",reg_crc);
+    return reg_crc;
+}
+
+void init(void)
+{
+    serverfd = socket(PF_INET,SOCK_STREAM,0);
+
+    if (serverfd == -1)
+    {
+        perror("创建socket失败");
+        exit(-1);
+    }
+
+//为套接字设置ip协议 设置端口号  并自动获取本机ip转化为网络ip
+
+    struct sockaddr_in addr;//存储套接字的信息
+    addr.sin_family = AF_INET;//地址族
+    addr.sin_port = htons(PORT);//设置server端端口号，你可以随便设置,当sin_port = 0时，系统随机选择一个未被使用的端口号
+    addr.sin_addr.s_addr = htons(INADDR_ANY);//当sin_addr = INADDR_ANY时，表示从本机的任一网卡接收数据
+
+//绑定套接字
+    // int on = 1;
+    struct timeval timeout;
+    timeout.tv_sec = 5;
+    timeout.tv_usec = 0;
+    if(setsockopt(serverfd, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
+    {
+        perror("端口设置失败");
+        exit(-1);
+    }
+
+    if (bind(serverfd,(meng*)&addr,sizeof(addr)) == -1)
+    {
+       perror("绑定失败");
+       exit(-1);
+    }
+
+    if (listen(serverfd,100) == -1)
+    {//监听最大连接数
+        perror("设置监听失败");
+        exit(-1);
+    }
+}
+int OtaFileSend(int fd)
+{
+    unsigned char buf[32] = { 0 };
+    struct ota_data data;
+    FILE *file_fd;
+    char ch;
+    int length = 0;
+    int try_times = 10;
+    int recv_end_times = 3;
+    int ret = 0;
+    int  frame_cnt = 0;
+    int file_length = 0;
+    char * file_buf = NULL;
+
+    file_fd = fopen("/home/aep04/wwg/XiUOS_aiit-arm32-board_app.bin", "r");
+    if (NULL == file_fd){
+        printf("open file failed.\n");
+        return -1;
+    }
+    fseek(file_fd, 0, SEEK_SET);
+    printf("start send file.\n");
+    while(!feof(file_fd))
+    {
+        memset(&data, 0, sizeof(data));
+
+        data.header.frame_flag = 0x5A5A;
+        length = fread( data.frame.frame_data, 1, 64, file_fd );
+        if(length > 0) 
+        {
+            printf("read %d Bytes\n",length);
+            data.frame.frame_id = frame_cnt;
+            data.frame.frame_len = length;
+            data.frame.crc = OtaCrc16(data.frame.frame_data, length);
+            file_length += length;
+        }
+
+send_again:
+        usleep(50000);
+        printf("ota send current[%d] frame.\n",frame_cnt);
+        length = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
+        if(length < 0){
+            printf("send [%d] frame faile.go to send again\n",frame_cnt);
+            goto send_again;
+        }
+        
+recv_again:
+        memset(buf, 0, 32);
+        length = recv(fd, buf, sizeof(buf), 0);
+        if(length < 0 ){
+            printf("[%d] frame waiting for ok timeout,receive again.\n",frame_cnt);
+            goto recv_again;
+        }
+
+        printf("receive buf[%s] length = %d\n",buf, length);
+        if(0 == strncmp(buf, "ok", length))
+        {
+            try_times = 10;
+            printf("[%d]frame data send done.\n",frame_cnt);
+            frame_cnt++;
+            continue;
+        } 
+        else
+        {
+            if(try_times > 0)
+            {
+                try_times--;
+                goto send_again;
+            } 
+            else
+            {
+                printf("send frame[%d] 10 times failed.\n",frame_cnt);
+                ret = -1;
+                break;
+            }
+        }
+    }
+
+    /* finally,crc check total bin file.*/
+    if (ret == 0)
+    {
+        sleep(1);
+        printf("total send file length[%d] Bytes [%d] frames.\n",file_length,frame_cnt);
+        printf("now crc check total bin file.\n");
+        file_buf = malloc(file_length);
+        memset(file_buf, 0, file_length);
+        memset(&data, 0, sizeof(data));
+
+        data.header.frame_flag = 0x5A5A;
+
+        file_fd = fopen("/home/aep04/wwg/XiUOS_aiit-arm32-board_app.bin", "r");
+        if (NULL == file_fd){
+            printf("open file failed.\n");
+            return -1;
+        }
+        fseek(file_fd, 0, SEEK_SET);
+        length = fread(file_buf,1, file_length, file_fd);
+        printf("read file length = %d\n",length);
+        if(length > 0) {
+            data.frame.frame_id = frame_cnt;
+            data.header.total_len = file_length;
+            data.frame.frame_len = strlen("aiit_ota_end");
+            data.frame.crc = OtaCrc16(file_buf, length);
+            memcpy(data.frame.frame_data,"aiit_ota_end",strlen("aiit_ota_end"));
+        }
+
+send_end_signal:
+        printf("send aiit_ota_end signal.\n");
+        length = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
+        if(length < 0){
+            printf("send end signal faile,send end signal again\n");
+            goto send_end_signal;
+        }
+
+recv_end_signal:
+        memset(buf, 0, 32);
+        length = recv(fd, buf, sizeof(buf), 0);
+        if(length < 0 )
+        {
+            recv_end_times--;
+            printf("end signal waiting for ok timeout,receive again.\n");
+            if(recv_end_times > 0)
+            {
+                goto recv_end_signal;
+            }
+            else
+            {
+                ret = -1;
+            }
+        }
+
+        if(0 != strncmp(buf, "ok", length))
+        {
+            printf("error end !!!\n");
+            ret = -1;
+        } 
+
+        free(file_buf);
+    }
+
+    fclose(file_fd);
+    return ret;
+}
+
+void* server_thread(void* p)
+{
+    int fd = *(int*)p;
+    unsigned char buf[32] = { 0 };
+    struct ota_data data;
+    int ret = 0;
+    int length = 0;
+
+    printf("pthread = %d\n",fd);
+    sleep(8);
+    while(1)
+    {
+        memset(&data, 0x0 , sizeof(struct ota_data));
+        data.header.frame_flag = 0x5A5A;
+        memcpy(data.frame.frame_data,"aiit_ota_start",strlen("aiit_ota_start"));
+        data.frame.frame_len = strlen("aiit_ota_start");
+
+        printf("send start signal.\n");
+        ret = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
+        if (ret > 0){
+            printf("send %s[%d] Bytes\n",data.frame.frame_data,ret);
+        }
+        // sleep(1);
+        memset(buf, 0, 32);
+        length = recv(fd, buf, sizeof(buf), 0);
+        if (length <= 0)
+        {
+            continue;
+        }
+        else 
+        {
+            printf("recv buf %s length %d\n",buf,length);
+            if(0 == strncmp(buf, "ready", length))
+            {
+                ret = OtaFileSend(fd);
+                if (ret == 0) {
+                    printf("ota file send successful.\n");
+                    break;
+                } else { /* ota failed then restart the ota process */
+                    continue;
+                }
+            }
+        }
+    }
+    printf("exit fd = %d\n",fd);
+    close(fd);
+    pthread_exit(0);
+}
+
+void server(void)
+{
+    printf("ota Server startup\n");
+    while(1)
+    {
+        struct sockaddr_in fromaddr;
+        socklen_t len = sizeof(fromaddr);
+        int fd = accept(serverfd,(meng*)&fromaddr,&len);
+
+//调用accept进入堵塞状态，等待客户端的连接
+
+        if (fd == -1)
+        {
+            // printf("The client connection is wrong...\n");
+            continue;
+        }
+
+        int i = 0;
+        for (i = 0;i < size;i++)
+        {
+            if (clientfd[i] == 0)
+            {
+                //记录客户端的socket
+                clientfd[i] = fd;
+
+                //有客户端连接之后，启动线程给此客户服务
+                pthread_t tid;
+                pthread_create(&tid,0,server_thread,&fd);
+                break;
+            }
+
+            if (size == i)
+            {
+                //发送给客户端说聊天室满了
+                char* str = "Devices full";
+                printf("%s", str);
+                send(fd,str,strlen(str),0);
+                close(fd);
+            }
+        }
+    }
+}
+
+int main(void)
+{
+    init();
+    server();
+}
+

APP_Framework/Applications/sensor_app/Kconfig

@@ -5,6 +5,46 @@ menu "sensor app"
         default n
 
         if APPLICATION_SENSOR
+            menuconfig APPLICATION_SENSOR_HCHO
+                bool "Using sensor HCHO apps"
+                default n
+
+                if APPLICATION_SENSOR_HCHO
+                    config APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS
+                    bool "Using sensor TB600B_WQ_HCHO1OS apps"
+                    default n
+                endif
+
+            menuconfig APPLICATION_SENSOR_TVOC
+                bool "Using sensor TVOC apps"
+                default n
+
+                if APPLICATION_SENSOR_TVOC
+                    config APPLICATION_SENSOR_TVOC_TB600B_TVOC10
+                    bool "Using sensor TB600B_TVOC10 apps"
+                    default n
+                endif
+
+            menuconfig APPLICATION_SENSOR_IAQ
+                bool "Using sensor IAQ apps"
+                default n
+
+                if APPLICATION_SENSOR_IAQ
+                    config APPLICATION_SENSOR_IAQ_TB600B_IAQ10
+                    bool "Using sensor TB600B_IAQ10 apps"
+                    default n
+                endif
+
+            menuconfig APPLICATION_SENSOR_CH4
+                bool "Using sensor CH4 apps"
+                default n
+
+                if APPLICATION_SENSOR_CH4
+                    config APPLICATION_SENSOR_CH4_AS830
+                    bool "Using sensor AS830 apps"
+                    default n
+                endif
+
             menuconfig APPLICATION_SENSOR_CO2
                 bool "Using sensor CO2 apps"
                 default n

APP_Framework/Applications/sensor_app/Makefile

@@ -1,5 +1,21 @@
 SRC_FILES := 
 
+ifeq ($(CONFIG_APPLICATION_SENSOR_HCHO_TB600B_WQ_HCHO1OS), y)
+	SRC_FILES += hcho_tb600b_wq_hcho1os.c
+endif
+
+ifeq ($(CONFIG_APPLICATION_SENSOR_TVOC_TB600B_TVOC10), y)
+	SRC_FILES += tvoc_tb600b_tvoc10.c
+endif
+
+ifeq ($(CONFIG_APPLICATION_SENSOR_IAQ_TB600B_IAQ10), y)
+	SRC_FILES += iaq_tb600b_iaq10.c
+endif
+
+ifeq ($(CONFIG_APPLICATION_SENSOR_CH4_AS830), y)
+	SRC_FILES += ch4_as830.c
+endif
+
 ifeq ($(CONFIG_APPLICATION_SENSOR_CO2_ZG09), y)
 	SRC_FILES += co2_zg09.c
 endif

APP_Framework/Applications/sensor_app/SConscript

@@ -0,0 +1,20 @@
+import os
+from building import * 
+Import('RTT_ROOT')
+Import('rtconfig')
+cwd = GetCurrentDir()
+DEPENDS = ["SUPPORT_SENSOR_FRAMEWORK"]
+SOURCES = []
+if GetDepend(['APPLICATION_SENSOR_CO2_ZG09']):
+    SOURCES = ['co2_zg09.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_PM1_0_PS5308']):
+    SOURCES = ['pm1_0_ps5308.c.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_VOICE_D124']):
+    SOURCES = ['voice_d124.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_HUMIDITY_HS300X']):
+    SOURCES = ['humidity_hs300x.c'] + SOURCES
+if GetDepend(['APPLICATION_SENSOR_TEMPERATURE_HS300X']):
+    SOURCES = ['temperature_hs300x.c'] + SOURCES
+path =  [cwd]
+objs = DefineGroup('sensor_app', src = SOURCES, depend = DEPENDS,CPPPATH = path) 
+Return("objs") 

APP_Framework/Applications/sensor_app/ch4_as830.c

@@ -0,0 +1,34 @@
+/*
+* 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 ch4_as830.c
+ * @brief CH4 AS830 example
+ * @version 1.0
+ * @author AIIT XUOS Lab
+ * @date 2021.12.10
+ */
+
+#include <user_api.h>
+#include <sensor.h>
+
+/**
+ * @description: Read a ch4
+ * @return 0
+ */
+void Ch4As830(void)
+{
+    struct SensorQuantity *ch4 = SensorQuantityFind(SENSOR_QUANTITY_AS830_CH4, SENSOR_QUANTITY_CH4);
+    SensorQuantityOpen(ch4);
+    printf("CH4 : %d %%LTL\n", SensorQuantityRead(ch4));
+    SensorQuantityClose(ch4);
+}

APP_Framework/Applications/sensor_app/hcho_tb600b_wq_hcho1os.c

@@ -0,0 +1,39 @@
+/*
+* 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 hcho_tb600b_wq_hcho1os.c
+ * @brief hcho example
+ * @version 1.0
+ * @author AIIT XUOS Lab
+ * @date 2021.12.15
+ */
+
+#include <user_api.h>
+#include <sensor.h>
+
+
+/**
+ * @description: Read a hcho
+ * @return 0
+ */
+void HchoTb600bHcho1os(void)
+{
+    struct SensorQuantity *hcho = SensorQuantityFind(SENSOR_QUANTITY_TB600B_HCHO, SENSOR_QUANTITY_HCHO);
+    SensorQuantityOpen(hcho);
+    int32_t result = 0;
+
+    result = SensorQuantityRead(hcho);
+
+    printf("tvoc concentration is : %dppb\n", result);
+    SensorQuantityClose(hcho);
+}

APP_Framework/Applications/sensor_app/humidity_hs300x.c

@@ -27,9 +27,14 @@
  */
 void HumiHs300x(void)
 {
+    int i = 0;
+    int32 humidity;
     struct SensorQuantity *humi = SensorQuantityFind(SENSOR_QUANTITY_HS300X_HUMIDITY, SENSOR_QUANTITY_HUMI);
     SensorQuantityOpen(humi);
-    int32 humidity = SensorQuantityRead(humi);
-    printf("Humidity : %d.%d %%RH\n", humidity/10, humidity%10);
+    for (i = 0; i < 100; i ++) {
+        humidity = SensorQuantityRead(humi);
+        printf("Humidity : %d.%d %%RH\n", humidity/10, humidity%10);
+        PrivTaskDelay(5000);
+    }
     SensorQuantityClose(humi);
 }

APP_Framework/Applications/sensor_app/iaq_tb600b_iaq10.c

@@ -0,0 +1,45 @@
+/*
+* 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 iaq_tb600b_iaq10.c
+ * @brief iaq10 example
+ * @version 1.0
+ * @author AIIT XUOS Lab
+ * @date 2021.12.14
+ */
+
+#include <user_api.h>
+#include <sensor.h>
+
+// struct iaq_data {
+//     uint16_t gas;
+//     uint8_t TH;
+//     uint8_t TL;
+//     uint8_t RhH;
+//     uint8_t RhL;
+// };
+/**
+ * @description: Read a iaq
+ * @return 0
+ */
+void IaqTb600bIaq10(void)
+{
+    struct SensorQuantity *iaq = SensorQuantityFind(SENSOR_QUANTITY_TB600B_IAQ, SENSOR_QUANTITY_IAQ);
+    SensorQuantityOpen(iaq);
+    int32_t result = 0;
+
+    result = SensorQuantityRead(iaq);
+
+    printf("Gas concentration is : %dppb\n", result);
+    SensorQuantityClose(iaq);
+}

APP_Framework/Applications/sensor_app/pm1_0_ps5308.c

@@ -29,7 +29,7 @@ void Pm10Ps5308(void)
 {
     struct SensorQuantity *pm1_0 = SensorQuantityFind(SENSOR_QUANTITY_PS5308_PM1_0, SENSOR_QUANTITY_PM);
     SensorQuantityOpen(pm1_0);
-    UserTaskDelay(2000);
+    PrivTaskDelay(2000);
     printf("PM1.0 : %d ug/m³\n", SensorQuantityRead(pm1_0));
     SensorQuantityClose(pm1_0);
 }

APP_Framework/Applications/sensor_app/temperature_hs300x.c

@@ -27,12 +27,20 @@
  */
 void TempHs300x(void)
 {
+    int i = 0;
+    int32 temperature;
     struct SensorQuantity *temp = SensorQuantityFind(SENSOR_QUANTITY_HS300X_TEMPERATURE, SENSOR_QUANTITY_TEMP);
     SensorQuantityOpen(temp);
-    int32 temperature = SensorQuantityRead(temp);
-    if (temperature > 0)
-        printf("Temperature : %d.%d ℃\n", temperature/10, temperature%10);
-    else
-        printf("Temperature : %d.%d ℃\n", temperature/10, -temperature%10);
+    for (i = 0; i < 100; i ++) {
+        temperature = SensorQuantityRead(temp);
+        if (temperature > 0)
+            printf("Temperature : %d.%d ℃\n", temperature/10, temperature%10);
+        else
+            printf("Temperature : %d.%d ℃\n", temperature/10, -temperature%10);
+
+        PrivTaskDelay(5000);
+    }
+
     SensorQuantityClose(temp);
-}
+}
+SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, TempHs300x, TempHs300x, TempHs300x function);

APP_Framework/Applications/sensor_app/tvoc_tb600b_tvoc10.c

@@ -0,0 +1,39 @@
+/*
+* 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 tvoc_tb600b_tvoc10.c
+ * @brief tvoc10 example
+ * @version 1.0
+ * @author AIIT XUOS Lab
+ * @date 2021.12.15
+ */
+
+#include <user_api.h>
+#include <sensor.h>
+
+
+/**
+ * @description: Read a tvoc
+ * @return 0
+ */
+void TvocTb600bTvoc10(void)
+{
+    struct SensorQuantity *tvoc = SensorQuantityFind(SENSOR_QUANTITY_TB600B_TVOC, SENSOR_QUANTITY_TVOC);
+    SensorQuantityOpen(tvoc);
+    int32_t result = 0;
+
+    result = SensorQuantityRead(tvoc);
+
+    printf("tvoc concentration is : %dppb\n", result);
+    SensorQuantityClose(tvoc);
+}

APP_Framework/Applications/sensor_app/voice_d124.c

@@ -18,7 +18,7 @@
  * @date 2021.04.23
  */
 
-#include <user_api.h>
+#include <transform.h>
 #include <sensor.h>
 
 /**
@@ -29,7 +29,7 @@ void VoiceD124(void)
 {
     struct SensorQuantity *voice = SensorQuantityFind(SENSOR_QUANTITY_D124_VOICE, SENSOR_QUANTITY_VOICE);
     SensorQuantityOpen(voice);
-    UserTaskDelay(2000);
+    PrivTaskDelay(2000);
     uint16 result = SensorQuantityRead(voice);
     printf("voice : %d.%d dB\n", result/(10*voice->value.decimal_places), result%(10*voice->value.decimal_places));
     SensorQuantityClose(voice);

APP_Framework/Framework/connection/4G/Kconfig

@@ -1,14 +0,0 @@
-config ADAPTER_4G
-        bool "Using 4G adapter function"
-        default y
-
-        if ADAPTER_4G
-            config ADAPTER_EC200T
-                    bool "Using 4G adapter device EC200T"
-                    default y
-            
-            if ADAPTER_EC200T
-                source "$APP_DIR/Framework/connection/4G/EC200T/Kconfig"
-            endif
-                
-        endif

APP_Framework/Framework/connection/4G/Makefile

@@ -1,7 +0,0 @@
-SRC_FILES := adapter_4G.c
-
-ifeq ($(CONFIG_ADAPTER_EC200T),y)
-	SRC_DIR += EC200T
-endif
-
-include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Framework/connection/4g/Kconfig

@@ -0,0 +1,8 @@
+config ADAPTER_EC200T
+        bool "Using 4G adapter device EC200T"
+        default y
+
+if ADAPTER_EC200T
+    source "$APP_DIR/Framework/connection/4g/ec200t/Kconfig"
+endif
+                

APP_Framework/Framework/connection/4g/Makefile

@@ -0,0 +1,7 @@
+SRC_FILES := adapter_4g.c
+
+ifeq ($(CONFIG_ADAPTER_EC200T),y)
+	SRC_DIR += ec200t
+endif
+
+include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Framework/connection/4g/adapter_4g.c

@@ -49,16 +49,18 @@ int Adapter4GInit(void)
 {
     int ret = 0;
 
-    struct Adapter *adapter = malloc(sizeof(struct Adapter));
+    struct Adapter *adapter = PrivMalloc(sizeof(struct Adapter));
     if (!adapter) {
-        free(adapter);
+        PrivFree(adapter);
         return -1;
     }
 
+    memset(adapter, 0, sizeof(struct Adapter));
+
     ret = Adapter4GRegister(adapter);
     if (ret < 0) {
         printf("Adapter4GInit register 4G adapter error\n");
-        free(adapter);
+        PrivFree(adapter);
         return -1;
     }
 
@@ -66,7 +68,7 @@ int Adapter4GInit(void)
     AdapterProductInfoType product_info = Ec200tAttach(adapter);
     if (!product_info) {
         printf("Adapter4GInit ec200t attach error\n");
-        free(adapter);
+        PrivFree(adapter);
         return -1;
     }
 
@@ -82,16 +84,18 @@ int Adapter4GInit(void)
 /******************4G TEST*********************/
 int Adapter4GTest(void)
 {
-    const char *send_msg = "SendHeart";
-    char recv_msg[128];
+    const char *send_msg = "Adapter_4G Test";
+    char recv_msg[256] = {0};
     int baud_rate = BAUD_RATE_115200;
 
     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_4G_NAME);
 
 #ifdef ADAPTER_EC200T
-    //Using DSD server to test 4G Socket connection
-    uint8 server_addr[64] = "115.238.53.61";
-    uint8 server_port[64] = "33333";
+    //Using Hang Xiao server to test 4G Socket connection
+    uint8 server_addr[64] = "101.68.82.219";
+    uint8 server_port[64] = "9898";
+
+    adapter->socket.socket_id = 0;
 
     AdapterDeviceOpen(adapter);
     AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
@@ -100,11 +104,12 @@ int Adapter4GTest(void)
 
     while (1) {
         AdapterDeviceSend(adapter, send_msg, strlen(send_msg));
-        AdapterDeviceRecv(adapter, recv_msg, 128);
+        AdapterDeviceRecv(adapter, recv_msg, 256);
         printf("4G recv msg %s\n", recv_msg);
+        memset(recv_msg, 0, 256);
     }
 #endif
 
     return 0;    
 }
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, Adapter4GTest, Adapter4GTest, show adapter 4G information);
+// SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, Adapter4GTest, Adapter4GTest, show adapter 4G information);

APP_Framework/Framework/connection/4g/ec200t/Kconfig

@@ -17,7 +17,7 @@ if ADD_XIUOS_FETURES
 
         config ADAPTER_EC200T_DRIVER
                 string "EC200T device uart driver path"
-                default "/dev/uart2_dev2"
+                default "/dev/usart2_dev2"
                 depends on !ADAPTER_EC200T_DRIVER_EXTUART
 
         if ADAPTER_EC200T_DRIVER_EXTUART                    

APP_Framework/Framework/connection/4g/ec200t/ec200t.c

@@ -21,14 +21,33 @@
 #include <adapter.h>
 #include <at_agent.h>
 
+#define EC200T_AT_MODE_CMD          "+++"
+#define EC200T_GET_CCID_CMD         "AT+CCID\r\n"
+#define EC200T_GET_CPIN_CMD         "AT+CPIN?\r\n"
+#define EC200T_GET_CREG_CMD         "AT+CREG?\r\n"
+#define EC200T_OPEN_SOCKET_CMD      "AT+QIOPEN=1,%u"
+#define EC200T_CLOSE_SOCKET_CMD     "AT+QICLOSE=%u\r\n"
+#define EC200T_ACTIVE_PDP_CMD       "AT+QIACT=1\r\n"
+#define EC200T_DEACTIVE_PDP_CMD     "AT+QIDEACT=1\r\n"
+#define EC200T_CFG_TCP_CMD          "AT+QICSGP"
+
+#define EC200T_OK_REPLY             "OK"
+#define EC200T_READY_REPLY          "READY"
+#define EC200T_CREG_REPLY           ",1"
+#define EC200T_CONNECT_REPLY        "CONNECT"
+
 static void Ec200tPowerSet(void)
 {
     int pin_fd;
     pin_fd = PrivOpen(ADAPTER_EC200T_PIN_DRIVER, O_RDWR);
+    if (pin_fd < 0) {
+        printf("open %s error\n", ADAPTER_EC200T_PIN_DRIVER);
+        return;
+    }
 
     struct PinParam pin_param;
     pin_param.cmd = GPIO_CONFIG_MODE;
-    pin_param.mode = GPIO_CFG_INPUT_PULLUP;
+    pin_param.mode = GPIO_CFG_OUTPUT;
     pin_param.pin = ADAPTER_EC200T_PWRKEY;
 
     struct PrivIoctlCfg ioctl_cfg;
@@ -47,6 +66,8 @@ static void Ec200tPowerSet(void)
     PrivWrite(pin_fd, &pin_stat, 1);
 
     PrivClose(pin_fd);
+
+    PrivTaskDelay(10000);
 }
 
 static int Ec200tOpen(struct Adapter *adapter)
@@ -70,32 +91,6 @@ static int Ec200tOpen(struct Adapter *adapter)
         adapter->agent = at_agent;
     }
 
-    /*step3: serial write "+++", quit transparent mode*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "+++");
-
-    /*step4: serial write "AT+CCID", get SIM ID*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+CCID\r\n");
-
-    PrivTaskDelay(2500);
-
-    /*step5: serial write "AT+CPIN?", check SIM status*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+CPIN?\r\n");
-
-    PrivTaskDelay(2500);
-
-    /*step6: serial write "AT+CREG?", check whether registered to GSM net*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+CREG?\r\n");
-
-    PrivTaskDelay(2500);
-
-    /*step7: serial write "AT+QICLOSE", close socket connect before open socket*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QICLOSE=0\r\n");
-
-    PrivTaskDelay(2500);
-
-    /*step8: serial write "AT+QIDEACT", close TCP net before open socket*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QIDEACT=1\r\n");
-
     PrivTaskDelay(2500);
     
     ADAPTER_DEBUG("Ec200t open done\n");
@@ -105,31 +100,41 @@ static int Ec200tOpen(struct Adapter *adapter)
 
 static int Ec200tClose(struct Adapter *adapter)
 {
+    int ret = 0;
+    uint8_t ec200t_cmd[64];
+    
     if (!adapter->agent) {
         printf("Ec200tClose AT agent NULL\n");
         return -1;
     }
 
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
+
     /*step1: serial write "+++", quit transparent mode*/
     ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "+++");
 
     /*step2: serial write "AT+QICLOSE", close socket connect before open socket*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QICLOSE=0\r\n");
-
-    PrivTaskDelay(2500);
+    memset(ec200t_cmd, 0, sizeof(ec200t_cmd));
+    sprintf(ec200t_cmd, EC200T_CLOSE_SOCKET_CMD, adapter->socket.socket_id);
+    ret = AtCmdConfigAndCheck(adapter->agent, ec200t_cmd, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
 
     /*step3: serial write "AT+QIDEACT", close TCP net before open socket*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QIDEACT=1\r\n");
-
-    PrivTaskDelay(2500);
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_DEACTIVE_PDP_CMD, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
 
+out:
     /*step4: close ec200t serial port*/
     PrivClose(adapter->fd);
 
     /*step5: power down ec200t*/
     Ec200tPowerSet();
     
-    return 0;
+    return ret;
 }
 
 static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)
@@ -159,15 +164,41 @@ static int Ec200tIoctl(struct Adapter *adapter, int cmd, void *args)
     ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
     ioctl_cfg.args = &serial_cfg;
     PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg);
+
+    Ec200tPowerSet();
     
     return 0;
 }
 
 static int Ec200tConnect(struct Adapter *adapter, enum NetRoleType net_role, const char *ip, const char *port, enum IpType ip_type)
 {
+    int ret = 0;
     uint8_t ec200t_cmd[64];
 
-    /*step1: serial write "AT+QICSGP", connect to China Mobile using ipv4 or ipv6*/
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
+
+    /*step1: serial write "+++", quit transparent mode*/
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "+++");
+
+    /*step2: serial write "AT+CCID", get SIM ID*/
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_GET_CCID_CMD, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step3: serial write "AT+CPIN?", check SIM status*/
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_GET_CPIN_CMD, EC200T_READY_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step4: serial write "AT+CREG?", check whether registered to GSM net*/
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_GET_CREG_CMD, EC200T_CREG_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step5: serial write "AT+QICSGP", connect to China Mobile using ipv4 or ipv6*/
     memset(ec200t_cmd, 0, sizeof(ec200t_cmd));
 
     if (IPV4 == ip_type) {
@@ -176,58 +207,105 @@ static int Ec200tConnect(struct Adapter *adapter, enum NetRoleType net_role, con
         strcpy(ec200t_cmd, "AT+QICSGP=1,2,\"CMNET\",\"\",\"\",1\r\n");
     }
     
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, ec200t_cmd);
+    ret = AtCmdConfigAndCheck(adapter->agent, ec200t_cmd, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
 
-    PrivTaskDelay(2500);
-
-    /*step2: serial write "AT+QIACT", open TCP net*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QIACT=1\r\n");
-
-    PrivTaskDelay(2500);
-
-    /*step3: serial write "AT+QIOPEN", connect socket using TCP*/
+    /*step6: serial write "AT+QICLOSE", close socket connect before open socket*/
     memset(ec200t_cmd, 0, sizeof(ec200t_cmd));
-    strcpy(ec200t_cmd, "AT+QIOPEN=1,0,\"TCP\",\"");
+    sprintf(ec200t_cmd, EC200T_CLOSE_SOCKET_CMD, adapter->socket.socket_id);
+    ret = AtCmdConfigAndCheck(adapter->agent, ec200t_cmd, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step7: serial write "AT+QIDEACT", close TCP net before open socket*/
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_DEACTIVE_PDP_CMD, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step8: serial write "AT+QIACT", open TCP net*/
+    ret = AtCmdConfigAndCheck(adapter->agent, EC200T_ACTIVE_PDP_CMD, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
+
+    /*step9: serial write "AT+QIOPEN", connect socket using TCP*/
+    memset(ec200t_cmd, 0, sizeof(ec200t_cmd));
+    sprintf(ec200t_cmd, EC200T_OPEN_SOCKET_CMD, adapter->socket.socket_id);
+    strcat(ec200t_cmd, ",\"TCP\",\"");
     strcat(ec200t_cmd, ip);
     strcat(ec200t_cmd, "\",");
     strcat(ec200t_cmd, port);
     strcat(ec200t_cmd, ",0,2\r\n");
 
-    ADAPTER_DEBUG("Ec200t connect AT CMD :%s\n", ec200t_cmd);
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, ec200t_cmd);
+    AtSetReplyEndChar(adapter->agent, 0x43, 0x54);
+
+    ret = AtCmdConfigAndCheck(adapter->agent, ec200t_cmd, EC200T_CONNECT_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
 
     ADAPTER_DEBUG("Ec200t connect TCP done\n");
 
     return 0;
+
+out:
+    ADAPTER_DEBUG("Ec200t connect TCP failed. Power down\n");
+    Ec200tPowerSet();
+    return -1;
 }
 
 static int Ec200tSend(struct Adapter *adapter, const void *buf, size_t len)
 {
-    PrivWrite(adapter->fd, buf, len);
+    x_err_t result = EOK;
+    if (adapter->agent) {
+        EntmSend(adapter->agent, (const char *)buf, len);
+    } else {
+        printf("Ec200tSend can not find agent\n");
+    }
     return 0;
 }
 
 static int Ec200tRecv(struct Adapter *adapter, void *buf, size_t len)
 {
-    PrivRead(adapter->fd, buf, len);
-    return 0;
+    if (adapter->agent) {
+        return EntmRecv(adapter->agent, (char *)buf, len, 6);
+    } else {
+        printf("Ec200tRecv can not find agent\n");
+	}
+    
+    return -1;
 }
 
 static int Ec200tDisconnect(struct Adapter *adapter)
 {
+    int ret = 0;
     uint8_t ec200t_cmd[64];
+
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
     
     /*step1: serial write "+++", quit transparent mode*/
     ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "+++");
 
     /*step2: serial write "AT+QICLOSE", close socket connect before open socket*/
-    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+QICLOSE=0\r\n");
-
-    PrivTaskDelay(2500);
+    memset(ec200t_cmd, 0, sizeof(ec200t_cmd));
+    sprintf(ec200t_cmd, EC200T_CLOSE_SOCKET_CMD, adapter->socket.socket_id);
+    ret = AtCmdConfigAndCheck(adapter->agent, ec200t_cmd, EC200T_OK_REPLY);
+    if (ret < 0) {
+        goto out;
+    }
 
     ADAPTER_DEBUG("Ec200t disconnect TCP done\n");
 
     return 0;
+
+out:
+    ADAPTER_DEBUG("Ec200t disconnect TCP failed. Power down\n");
+    Ec200tPowerSet();
+    return -1;
 }
 
 static const struct IpProtocolDone ec200t_done = 
@@ -250,21 +328,16 @@ static const struct IpProtocolDone ec200t_done =
 
 AdapterProductInfoType Ec200tAttach(struct Adapter *adapter)
 {
-    struct AdapterProductInfo *product_info = malloc(sizeof(struct AdapterProductInfo));
+    struct AdapterProductInfo *product_info = PrivMalloc(sizeof(struct AdapterProductInfo));
     if (!product_info) {
         printf("Ec200tAttach malloc product_info error\n");
-        free(product_info);
+        PrivFree(product_info);
         return NULL;
     }
 
-    product_info->model_name = ADAPTER_4G_EC200T;
+    strcpy(product_info->model_name, ADAPTER_4G_EC200T);
 
     product_info->model_done = (void *)&ec200t_done;
 
-    Ec200tPowerSet();
-
     return product_info;
 }
-
-
-

APP_Framework/Framework/connection/5g/Makefile

@@ -1,3 +1,3 @@
-SRC_FILES := adapter_5G.c
+SRC_FILES := adapter_5g.c
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Framework/connection/5g/adapter_5g.c

@@ -11,7 +11,7 @@
 */
 
 /**
- * @file adapter_5G.c
+ * @file adapter_5g.c
  * @brief Implement the connection 5G adapter function
  * @version 1.1
  * @author AIIT XUOS Lab

APP_Framework/Framework/connection/Kconfig

@@ -1,12 +1,34 @@
 menuconfig SUPPORT_CONNECTION_FRAMEWORK
         bool "support connection framework"
         default n
+        select TRANSFORM_LAYER_ATTRIUBUTE
 
 if SUPPORT_CONNECTION_FRAMEWORK
         config CONNECTION_FRAMEWORK_DEBUG
         bool "Using connection framework debug log function"
         default y
 
+        menuconfig CONNECTION_INDUSTRIAL_ETHERNET
+                bool "Using industrial ethernet"
+                default n
+        if CONNECTION_INDUSTRIAL_ETHERNET
+        source "$APP_DIR/Framework/connection/industrial_ethernet/Kconfig"
+        endif
+
+        menuconfig CONNECTION_INDUSTRIAL_FIELDBUS
+                bool "Using industrial fieldbus"
+                default n
+        if CONNECTION_INDUSTRIAL_FIELDBUS
+        source "$APP_DIR/Framework/connection/industrial_fieldbus/Kconfig"
+        endif
+
+        menuconfig CONNECTION_INDUSTRIAL_WLAN
+                bool "Using industrial wlan"
+                default n
+        if CONNECTION_INDUSTRIAL_WLAN
+        source "$APP_DIR/Framework/connection/industrial_wlan/Kconfig"
+        endif
+
         menuconfig CONNECTION_ADAPTER_LORA
                 bool "Using lora adapter device"
                 default n
@@ -18,7 +40,7 @@ if SUPPORT_CONNECTION_FRAMEWORK
                 bool "Using 4G adapter device"
                 default n
         if CONNECTION_ADAPTER_4G
-        source "$APP_DIR/Framework/connection/4G/Kconfig"
+        source "$APP_DIR/Framework/connection/4g/Kconfig"
         endif
 
         menuconfig CONNECTION_ADAPTER_NB
@@ -60,6 +82,6 @@ if SUPPORT_CONNECTION_FRAMEWORK
                 bool "Using 5G adapter device"
                 default n
         if CONNECTION_ADAPTER_5G
-        source "$APP_DIR/Framework/connection/5G/Kconfig"
+        source "$APP_DIR/Framework/connection/5g/Kconfig"
         endif
 endif

APP_Framework/Framework/connection/Makefile

@@ -1,35 +1,47 @@
 SRC_FILES := adapter.c adapter_agent.c
 
-ifeq ($(CONFIG_ADAPTER_LORA),y)
+ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
+	SRC_DIR += industrial_ethernet
+endif
+
+ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_FIELDBUS),y)
+	SRC_DIR += industrial_fieldbus
+endif
+
+ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_WLAN),y)
+	SRC_DIR += industrial_wlan
+endif
+
+ifeq ($(CONFIG_CONNECTION_ADAPTER_LORA),y)
 	SRC_DIR += lora
 endif
 
-ifeq ($(CONFIG_ADAPTER_4G),y)
-	SRC_DIR += 4G
+ifeq ($(CONFIG_CONNECTION_ADAPTER_4G),y)
+	SRC_DIR += 4g
 endif
 
-ifeq ($(CONFIG_ADAPTER_NB),y)
+ifeq ($(CONFIG_CONNECTION_ADAPTER_NB),y)
 	SRC_DIR += nbiot
 endif
 
-ifeq ($(CONFIG_ADAPTER_WIFI),y)
+ifeq ($(CONFIG_CONNECTION_ADAPTER_WIFI),y)
 	SRC_DIR += wifi
 endif
 
-ifeq ($(CONFIG_ADAPTER_ETHERNET),y)
+ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERNET),y)
 	SRC_DIR += ethernet
 endif
 
-ifeq ($(CONFIG_ADAPTER_BLUETOOTH),y)
+ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y)
 	SRC_DIR += bluetooth
 endif
 
-ifeq ($(CONFIG_ADAPTER_ZIGBEE),y)
+ifeq ($(CONFIG_CONNECTION_ADAPTER_ZIGBEE),y)
 	SRC_DIR += zigbee
 endif
 
-ifeq ($(CONFIG_ADAPTER_5G),y)
-	SRC_DIR += 5G
+ifeq ($(CONFIG_CONNECTION_ADAPTER_5G),y)
+	SRC_DIR += 5g
 endif
 
 include $(KERNEL_ROOT)/compiler.mk

APP_Framework/Framework/connection/adapter.c

@@ -395,7 +395,7 @@ int AdapterDeviceConnect(struct Adapter *adapter, enum NetRoleType net_role, con
  * @param priv_net_group - private net group
  * @return success: 0 , failure: other
  */
-int AdapterDeviceJoin(struct Adapter *adapter, const char *priv_net_group)
+int AdapterDeviceJoin(struct Adapter *adapter, unsigned char *priv_net_group)
 {
     if (!adapter)
         return -1;
@@ -419,9 +419,10 @@ int AdapterDeviceJoin(struct Adapter *adapter, const char *priv_net_group)
 /**
  * @description: Adapter disconnect from ip net or private net group 
  * @param adapter - adapter device pointer
+ * @param priv_net_group - private net group for PRIVATE_PROTOCOL quit function
  * @return success: 0 , failure: other
  */
-int AdapterDeviceDisconnect(struct Adapter *adapter)
+int AdapterDeviceDisconnect(struct Adapter *adapter, unsigned char *priv_net_group)
 {
     if (!adapter)
         return -1;
@@ -432,7 +433,7 @@ int AdapterDeviceDisconnect(struct Adapter *adapter)
         if (NULL == priv_done->quit)
             return -1;
     
-        return priv_done->quit(adapter);
+        return priv_done->quit(adapter, priv_net_group);
     } else if (IP_PROTOCOL == adapter->net_protocol) {
         struct IpProtocolDone *ip_done = (struct IpProtocolDone *)adapter->done;