测试:场景中延时执行、反馈灯控制,初步测试OK
场景执行基本功能都已测试通过,开关设备、插卡取电设备、温控器设备初步测试OK
This commit is contained in:
@@ -795,6 +795,7 @@ __attribute__((section(".non_0_wait"))) void BLV_PollPort_Task(void)
|
||||
Poll485_Info.Retry_Flag = 0x01;
|
||||
|
||||
/*2021 09 17 <20><><EFBFBD><EFBFBD><DEB8><EFBFBD><EFBFBD>ӷ<EFBFBD><D3B7>ͺ<EFBFBD><CDBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD>жϣ<D0B6>RS485OCCUPYNOTIME<4D><45>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>û<EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>豸*/
|
||||
//Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<22><>ѯ<EFBFBD>˿<EFBFBD> - <20><>ȡ<EFBFBD>豸 %x",Poll485_Info.n_list_read_addr);
|
||||
|
||||
if((Poll485_Info.n_polling_cf!=0x00000000) && (Poll485_Info.n_polling_cf!=0xFFFFFFFF)) rev = ((fun4_prt)Poll485_Info.n_polling_cf)(Poll485_Info.n_list_read_addr);
|
||||
|
||||
@@ -851,7 +852,7 @@ __attribute__((section(".non_0_wait"))) void BLV_PollPort_Task(void)
|
||||
case Change_Dev:
|
||||
Poll485_Info.Last_list_addr += SRAM_Device_List_Size; //<2F><>һ<EFBFBD><D2BB><EFBFBD>豸
|
||||
if(Poll485_Info.Last_list_addr >= SRAM_Read_DW(SRAM_POLL_Device_List_Addr)) Poll485_Info.Last_list_addr = SRAM_Read_DW(SRAM_BUS_Device_List_Addr);
|
||||
|
||||
//Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<22><>ѯ<EFBFBD>˿<EFBFBD> - <20>л<EFBFBD><D0BB>豸 %x",Poll485_Info.n_list_read_addr);
|
||||
Poll485_Info.POLL_Start = B_Polling;
|
||||
break;
|
||||
case B_Retry:
|
||||
@@ -868,6 +869,8 @@ __attribute__((section(".non_0_wait"))) void BLV_PollPort_Task(void)
|
||||
Poll485_Info.n_retry_num--;
|
||||
Poll485_Info.POLL_Start = Wait_Reply;
|
||||
}
|
||||
|
||||
//Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<22><>ѯ<EFBFBD>˿<EFBFBD> - <20>ط<EFBFBD><D8B7><EFBFBD><EFBFBD><EFBFBD> %x",Poll485_Info.n_list_read_addr);
|
||||
}else if((Poll485_Info.Retry_Flag == 0x01) && (Poll485_Info.n_retry_num == 0x00))
|
||||
{
|
||||
Poll485_Info.POLL_Start = Change_Dev; //<2F><><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD><DCA3>л<EFBFBD><D0BB>¸<EFBFBD><C2B8>豸
|
||||
@@ -880,6 +883,7 @@ __attribute__((section(".non_0_wait"))) void BLV_PollPort_Task(void)
|
||||
if(g_uart[UART_0].RX_Buffer_WriteAddr != g_uart[UART_0].RX_Buffer_ReadAddr)
|
||||
{
|
||||
data_len = SRAM_Read_Word(g_uart[UART_0].RX_Buffer_ReadAddr);
|
||||
//Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<22><>ѯ<EFBFBD>˿ڽ<CBBF><DABD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD> %x - %d",g_uart[UART_0].RX_Buffer_ReadAddr,data_len);
|
||||
|
||||
if((Poll485_Info.n_processing_cf!=0x00000000) && (Poll485_Info.n_processing_cf!=0xFFFFFFFF)) {
|
||||
Poll485_Info.Retry_Flag = ((fun2_prt )Poll485_Info.n_processing_cf)(Poll485_Info.n_list_read_addr,g_uart[UART_0].RX_Buffer_ReadAddr + 2,data_len);
|
||||
@@ -901,7 +905,10 @@ __attribute__((section(".non_0_wait"))) void BLV_PollPort_Task(void)
|
||||
}
|
||||
}
|
||||
/*<2A><><EFBFBD>ճ<EFBFBD>ʱ - <20><><EFBFBD><EFBFBD><EFBFBD>ط<EFBFBD>*/
|
||||
if(SysTick_1ms - BLV_POLL_Wait > Poll485_Info.n_dev_waittime) Poll485_Info.POLL_Start = B_Retry;
|
||||
if(SysTick_1ms - BLV_POLL_Wait > Poll485_Info.n_dev_waittime) {
|
||||
//Dbg_Println(DBG_BIT_SYS_STATUS_bit,"<22><>ѯ<EFBFBD>˿ڽ<CBBF><DABD>ճ<EFBFBD>ʱ - <20><><EFBFBD><EFBFBD><EFBFBD>ط<EFBFBD>");
|
||||
Poll485_Info.POLL_Start = B_Retry;
|
||||
}
|
||||
break;
|
||||
case B_Wait: //<2F><><EFBFBD>ͳɹ<CDB3><C9B9>ȴ<EFBFBD>ʱ<EFBFBD><CAB1>
|
||||
if(SysTick_1ms - BLV_POLL_Wait > Poll485_Info.n_dev_waittime) Poll485_Info.POLL_Start = Change_Dev;
|
||||
|
||||
Reference in New Issue
Block a user