增加cywee密钥2w个

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index 9f52c7a..59bcee4 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -3482,13 +3482,12 @@ void uapi_cywee_save_mac_key(const uint8_t *key_data,uint16_t len)
 
 #ifdef CYWEE_MAC_ACTIVE
 
-uint8_t DEFAULT_MAC_KEY[] =
+static uint8_t DEFAULT_MAC_KEY[] =
 {
-#ifdef BOARD_N9
-    0x23, 0x20, 0x86, 0xae, 0xe3, 0x01, 0x00, 0x00, 0x01, 0x00, 0x1f, 0x02, 0x87, 0xea, 0x2a, 0x36, 
-    0x1b, 0x1c, 0x1f, 0xd5, 0xa8, 0xdc, 0xd5, 0xeb, 0xf7, 0x89, 0x25, 0xac, 0x05, 0xd3, 0x28, 0x0b, 
-    0x90, 0x41, 0xbe, 0xeb, 0xe8, 0x0c, 0x17, 0xc8, 0x1b, 0x76, 0x1c, 0x80, 0x47, 0x81, 0x0d, 0xd0, 
-    0xd9, 0x95, 0xba, 0xff, 0xcb, 0x84, 0x8e, 0xe9, 0x37, 0x74, 0x1b, 0xaa, 0x44, 0x29, 0x86, 0x64, 
+    0x23, 0x20, 0x86, 0xae, 0xed, 0x01, 0x00, 0x00, 0x01, 0x00, 0x1f, 0x02, 0x84, 0x99, 0xa7, 0xa1, 
+    0x85, 0x6e, 0x65, 0x72, 0xb8, 0xd9, 0x99, 0x2f, 0x77, 0xc0, 0x1d, 0x16, 0xc3, 0x4b, 0x27, 0x60, 
+    0x93, 0x50, 0x1c, 0x98, 0x63, 0x17, 0x03, 0xe7, 0x78, 0x03, 0xbb, 0x92, 0x29, 0xec, 0x25, 0x07, 
+    0x6a, 0x80, 0x0a, 0x0b, 0xfe, 0x9c, 0x75, 0x80, 0x02, 0x5b, 0xf3, 0x3d, 0x81, 0xe3, 0x5a, 0x38, 
     0x93, 0x68, 0x8e, 0xeb, 0x47, 0xbf, 0x59, 0x3d, 0x96, 0x7e, 0xb0, 0xd5, 0x79, 0x80, 0x67, 0x03, 
     0xaf, 0x57, 0xb7, 0xc3, 0x46, 0x93, 0x75, 0x10, 0xbc, 0x68, 0x8f, 0xeb, 0x40, 0xa8, 0x66, 0xa3, 
     0x88, 0x70, 0x94, 0xd9, 0x65, 0x9a, 0x0c, 0xad, 0x52, 0xa9, 0x67, 0x13, 0xb8, 0xf8, 0xe4, 0x70, 
@@ -3515,16 +3514,7 @@ uint8_t DEFAULT_MAC_KEY[] =
     0xc3, 0xef, 0x0b, 0x46, 0xfa, 0x05, 0x6b, 0x30, 0x53, 0xa8, 0x66, 0x12, 0xb9, 0x15, 0xdc, 0x6b, 
     0xc4, 0x15, 0xe2, 0x81, 0x2c, 0xbb, 0x2f, 0x48, 0xcd, 0x25, 0xc5, 0x29, 0x64, 0x92, 0x76, 0x3b, 
     0x87, 0x78, 0x43, 0xc0, 0x6f, 0x94, 0x5a, 0x2e, 0x85, 0x3d, 0xdc, 0x67, 0xc8, 0x19, 0xee, 0x8d, 
-    0x6a, 0x22, 0xf9, 
-#else
-    0x23, 0x20, 0x86, 0xae, 0x62, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1f, 0x02, 0xe5, 0xec, 0x73, 0xfc, 
-    0x46, 0x01, 0x18, 0xd5, 0x6b, 0x68, 0x56, 0xdd, 0x67, 0x09, 0x0a, 0x94, 0x91, 0xbf, 0x9a, 0xc4, 
-    0xa1, 0x84, 0xef, 0x8e, 0x64, 0xcb, 0xfa, 0xac, 0xac, 0x04, 0x65, 0xe6, 0x66, 0x12, 0x82, 0xb1, 
-    0x2a, 0xf4, 0xf3, 0xdb, 0xae, 0x92, 0xa4, 0xa1, 0x3f, 0xff, 0xde, 0x5a, 0xa0, 0xbe, 0x56, 0x21, 
-    0x93, 0x68, 0x8e, 0xeb, 0x47, 0xbf, 0x59, 0x3d, 0x96, 0x7e, 0xb0, 0xd5, 0x79, 0x80, 0x67, 0x03, 
-    0xaf, 0x57, 0xb7, 0xc3, 0x46, 0x93, 0x75, 0x10, 0xbc, 0x68, 0x8f, 0xeb, 0x40, 0xa8, 0x66, 0xa3, 
-    0x88, 0x70,
-#endif
+    0x6a, 0x22, 0xf9, 0x9d, 0x30, 0xc9, 0x2c, 0x4f, 0xf3, 0x22, 0xe4, 0xcf, 0x62, 
 };
 
 #endif
