添加mac密钥，chipinfo激活转为mac激活

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 8d7da27..715d2e1 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -143,7 +143,7 @@ target = {
                     #"MEM_CHECK",
                     #'ENABLE_WEBSOCKET',
                     'CYWEE_SPORT',
-                    #'CYWEE_MAC_ACTIVE',
+                    'CYWEE_MAC_ACTIVE',
                     'SUPPORT_TCPIP',                                   
                     'SUPPORT_HID_SERVICE',
                     'SUPPORT_BAIDU_MAP'

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 9508a37..7ae64cb 100644 (file)
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -87,7 +87,7 @@ static uint32_t asleep_timestampe = 0;
 int cm__hs1__mac_c1_init(void);
 int cm__hs1__deinit(void);
 
-uint8_t SEC_FILE_ADDR[78] = {0};
+uint8_t SEC_FILE_ADDR[88] = {0};
 
 #else 
 int cm__hs1__init(void);
@@ -1115,7 +1115,7 @@ int cywee_main_dml(void)
     //}    
 
     change_mac_from_chipinfo_map();
-    uint16_t len = 78;
+    uint16_t len = 0;
     uapi_cywee_get_mac_key(SEC_FILE_ADDR,&len);
     // printf("SEC_FILE_ADDR : ");
     // for(int i = 0 ; i < 78 ; i++)

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 81d8809..1b73976 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -2731,12 +2731,13 @@ void uapi_cywee_save_mac_key(const uint8_t *key_data,uint16_t len)
 
 #ifdef CYWEE_MAC_ACTIVE
 
-uint8_t DEFAULT_MAC_KEY[78] = {
-    0x23, 0x20, 0x86, 0xae, 0x4e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1f, 0x02, 0x4c, 0x07, 0x5b, 0xf0, 
-    0x12, 0xc4, 0xf9, 0xeb, 0xea, 0xce, 0x8e, 0x7b, 0xa7, 0x92, 0xf4, 0x4c, 0x6c, 0x75, 0x2f, 0xd5, 
-    0x86, 0x23, 0xda, 0x9b, 0xf3, 0x9f, 0xe1, 0x21, 0x47, 0xa0, 0x15, 0x83, 0x4c, 0x86, 0x60, 0xba, 
-    0xc2, 0xef, 0x21, 0x84, 0x93, 0x0d, 0x8a, 0xf6, 0xe8, 0x29, 0x10, 0xde, 0x68, 0xfa, 0x5c, 0x17, 
-    0x93, 0x68, 0x8e, 0xeb, 0x47, 0xbf, 0x59, 0x3d, 0x96, 0x7e, 0xb0, 0xd5, 0x79, 0x80, 
+uint8_t DEFAULT_MAC_KEY[88] = {
+    0x23, 0x20, 0x86, 0xae, 0x58, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1f, 0x02, 0x62, 0x0e, 0x1e, 0x25, 
+    0x1f, 0x4e, 0x8b, 0x0b, 0xcc, 0xb1, 0x1f, 0x38, 0x34, 0xfa, 0x71, 0x2e, 0xa4, 0xf0, 0xbd, 0x18, 
+    0x49, 0xc2, 0x6d, 0x19, 0x45, 0xfd, 0xd3, 0xbb, 0x68, 0xf8, 0x9c, 0x5a, 0xd7, 0x55, 0xbc, 0x99, 
+    0x4f, 0x27, 0x8e, 0x61, 0x99, 0x0b, 0x2e, 0xe1, 0x81, 0x4d, 0xba, 0x47, 0x62, 0x33, 0x47, 0x71, 
+    0x93, 0x68, 0x8e, 0xeb, 0x47, 0xbf, 0x59, 0x3d, 0x96, 0x7e, 0xb0, 0xd5, 0x79, 0x80, 0x67, 0x03, 
+    0xaf, 0x57, 0xb7, 0xc3, 0x46, 0x93, 0x75, 0x10,  
 };
 #endif
 void uapi_cywee_get_mac_key(uint8_t *key_data,uint16_t *len)