Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into develop

2022-10-17 18:21:09 +08:00
parent deb247165a 43fdd542da
commit 64da177d6a
5274 changed files with 112696 additions and 3848 deletions
@@ -110,10 +110,4 @@ int Adapter4GTest(void)

    return 0;    
 }
-
-#ifdef ADD_RTTHREAD_FETURES     
-MSH_CMD_EXPORT(Adapter4GTest,a EC200T adpter sample);
-#endif
-#ifdef ADD_XIZI_FETURES
-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);
-#endif
+PRIV_SHELL_CMD_FUNCTION(Adapter4GTest, a EC200T adpter sample, PRIV_SHELL_CMD_FUNC_ATTR);
@@ -8,11 +8,11 @@ if SUPPORT_CONNECTION_FRAMEWORK
        bool "Using connection framework debug log function"
        default y

-        menuconfig CONNECTION_INDUSTRIAL_ETHERNET
-                bool "Using industrial ethernet"
+        menuconfig CONNECTION_INDUSTRIAL_NETWORK
+                bool "Using industrial network"
                default n
-        if CONNECTION_INDUSTRIAL_ETHERNET
-        source "$APP_DIR/Framework/connection/industrial_ethernet/Kconfig"
+        if CONNECTION_INDUSTRIAL_NETWORK
+        source "$APP_DIR/Framework/connection/industrial_network/Kconfig"
        endif

        menuconfig CONNECTION_INDUSTRIAL_FIELDBUS
@@ -9,8 +9,8 @@ endif
 ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
    SRC_FILES := adapter.c adapter_agent.c

-    ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
-        SRC_DIR += industrial_ethernet
+    ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_NETWORK),y)
+        SRC_DIR += industrial_network
    endif

    ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_FIELDBUS),y)
@@ -111,9 +111,4 @@ int AdapterBlueToothTest(void)

    return 0;    
 }
-#ifdef ADD_RTTHREAD_FETURES
-MSH_CMD_EXPORT(AdapterBlueToothTest,a bt adpter sample);
-#endif
-#ifdef ADD_XIZI_FETURES
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, AdapterBlueToothTest, AdapterBlueToothTest, show adapter bluetooth information);
-#endif
+PRIV_SHELL_CMD_FUNCTION(AdapterBlueToothTest, a bluetooth test sample, PRIV_SHELL_CMD_MAIN_ATTR);
@@ -122,8 +122,4 @@ int AdapterEthernetTest(void)
    
    return 0;
 }
-#ifdef ADD_RTTHREAD_FETURES
-MSH_CMD_EXPORT(AdapterEthernetTest,a ethernet adpter sample);
-#elif definded ADD_XIZI_FETURES
-SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, AdapterEthernetTest, AdapterEthernetTest, show adapter ethernet information);
-#endif
+PRIV_SHELL_CMD_FUNCTION(AdapterEthernetTest, a ethernet test sample, PRIV_SHELL_CMD_MAIN_ATTR);
@@ -1,15 +0,0 @@
-config CONNECTION_ADAPTER_ETHERCAT
-    bool "Using ethercat on industrial_ethernet adapter device"
-    default n
-
-    if CONNECTION_ADAPTER_ETHERCAT
-        source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/Kconfig"
-    endif
-
-menuconfig POWERLINK_MN
-    bool "Using powerlink MN"
-    default n
-
-menuconfig POWERLINK_CN
-    bool "Using powerlink CN"
-    default n
@@ -1,28 +0,0 @@
-#include <xizi.h>
-#include <xsconfig.h>
-
-#ifdef POWERLINK_MN
-extern int OplkDemoMnConsole(int argc, char *argv[]);
-
-SHELL_EXPORT_CMD(
-    SHELL_CMD_PERMISSION(0) |
-    SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) |
-    SHELL_CMD_PARAM_NUM(0) |
-    SHELL_CMD_DISABLE_RETURN,
-    OplkDemoMnConsole,
-    OplkDemoMnConsole,
-    openPOWERLINK demo MN (console version));
-#endif
-
-#ifdef POWERLINK_CN
-extern int OplkDemoCnConsole(int argc, char *argv[]);
-
-SHELL_EXPORT_CMD(
-    SHELL_CMD_PERMISSION(0) |
-    SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN) |
-    SHELL_CMD_PARAM_NUM(0) |
-    SHELL_CMD_DISABLE_RETURN,
-    OplkDemoCnConsole,
-    OplkDemoCnConsole,
-    openPOWERLINK demo CN (console version));
-#endif
@@ -1,2 +1,3 @@
+SRC_DIR := 

 include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,15 @@
