更新cywee算法，添加MAC地址密钥激活方式，优化睡眠模式佩戴检测(补交)

diff --git a/code/sdk/drivers/peripheral/cywee/CMakeLists.txt b/code/sdk/drivers/peripheral/cywee/CMakeLists.txt
index 3b96e97..bf949c5 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/CMakeLists.txt
+++ b/code/sdk/drivers/peripheral/cywee/CMakeLists.txt
@@ -52,7 +52,11 @@ set(MAIN_COMPONENT
 
 if("SUPPORT_AT_CYWEE" IN_LIST DEFINES)
     find_library(LIB_PATH_CWM_LIB_DML Lib/CWM_LIB_DML_clang_riscv.a ${CMAKE_CURRENT_SOURCE_DIR})
-    find_library(LIB_PATH_CWM_LIB Lib/CWM_LIB_clang_riscv.a ${CMAKE_CURRENT_SOURCE_DIR})
+    if("CYWEE_MAC_ACTIVE" IN_LIST DEFINES)
+        find_library(LIB_PATH_CWM_LIB Lib/CWM_LIB_clang_riscv_mac.a ${CMAKE_CURRENT_SOURCE_DIR})
+    else()
+        find_library(LIB_PATH_CWM_LIB Lib/CWM_LIB_clang_riscv.a ${CMAKE_CURRENT_SOURCE_DIR})
+    endif()
     target_link_libraries(${TARGET_NAME} PRIVATE -Wl,--whole-archive ${LIB_PATH_CWM_LIB_DML} ${LIB_PATH_CWM_LIB} PRIVATE -Wl,--whole-archive)
     #target_link_libraries(${TARGET_NAME} PRIVATE -Wl,--whole-archive  ${LIB_PATH_CWM_LIB} PRIVATE -Wl,--whole-archive)
 endif()

diff --git a/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv.a b/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv.a
index 5f22c2e..a74ed86 100644 (file)
Binary files a/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv.a and b/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv.a differ

diff --git a/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv_mac.a b/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv_mac.a
new file mode 100644 (file)
index 0000000..5f22c2e
Binary files /dev/null and b/code/sdk/drivers/peripheral/cywee/Lib/CWM_LIB_clang_riscv_mac.a differ

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 9e01c37..499a8c9 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -2703,7 +2703,7 @@ uint8_t uapi_get_cywee_static_state(void)
 void uapi_cywee_save_mac_key(const uint8_t *key_data,uint16_t len)
 {
 #ifdef CYWEE_MAC_ACTIVE
-    uapi_save_file_data(CYWEE_MAC_KEY_PATH,key_data,len,"ab");
+    uapi_save_file_data(CYWEE_MAC_KEY_PATH,key_data,len,"wb");
 #endif
 }
 
@@ -2722,7 +2722,7 @@ void uapi_cywee_get_mac_key(uint8_t *key_data,uint16_t len)
 #ifdef CYWEE_MAC_ACTIVE
     if(access(CYWEE_MAC_KEY_PATH, F_OK) == -1)
     {
-        uapi_save_file_data(CYWEE_MAC_KEY_PATH,DEFAULT_MAC_KEY,sizeof(DEFAULT_MAC_KEY),"ab");
+        uapi_save_file_data(CYWEE_MAC_KEY_PATH,DEFAULT_MAC_KEY,sizeof(DEFAULT_MAC_KEY),"wb");
     }
     uapi_get_file_data(CYWEE_MAC_KEY_PATH,key_data,len);
 #endif

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 4a096c2..c119ce4 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -240,6 +240,9 @@ int custom_exit_lpm(void);
 void uapi_cywee_get_sleep_data(void);
 void uapi_cywee_time_sync(void);
 void uapi_cywee_get_chipinfo(char *databuf,uint8_t len);
+void uapi_cywee_get_version(char *databuf,uint8_t len);
+void uapi_cywee_save_mac_key(const uint8_t *key_data,uint16_t len);
+void uapi_cywee_get_mac_key(uint8_t *key_data,uint16_t len);
 void uapi_ppg_get_id(uint8_t *chip_id);
 
 
@@ -256,8 +259,8 @@ void uapi_efuse_test_write(uint8_t *data,uint32_t byte_number,uint8_t len);
 void uapi_efuse_test_read(uint32_t byte_number,uint8_t len);
 void uapi_gei_btmac_and_chipinfo(void);
 uint8_t uapi_get_cywee_active_state(void);
-void uapi_get_file_data(char *path,uint8_t *data,uint8_t len);
-void uapi_save_file_data(char *path,uint8_t *data,uint8_t len);
+void uapi_get_file_data(char *path,uint8_t *data,uint16_t len);
+void uapi_save_file_data(char *path,uint8_t *data,uint16_t len,char *mode);
 uint8_t uapi_get_cywee_static_state(void);
 void uapi_get_a5133_rxdata(uint8_t *databuf,uint8_t len);
 uint16_t CRC16_XMODEM(uint8_t *bytes,uint16_t length);