@@ -3563,6 +3553,20 @@ uint8_t* uapi_cywee_get_mac_key(void)
         return NULL;
     }
     fclose(file);
+    
+    if (fileSize != sizeof(DEFAULT_MAC_KEY) || memcmp(data, DEFAULT_MAC_KEY, sizeof(DEFAULT_MAC_KEY)) != 0)
+    {
+        PRINT("MAC key file content differs from default, using DEFAULT_MAC_KEY and rewriting file\n");
+
+        free(data);
+
+        uapi_save_file_data(CYWEE_MAC_KEY_PATH, DEFAULT_MAC_KEY, sizeof(DEFAULT_MAC_KEY), "wb");
+
+        data = (uint8_t *)malloc(sizeof(DEFAULT_MAC_KEY));
+        if (data != NULL) {
+            memcpy(data, DEFAULT_MAC_KEY, sizeof(DEFAULT_MAC_KEY));
+        }
+    }
 #endif
     return data;
 }
@@ -4228,7 +4232,17 @@ errcode_t change_mac_from_chipinfo_map(void)
         sprintf(uid_str + i * 2, "%02x", uid[i]);
     uid_str[32] = '\0';
 
-    uapi_get_nv_btaddr(bd_addr,&len);
+    // uapi_get_nv_btaddr(bd_addr,&len);
+
+            bd_addr[5] = 00 ; 
+            bd_addr[4] = 00 ;
+            bd_addr[3] = 0x03 ;
+            bd_addr[2] = 0x06 ;
+            bd_addr[1] = 0x11 ;
+            bd_addr[0] = 0x28 ;
+            ret = uapi_set_nv_btaddr(bd_addr, len);
+
+            return 0;
 
     for (int i=0 ; i< sizeof(g_chipinfo_map)/sizeof(chiinfo_mac_pair);i++)
     {
@@ -4238,9 +4252,9 @@ errcode_t change_mac_from_chipinfo_map(void)
                 return ERRCODE_SUCC;
 
             uint16_t btmac2 = g_chipinfo_map[i].mac;
-            bd_addr[5] = (btmac2&0x00FF) ; 
-            bd_addr[4] = (btmac2&0xFF00) >>8 ;
-            bd_addr[3] = 0x01 ;
+            bd_addr[5] = 00 ; 
+            bd_addr[4] = 00 ;
+            bd_addr[3] = 0x03 ;
             bd_addr[2] = 0x06 ;
             bd_addr[1] = 0x11 ;
             bd_addr[0] = 0x28 ;