继续测试优化

jinlicong

2024-06-11 e4424eb6b50d0300583c422dfb71d58e040f4b9e

 Function/STORAGE/sizhu_event_record.c

@@ -1,4 +1,14 @@
#include "sizhu_event_record.h"
#include "sizhu_ctrl_word.h"
#include "system_mem_para.h"
//#include "rs485_data_analysis_pro.h"
//#include "power_manage.h"
#include "mbcrc1.h"
#include "system_flash_mem_manage.h"
#include "system_eep_mem_manage.h"





void    sizhu_event_log_eeprom_default_init(void)
@@ -56,9 +66,45 @@
{
}

void sizhu_valve_action_log_data_handle(uint8_t valve_action_source, uint16_t valve_action_type,uint16_t valve_action_ID)
void sizhuValveActionLogHandle(VALVE_CTRL_SOURCE_T valve_ctrl_source, VALVE_CTRL_TYPE_T valve_action_type,uint16_t valve_action_ID)
{
   LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T   valve_ctrl_log_l;
   LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T   previous_log_l;
   uint32_t   previous_addr = 0;
	
	
   return;  //?û¾­¹ý²âÊÔ£¬ÏÈÆÁ±Î
   arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&valve_ctrl_log_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
	
   valve_ctrl_log_l.valve_action_source = valve_ctrl_source; // ÕýÏò±ê¿öÀÛ»ýÁ¿
   valve_ctrl_log_l.valve_action_type = valve_action_type;
   valve_ctrl_log_l.valve_action_id = valve_action_ID;
   valve_ctrl_log_l.open_valve_times = save_valve_para_g.open_times;   
   valve_ctrl_log_l.close_valve_times = save_valve_para_g.close_times;

   FLASH_LOG_ADDR_CHECK(log_event_ctrl_g.valve_operation_log,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_EVENT_LOG_MAX_NUM);
   if(log_event_ctrl_g.valve_operation_log.log_count != 0){
      previous_addr = FlashLogPreviousAddrGet(log_event_ctrl_g.valve_operation_log.log_addr_save,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_EVENT_LOG_END_ADDR);
      if(FlashMultipleReadAndCrcCheck((uint8_t *)&previous_log_l,previous_addr,VALVE_OPERATION_EVENT_LOG_LENGTH)== PASS)
         valve_ctrl_log_l.serial_number = previous_log_l.serial_number +1;
      else
         valve_ctrl_log_l.serial_number = 0;
   }else{
      valve_ctrl_log_l.serial_number = 0;
   }
	
   //¼ÆËãCRC
   valve_ctrl_log_l.CRC16_MODBUS = usMBCRC16(0xFFFF, (uint8_t * )&valve_ctrl_log_l.record_time_BCD, sizeof(LOG_SIZHU_VALVE_ACTION_RECORD_SAVE_T) - sizeof(valve_ctrl_log_l.CRC16_MODBUS) );
	
   FlashMultipleWriteAndReadCheck((uint8_t *)&valve_ctrl_log_l,log_event_ctrl_g.valve_operation_log.log_addr_save,VALVE_OPERATION_EVENT_LOG_LENGTH);
   FLASH_LOG_CRTL_PARA_HANDLE(log_event_ctrl_g.valve_operation_log,VALVE_OPERATION_EVENT_LOG_START_ADDR,VALVE_OPERATION_EVENT_LOG_LENGTH,VALVE_OPERATION_EVENT_LOG_MAX_NUM);
   //?²ÎÊý´æ´¢
   if(paraCalcCrcAndWriteEepAB((uint8_t * )&log_event_ctrl_g,LOG_EVENT_CTRL_ADDR,LOG_EVENT_CTRL_ADDR + PARA_EEP_B_OFFSET_ADDR,sizeof(log_event_ctrl_g))==FAIL){
		
   }
}


void sizhu_factory_reset_log_data_handle(uint8_t reset_source, uint16_t factory_id)
{
}