Merge branch 'master' of https://192.168.14.200:3000/dtelenkov/bt-670x

modules/Ethernet/private_mib.c

@@ -16,6 +16,7 @@
 #include "megatec.h"
 
 #include "FreeRTOS.h"
+#include "task.h"
 
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
@@ -481,10 +482,8 @@ static void signals_set_value (struct obj_def *od, u16_t len, void *value)
   char *val_string;
   char str[20];
   int8_t res = 0;
-  char log_string[50];
 
   memset(str, 0, 20);
-  memset(log_string, 0,50);
   
   id = od->id_inst_ptr[0];
   
@@ -493,13 +492,25 @@ static void signals_set_value (struct obj_def *od, u16_t len, void *value)
     case 2: /* RestoreSignal */
       val = *((s32_t*)value);
       if (val == 1) {
-        HTTP_ResetSettings();
+    	SNMP_SendUserTrap(DEVICE_RESTORED);
+		log_event_data(LOG_SYSTEM_DEFCONFIG, "Администратор");
+		vTaskDelay(500);
+		SETTINGS_SetPartDefault();
+		SETTINGS_Save();
       }
     break;
     case 3: /* RebootSignal */
       val = *((s32_t*)value);
-      if (val == 1)
-        HTTP_StartResetTask(false);
+      if (val == 1){
+#ifndef BT6702_SERVICE
+		SNMP_SendUserTrap(DEVICE_REBOOTED);
+		log_event_data(LOG_SYSTEM_BOOT, "Администратор");
+
+		vTaskDelay(1010);
+		LOG_Disable();
+#endif
+		NVIC_SystemReset();
+      }
     break;
 	case 5: /* DO1 */
 	  if(sSettings.sInOuts.ro_type_source[0] == SNMP_SET){
@@ -530,34 +541,26 @@ static void signals_set_value (struct obj_def *od, u16_t len, void *value)
 	  if(val == 0){
 		  res = ups_metac_service_pdu(ups_cancel_test);
 		  if(res == 1){
-			  strcpy(log_string, name_login);
-			  strcat(log_string, " (Останов)");
-			  log_event_data(LOG_TEST_UPS, log_string);
+			  log_event_data(LOG_TEST_UPS, "Администратор (Останов)");
 		  }
 	  }
 	  else if(val > 0 && val < 100){
 		  TimeParam = val;
 		  res = ups_metac_service_pdu(ups_test_time);
 		  if(res == 1){
-			  strcpy(log_string, name_login);
-			  strcat(log_string, " (Запущен)");
-			  log_event_data(LOG_TEST_UPS, log_string);
+			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
 		  }
 	  }
 	  else if(val == 100){
 		  res = ups_metac_service_pdu(ups_test_10sec);
 		  if(res == 1){
-			  strcpy(log_string, name_login);
-			  strcat(log_string, " (Запущен)");
-			  log_event_data(LOG_TEST_UPS, log_string);
+			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
 		  }
 	  }
 	  else if(val == 999){
 		  res = ups_metac_service_pdu(ups_test_low_bat);
 		  if(res == 1){
-			  strcpy(log_string, name_login);
-			  strcat(log_string, " (Запущен)");
-			  log_event_data(LOG_TEST_UPS, log_string);
+			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
 		  }
 	  }
 	  break;
@@ -567,16 +570,14 @@ static void signals_set_value (struct obj_def *od, u16_t len, void *value)
 	  if(shtdn_val == 0){
 		  res = ups_metac_service_pdu(ups_cancel_shut_down);
 		 	if(res == 1){
-		 		strcpy(log_string, name_login);
-		 		strcat(log_string, " (Останов)");
-		 		log_event_data(LOG_SHUTDOWN_UPS, log_string);
+		 		log_event_data(LOG_SHUTDOWN_UPS, "Администратор (Останов)");
 		 	}
 	  }
 	  else{
 		TimeParamFloat = shtdn_val;
 		res = ups_metac_service_pdu(ups_shutdown);
 		if(res == 1)
-			log_event_data(LOG_SHUTDOWN_UPS, name_login);
+			log_event_data(LOG_SHUTDOWN_UPS, "Администратор");
 	  }
 	  break;
     default :

modules/monitor/ups_monitor.c

@@ -97,8 +97,8 @@ void UPS_DI0Monitor(void)
 	  return;
 	}
 
-	if (DI0StateCurrent)
-	  flCriticalAlarm = true;
+	/*if (DI0StateCurrent)
+	  flCriticalAlarm = true;*/
 
 	// Значение параметра изменилось
 	if (DI0StateCurrent != DI0OldState)

modules/settings_api.c

@@ -219,7 +219,7 @@ void SETTINGS_SetPartDefault(void)
  // SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
   SETTINGS_SetINOUTSDef();
-  SETTINGS_SetRADIUSDef();
+ // SETTINGS_SetRADIUSDef();
   
   sSettings.CritSecCRC = SETTINGS_GetCritSecCRC();