继续开发

jinlicong

2024-05-06 64cf4a779ef5c16c79bbbee27370169dc8d69499

 Soft/system_run_fun.c

@@ -160,7 +160,19 @@
   uint8_t first_time[2] = {0,0};
   uint16_t   IntervalTime;
   
   /*rs485²É¼¯Æô¶¯¿ØÖÆ£¬ °´¼ü¡¢¶¨Ê±¡¢Òì³£±¨¾¯µÈ*/
   /*rs485²É¼¯Æô¶¯¿ØÖÆ£¬ °´¼ü¡¢¶¨Ê±¡¢Òì³£±¨¾¯¡¢¼Ç¼´æ´¢ËùÐèµÈ*/
	
      /*Сʱ¡¢Ìì¡¢ÔÂ*/
   if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ¼Ç¼´æ´¢µã
      start_rs485_g = RS485_START_REASON_RECORD;
	
   if((sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//Ìì¼Ç¼´æ´¢µã
      start_rs485_g = RS485_START_REASON_RECORD;
	
   if((sys_clockBCD_in.day == 1)&&(sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//ԼǼ´æ´¢µã
      start_rs485_g = RS485_START_REASON_RECORD;
	
	
   if(__SYS_STATUS_BYTES_GET(power_state) == SET)
      IntervalTime = wrc_para_sizhu_g.ext_power_data_interval;
   else
@@ -206,3 +218,24 @@
   }
   
}


//ϵͳ±£³ÖÔËÐв»ÐÝÃß״̬£¬·µ»ØRESET´ú±í¿ÉÒÔÐÝÃß
FlagStatus SysKeepRunningStatusGet(FUN_START_CTRL_PARA_T sys_fun_run_ctrl_in)
{
   if(__SYS_STATUS_BYTES_GET(power_state) == SET) //Í⹩µç״̬Ï¿ÉÒÔ²»ÐÝÃß
      return SET;
	
   if(sys_fun_run_ctrl_in.rs485_ctrl_flag.running_flag ==SET)
      return SET;
	
//   if(sys_fun_run_ctrl_in.valve_ctrl_flag.running_flag ==SET) //·§¿ØÔËÐпÉÒÔÐÝÃß
//      return SET;
	
   if(sys_fun_run_ctrl_in.wrc_ctrl_flag.running_flag ==SET)
      return SET;
	
   return RESET;
	
	
}