开始增加脉冲、报警线处理

jinlicong

2024-05-14 ec1ec68ba7d175f39f5d4e066663cf29fa7c262a

 Function/STORAGE/sizhu_history_record.h

@@ -18,31 +18,25 @@
//¼ä¸ô¶³½áÈÕÖ¾ÄÚÈÝ
typedef struct log_sizhu_log_save_period_t
{
   uint8_t        sample_year;
   uint8_t        sample_month;
   uint8_t        sample_day;
   uint8_t        sample_hour;
   uint8_t        sample_min;
   uint8_t        sample_sec;
   sClockBCD       record_time_BCD;

   double           standardgasusagetotal;
   double           workinggasusagetotal;
   double forward_cumulate_sc; // ÕýÏò±ê¿öÀÛ»ýÁ¿
   double forward_cumulate_wc;

   float             standardvec;
   float             workingvec;
   float instant_sc;
   float instant_wc;   
   float temperature;	
   float pressure;
   
   float          temperature;
   float          pressure;
	
   u32           current_price;
   double        residual_amount;
   double        cumulative_gas_usage;
   double        cumulative_fee_usage;
   uint8_t            lith_bat_v;
   uint8_t            lith_bat_per;
   u32   current_price;
   double   residual_amount;
   double   cumulate_gas_usage;
   double   cumulate_fee_usage;
   uint8_t   lith_bat_v;
   uint8_t   lith_bat_per;

   uint8_t            alka_bat_v;
   uint8_t            alka_bat_per;
   uint8_t   alka_bat_v;
   uint8_t   alka_bat_per;

   SYSTEM_STATUS_WORD_T  status_word;

@@ -51,24 +45,18 @@
//Ô¡¢ÈÕ¡¢Ê±ÈÕÖ¾ÄÚÈÝ
typedef struct log_sizhu_log_save_t
{
   uint8_t        sample_year;
   uint8_t        sample_month;
   uint8_t        sample_day;
   uint8_t        sample_hour;
   uint8_t        sample_min;
   uint8_t        sample_sec;
   sClockBCD       record_time_BCD;

   double           standardgasusagetotal;
   double           workinggasusagetotal;
   double forward_cumulate_sc; // ÕýÏò±ê¿öÀÛ»ýÁ¿
   double forward_cumulate_wc;

   float             standardvec;
   float             workingvec;

   float          temperature;
   float          pressure;
   float instant_sc;
   float instant_wc;   
   float temperature;	
   float pressure;
   
   u32           unitprice;
   double        residualamount;
   u32   current_price;
   double   residual_amount;
   uint8_t            reverse[2];
}LOG_SIZHU_LOG_SAVE_T;