guoqiang 2 роки тому
батько
коміт
95225f354d
4 змінених файлів з 12 додано та 4 видалено
  1. 1 1
      Core/Inc/hdf.h
  2. 1 1
      Core/Src/hdf.c
  3. 1 1
      Core/Src/kzq.c
  4. 9 1
      Core/Src/main.c

+ 1 - 1
Core/Inc/hdf.h

@@ -47,7 +47,7 @@ extern uint8_t USART3_RX_BUF002_print[Uart3_BUF_SIZE];
 
 
 
-
+extern uint8_t DoPinIoHitSame(uint8_t pinNo, uint8_t *pstatus);
 extern HDF_Inf hdf_inf[SENSOR_DEEP];
 extern uint8_t Get_DFState(uint8_t Cang_Num);
 extern void DF_State(uint8_t Cang_Num); 

+ 1 - 1
Core/Src/hdf.c

@@ -54,7 +54,7 @@ GPIO_PinState Get_Pin(int Pin_No)
  * ·µ»Ø: 0-²»ÈϿɣ¬1-ÈÏ¿É
  ***************************************
  */
-int DoPinIoHitSame(uint8_t pinNo, uint8_t *pstatus)
+uint8_t DoPinIoHitSame(uint8_t pinNo, uint8_t *pstatus)
 {
 	uint8_t status = 0;
 	static struct pin_same {

+ 1 - 1
Core/Src/kzq.c

@@ -4581,7 +4581,7 @@ uint16_t Tem_SetType(uint8_t* pTx)
 		return 0;
 }
 
-uint32_t Version_Soft[8] = {2, 2, 3, 13, 1, 1, 0, 20221013};
+uint32_t Version_Soft[8] = {2, 2, 3, 13, 1, 1, 0, 20221025};
 uint16_t Read_SoftVersion(uint8_t *pTx)
 {
 	int i;

+ 9 - 1
Core/Src/main.c

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