|
@@ -1721,6 +1721,8 @@ void StartTask02(void *argument) //ж
|
|
Cang_Inf* pcang = &cang_inf;
|
|
Cang_Inf* pcang = &cang_inf;
|
|
Angle_Inf* pangle = &angle_inf;
|
|
Angle_Inf* pangle = &angle_inf;
|
|
|
|
|
|
|
|
+ uint8_t status = 0, hit = 0;
|
|
|
|
+
|
|
xyfaddr_max=0;
|
|
xyfaddr_max=0;
|
|
hdfaddr_max=0;
|
|
hdfaddr_max=0;
|
|
for(i = 0;i < pcang->Cang_Num;i++)
|
|
for(i = 0;i < pcang->Cang_Num;i++)
|
|
@@ -1739,6 +1741,8 @@ void StartTask02(void *argument) //ж
|
|
extern uint8_t XYF_TxBuf[70];
|
|
extern uint8_t XYF_TxBuf[70];
|
|
extern uint16_t Uart_len_TouChuan;
|
|
extern uint16_t Uart_len_TouChuan;
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
/* Infinite loop */
|
|
/* Infinite loop */
|
|
for(;;)
|
|
for(;;)
|
|
{
|
|
{
|
|
@@ -2003,7 +2007,11 @@ void StartTask02(void *argument) //ж
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data1[0] = USART3_RX_BUF002[3];
|
|
pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data1[0] = USART3_RX_BUF002[3];
|
|
- pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data2[0] = USART3_RX_BUF002[4];
|
|
|
|
|
|
+ //pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data2[0] = USART3_RX_BUF002[4];
|
|
|
|
+ //pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data2[0] = USART3_RX_BUF002[4];
|
|
|
|
+ hit = DoPinIoHitSame(7, &status);
|
|
|
|
+ pxyf[USART3_RX_BUF002[0] - 0x10].XYF_Data2[0] = (status==0?1:0);
|
|
|
|
+
|
|
#endif
|
|
#endif
|
|
XYF_state(USART3_RX_BUF002[0] - 0x10);
|
|
XYF_state(USART3_RX_BUF002[0] - 0x10);
|
|
|
|
|