merge upstream

2023-12-29 14:50:57 +08:00
parent c6b57ed826 9d546c8c02
commit 618ca9d872
132 changed files with 28080 additions and 407 deletions
@@ -8,9 +8,8 @@ endif

 config ADAPTER_EC200A
        bool "Using 4G adapter device EC200A"
-        default y
+        default n

 if ADAPTER_EC200A
    source "$APP_DIR/Framework/connection/4g/ec200a/Kconfig"
 endif
-                
@@ -3,6 +3,7 @@ config ADAPTER_4G_EC200A
        default "ec200a"

 if ADD_XIZI_FEATURES
+<<<<<<< HEAD
        config ADAPTER_EC200A_USING_PWRKEY
                bool "EC200A using PWRKEY pin number"
                default n
@@ -102,3 +103,10 @@ if ADD_RTTHREAD_FEATURES


 endif
+=======
+        config ADAPTER_EC200A_DRIVER
+                string "EC200A device uart driver path"
+                default "/dev/usart6_dev6"
+endif
+
+>>>>>>> upstream/prepare_for_master
@@ -13,9 +13,9 @@
 /**
 * @file ec200a.c
 * @brief Implement the connection 4G adapter function, using EC200A device
- * @version 1.0
+ * @version 3.0
 * @author AIIT XUOS Lab
- * @date 2023.11.23
+ * @date 2023.12.22
 */

 #include <adapter.h>