mcuid调试完成

source/app/main.c

@@ -135,11 +135,15 @@ void main(void)
 #endif
 	//初始化
 	L0_main_init();
-	//验证加密信息
+
-	//L3_encrypt_handler();
+	//上电延时方便输出
-	//主循环
+	delayInMs(1000);
-	// L0_board_config();
+
-	// bsp_key_init();
+	//获取mcuid
+	L0_id_get_chipid();
+	L0_uart0_sendArrayHex(mcuid, MSP_ID_LEN);
+	L0_uart0_0d0a();
+
 	while(1)
 	{
 		if(1 == s_nos_tick.t1s_heatbeart)
@@ -161,13 +165,15 @@ void main(void)
 			L0_uart0_uchex(key);
 		}
 
+		//NFC协议处理
+		L3_task_nfc_handler(&_s_task_nfc);
+
 		//串口调试
 		// if(ts_uart3_recv_buf.ok == 1){
 		// 	// count++;
 		// 	ts_uart3_recv_buf.ok = 0;
 		// 	L0_uart0_uchex(ts_uart3_recv_buf.reg);
 		// }
-		L3_task_nfc_handler(&_s_task_nfc);
 		
 		
 		//L1_ADS1213_main();

source/bsp/chipid.c

@@ -12,30 +12,34 @@
 #include "chipid.h"
 #include "../bsp/bsp_config.h"
 
-void L0_id_get_ram(U8 *id)
+U8 mcuid[MSP_ID_LEN];
+
+void L0_id_get_ram()
 {
 	U8 i = 0;
 	for(i=0;i<MSP_ID_LEN;i++)
 	{
-		id[i] = (U8)(ID_ADDR_IN_RAM[i]);
+		mcuid[i] = (U8)(ID_ADDR_IN_RAM[i]);
 	}
 }
 
-void L0_id_get_rom(U8 *id)
+void L0_id_get_rom()
 {
 	U8 i = 0;
 	for(i=0;i<MSP_ID_LEN;i++)
 	{
-		id[i] = (U8)ID_ADDR_IN_ROM[i];
+		mcuid[i] = (U8)ID_ADDR_IN_ROM[i];
 	}
 }
 
-void L0_id_get_chipid(U8 *id)
+void L0_id_get_chipid()
 {
 	U8 i = 0;
+	//使能访问XFR
+	P_SW2 |= 0x80;  
 	for(i=0;i<MSP_ID_LEN;i++)
 	{
-		id[i] = ID_ADDR_IN_CHIPID[i];
+		mcuid[i] = ID_ADDR_IN_CHIPID[i];
 	}
 }
 

source/bsp/chipid.h

@@ -28,8 +28,11 @@
 #include "../bsp/bsp_config.h"
 #include "../msp/uart0.h"
 
-extern void L0_id_get(U8 *id);
+extern U8 mcuid[];
-extern void L0_id_get_rom(U8 *id);
+
+extern void L0_id_get();
+extern void L0_id_get_rom();
+extern void L0_id_get_chipid();
 extern void L0_id_main(void);
 
 #endif// #ifndef _msp_eeprom_H_