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

merge upstream

This commit is contained in:
xuyanghang 2024-01-09 17:59:12 +08:00
parent 3e93d2e173
commit e5802dc0f3
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
APP_Framework/Framework/connection/4g/ec200a/Kconfig
View File

@ -3,7 +3,6 @@ config ADAPTER_4G_EC200A
default "ec200a" default "ec200a"
if ADD_XIZI_FEATURES if ADD_XIZI_FEATURES
<<<<<<< HEAD
config ADAPTER_EC200A_USING_PWRKEY config ADAPTER_EC200A_USING_PWRKEY
bool "EC200A using PWRKEY pin number" bool "EC200A using PWRKEY pin number"
default n default n
@ -103,10 +102,3 @@ if ADD_RTTHREAD_FEATURES
endif endif
=======
config ADAPTER_EC200A_DRIVER
string "EC200A device uart driver path"
default "/dev/usart6_dev6"
endif
>>>>>>> upstream/prepare_for_master