Jelajahi Sumber

fix update log

balbekova 7 tahun lalu
induk
melakukan
11e9507202
1 mengubah file dengan 6 tambahan dan 2 penghapusan
  1. 6 2
      modules/monitor/ups_monitor.c

+ 6 - 2
modules/monitor/ups_monitor.c

@@ -136,12 +136,12 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 {
 	uint8_t i = 0;
 
-	flUpdateLog = true;
 	for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
 		if(curr_source[i] == src_act_ro){
 			  SetROInt(state_relay, i);
 			  SNMP_SendUserTrap((DO0_TOGGLED+i));
 			  if(state_relay){
+				  flUpdateLog = true;
 #ifdef HARDWARE_BT6706
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 #elif HARDWARE_BT6702
@@ -150,6 +150,7 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 
 			  }
 			  else{
+				  flUpdateLog = true;
 #ifdef HARDWARE_BT6706
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 #elif HARDWARE_BT6702
@@ -164,27 +165,30 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 {
 	uint8_t i = 0;
 
-	flUpdateLog = true;
 	for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
 		if(curr_source[i] != prev_source[i] && (prev_source[i] == src_act_ro || curr_source[i] == src_act_ro)){
 #ifdef HARDWARE_BT6706
 			if(curr_source[i] != src_act_ro){
+				flUpdateLog = true;
 				 SetROInt(0, i);
 				 SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 			  }
 			  else{
+				  flUpdateLog = true;
 				  SetROInt(1, i);
 				  SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 			  }
 #elif HARDWARE_BT6702
 			  if(curr_source[i] != src_act_ro){
+				  flUpdateLog = true;
 				  SetROInt(0, i);
 				  SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 			  }
 			  else{
+				  flUpdateLog = true;
 				  SetROInt(1, i);
 				 SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");