forked from SZV10X_Software/SZV103_FM33A0xxEV_SiZhu

jinlicong
2024-06-19 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c
Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
@@ -5,6 +5,7 @@
#include "gpio.h"
#include "uart.h"
#include "linked_list.h"
#include "sizhu_alarm_record.h"
/****ÕûÌå¿ØÖÆË¼Â·******************
*RS485ÕûÌå¿ØÖÆ·ÖΪÉϵ硢·¢ËͶÁȡָÁî¡¢µÈ´ý½ÓÊÕÊý¾Ý²¢´¦ÀíÈý¸ö״̬»ú²½Ö裻¿ÉÒÔʵÏֵȴý³¬Ê±ÅжϺͶà´ÎÖØ¶Á¡£
@@ -269,14 +270,14 @@
   if(rs485_com_uart_data_g.recv_flag == SET){
      rs485_com_uart_data_g.recv_flag =RESET;
      
      read_ok = rs485ComDataAnalysis(rs485_com_uart_data_g,SIZHUMODBUSV2_0,1,rs485_com_ctrl_pata_g ) ;//?É豸´úÂë¡¢´Ó»úµØÖ·Èë²ÎÒª¸Ä
      read_ok = rs485ComDataAnalysis(rs485_com_uart_data_g,SIZHUMODBUSV2_0,1,rs485_com_ctrl_pata_g ) ;
      memset(rs485_com_uart_data_g.recv_buf, 0, sizeof(rs485_com_uart_data_g.recv_buf)); //Ó¦´ðÍêºóÇå¿Õ½ÓÊÕ
   }
   
   if(read_ok==PASS){
      if(rs485_com_ctrl_pata_g.modbus_step_status >= rs485_com_ctrl_pata_g.modbus_last_status)  {
         //?´ú±íͨѶȫ²¿³É¹¦£¬½øÐÐÏàÓ¦µÄ´¦Àí
         //´ú±íͨѶȫ²¿³É¹¦£¬½øÐÐÏàÓ¦µÄ´¦Àí
         //¹Ø±ÕµçÔ´¡¢¹Ø±Õ´®¿Ú
         RS485_PWR_OFF;
         RS485_RE_REC_ENABLE;
@@ -298,7 +299,7 @@
   
   if((--rs485_com_ctrl_pata_g.reread_wait_time_cnt)==0){
      if((--rs485_com_ctrl_pata_g.reread_num_cnt)==0){
         //?³¬Ê±ÇÒÖØ¶Á´ÎÊýÓÃÍ꣬´ú±íͨѶ×îÖÕÒÔʧ°Ü¸æÖÕ£¬½øÐÐÏàÓ¦µÄ´¦Àí
         //³¬Ê±ÇÒÖØ¶Á´ÎÊýÓÃÍ꣬´ú±íͨѶ×îÖÕÒÔʧ°Ü¸æÖÕ£¬½øÐÐÏàÓ¦µÄ´¦Àí
         //¹Ø±ÕµçÔ´¡¢¹Ø±Õ´®¿Ú£¬RS485ͨѶʧ°Ü+1,
         RS485_PWR_OFF;
         RS485_RE_REC_ENABLE;