+config CONNECTION_ADAPTER_ETHERCAT
+    bool "Using EtherCAT on industrial network adapter device"
+    default n
+
+    if CONNECTION_ADAPTER_ETHERCAT
+        source "$APP_DIR/Framework/connection/industrial_network/ethercat/Kconfig"
+    endif
+
+config CONNECTION_ADAPTER_POWERLINK
+    bool "Using POWERLINK on industrial network adapter device"
+    default n
+
+    if CONNECTION_ADAPTER_POWERLINK
+        source "$APP_DIR/Framework/connection/industrial_network/powerlink/Kconfig"
+    endif
@@ -0,0 +1,11 @@
+SRC_DIR := 
+
+ifeq ($(CONFIG_CONNECTION_ADAPTER_POWERLINK),y)
+	SRC_DIR += powerlink
+endif
+
+ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
+	SRC_DIR += ethercat
+endif
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -2,10 +2,10 @@ config ADAPTER_HFA21_ETHERCAT
        depends on ADAPTER_HFA21_ETHERNET # ADAPTER_HFA21_WIFI
        help
            Ethercat is dependant on Ethernet. Please enable hfa21 ethernet first. And this is a software-defined experiment module, without supports on ECS and on-the-fly.
-        bool "Using ethercat on ethernet adapter device HFA21"
+        bool "Using ethercat on industrial network adapter device HFA21"
        default n

    if ADAPTER_HFA21_ETHERCAT
-        source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig"
+        source "$APP_DIR/Framework/connection/industrial_network/ethercat/hfa21_ethercat/Kconfig"
    endif

@@ -205,4 +205,4 @@ int AdapterEthercatTest(void)

    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, AdapterEthercatTest, AdapterEthercatTest, show adapter ethercat information);
+PRIV_SHELL_CMD_FUNCTION(AdapterEthercatTest, a ethercat test sample, PRIV_SHELL_CMD_MAIN_ATTR);
@@ -0,0 +1,3 @@
+SRC_DIR := 
+
+include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,7 @@
+config POWERLINK_MN
+    bool "Using powerlink MN"
+    default n
+
+config POWERLINK_CN
+    bool "Using powerlink CN"
+    default n
@@ -41,7 +41,7 @@ LIBOPLKCN := $(LIBOPLKCN:$(CUR_DIR)/%=%)
 OPLK_DEMO_MN_CONSOLE := $(OPLK_DEMO_MN_CONSOLE:$(CUR_DIR)/%=%)
 OPLK_DEMO_CN_CONSOLE := $(OPLK_DEMO_CN_CONSOLE:$(CUR_DIR)/%=%)

-SRC_FILES := powerlink_demo.c
+SRC_FILES := adapter_powerlink.c
 ifeq ($(CONFIG_POWERLINK_MN)_$(CONFIG_POWERLINK_CN),y_)
 	SRC_FILES += $(OPLK_DEMO_MN_CONSOLE) $(LIBOPLKMN)
 else ifeq ($(CONFIG_POWERLINK_MN)_$(CONFIG_POWERLINK_CN),_y)
@@ -50,8 +50,4 @@ else ifeq ($(CONFIG_POWERLINK_MN)_$(CONFIG_POWERLINK_CN),y_y)
 	$(error CONFIG_POWERLINK_MN and CONFIG_POWERLINK_CN cannot be enabled simultaneously due to name conflict)
 endif

-ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
-	SRC_DIR += ethercat
-endif
-
 include $(KERNEL_ROOT)/compiler.mk
@@ -0,0 +1,33 @@
+/*
+ * 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 adapter_powerlink.c
+ * @brief Implement the connection powerlink adapter function
+ * @version 3.0
+ * @author AIIT XUOS Lab
+ * @date 2022.09.27
+ */
+
+#include <adapter.h>
+
+#ifdef POWERLINK_MN
+extern int OplkDemoMnConsole(int argc, char *argv[]);
+
+PRIV_SHELL_CMD_FUNCTION(OplkDemoMnConsole, a openPOWERLINK MN sample, PRIV_SHELL_CMD_MAIN_ATTR);
+#endif
+
+#ifdef POWERLINK_CN
+extern int OplkDemoCnConsole(int argc, char *argv[]);
+
+PRIV_SHELL_CMD_FUNCTION(OplkDemoCnConsole, a openPOWERLINK CN sample, PRIV_SHELL_CMD_MAIN_ATTR);
+#endif
--- a/Show More
+++ b/Show More