diff --git a/APP_Framework/Framework/connection/Kconfig b/APP_Framework/Framework/connection/Kconfig index ea22c5fb2..43094d28f 100644 --- a/APP_Framework/Framework/connection/Kconfig +++ b/APP_Framework/Framework/connection/Kconfig @@ -62,12 +62,6 @@ if SUPPORT_CONNECTION_FRAMEWORK default n if CONNECTION_ADAPTER_ETHERNET source "$APP_DIR/Framework/connection/ethernet/Kconfig" - config CONNECTION_ADAPTER_ETHERCAT - bool "Using ethercat on ethernet adapter device" - default n - if CONNECTION_ADAPTER_ETHERCAT - source "$APP_DIR/Framework/connection/ethercat/Kconfig" - endif endif menuconfig CONNECTION_ADAPTER_BLUETOOTH diff --git a/APP_Framework/Framework/connection/Makefile b/APP_Framework/Framework/connection/Makefile index b9afa159a..01b5b6eaa 100644 --- a/APP_Framework/Framework/connection/Makefile +++ b/APP_Framework/Framework/connection/Makefile @@ -41,10 +41,6 @@ ifeq ($(CONFIG_ADD_XIZI_FETURES),y) SRC_DIR += ethernet endif - ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y) - SRC_DIR += ethercat - endif - ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y) SRC_DIR += bluetooth endif diff --git a/APP_Framework/Framework/connection/industrial_ethernet/Kconfig b/APP_Framework/Framework/connection/industrial_ethernet/Kconfig index e69de29bb..0826acf22 100644 --- a/APP_Framework/Framework/connection/industrial_ethernet/Kconfig +++ b/APP_Framework/Framework/connection/industrial_ethernet/Kconfig @@ -0,0 +1,7 @@ +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 diff --git a/APP_Framework/Framework/connection/industrial_ethernet/Makefile b/APP_Framework/Framework/connection/industrial_ethernet/Makefile index 98aa92bfb..e9ec8be90 100644 --- a/APP_Framework/Framework/connection/industrial_ethernet/Makefile +++ b/APP_Framework/Framework/connection/industrial_ethernet/Makefile @@ -1,2 +1,5 @@ +ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y) + SRC_DIR += ethercat +endif include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Framework/connection/ethercat/Kconfig b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/Kconfig similarity index 72% rename from APP_Framework/Framework/connection/ethercat/Kconfig rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/Kconfig index 0193e6a80..b294c337a 100644 --- a/APP_Framework/Framework/connection/ethercat/Kconfig +++ b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/Kconfig @@ -5,6 +5,7 @@ config ADAPTER_HFA21_ETHERCAT bool "Using ethercat on ethernet adapter device HFA21" default n -if ADAPTER_HFA21_ETHERCAT - source "$APP_DIR/Framework/connection/ethercat/hfa21_ethercat/Kconfig" -endif + if ADAPTER_HFA21_ETHERCAT + source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig" + endif + diff --git a/APP_Framework/Framework/connection/ethercat/Makefile b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/Makefile similarity index 100% rename from APP_Framework/Framework/connection/ethercat/Makefile rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/Makefile diff --git a/APP_Framework/Framework/connection/ethercat/adapter_ethercat.c b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/adapter_ethercat.c similarity index 100% rename from APP_Framework/Framework/connection/ethercat/adapter_ethercat.c rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/adapter_ethercat.c diff --git a/APP_Framework/Framework/connection/ethercat/ethercat.h b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/ethercat.h similarity index 100% rename from APP_Framework/Framework/connection/ethercat/ethercat.h rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/ethercat.h diff --git a/APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Kconfig b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig similarity index 100% rename from APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Kconfig rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig diff --git a/APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Makefile b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Makefile similarity index 100% rename from APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Makefile rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Makefile diff --git a/APP_Framework/Framework/connection/ethercat/hfa21_ethercat/hfa21_ethercat.c b/APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/hfa21_ethercat.c similarity index 100% rename from APP_Framework/Framework/connection/ethercat/hfa21_ethercat/hfa21_ethercat.c rename to APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/hfa21_ethercat.c diff --git a/Ubiquitous/XiZi/path_kernel.mk b/Ubiquitous/XiZi/path_kernel.mk index 3b6f53047..3c5d630d2 100755 --- a/Ubiquitous/XiZi/path_kernel.mk +++ b/Ubiquitous/XiZi/path_kernel.mk @@ -305,7 +305,7 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/zigbee endif ifeq ($(CONFIG_ADAPTER_HFA21_ETHERCAT), y) -KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/ethercat # +KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/industrial_ethernet/ethercat # endif ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK), y)