diff --git a/source/app/main.c b/source/app/main.c index 7991828..8f980a0 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -30,7 +30,7 @@ void L0_main_init(void) {L1_Oid_readoid();} #endif //系统时钟初始化 - + // L1_tick_init(); // 定时器初始化 L0_timer0_Init(); //G初始化 @@ -47,7 +47,7 @@ void L0_main_init(void) //L3_task_reglisten_init(); //w600任务初始化 - // L3_task_gm35_flow_init(W600_ST); + L3_task_gm35_flow_init(W600_ST); //按键任务初始化 // L0_key_init(); //笔头任务初始化 diff --git a/source/bsp/bsp_oid.c b/source/bsp/bsp_oid.c index 60c8081..f983e80 100644 --- a/source/bsp/bsp_oid.c +++ b/source/bsp/bsp_oid.c @@ -392,56 +392,7 @@ void L2_oid_ParseF1(void) //解析 // R.oid.type = ts_oid.rec.d[6]; // R.oid.dat = ts_oid.rec.d[7]; - - // d[7] - L0_uart0_sendstr("ts_oid.rec.d[0] = "); - L0_uart0_uchex(ts_oid.rec.d[0]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[1] = "); - L0_uart0_uchex(ts_oid.rec.d[1]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[2] = "); - L0_uart0_uchex(ts_oid.rec.d[2]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[3] = "); - L0_uart0_uchex(ts_oid.rec.d[3]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[4] = "); - L0_uart0_uchex(ts_oid.rec.d[4]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[5] = "); - L0_uart0_uchex(ts_oid.rec.d[5]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[6] = "); - L0_uart0_uchex(ts_oid.rec.d[6]); - L0_uart0_0d0a(); - L0_uart0_sendstr("ts_oid.rec.d[7] = "); - L0_uart0_uchex(ts_oid.rec.d[7]); - L0_uart0_0d0a(); - // // d16 - // L0_uart0_sendstr("ts_oid.rec.d16[0] = "); - // L0_uart0_ushex(ts_oid.rec.d16[0]); - // L0_uart0_0d0a(); - // L0_uart0_sendstr("ts_oid.rec.d16[1] = "); - // L0_uart0_ushex(ts_oid.rec.d16[1]); - // L0_uart0_0d0a(); - // L0_uart0_sendstr("ts_oid.rec.d16[2] = "); - // L0_uart0_ushex(ts_oid.rec.d16[2]); - // L0_uart0_0d0a(); - // L0_uart0_sendstr("ts_oid.rec.d16[3] = "); - // L0_uart0_ushex(ts_oid.rec.d16[3]); - // L0_uart0_0d0a(); - // // d32 - // L0_uart0_sendstr("ts_oid.rec.d32[0] = "); - // L0_uart0_ulhex(ts_oid.rec.d32[0]); - // L0_uart0_0d0a(); - // L0_uart0_sendstr("ts_oid.rec.d32[1] = "); - // L0_uart0_ulhex(ts_oid.rec.d32[1]); - // L0_uart0_0d0a(); - // // oid_type - // L0_uart0_sendstr("ts_oid.oid_type = "); - // L0_uart0_uchex(ts_oid.oid_type); - // L0_uart0_0d0a(); + L1_Oid_Rec_PRINT(); if(ts_oid.rec.d[0] == 0x00) // 4 @@ -748,6 +699,60 @@ void L1_Oid_readoid(void) /// delay_us(100); } +void L1_Oid_Rec_PRINT(void) +{ +// d[7] + L0_uart0_sendstr("ts_oid.rec.d[0] = "); + L0_uart0_uchex(ts_oid.rec.d[0]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[1] = "); + L0_uart0_uchex(ts_oid.rec.d[1]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[2] = "); + L0_uart0_uchex(ts_oid.rec.d[2]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[3] = "); + L0_uart0_uchex(ts_oid.rec.d[3]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[4] = "); + L0_uart0_uchex(ts_oid.rec.d[4]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[5] = "); + L0_uart0_uchex(ts_oid.rec.d[5]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[6] = "); + L0_uart0_uchex(ts_oid.rec.d[6]); + L0_uart0_0d0a(); + L0_uart0_sendstr("ts_oid.rec.d[7] = "); + L0_uart0_uchex(ts_oid.rec.d[7]); + L0_uart0_0d0a(); + // // d16 + // L0_uart0_sendstr("ts_oid.rec.d16[0] = "); + // L0_uart0_ushex(ts_oid.rec.d16[0]); + // L0_uart0_0d0a(); + // L0_uart0_sendstr("ts_oid.rec.d16[1] = "); + // L0_uart0_ushex(ts_oid.rec.d16[1]); + // L0_uart0_0d0a(); + // L0_uart0_sendstr("ts_oid.rec.d16[2] = "); + // L0_uart0_ushex(ts_oid.rec.d16[2]); + // L0_uart0_0d0a(); + // L0_uart0_sendstr("ts_oid.rec.d16[3] = "); + // L0_uart0_ushex(ts_oid.rec.d16[3]); + // L0_uart0_0d0a(); + // // d32 + // L0_uart0_sendstr("ts_oid.rec.d32[0] = "); + // L0_uart0_ulhex(ts_oid.rec.d32[0]); + // L0_uart0_0d0a(); + // L0_uart0_sendstr("ts_oid.rec.d32[1] = "); + // L0_uart0_ulhex(ts_oid.rec.d32[1]); + // L0_uart0_0d0a(); + // // oid_type + // L0_uart0_sendstr("ts_oid.oid_type = "); + // L0_uart0_uchex(ts_oid.oid_type); + // L0_uart0_0d0a(); + +} + #if 0 diff --git a/source/bsp/bsp_oid.h b/source/bsp/bsp_oid.h index 7c20c28..d5503f0 100644 --- a/source/bsp/bsp_oid.h +++ b/source/bsp/bsp_oid.h @@ -177,6 +177,7 @@ void L1_Oid_readoid(void); uint8_t L1_OID_WakeUp(void); void L2_oid_ParseF1(void); void L0_oid_Recv64(void); +void L1_Oid_Rec_PRINT(void); #endif // __OPTICALDATA__