autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Framework/connection/industrial_ethernet/ethercat DIR error

This commit is contained in:
Liu_Weichao 2022-04-06 14:33:32 +08:00
parent 8c76480a97
commit 06d163295a
12 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APP_Framework/Framework/connection/Kconfig
View File

@ -62,12 +62,6 @@ if SUPPORT_CONNECTION_FRAMEWORK
default n default n
if CONNECTION_ADAPTER_ETHERNET if CONNECTION_ADAPTER_ETHERNET
source "$APP_DIR/Framework/connection/ethernet/Kconfig" 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 endif
menuconfig CONNECTION_ADAPTER_BLUETOOTH menuconfig CONNECTION_ADAPTER_BLUETOOTH

4
APP_Framework/Framework/connection/Makefile
View File

@ -41,10 +41,6 @@ ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_DIR += ethernet SRC_DIR += ethernet
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
SRC_DIR += ethercat
endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y)
SRC_DIR += bluetooth SRC_DIR += bluetooth
endif endif

7
APP_Framework/Framework/connection/industrial_ethernet/Kconfig
View File

@ -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

3
APP_Framework/Framework/connection/industrial_ethernet/Makefile
View File

@ -1,2 +1,5 @@
ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
SRC_DIR += ethercat
endif
include $(KERNEL_ROOT)/compiler.mk include $(KERNEL_ROOT)/compiler.mk

7
APP_Framework/Framework/connection/ethercat/Kconfig → APP_Framework/Framework/connection/industrial_ethernet/ethercat/Kconfig
View File

@ -5,6 +5,7 @@ config ADAPTER_HFA21_ETHERCAT
bool "Using ethercat on ethernet adapter device HFA21" bool "Using ethercat on ethernet adapter device HFA21"
default n default n
if ADAPTER_HFA21_ETHERCAT if ADAPTER_HFA21_ETHERCAT
source "$APP_DIR/Framework/connection/ethercat/hfa21_ethercat/Kconfig" source "$APP_DIR/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig"
endif endif

0
APP_Framework/Framework/connection/ethercat/Makefile → APP_Framework/Framework/connection/industrial_ethernet/ethercat/Makefile
View File

0
APP_Framework/Framework/connection/ethercat/adapter_ethercat.c → APP_Framework/Framework/connection/industrial_ethernet/ethercat/adapter_ethercat.c
View File

0
APP_Framework/Framework/connection/ethercat/ethercat.h → APP_Framework/Framework/connection/industrial_ethernet/ethercat/ethercat.h
View File

0
APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Kconfig → APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Kconfig
View File

0
APP_Framework/Framework/connection/ethercat/hfa21_ethercat/Makefile → APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/Makefile
View File

0
APP_Framework/Framework/connection/ethercat/hfa21_ethercat/hfa21_ethercat.c → APP_Framework/Framework/connection/industrial_ethernet/ethercat/hfa21_ethercat/hfa21_ethercat.c
View File

2
Ubiquitous/XiZi/path_kernel.mk
View File

@ -305,7 +305,7 @@ KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/Framework/connection/zigbee
endif endif
ifeq ($(CONFIG_ADAPTER_HFA21_ETHERCAT), y) 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 endif
ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK), y) ifeq ($(CONFIG_SUPPORT_KNOWING_FRAMEWORK), y)