继续完善

jinlicong

2024-04-30 ee3c90168f81ce19529904d80f9c9de4fed23bb8

 CORE/main.c

@@ -19,6 +19,7 @@
#include "rs485_read_data.h"
#include "valve_control.h"
#include "wireless_remote_comm.h"
#include "sizhu_ctrl_word.h"

FlagStatus key_awaken_flag_g = RESET;
//uint8_t lcd_only_one_flag = 0;
@@ -54,10 +55,11 @@
         if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //»ñȡʱ¼ä
         {
            //?RTCʱ¼äÒì³£±¨¾¯
            __SYS_STATUS_ALARM_BYTES_SET(rtc_err);
         }
         
         /*°´¼üʶ±ð*/
         //µ¥»÷²Ù×÷Ö÷ÒªÖжÏʶ±ð£¬³¤°´·ÅÔÚÑ­»·Àïʶ±ð
         //µ¥»÷²Ù×÷Ö÷ÒªÖжÏʶ±ð£¬³¤°´·ÅÔÚÑ­»·Àï¶ÁÈ¡IO״̬ʶ±ð
         keyPro();
               
         /*LCDÏÔʾ*/
@@ -70,17 +72,17 @@
         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
         //?ÈýÕß²»Í¬Ê±½øÐУ¬²É¼¯·ÅÔÚÉϱ¨Ö®Ç°£¬Í¬Ê±´¥·¢µÄ»°ÓÅÏȲɼ¯£¬
         //±¨¾¯´¥·¢Éϱ¨ÅжÏÂß¼­·ÅÔڲɼ¯Ç°Ã棬ÏÈ´¥·¢²É¼¯£¬ÔÙ´¥·¢Éϱ¨
         //
         sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
         
         /*485²É¼¯*/
         rs485ReadDataPro();
         rs485ReadDataPro(&sys_fun_run_ctrl_g);
         
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
         
         
         /*·§¿Ø*/
         valveCtrlPro();
         valveCtrlPro(&sys_fun_run_ctrl_g);
         
         
         /*״̬×Ö¡¢±¨¾¯×Ö´¦Àí*/
@@ -90,7 +92,7 @@
         
         
         /*˼Öþƽ̨ÎÞÏßͨѶ*/
         WirelessRemoteCommPro();
         WirelessRemoteCommPro(&sys_fun_run_ctrl_g);
         
         /*modbusµØÖ·±íÊý¾Ý¸üÐÂ*/