Merge remote-tracking branch 'origin/master' into sshd

.gdbinit_bt6703

@@ -0,0 +1,5 @@
+target remote localhost:3333
+file build/bt6703/stm32bt6703/stm32bt6703.elf
+load
+break Reset_Handler
+

.gdbinit_bt6703_noflash

@@ -0,0 +1,4 @@
+target remote localhost:3333
+file build/bt6703/stm32bt6703/stm32bt6703.elf
+break Reset_Handler
+monitor halt

.gdbinit_bt6703_service

@@ -0,0 +1,5 @@
+target remote localhost:3333
+file build/bt6703_service/stm32bt6703service/stm32bt6703service.elf
+load
+break Reset_Handler
+

.gdbinit_bt6707

@@ -0,0 +1,5 @@
+target remote localhost:3333
+file build/bt6707/stm32bt6707/stm32bt6707.elf
+load
+break Reset_Handler
+

.gdbinit_bt6707_noflash

@@ -0,0 +1,4 @@
+target remote localhost:3333
+file build/bt6707/stm32bt6707/stm32bt6707.elf
+break Reset_Handler
+monitor halt

.gdbinit_bt6709

@@ -0,0 +1,5 @@
+target remote localhost:3333
+file build/bt6709/stm32bt6709/stm32bt6709.elf
+load
+break Reset_Handler
+

.gdbinit_bt6709_noflash

@@ -0,0 +1,4 @@
+target remote localhost:3333
+file build/bt6709/stm32bt6709/stm32bt6709.elf
+break Reset_Handler
+monitor halt

.gdbinit_bt6709_service

@@ -0,0 +1,5 @@
+target remote localhost:3333
+file build/bt6703_service/stm32bt6709service/stm32bt6709service.elf
+load
+break Reset_Handler
+

.vscode/settings.json

@@ -21,6 +21,7 @@
         "utility": "c",
         "chrono": "c",
         "sstream": "c",
-        "string": "c"
+        "string": "c",
+        "cstdlib": "c"
     }
 }

modules/Ethernet/netconf.c

@@ -288,7 +288,7 @@ void vTaskWebReinit(void *pvParameters)
             SetWebReinitFlag(false);
             HTTP_SaveSettings();
             vTaskDelay(1010);
-            Reboot();
+            Reboot(OTHER_ACT);
         }
 
         if (fConfirmWebParams) {

modules/Ethernet/private_mib_bt6703.c

@@ -1,11 +1,13 @@
 #ifdef HARDWARE_BT6703
 
-#include "stm32f4xx.h"  
+#include "stm32f4xx.h"
 #include "private_mib.h"
 #include "parameters.h"
 #include "settings_api.h"
 #include "log.h"
 #include "megatec.h"
+#include "web_params_api.h"
+#include "hal.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -29,123 +31,141 @@ extern struct snmp_mib mib2;
 extern SETTINGS_t sSettings;
 
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value);
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value);
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value);
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value);
 
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.18  */
-static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.17  */
-static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.16  */
-static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.15  */
-static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.14  */
-static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.13  */
-static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.12  */
-static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.11  */
-static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.10  */
-static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.9  */
-static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.8  */
-static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.7  */
-static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.6  */
-static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.5  */
-static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.4  */
-static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.3  */
-static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.2  */
-static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.6.1.1  */
-static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
-
-
-// signals .1.3.6.1.4.1.41752.911.6.1 
-static const struct snmp_node* const signals_nodes[] = {
-/*  &test_signal.node.node,
-  &test_signal2.node.node,
-  &test_signal3.node.node*/
-	&signal1.node.node,
-	&signal2.node.node,
-	&signal3.node.node,
-	&signal4.node.node,
-	&signal5.node.node,
-	&signal6.node.node,
-	&signal7.node.node,
-	&signal8.node.node,
-	&signal9.node.node,
-	&signal10.node.node,
-	&signal11.node.node,
-	&signal12.node.node,
-	&signal13.node.node,
-	&signal14.node.node,
-	&signal15.node.node,
-	&signal16.node.node,
-	&signal17.node.node,
-	&signal18.node.node,
+static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
+
+
+// signals .1.3.6.1.4.1.41752.911.6.1
+static const struct snmp_node *const signals_nodes[] = {
+    /*  &test_signal.node.node,
+      &test_signal2.node.node,
+      &test_signal3.node.node*/
+    &signal1.node.node,
+    &signal2.node.node,
+    &signal3.node.node,
+    &signal4.node.node,
+    &signal5.node.node,
+    &signal6.node.node,
+    &signal7.node.node,
+    &signal8.node.node,
+    &signal9.node.node,
+    &signal10.node.node,
+    &signal11.node.node,
+    &signal12.node.node,
+    &signal13.node.node,
+    &signal14.node.node,
+    &signal15.node.node,
+    &signal16.node.node,
+    &signal17.node.node,
+    &signal18.node.node,
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
-// bt_6702 .1.3.6.1.4.1.41752.911.6 
-static const struct snmp_node* const bt6703_nodes[] = {
-  &signals_node.node
+// bt_6702 .1.3.6.1.4.1.41752.911.6
+static const struct snmp_node *const bt6703_nodes[] = {
+    &signals_node.node
 };
 static const struct snmp_tree_node bt6703_node = SNMP_CREATE_TREE_NODE(6, bt6703_nodes);
 
-// swt .1.3.6.1.4.1.41752.911 
-static const struct snmp_node* const swt_nodes[] = {
-  &bt6703_node.node
+// swt .1.3.6.1.4.1.41752.911
+static const struct snmp_node *const swt_nodes[] = {
+    &bt6703_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 
-// rotek .1.3.6.1.4.1.41752 
-static const struct snmp_node* const rotek_nodes[] = {
-  &swt_node.node
+// rotek .1.3.6.1.4.1.41752
+static const struct snmp_node *const rotek_nodes[] = {
+    &swt_node.node
 };
 static const struct snmp_tree_node rotek_node = SNMP_CREATE_TREE_NODE(41752, rotek_nodes);
 
-// enterprises .1.3.6.1.4.1 
-static const struct snmp_node* const enterprises_nodes[] = {
-  &rotek_node.node
+// enterprises .1.3.6.1.4.1
+static const struct snmp_node *const enterprises_nodes[] = {
+    &rotek_node.node
 };
 static const struct snmp_tree_node enterprises_node = SNMP_CREATE_TREE_NODE(1, enterprises_nodes);
 
-// private .1.3.6.1.4 
-static const struct snmp_node* const private_nodes[] = {
-  &enterprises_node.node
+// private .1.3.6.1.4
+static const struct snmp_node *const private_nodes[] = {
+    &enterprises_node.node
 };
 static const struct snmp_tree_node private_root = SNMP_CREATE_TREE_NODE(0, private_nodes);
 
-static const u32_t prvmib_base_oid[] = { 1,3,6,1,4 };
+static const u32_t prvmib_base_oid[] = { 1, 3, 6, 1, 4 };
 static const struct snmp_mib private_mib = SNMP_MIB_CREATE(prvmib_base_oid, &private_root.node);
 
 
@@ -154,1410 +174,224 @@ static const struct snmp_mib private_mib = SNMP_MIB_CREATE(prvmib_base_oid, &pri
 void lwip_privmib_init(void)
 {
     static const struct snmp_mib *my_snmp_mibs[] = {&mib2, &private_mib};
-   
+
     snmp_set_mibs(my_snmp_mibs, LWIP_ARRAYSIZE(my_snmp_mibs));
 }
 
 
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value)
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value)
 {
-	u8_t *paramStr = (u8_t*)value;
-	u8_t paramLength = 0;
+    u8_t *paramStr = (u8_t *)value;
+    u8_t paramLength = 0;
     u32_t oid = instance->node->oid; // id сигнала
 
-    switch (oid){
-	case 1: /* FWVersion */
-		GetVersionStr((char*)paramStr, &paramLength);
-		break;
-	case 4: /* UPSModel*/
-		GetUPSModelStr((char*)paramStr, &paramLength);
-		break;
-	case 5: /* DO1*/
-		GetDOUTStatusStr((char*)paramStr, &paramLength, 0);
-		break;
-	case 6: /* DO2*/
-		GetDOUTStatusStr((char*)paramStr, &paramLength, 1);
-		break;
-	case 9: /* DIO*/
-		GetDINStatusStr((char*)paramStr, &paramLength, 0);
-		break;
-	case 10: /* IntTemp */
-		GetInternalTempStr((char*)paramStr, &paramLength);
-		break;
-	case 11: /* InFreq */
-		GetInputFreqStr((char*)paramStr, &paramLength);
-		break;
-	case 12: /* InVoltVAC */
-		GetInputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 13: /* OutVoltVAC */
-		GetOutputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 14: /* Power */
-		GetPowerStr((char*)paramStr, &paramLength);
-		break;
-	case 15: /* BatCap */
-		GetBatCapacityStr((char*)paramStr, &paramLength);
-		break;
-	case 16: /* BatTime */
-		GetRuntimeStr((char*)paramStr, &paramLength);
-		break;
-	case 17: /* ConnectMonitor */
-		GetConnectMonitorStr((char*)paramStr, &paramLength);
-		break;
-	case 18: /* Alarms */
-		GetAlarmStr((char*)paramStr, &paramLength);
-		break;
-	default:
-	break;
+    switch (oid) {
+        case 1: /* FWVersion */
+            GetVersionStr((char *)paramStr, &paramLength);
+            break;
+        case 4: /* UPSModel*/
+            GetUPSModelStr((char *)paramStr, &paramLength);
+            break;
+        case 5: /* DO1*/
+            GetDOUTStatusStr((char *)paramStr, &paramLength, 0);
+            break;
+        case 6: /* DO2*/
+            GetDOUTStatusStr((char *)paramStr, &paramLength, 1);
+            break;
+        case 9: /* DIO*/
+            GetDINStatusStr((char *)paramStr, &paramLength, 0);
+            break;
+        case 10: /* IntTemp */
+            GetInternalTempStr((char *)paramStr, &paramLength);
+            break;
+        case 11: /* InFreq */
+            GetInputFreqStr((char *)paramStr, &paramLength);
+            break;
+        case 12: /* InVoltVAC */
+            GetInputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 13: /* OutVoltVAC */
+            GetOutputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 14: /* Power */
+            GetPowerStr((char *)paramStr, &paramLength);
+            break;
+        case 15: /* BatCap */
+            GetBatCapacityStr((char *)paramStr, &paramLength);
+            break;
+        case 16: /* BatTime */
+            GetRuntimeStr((char *)paramStr, &paramLength);
+            break;
+        case 17: /* ConnectMonitor */
+            GetConnectMonitorStr((char *)paramStr, &paramLength);
+            break;
+        case 18: /* Alarms */
+            GetAlarmStr((char *)paramStr, &paramLength);
+            break;
+        default:
+            break;
     }
 
     return paramLength;
 
 }
 
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value)
 {
 
-	u32_t oid = instance->node->oid; // id сигнала
-	char *val_string;
-	char str[20];
-	int8_t res = 0;
-	s32_t val;
-
-     memset(str, 0, 20);
-
-    switch (oid)
-    {
-      case 2: /* RestoreSignal */
-        val = *(s32_t*)value;
-        if (val == 1) {
-      //	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){
-#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){
-  		  val_string = (char*)value;
-  		  SetROStr(val_string, 0);
-  		  if(val_string[0] == 0x31)
-  			  strcat(str, "Замкнуто");
-  		  else
-  			  strcat(str, "Разомкнуто");
-  		//  SNMP_SendUserTrap(DO0_TOGGLED);
-  		  log_event_data(LOG_DO0_STATE, str);
-  	  }
-  	  break;
-  	case 6: /* DO2 */
-  	  if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET){
-  		  val_string = (char*)value;
-  		  SetROStr(val_string, 1);
-  		  if(val_string[0] == 0x31)
-  			  strcat(str, "Замкнуто");
-  		  else
-  			  strcat(str, "Разомкнуто");
-  		//  SNMP_SendUserTrap(DO1_TOGGLED);
-  		  log_event_data(LOG_DO1_STATE, str);
-  	  }
-  	  break;
-  	case 7: /* BatTest */
-  	  val =*(s32_t*)value;
-  	  if(val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_test);
-  		  if(res == 1){
-  			  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){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 100){
-  		  res = ups_metac_service_pdu(ups_test_10sec);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 999){
-  		  res = ups_metac_service_pdu(ups_test_low_bat);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  break;
-  	case 8: /* Shutdown UPS */
-  	  val_string = (char*)value;
-  	  float shtdn_val = atof(val_string);
-  	  if(shtdn_val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_shut_down);
-  		 	if(res == 1){
-  		 		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, "Администратор");
-  	  }
-  	  break;
-      default :
-    	  return SNMP_ERR_GENERROR;
-      break;
+    u32_t oid = instance->node->oid; // id сигнала
+    char *val_string;
+    char str[20];
+    int8_t res = 0;
+    s32_t val;
+
+    memset(str, 0, 20);
+
+    switch (oid) {
+        case 2: /* RestoreSignal */
+            val = *(s32_t *)value;
+            if (val == 1) {
+                //    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);
+            }
+            break;
+        case 5: /* DO1 */
+            if (sSettings.sInOuts.ro_type_source[0] == SNMP_SET) {
+                val_string = (char *)value;
+                SetROStr(val_string, 0);
+                if (val_string[0] == 0x31) {
+                    strcat(str, "Замкнуто");
+                } else {
+                    strcat(str, "Разомкнуто");
+                }
+                //  SNMP_SendUserTrap(DO0_TOGGLED);
+                log_event_data(LOG_DO0_STATE, str);
+            }
+            break;
+        case 6: /* DO2 */
+            if (sSettings.sInOuts.ro_type_source[1] == SNMP_SET) {
+                val_string = (char *)value;
+                SetROStr(val_string, 1);
+                if (val_string[0] == 0x31) {
+                    strcat(str, "Замкнуто");
+                } else {
+                    strcat(str, "Разомкнуто");
+                }
+                //  SNMP_SendUserTrap(DO1_TOGGLED);
+                log_event_data(LOG_DO1_STATE, str);
+            }
+            break;
+        case 7: /* BatTest */
+            val = *(s32_t *)value;
+            if (val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_test);
+                if (res == 1) {
+                    log_event_data(LOG_TEST_UPS, "Администратор (Останов)");
+                }
+            } else if (val > 0 && val < 100) {
+                TimeParam = val;
+                res = ups_metac_service_pdu(ups_test_time);
+                set_act_source(SNMP_ACT);
+            } else if (val == 100) {
+                res = ups_metac_service_pdu(ups_test_10sec);
+                set_act_source(SNMP_ACT);
+            } else if (val == 999) {
+                res = ups_metac_service_pdu(ups_test_low_bat);
+                set_act_source(SNMP_ACT);
+            }
+            break;
+        case 8: /* Shutdown UPS */
+            val_string = (char *)value;
+            float shtdn_val = atof(val_string);
+            if (shtdn_val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_shut_down);
+                if (res == 1) {
+                    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, "Администратор");
+                }
+            }
+            break;
+        default :
+            return SNMP_ERR_GENERROR;
+            break;
     };
 
-  return SNMP_ERR_NOERROR;
+    return SNMP_ERR_NOERROR;
 }
 
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value)
 {
-	snmp_err_t ret = SNMP_ERR_WRONGVALUE;
+    snmp_err_t ret = SNMP_ERR_WRONGVALUE;
     char *val_string;
     int32_t val;
     u32_t oid = instance->node->oid; // id сигнала
 
-    switch (oid)
-    {
-      case 2:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-
-      case 3:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-  	case 5: /* DO1 */
-  		if ( len <= 1 )
-  	    {
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atoi(val_string) <= 1){
-  			   if(sSettings.sInOuts.ro_type_source[0] == SNMP_SET)
-  				 ret = SNMP_ERR_NOERROR;
-  		   }
-  	    }
-  	  break;
-  	case 6: /* DO2 */
-  		if ( len <= 1 )
-  		{
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atoi(val_string) <= 1){
-  			   if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET)
-  				 ret = SNMP_ERR_NOERROR;
-  		   }
-  		}
-  	  break;
-  	case 7: /* BatTest */
-  	   val = *((s32_t*)value);
-  	   if((val >= 0 && val <= 100) || val == 999){
-  		 ret = SNMP_ERR_NOERROR;
-  	   }
-  	  break;
-  	case 8: /* Shutdown UPS */
-  		if ( len <= 3 )
-  		{
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atof(val_string) <= 10){
-  			 ret = SNMP_ERR_NOERROR;
-  		   }
-  		}
-  	  break;
+    switch (oid) {
+        case 2:
+        case 3:
+            if ( len == sizeof(s32_t) ) {
+                val = *((s32_t *)value);
+                if (val == 1) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 5: /* DO1 */
+            if ( len <= 1 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atoi(val_string) <= 1) {
+                    if (sSettings.sInOuts.ro_type_source[0] == SNMP_SET) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 6: /* DO2 */
+            if ( len <= 1 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atoi(val_string) <= 1) {
+                    if (sSettings.sInOuts.ro_type_source[1] == SNMP_SET) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 7: /* BatTest */
+            val = *((s32_t *)value);
+            if ((val >= 0 && val <= 100) || val == 999) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 8: /* Shutdown UPS */
+            if ( len <= 3 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atof(val_string) <= 10) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
     };
 
 
-  return ret;
+    return ret;
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#if 0
-#include "private_mib.h"
-#include "lwip/snmp.h"
-#include "lwip/snmp_msg.h"
-#include "lwip/snmp_asn1.h"
-#include "lwip/snmp_structs.h"
-
-#include "settings_api.h"
-#include "parameters.h"
-#include "web_params_api.h"
-#include "snmp_api.h"
-#include "trap_api.h"
-#include "common_config.h"
-#include "log.h"
-#include "megatec.h"
-
-#include "FreeRTOS.h"
-#include "task.h"
-
-#ifdef PRINTF_STDLIB
-#include <stdio.h>
-#endif
-#ifdef PRINTF_CUSTOM
-#include "tinystdio.h"
-#endif
-#include <stdlib.h>
-
-/**
-  * @brief  Общая структура настроек
-  */
-extern SETTINGS_t sSettings;
-
-extern float TimeParamFloat;
-
-extern void ocstrncpy(u8_t *dst, u8_t *src, u16_t n);
-
-char paramStr[255];
-uint8_t paramLength = 0;
-uint32_t paramInt = 0;
-
-static void system_get_object_def_ee( u8_t ident_len, s32_t *ident, struct obj_def *od );
-static void system_get_value_ee(struct obj_def *od, u16_t len, void *value);
-static u8_t system_set_test_ee(struct obj_def *od, u16_t len, void *value);
-static void system_set_value_ee(struct obj_def *od, u16_t len, void *value);
-
-/* Функции для узла Signals */
-static void signals_get_object_def (u8_t ident_len, s32_t *ident, struct obj_def *od);
-static void signals_get_value (struct obj_def *od, u16_t len, void *value);
-static u8_t signals_set_test (struct obj_def *od, u16_t len, void *value);
-static void signals_set_value (struct obj_def *od, u16_t len, void *value);
-
-/*------------------------------------------------------------------------------
- Описание узлов 
-------------------------------------------------------------------------------*/
-/* узел SYSTEM (операции с EEPROM) */
-/*             0 1 2 3 4 5 6 */
-/* system .1.3.6.1.2.1.1 */
-const mib_scalar_node system_scalar_ee = {
-  &system_get_object_def_ee,
-  &system_get_value_ee,
-  &system_set_test_ee,
-  &system_set_value_ee,
-  MIB_NODE_SC,
-  0
-};
-
-// переменные узла SIGNALS ------------------------------------------
-
-const mib_scalar_node signals_var = 
-{
-  &signals_get_object_def,
-  &signals_get_value,
-  &signals_set_test,
-  &signals_set_value,
-  MIB_NODE_SC,
-  0
-};
-
-// узел SIGNALS -----------------------------------------------------
-
-const s32_t signals_ids[18] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 };
-
-struct mib_node* const signals_nodes[18] =
-{
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-  (struct mib_node* const)&signals_var,
-};
-
-const struct mib_array_node signals = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  18,
-  signals_ids,
-  signals_nodes
-};
-
-
-// узел BT-6701 ------------------------------------------------------------
-
-const s32_t bt6701_ids[1] = { 1 };
-
-struct mib_node* const bt6701_nodes[1] = 
-{
-  (struct mib_node* const)&signals,
-};
-
-const struct mib_array_node bt6701 = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  1,
-  bt6701_ids,
-  bt6701_nodes
-};
-
-// узел swt ------------------------------------------------------------
-const s32_t swt_ids[1] = { 
-3
-};
-
-struct mib_node* const swt_nodes[1] = 
-{
-  (struct mib_node* const)&bt6701,
-};
-
-const struct mib_array_node swt = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  1,
-  swt_ids,
-  swt_nodes
-};
-
-// узел ROTEK ------------------------------------------------------------
-
-const s32_t rotek_ids[1] = { 911 };
-
-struct mib_node* const rotek_nodes[1] = 
-{
-  (struct mib_node* const)&swt,
-};
-
-const struct mib_array_node rotek = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  1,
-  rotek_ids,
-  rotek_nodes
-};
-
-// узел ENTERPRISES -------------------------------------------------------
-
-const s32_t enterprises_ids[1] = { 41752 };
-
-struct mib_node* const enterprises_nodes[1] = 
-{
-  (struct mib_node* const)&rotek
-};
-
-const struct mib_array_node enterprises = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  1,
-  enterprises_ids,
-  enterprises_nodes
-};
-
-// узел PRIVATE -----------------------------------------------------------
-
-const s32_t mib_private_ids[1] = { 1 };
-
-struct mib_node* const mib_pivate_nodes[1] = 
-{
-  (struct mib_node* const)&enterprises
-};
-
-const struct mib_array_node mib_private = 
-{
-  &noleafs_get_object_def,
-  &noleafs_get_value,
-  &noleafs_set_test,
-  &noleafs_set_value,
-  MIB_NODE_AR,
-  1,
-  mib_private_ids,
-  mib_pivate_nodes
-};
-
-
-/*------------------------------------------------------------------------------
- Функции
-------------------------------------------------------------------------------*/
-
-// Функции для узла SIGNALS
-
-/**-----------------------------------------------------------------------------
- \fn     static void signals_get_object_def (u8_t ident_len, s32_t *ident, struct obj_def *od)
- \brief  функция получения свойств переменных узла Identification
- \param  ident_len - the address length. длина адреса
- \param  ident - points to objectname.0 (object id trailer) 
- \param  od - points to object definition. указатель на описание переменной
- \return нет
-------------------------------------------------------------------------------*/
-static void signals_get_object_def (u8_t ident_len, s32_t *ident, struct obj_def *od)
-{
-  u8_t id;
-  
-  /* return to object name, adding index depth (1) */
-  ident_len += 1;
-  ident -= 1;
-  if (ident_len == 2)
-  {
-    od->id_inst_len = ident_len;
-    od->id_inst_ptr = ident;
-
-    id =     [0];
-    
-    switch (id)
-    {
-      case 1: /* FWVersion */
-		GetVersionStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-	 case 2: /* RestoreSignal */
-
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_WRITE_ONLY;
-        od->asn_type = SNMP_ASN1_INTEG;
-        od->v_len = sizeof(s32_t);
-        break;
-	  case 3: /* RebootSignal */
-
-		od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_WRITE_ONLY;
-        od->asn_type = SNMP_ASN1_INTEG;
-        od->v_len = sizeof(s32_t);
-        break;
-	  case 4: /* UPSModel*/
-		GetUPSModelStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-	  case 5: /* DO1*/
-		GetDOUTStatusStr(paramStr, &paramLength, 0);
-		od->instance = MIB_OBJECT_SCALAR;
-		od->access = MIB_OBJECT_READ_WRITE;
-		od->asn_type = SNMP_ASN1_OC_STR;
-		od->v_len = paramLength;
-		break;
-	  case 6: /* DO2*/
-		GetDOUTStatusStr(paramStr, &paramLength, 1);
-		od->instance = MIB_OBJECT_SCALAR;
-		od->access = MIB_OBJECT_READ_WRITE;
-		od->asn_type = SNMP_ASN1_OC_STR;
-		od->v_len = paramLength;
-		break;
-	  case 7: /* BatTest*/
-
-		od->instance = MIB_OBJECT_SCALAR;
-		od->access = MIB_OBJECT_WRITE_ONLY;
-		od->asn_type = SNMP_ASN1_INTEG;
-		od->v_len = sizeof(s32_t);
-		break;
-	  case 8: /* Shutdown UPS*/
-
-		od->instance = MIB_OBJECT_SCALAR;
-		od->access = MIB_OBJECT_WRITE_ONLY;
-		od->asn_type = SNMP_ASN1_OC_STR;
-		od->v_len = paramLength;
-		break;
-	  case 9: /* DIO*/
-		GetDINStatusStr(paramStr, &paramLength, 0);
-		od->instance = MIB_OBJECT_SCALAR;
-		od->access = MIB_OBJECT_READ_ONLY;
-		od->asn_type = SNMP_ASN1_OC_STR;
-		od->v_len = paramLength;
-		break;
-	  case 10: /* IntTemp */
-		GetInternalTempStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-	  case 11: /* InFreq */
-		GetInputFreqStr(paramStr, &paramLength);
-		od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-		break;
-	  case 12: /* InVoltVAC */
-		GetInputVoltageStr(paramStr, &paramLength);
-		od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-		break;
-	  case 13: /* OutVoltVAC */
-		GetOutputVoltageStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-	  case 14: /* Power */
-		GetPowerStr(paramStr, &paramLength);
-		od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-		break;
-	  case 15: /* BatCap */
-		GetBatCapacityStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-	  case 16: /* BatTime */
-		GetRuntimeStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;	
-      case 17: /* ConnectMonitor */
-		GetConnectMonitorStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-      case 18: /* Alarms */
-    	GetAlarmStr(paramStr, &paramLength);
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_ONLY;
-        od->asn_type = SNMP_ASN1_OC_STR;
-        od->v_len = paramLength;
-        break;
-      default:
-        //LWIP_DEBUGF(SNMP_MIB_DEBUG,("planar_get_object_def: no such object\n"));
-        od->instance = MIB_OBJECT_NONE;
-        break;
-    };
-  }
-  else
-  {
-    LWIP_DEBUGF(SNMP_MIB_DEBUG,("planar_get_object_def: no scalar\n"));
-    od->instance = MIB_OBJECT_NONE;
-  }
-}
-
-/**-----------------------------------------------------------------------------
- \fn     static void Identification_get_value(struct obj_def *od, u16_t len, void *value)
- \brief  функция получения значения переменных узла Identification
- \param  obj_def - указатель на описание переменной
- \param  len - длина переменной в байтах 
- \param  value - указатель на значение переменной
- \return нет
-------------------------------------------------------------------------------*/
-static void signals_get_value (struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id;
-  
-  id = od->id_inst_ptr[0];
-  
-  switch (id)
-  {
-    case 1: /* FWVersion */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-	case 2: /* RestoreSignal */
-	  *((s32_t*)value) = 0;
-      break;
-	case 3: /* RebootSignal */
-	  *((s32_t*)value) = 0;
-      break;
-	case 4: /* UPSModel */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-	  break;
-	case 5: /* DO1 */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-	  break;
-	case 6: /* DO2 */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-	  break;
-	case 7: /* BatTest */
-	  *((s32_t*)value) = 0;
-	  break;
-	case 8: /* Shutdown UPS */
-	  *((s32_t*)value) = 0;
-	  break;
-	case 9: /* DIO */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-	  break;
-	case 10: /* IntTemp */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;  
-	case 11: /* InFreq */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-	case 12: /* InVoltVAC */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-	case 13: /* OutVoltVAC */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-	case 14: /* Power */
-      ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-	case 15: /* BatCap */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-    case 16: /* BatTime */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-    case 17: /* ConnectMonitor */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-    case 18: /* Alarms */
-	  ocstrncpy((u8_t*)value, (u8_t*)paramStr, len);
-      break;
-    default :
-	  break;
-  };
-}
-
-/**-----------------------------------------------------------------------------
- \fn     static void Identification_set_value (struct obj_def *od, u16_t len, void *value)
- \brief  функция записи значений переменных узла Identification
- \param  obj_def - указатель на описание переменной
- \param  len - длина переменной в байтах 
- \param  value - указатель на значение переменной
- \return нет
-------------------------------------------------------------------------------*/
-static void signals_set_value (struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id;
-  uint32_t val;
-  char *val_string;
-  char str[20];
-  int8_t res = 0;
-
-  memset(str, 0, 20);
-  
-  id = od->id_inst_ptr[0];
-  
-  switch (id)
-  {
-    case 2: /* RestoreSignal */
-      val = *((s32_t*)value);
-      if (val == 1) {
-    	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){
-#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){
-		  val_string = (char*)value;
-		  SetROStr(val_string, 0);
-		  if(val_string[0] == 0x31)
-			  strcat(str, "Замкнуто");
-		  else
-			  strcat(str, "Разомкнуто");
-		  SNMP_SendUserTrap(DO0_TOGGLED);
-		  log_event_data(LOG_DO0_STATE, str);
-	  }
-	  break;
-	case 6: /* DO2 */
-	  if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET){
-		  val_string = (char*)value;
-		  SetROStr(val_string, 1);
-		  if(val_string[0] == 0x31)
-			  strcat(str, "Замкнуто");
-		  else
-			  strcat(str, "Разомкнуто");
-		  SNMP_SendUserTrap(DO1_TOGGLED);
-		  log_event_data(LOG_DO1_STATE, str);
-	  }
-	  break;
-	case 7: /* BatTest */
-	  val =*((s32_t*)value);
-	  if(val == 0){
-		  res = ups_metac_service_pdu(ups_cancel_test);
-		  if(res == 1){
-			  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){
-			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-		  }
-	  }
-	  else if(val == 100){
-		  res = ups_metac_service_pdu(ups_test_10sec);
-		  if(res == 1){
-			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-		  }
-	  }
-	  else if(val == 999){
-		  res = ups_metac_service_pdu(ups_test_low_bat);
-		  if(res == 1){
-			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-		  }
-	  }
-	  break;
-	case 8: /* Shutdown UPS */
-	  val_string = (char*)value;
-	  float shtdn_val = atof(val_string);
-	  if(shtdn_val == 0){
-		  res = ups_metac_service_pdu(ups_cancel_shut_down);
-		 	if(res == 1){
-		 		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, "Администратор");
-	  }
-	  break;
-    default :
-    break;
-  };
-  
-}
-
-/**-----------------------------------------------------------------------------
- \fn     static u8_t Identification_set_test (struct obj_def *od, u16_t len, void *value)
- \brief  функция проверки записываемых значений переменных узла Identification
- \param  obj_def - указатель на описание переменной
- \param  len - длина переменной в байтах 
- \param  value - указатель на значение переменной
- \return 0 - некорректное значение
-         1 - корректное значение
-------------------------------------------------------------------------------*/
-static u8_t signals_set_test (struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id, set_ok;
-  char *val_string;
-  int32_t val;
-
-  LWIP_UNUSED_ARG(value);
-  set_ok = 0;
-  id = od->id_inst_ptr[0];
-  
-  switch (id)
-  {
-    case 2: 
-      if ( len == sizeof(s32_t) )
-      {
-        set_ok = 1;
-      }
-      break;  
-	  
-    case 3: 
-      if ( len == sizeof(s32_t) )
-      {
-        set_ok = 1;
-      }
-      break; 
-	case 5: /* DO1 */
-		if ( len <= 1 )
-	    {
-		   val_string = (char*)value;
-		   val_string[len] = 0;
-		   if(atoi(val_string) <= 1){
-			   if(sSettings.sInOuts.ro_type_source[0] == SNMP_SET)
-				   set_ok = 1;
-		   }
-	    }
-	  break;
-	case 6: /* DO2 */
-		if ( len <= 1 )
-		{
-		   val_string = (char*)value;
-		   val_string[len] = 0;
-		   if(atoi(val_string) <= 1){
-			   if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET)
-				   set_ok = 1;
-		   }
-		}
-	  break;
-	case 7: /* BatTest */
-	   val = *((s32_t*)value);
-	   if((val >= 0 && val <= 100) || val == 999){
-		   set_ok = 1;
-	   }
-	  break;
-	case 8: /* Shutdown UPS */
-		if ( len <= 3 )
-		{
-		   val_string = (char*)value;
-		   val_string[len] = 0;
-		   if(atof(val_string) <= 10){
-			set_ok = 1;
-		   }
-		}
-	  break;
-  };
-  
-  return set_ok;
-}
-
-/**
- * Returns systems object definitions (eeprom).
- *
- * @param ident_len the address length (2)
- * @param ident points to objectname.0 (object id trailer)
- * @param od points to object definition.
- */
-static void
-system_get_object_def_ee(u8_t ident_len, s32_t *ident, struct obj_def *od)
-{
-  u8_t id;
-
-  /* return to object name, adding index depth (1) */
-  ident_len += 1;
-  ident -= 1;
-  if (ident_len == 2)
-  {
-    od->id_inst_len = ident_len;
-    od->id_inst_ptr = ident;
-
-    id = ident[0];
-    //LWIP_DEBUGF(SNMP_MIB_DEBUG,("get_object_def_ee system.%"U16_F".0\n",(u16_t)id));
-    switch (id)
-    {
-      case 4: /* sysContact */
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_WRITE;
-        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
-        od->v_len = 1 /*GetSnmpStringLen(SNMP_SYSCONTACT_TYPE)*/;
-        break;
-      case 5: /* sysName */
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_WRITE;
-        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
-        od->v_len = 1 /*GetSnmpStringLen(SNMP_SYSNAME_TYPE)*/;
-        break;
-      case 6: /* sysLocation */
-        od->instance = MIB_OBJECT_SCALAR;
-        od->access = MIB_OBJECT_READ_WRITE;
-        od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
-        od->v_len = 1 /*GetSnmpStringLen(SNMP_SYSLOCATION_TYPE)*/;
-        break;
-      default:
-        //LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_object_def_ee: no such object\n"));
-        od->instance = MIB_OBJECT_NONE;
-        break;
-    };
-  }
-  else
-  {
-    LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_object_def_ee: no scalar\n"));
-    od->instance = MIB_OBJECT_NONE;
-  }
-}
-// ----------------------------------------------------------------------------
-
-
-/**
- * Returns system object value.
- *
- * @param ident_len the address length (2)
- * @param ident points to objectname.0 (object id trailer)
- * @param len return value space (in bytes)
- * @param value points to (varbind) space to copy value into.
- */
-static void
-system_get_value_ee(struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id;
-
-  id = od->id_inst_ptr[0];
-  switch (id)
-  {
-    case 4: /* sysContact */
-      //GetSnmpString(SNMP_SYSCONTACT_TYPE, value, len );
-      break;
-    case 5: /* sysName */
-      //GetSnmpString(SNMP_SYSNAME_TYPE, value, len );
-      break;
-    case 6: /* sysLocation */
-      //GetSnmpString(SNMP_SYSLOCATION_TYPE, value, len );
-      break;
-  };
-}
-// ----------------------------------------------------------------------------
-
-
-static u8_t
-system_set_test_ee(struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id, set_ok;
-
-  LWIP_UNUSED_ARG(value);
-  set_ok = 0;
-  id = od->id_inst_ptr[0];
-  switch (id)
-  {
-    case 4: /* sysContact */
-      if ( len <= 255 )
-      {
-        set_ok = 1;
-      }
-      break;
-    case 5: /* sysName */
-      if ( len <= 255 )
-      {
-        set_ok = 1;
-      }
-      break;
-    case 6: /* sysLocation */
-      if ( len <= 255 )
-      {
-        set_ok = 1;
-      }
-      break;
-  };
-  return set_ok;
-}
-// ----------------------------------------------------------------------------
-
-
-static void
-system_set_value_ee(struct obj_def *od, u16_t len, void *value)
-{
-  u8_t id;
-
-  id = od->id_inst_ptr[0];
-  switch (id)
-  {
-    case 4: /* sysContact */
-      //SetSnmpString(SNMP_SYSCONTACT_TYPE, value, len );
-      //*syscontact_len_ptr = len;
-    break;
-    case 5: /* sysName */
-      //SetSnmpString(SNMP_SYSNAME_TYPE, value, len );
-      //*sysname_len_ptr = len;
-    break;
-    case 6: /* sysLocation */
-      //SetSnmpString(SNMP_SYSLOCATION_TYPE, value, len );
-      //*syslocation_len_ptr = len;
-    break;
-  };
-}
-// ----------------------------------------------------------------------------
-
-/**-----------------------------------------------------------------------------
- \fn     err_t snmp_send_trap_ex (s8_t generic_trap, 
-                         struct snmp_obj_id *eoid, 
-                         s32_t specific_trap, 
-                         struct snmp_obj_id* varbinds, 
-                         u8_t varbinds_num)
- \brief  функция посылки трапа с возможностью пристыковывать переменные
- \param  generic_trap  - код трапа
- \param  eoid          - указатель на enterprise object identifier
- \param  specific_trap - used for enterprise traps when generic_trap == 6
- \param  varbinds      - указатель на переменные
- \param  varbinds_num  - число переменных
- \return код ошибки
-------------------------------------------------------------------------------*/
-err_t snmp_send_trap_ex (s8_t generic_trap, 
-                         struct snmp_obj_id *eoid, 
-                         s32_t specific_trap, 
-                         struct snmp_obj_id* varbinds, 
-                         u8_t varbinds_num)
-{
-	uint8_t bSnmpActive = 1;
-	
-	struct snmp_varbind** vb_list;
-	struct mib_node* node;
-	struct obj_def obj;
-	err_t tResult;
-	s32_t* VarNum;
-    struct snmp_name_ptr np;
-	
-
-	/* SNMP не готово - ничего не отправляем */
-	if( !bSnmpActive )
-	{
-		return ERR_MEM;
-	}
-	
-	/* создаем таблицу указателей переменных */
-	pvPortMalloc( varbinds_num * sizeof(struct snmp_varbind*) );
-	/*
-	if(vb_list == NULL)
-	{
-		return ERR_MEM;
-	}
-	*/
-	/* создаем сами переменные */
-	for(u8_t i = 0; i < varbinds_num; i++)
-	{
-		/* ищем узел в дереве*/
-		node = snmp_search_tree( (struct mib_node*)&internet, varbinds[i].len - 3, 
-										 &varbinds[i].id[4], &np );
-		
-		//node = snmp_search_tree( (struct mib_node*)&internet, varbinds[i].len, 
-		//								 &varbinds[i].id[0], &np );
-		
-		if(node != NULL)
-		{
-			/* получаем информацию о переменной узла */
-			VarNum = &varbinds[i].id[ varbinds[i].len - 1 ];
-			
-			if( node->node_type == MIB_NODE_EX)
-			{
-				struct mib_external_node* node_ex;
-				node_ex = (struct mib_external_node*)node;
-				/* TODO: подставить правильный rid вместо 0 */
-				node_ex->get_object_def_a(0, 1, VarNum, &obj);
-			}
-			else
-			{
-				node->get_object_def(1, VarNum, &obj);
-			}
-			
-			/* создаем переменную */
-			vb_list[i] = snmp_varbind_alloc(&varbinds[i], obj.asn_type, obj.v_len);
-			if( vb_list[i] != NULL )
-			{
-				{
-					/* получаем значение переменной */
-					if( node->node_type == MIB_NODE_EX)
-					{
-						struct mib_external_node* node_ex;
-						node_ex = (struct mib_external_node*)node;
-						/* TODO: подставить правильный rid вместо 0 */
-						node_ex->get_value_a(0, &obj, obj.v_len, vb_list[i]->value);
-					}
-					else
-					{
-						node->get_value(&obj, obj.v_len, vb_list[i]->value);
-					}
-					/* добавляем переменную в ловушку */
-					snmp_varbind_tail_add(&trap_msg.outvb, vb_list[i]);
-				}
-			}
-		}
-	}
-
-	/* посылаем ловушку */
-	tResult = snmp_send_trap(generic_trap, eoid, specific_trap);
-	
-	/* удаляем переменные из списка */
-	snmp_varbind_list_free(&trap_msg.outvb);
-	
-	/* удаляем указатели переменных */
-	vPortFree(vb_list);
-	
-	return tResult;
-}
-
-void SNMP_SendTestTrap(void)
-{
-/*  
-  struct snmp_varbind *vb;
-  struct snmp_obj_id objid = {11, {1, 3, 6, 1, 4, 1, 41752, 5, 16, 2, 1}};
-  unsigned char msg[] = "Sex, drugs and LwIP";
-  unsigned char msglen = 19;
-  
-  vb = snmp_varbind_alloc(&objid, SNMP_ASN1_OPAQUE, msglen);
-  
-  vb->value = &msg;
-           
-  trap_msg.outvb.head = vb;
-  trap_msg.outvb.tail = vb;
-  trap_msg.outvb.count = 1;
-  
-  snmp_send_trap(SNMP_GENTRAP_ENTERPRISESPC, &objid, 0);
-     
-  trap_msg.outvb.head = NULL;
-  trap_msg.outvb.tail = NULL;
-  trap_msg.outvb.count = 0;
-  //vb->value = NULL;
-     
-  snmp_varbind_free(vb);
-*/  
-  static struct snmp_obj_id trapObjId = {11, {1, 3, 6, 1, 4, 1, 41752, 5, 16, 2, 1}};
-  static struct snmp_obj_id varObjId  = {11, {1, 3, 6, 1, 4, 1, 41752, 5, 16, 1, 1}};
-  
-  struct snmp_varbind* vb;
-  u32_t *u32ptr;
-  
-  vb = snmp_varbind_alloc(&varObjId, MIB_NODE_SC, 4);
-  
-  vb->value_len = 4;
-  vb->value_type = 0x02;
-  u32ptr = vb->value; 	
-  *u32ptr = 23;
-  
-  if( vb != NULL )
-	snmp_varbind_tail_add(&trap_msg.outvb, vb);
-			
-  snmp_send_trap(SNMP_GENTRAP_ENTERPRISESPC, &trapObjId, 0);
-	
-  /* удаляем переменные из списка */
-  snmp_varbind_list_free(&trap_msg.outvb);
-  
-  //snmp_send_trap_ex(SNMP_GENTRAP_ENTERPRISESPC, &trapObjId, 0, &varObjId, 1);
-  
-  
-#if 0	
-	struct snmp_varbind** vb_list;
-	struct mib_node* node;
-	struct obj_def obj;
-	err_t tResult;
-	s32_t* VarNum;
-    struct snmp_name_ptr np;
-	
-
-	/* создаем указатель на переменную */
-	pvPortMalloc(sizeof(struct snmp_varbind*) );
-
-	/* создаем сами переменные */
-	for(u8_t i = 0; i < varbinds_num; i++)
-	{
-		/* ищем узел в дереве*/
-		node = snmp_search_tree( (struct mib_node*)&internet, varbinds[i].len - 4, 
-										 &varbinds[i].id[4], &np );
-		
-		//node = snmp_search_tree( (struct mib_node*)&internet, varbinds[i].len, 
-		//								 &varbinds[i].id[0], &np );
-		
-		if(node != NULL)
-		{
-			/* получаем информацию о переменной узла */
-			VarNum = &varbinds[i].id[ varbinds[i].len - 1 ];
-			
-			if( node->node_type == MIB_NODE_EX)
-			{
-				struct mib_external_node* node_ex;
-				node_ex = (struct mib_external_node*)node;
-				/* TODO: подставить правильный rid вместо 0 */
-				node_ex->get_object_def_a(0, 1, VarNum, &obj);
-			}
-			else
-			{
-				node->get_object_def(1, VarNum, &obj);
-			}
-			
-			/* создаем переменную */
-			vb_list[i] = snmp_varbind_alloc(&varbinds[i], obj.asn_type, obj.v_len);
-			if( vb_list[i] != NULL )
-			{
-				{
-					/* получаем значение переменной */
-					if( node->node_type == MIB_NODE_EX)
-					{
-						struct mib_external_node* node_ex;
-						node_ex = (struct mib_external_node*)node;
-						/* TODO: подставить правильный rid вместо 0 */
-						node_ex->get_value_a(0, &obj, obj.v_len, vb_list[i]->value);
-					}
-					else
-					{
-						node->get_value(&obj, obj.v_len, vb_list[i]->value);
-					}
-					/* добавляем переменную в ловушку */
-					snmp_varbind_tail_add(&trap_msg.outvb, vb_list[i]);
-				}
-			}
-		}
-	}
-
-	/* посылаем ловушку */
-	tResult = snmp_send_trap(generic_trap, eoid, specific_trap);
-	
-	/* удаляем переменные из списка */
-	snmp_varbind_list_free(&trap_msg.outvb);
-	
-	/* удаляем указатели переменных */
-	vPortFree(vb_list);
-	
-	return tResult;
-#endif	
-}
-
-#define NUM_PRIVATE_TRAP 10
- 
-//static unsigned char SNMP_TRAP_0_FLAG = 1;
-//static struct ip_addr SNMP_TRAP_0_ADDR;
- 
-extern struct snmp_msg_trap trap_msg;
- 
-struct private_trap
-{
-  /* source enterprise ID (sysObjectID) */
-  struct snmp_obj_id *enterprise; 
-  /* trap ID */
-  struct snmp_obj_id *trap_oid;
- 
-  /* specific trap code */
-  u32_t spc_trap;
- 
-  /* object value ASN1 type */
-  u8_t value_type;
-  /* object value length (in u8_t) */
-  u8_t value_len;
-  /* object value */
-  void *value;
-  /* indicate that the trap is sent */
-  u8_t in_use;
-};
- 
-struct private_trap trap_bank[NUM_PRIVATE_TRAP];
- 
-struct private_trap * getNextFreePrivateTrap()
-{
-   u8_t index;
-   void * result = NULL;
-  
-   for(index = 0; index < NUM_PRIVATE_TRAP; index++)
-   {
-      if(!trap_bank[index].in_use)
-      {
-         trap_bank[index].in_use = 1;
-         result = &trap_bank[index];        
-         break;
-      }
-   }
-  
-   return result; 
-}
- 
-void freePrivateTrap(struct private_trap * trap)
-{
-   trap->enterprise = NULL;
-   trap->trap_oid = NULL;
-   trap->value = NULL;
-   trap->in_use = 0;  
-}
- 
-void vSendTrapCallback( void * parameters )
-{
-   struct private_trap * trapToSend;
-   struct snmp_varbind * vb;
-  
-   if( parameters != NULL )
-   {
-      trapToSend = (struct private_trap *) parameters;
-     
-      vb = snmp_varbind_alloc(trapToSend->enterprise,
-                              trapToSend->value_type,
-                              trapToSend->value_len);
-                             
-      vb->value = trapToSend->value;
-           
-      trap_msg.outvb.head = vb;
-      trap_msg.outvb.tail = vb;
-      trap_msg.outvb.count = 1;
-     
-      snmp_send_trap(SNMP_GENTRAP_ENTERPRISESPC, trapToSend->trap_oid, trapToSend->spc_trap);
-     
-      trap_msg.outvb.head = NULL;
-      trap_msg.outvb.tail = NULL;
-      trap_msg.outvb.count = 0;
-     
-      vb->value = NULL;
-     
-      snmp_varbind_free(vb);
-     
-      freePrivateTrap(trapToSend);
-   }  
-}
-#endif
- 

modules/Ethernet/private_mib_bt6707.c

@@ -14,6 +14,8 @@
 #include "settings_api.h"
 #include "log.h"
 #include "megatec.h"
+#include "web_params_api.h"
+#include "hal.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -37,124 +39,143 @@ extern struct snmp_mib mib2;
 extern SETTINGS_t sSettings;
 
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value);
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value);
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value);
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value);
 
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.19  */
-static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE_READONLY(19, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE_READONLY(19, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.18  */
-static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE_READONLY(18, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.17  */
-static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.16  */
-static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.15  */
-static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.14  */
-static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.13  */
-static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.12  */
-static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.11  */
-static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.9  */
-static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.9  */
-static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE(9, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE(9, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.8  */
-static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.7  */
-static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.6  */
-static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE(6, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.5  */
-static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE(5, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.4  */
-static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.3  */
-static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.2  */
-static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.7.1.1  */
-static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 
 // signals .1.3.6.1.4.1.41752.911.7.1
-static const struct snmp_node* const signals_nodes[] = {
-	&signal1.node.node,
-	&signal2.node.node,
-	&signal3.node.node,
-	&signal4.node.node,
-	&signal5.node.node,
-	&signal6.node.node,
-	&signal7.node.node,
-	&signal8.node.node,
-	&signal9.node.node,
-	&signal10.node.node,
-	&signal11.node.node,
-	&signal12.node.node,
-	&signal13.node.node,
-	&signal14.node.node,
-	&signal15.node.node,
-	&signal16.node.node,
-	&signal17.node.node,
-	&signal18.node.node,
-	&signal19.node.node
+static const struct snmp_node *const signals_nodes[] = {
+    &signal1.node.node,
+    &signal2.node.node,
+    &signal3.node.node,
+    &signal4.node.node,
+    &signal5.node.node,
+    &signal6.node.node,
+    &signal7.node.node,
+    &signal8.node.node,
+    &signal9.node.node,
+    &signal10.node.node,
+    &signal11.node.node,
+    &signal12.node.node,
+    &signal13.node.node,
+    &signal14.node.node,
+    &signal15.node.node,
+    &signal16.node.node,
+    &signal17.node.node,
+    &signal18.node.node,
+    &signal19.node.node
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
 // bt_6707 .1.3.6.1.4.1.41752.911.7
-static const struct snmp_node* const bt6707_nodes[] = {
-  &signals_node.node
+static const struct snmp_node *const bt6707_nodes[] = {
+    &signals_node.node
 };
 static const struct snmp_tree_node bt6707_node = SNMP_CREATE_TREE_NODE(7, bt6707_nodes);
 
 // swt .1.3.6.1.4.1.41752.911
-static const struct snmp_node* const swt_nodes[] = {
-  &bt6707_node.node
+static const struct snmp_node *const swt_nodes[] = {
+    &bt6707_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 
 // rotek .1.3.6.1.4.1.41752
-static const struct snmp_node* const rotek_nodes[] = {
-  &swt_node.node
+static const struct snmp_node *const rotek_nodes[] = {
+    &swt_node.node
 };
 static const struct snmp_tree_node rotek_node = SNMP_CREATE_TREE_NODE(41752, rotek_nodes);
 
 // enterprises .1.3.6.1.4.1
-static const struct snmp_node* const enterprises_nodes[] = {
-  &rotek_node.node
+static const struct snmp_node *const enterprises_nodes[] = {
+    &rotek_node.node
 };
 static const struct snmp_tree_node enterprises_node = SNMP_CREATE_TREE_NODE(1, enterprises_nodes);
 
 // private .1.3.6.1.4
-static const struct snmp_node* const private_nodes[] = {
-  &enterprises_node.node
+static const struct snmp_node *const private_nodes[] = {
+    &enterprises_node.node
 };
 static const struct snmp_tree_node private_root = SNMP_CREATE_TREE_NODE(0, private_nodes);
 
-static const u32_t prvmib_base_oid[] = { 1,3,6,1,4 };
+static const u32_t prvmib_base_oid[] = { 1, 3, 6, 1, 4 };
 static const struct snmp_mib private_mib = SNMP_MIB_CREATE(prvmib_base_oid, &private_root.node);
 
 
@@ -169,265 +190,244 @@ void lwip_privmib_init(void)
 
 
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value)
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value)
 {
-	u8_t *paramStr = (u8_t*)value;
-	u8_t paramLength = 0;
+    u8_t *paramStr = (u8_t *)value;
+    u8_t paramLength = 0;
     u32_t oid = instance->node->oid; // id сигнала
 
-    switch (oid){
-	case 1: /* FWVersion */
-		GetVersionStr((char*)paramStr, &paramLength);
-		break;
-	case 4: /* UPSModel*/
-		GetUPSModelStr((char*)paramStr, &paramLength);
-		break;
-	case 5: /* DO1*/
-		GetDOUTStatusStr((char*)paramStr, &paramLength, 0);
-		break;
-	case 6: /* DO2*/
-		GetDOUTStatusStr((char*)paramStr, &paramLength, 1);
-		break;
-	case 7: /* DO3*/
-		GetDOUTStatusStr((char*)paramStr, &paramLength, 2);
-		break;
-	case 10: /* DIO*/
-		GetDINStatusStr((char*)paramStr, &paramLength, 0);
-		break;
-	case 11: /* IntTemp */
-		GetInternalTempStr((char*)paramStr, &paramLength);
-		break;
-	case 12: /* InFreq */
-		GetInputFreqStr((char*)paramStr, &paramLength);
-		break;
-	case 13: /* InVoltVAC */
-		GetInputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 14: /* OutVoltVAC */
-		GetOutputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 15: /* Power */
-		GetPowerStr((char*)paramStr, &paramLength);
-		break;
-	case 16: /* BatCap */
-		GetBatCapacityStr((char*)paramStr, &paramLength);
-		break;
-	case 17: /* BatTime */
-		GetRuntimeStr((char*)paramStr, &paramLength);
-		break;
-	case 18: /* ConnectMonitor */
-		GetConnectMonitorStr((char*)paramStr, &paramLength);
-		break;
-	case 19: /* Alarms */
-		GetAlarmStr((char*)paramStr, &paramLength);
-		break;
-	default:
-	break;
+    switch (oid) {
+        case 1: /* FWVersion */
+            GetVersionStr((char *)paramStr, &paramLength);
+            break;
+        case 4: /* UPSModel*/
+            GetUPSModelStr((char *)paramStr, &paramLength);
+            break;
+        case 5: /* DO1*/
+            GetDOUTStatusStr((char *)paramStr, &paramLength, 0);
+            break;
+        case 6: /* DO2*/
+            GetDOUTStatusStr((char *)paramStr, &paramLength, 1);
+            break;
+        case 7: /* DO3*/
+            GetDOUTStatusStr((char *)paramStr, &paramLength, 2);
+            break;
+        case 10: /* DIO*/
+            GetDINStatusStr((char *)paramStr, &paramLength, 0);
+            break;
+        case 11: /* IntTemp */
+            GetInternalTempStr((char *)paramStr, &paramLength);
+            break;
+        case 12: /* InFreq */
+            GetInputFreqStr((char *)paramStr, &paramLength);
+            break;
+        case 13: /* InVoltVAC */
+            GetInputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 14: /* OutVoltVAC */
+            GetOutputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 15: /* Power */
+            GetPowerStr((char *)paramStr, &paramLength);
+            break;
+        case 16: /* BatCap */
+            GetBatCapacityStr((char *)paramStr, &paramLength);
+            break;
+        case 17: /* BatTime */
+            GetRuntimeStr((char *)paramStr, &paramLength);
+            break;
+        case 18: /* ConnectMonitor */
+            GetConnectMonitorStr((char *)paramStr, &paramLength);
+            break;
+        case 19: /* Alarms */
+            GetAlarmStr((char *)paramStr, &paramLength);
+            break;
+        default:
+            break;
     }
 
     return paramLength;
 
 }
 
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value)
 {
 
-	u32_t oid = instance->node->oid; // id сигнала
-	char *val_string;
-	char str[20];
-	int8_t res = 0;
-	s32_t val;
-
-     memset(str, 0, 20);
-
-    switch (oid)
-    {
-      case 2: /* RestoreSignal */
-        val = *(s32_t*)value;
-        if (val == 1) {
-      //	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){
-#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){
-  		  val_string = (char*)value;
-  		  SetROStr(val_string, 0);
-  		  if(val_string[0] == 0x31)
-  			  strcat(str, "Замкнуто");
-  		  else
-  			  strcat(str, "Разомкнуто");
-  		//  SNMP_SendUserTrap(DO0_TOGGLED);
-  		  log_event_data(LOG_DO0_STATE, str);
-  	  }
-  	  break;
-  	case 6: /* DO2 */
-  	  if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET){
-  		  val_string = (char*)value;
-  		  SetROStr(val_string, 1);
-  		  if(val_string[0] == 0x31)
-  			  strcat(str, "Замкнуто");
-  		  else
-  			  strcat(str, "Разомкнуто");
-  		//  SNMP_SendUserTrap(DO1_TOGGLED);
-  		  log_event_data(LOG_DO1_STATE, str);
-  	  }
-  	  break;
-	case 7: /* DO2*/
-		if(sSettings.sInOuts.ro_type_source[2] == SNMP_SET){
-			  val_string = (char*)value;
-			  SetROStr(val_string, 2);
-			  if(val_string[0] == 0x31)
-				  strcat(str, "Замкнуто");
-			  else
-				  strcat(str, "Разомкнуто");
-			//  SNMP_SendUserTrap(DO1_TOGGLED);
-			  log_event_data(LOG_DO2_STATE, str);
-		  }
-		break;
-  	case 8: /* BatTest */
-  	  val =*(s32_t*)value;
-  	  if(val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_test);
-  		  if(res == 1){
-  			  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){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 100){
-  		  res = ups_metac_service_pdu(ups_test_10sec);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 999){
-  		  res = ups_metac_service_pdu(ups_test_low_bat);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  break;
-  	case 9: /* Shutdown UPS */
-  	  val_string = (char*)value;
-  	  float shtdn_val = atof(val_string);
-  	  if(shtdn_val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_shut_down);
-  		 	if(res == 1){
-  		 		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, "Администратор");
-  	  }
-  	  break;
-      default :
-    	  return SNMP_ERR_GENERROR;
-      break;
+    u32_t oid = instance->node->oid; // id сигнала
+    char *val_string;
+    char str[20];
+    int8_t res = 0;
+    s32_t val;
+
+    memset(str, 0, 20);
+
+    switch (oid) {
+        case 2: /* RestoreSignal */
+            val = *(s32_t *)value;
+            if (val == 1) {
+                //    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);
+            }
+            break;
+        case 5: /* DO1 */
+            if (sSettings.sInOuts.ro_type_source[0] == SNMP_SET) {
+                val_string = (char *)value;
+                SetROStr(val_string, 0);
+                if (val_string[0] == 0x31) {
+                    strcat(str, "Замкнуто");
+                } else {
+                    strcat(str, "Разомкнуто");
+                }
+                //  SNMP_SendUserTrap(DO0_TOGGLED);
+                log_event_data(LOG_DO0_STATE, str);
+            }
+            break;
+        case 6: /* DO2 */
+            if (sSettings.sInOuts.ro_type_source[1] == SNMP_SET) {
+                val_string = (char *)value;
+                SetROStr(val_string, 1);
+                if (val_string[0] == 0x31) {
+                    strcat(str, "Замкнуто");
+                } else {
+                    strcat(str, "Разомкнуто");
+                }
+                //  SNMP_SendUserTrap(DO1_TOGGLED);
+                log_event_data(LOG_DO1_STATE, str);
+            }
+            break;
+        case 7: /* DO2*/
+            if (sSettings.sInOuts.ro_type_source[2] == SNMP_SET) {
+                val_string = (char *)value;
+                SetROStr(val_string, 2);
+                if (val_string[0] == 0x31) {
+                    strcat(str, "Замкнуто");
+                } else {
+                    strcat(str, "Разомкнуто");
+                }
+                //  SNMP_SendUserTrap(DO1_TOGGLED);
+                log_event_data(LOG_DO2_STATE, str);
+            }
+            break;
+        case 8: /* BatTest */
+            val = *(s32_t *)value;
+            if (val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_test);
+                if (res == 1) {
+                    log_event_data(LOG_TEST_UPS, "Администратор (Останов)");
+                }
+            } else if (val > 0 && val < 100) {
+                TimeParam = val;
+                res = ups_metac_service_pdu(ups_test_time);
+                set_act_source(SNMP_ACT);
+            } else if (val == 100) {
+                res = ups_metac_service_pdu(ups_test_10sec);
+                set_act_source(SNMP_ACT);
+            } else if (val == 999) {
+                res = ups_metac_service_pdu(ups_test_low_bat);
+                set_act_source(SNMP_ACT);
+            }
+            break;
+        case 9: /* Shutdown UPS */
+            val_string = (char *)value;
+            float shtdn_val = atof(val_string);
+            if (shtdn_val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_shut_down);
+                if (res == 1) {
+                    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, "Администратор");
+                }
+            }
+            break;
+        default :
+            return SNMP_ERR_GENERROR;
+            break;
     };
 
-  return SNMP_ERR_NOERROR;
+    return SNMP_ERR_NOERROR;
 }
 
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value)
 {
-	snmp_err_t ret = SNMP_ERR_WRONGVALUE;
+    snmp_err_t ret = SNMP_ERR_WRONGVALUE;
     char *val_string;
     int32_t val;
     u32_t oid = instance->node->oid; // id сигнала
 
-    switch (oid)
-    {
-      case 2:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-
-      case 3:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-  	case 5: /* DO1 */
-  		if ( len <= 1 )
-  	    {
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atoi(val_string) <= 1){
-  			   if(sSettings.sInOuts.ro_type_source[0] == SNMP_SET)
-  				 ret = SNMP_ERR_NOERROR;
-  		   }
-  	    }
-  	  break;
-  	case 6: /* DO2 */
-  		if ( len <= 1 )
-  		{
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atoi(val_string) <= 1){
-  			   if(sSettings.sInOuts.ro_type_source[1] == SNMP_SET)
-  				 ret = SNMP_ERR_NOERROR;
-  		   }
-  		}
-  	  break;
-  	case 7: /* DO2*/
-		if ( len <= 1 )
-		{
-		   val_string = (char*)value;
-		   val_string[len] = 0;
-		   if(atoi(val_string) <= 1){
-			   if(sSettings.sInOuts.ro_type_source[2] == SNMP_SET)
-				 ret = SNMP_ERR_NOERROR;
-		   }
-		}
-		break;
-  	case 8: /* BatTest */
-  	   val = *((s32_t*)value);
-  	   if((val >= 0 && val <= 100) || val == 999){
-  		 ret = SNMP_ERR_NOERROR;
-  	   }
-  	  break;
-  	case 9: /* Shutdown UPS */
-  		if ( len <= 3 )
-  		{
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atof(val_string) <= 10){
-  			 ret = SNMP_ERR_NOERROR;
-  		   }
-  		}
-  	  break;
+    switch (oid) {
+        case 2:
+        case 3:
+            if ( len == sizeof(s32_t) ) {
+                val = *((s32_t *)value);
+                if (val == 1) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 5: /* DO1 */
+            if ( len <= 1 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atoi(val_string) <= 1) {
+                    if (sSettings.sInOuts.ro_type_source[0] == SNMP_SET) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 6: /* DO2 */
+            if ( len <= 1 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atoi(val_string) <= 1) {
+                    if (sSettings.sInOuts.ro_type_source[1] == SNMP_SET) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 7: /* DO2*/
+            if ( len <= 1 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atoi(val_string) <= 1) {
+                    if (sSettings.sInOuts.ro_type_source[2] == SNMP_SET) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 8: /* BatTest */
+            val = *((s32_t *)value);
+            if ((val >= 0 && val <= 100) || val == 999) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 9: /* Shutdown UPS */
+            if ( len <= 3 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atof(val_string) <= 10) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
     };
 
-
-  return ret;
+    return ret;
 }
 
 #endif

modules/Ethernet/private_mib_bt6709.c

@@ -16,6 +16,8 @@
 #include "megatec.h"
 #include "control_symbol.h"
 #include "sntp_api.h"
+#include "web_params_api.h"
+#include "hal.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -41,243 +43,292 @@ extern struct snmp_mib mib2;
 extern SETTINGS_t sSettings;
 
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value);
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value);
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value);
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value);
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value);
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.49  */
-static const struct snmp_scalar_node signal49 = SNMP_SCALAR_CREATE_NODE_READONLY(49, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal49 = SNMP_SCALAR_CREATE_NODE_READONLY(49, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.48  */
-static const struct snmp_scalar_node signal48 = SNMP_SCALAR_CREATE_NODE_READONLY(48, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal48 = SNMP_SCALAR_CREATE_NODE_READONLY(48, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.47  */
-static const struct snmp_scalar_node signal47 = SNMP_SCALAR_CREATE_NODE_READONLY(47, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal47 = SNMP_SCALAR_CREATE_NODE_READONLY(47, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.46  */
-static const struct snmp_scalar_node signal46 = SNMP_SCALAR_CREATE_NODE_READONLY(46, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal46 = SNMP_SCALAR_CREATE_NODE_READONLY(46, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.45  */
-static const struct snmp_scalar_node signal45 = SNMP_SCALAR_CREATE_NODE_READONLY(45, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal45 = SNMP_SCALAR_CREATE_NODE_READONLY(45, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.44  */
-static const struct snmp_scalar_node signal44 = SNMP_SCALAR_CREATE_NODE_READONLY(44, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal44 = SNMP_SCALAR_CREATE_NODE_READONLY(44, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.43  */
-static const struct snmp_scalar_node signal43 = SNMP_SCALAR_CREATE_NODE(43, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal43 = SNMP_SCALAR_CREATE_NODE(43, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.42  */
-static const struct snmp_scalar_node signal42 = SNMP_SCALAR_CREATE_NODE(42, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal42 = SNMP_SCALAR_CREATE_NODE(42, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.41  */
-static const struct snmp_scalar_node signal41 = SNMP_SCALAR_CREATE_NODE(41, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal41 = SNMP_SCALAR_CREATE_NODE(41, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.40  */
-static const struct snmp_scalar_node signal40 = SNMP_SCALAR_CREATE_NODE(40, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal40 = SNMP_SCALAR_CREATE_NODE(40, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.39  */
-static const struct snmp_scalar_node signal39 = SNMP_SCALAR_CREATE_NODE(39, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal39 = SNMP_SCALAR_CREATE_NODE(39, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.38  */
-static const struct snmp_scalar_node signal38 = SNMP_SCALAR_CREATE_NODE(38, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal38 = SNMP_SCALAR_CREATE_NODE(38, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.37  */
-static const struct snmp_scalar_node signal37 = SNMP_SCALAR_CREATE_NODE(37, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal37 = SNMP_SCALAR_CREATE_NODE(37, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.36  */
-static const struct snmp_scalar_node signal36 = SNMP_SCALAR_CREATE_NODE(36, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal36 = SNMP_SCALAR_CREATE_NODE(36, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.22  */
-static const struct snmp_scalar_node signal35 = SNMP_SCALAR_CREATE_NODE(35, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal35 = SNMP_SCALAR_CREATE_NODE(35, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.34  */
-static const struct snmp_scalar_node signal34 = SNMP_SCALAR_CREATE_NODE(34, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal34 = SNMP_SCALAR_CREATE_NODE(34, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.33  */
-static const struct snmp_scalar_node signal33 = SNMP_SCALAR_CREATE_NODE(33, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal33 = SNMP_SCALAR_CREATE_NODE(33, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.32  */
-static const struct snmp_scalar_node signal32 = SNMP_SCALAR_CREATE_NODE(32, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal32 = SNMP_SCALAR_CREATE_NODE(32, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.31  */
-static const struct snmp_scalar_node signal31 = SNMP_SCALAR_CREATE_NODE(31, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal31 = SNMP_SCALAR_CREATE_NODE(31, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.22  */
-static const struct snmp_scalar_node signal30 = SNMP_SCALAR_CREATE_NODE(30, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal30 = SNMP_SCALAR_CREATE_NODE(30, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.29  */
-static const struct snmp_scalar_node signal29 = SNMP_SCALAR_CREATE_NODE(29, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal29 = SNMP_SCALAR_CREATE_NODE(29, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.28  */
-static const struct snmp_scalar_node signal28 = SNMP_SCALAR_CREATE_NODE(28, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal28 = SNMP_SCALAR_CREATE_NODE(28, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.27  */
-static const struct snmp_scalar_node signal27 = SNMP_SCALAR_CREATE_NODE_READONLY(27, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal27 = SNMP_SCALAR_CREATE_NODE_READONLY(27, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.26  */
-static const struct snmp_scalar_node signal26 = SNMP_SCALAR_CREATE_NODE_READONLY(26, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal26 = SNMP_SCALAR_CREATE_NODE_READONLY(26, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.25  */
-static const struct snmp_scalar_node signal25 = SNMP_SCALAR_CREATE_NODE_READONLY(25, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal25 = SNMP_SCALAR_CREATE_NODE_READONLY(25, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.24  */
-static const struct snmp_scalar_node signal24 = SNMP_SCALAR_CREATE_NODE_READONLY(24, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal24 = SNMP_SCALAR_CREATE_NODE_READONLY(24, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.23  */
-static const struct snmp_scalar_node signal23 = SNMP_SCALAR_CREATE_NODE_READONLY(23, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal23 = SNMP_SCALAR_CREATE_NODE_READONLY(23, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.22  */
-static const struct snmp_scalar_node signal22 = SNMP_SCALAR_CREATE_NODE(22, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal22 = SNMP_SCALAR_CREATE_NODE(22, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.21  */
-static const struct snmp_scalar_node signal21 = SNMP_SCALAR_CREATE_NODE(21, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal21 = SNMP_SCALAR_CREATE_NODE(21, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.20  */
-static const struct snmp_scalar_node signal20 = SNMP_SCALAR_CREATE_NODE(20, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal20 = SNMP_SCALAR_CREATE_NODE(20, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.19  */
-static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE(19, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal19 = SNMP_SCALAR_CREATE_NODE(19, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.18  */
-static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE(18, SNMP_NODE_INSTANCE_READ_WRITE, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal18 = SNMP_SCALAR_CREATE_NODE(18, SNMP_NODE_INSTANCE_READ_WRITE,
+        SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.17  */
-static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal17 = SNMP_SCALAR_CREATE_NODE_READONLY(17, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.16  */
-static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal16 = SNMP_SCALAR_CREATE_NODE_READONLY(16, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.15  */
-static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal15 = SNMP_SCALAR_CREATE_NODE_READONLY(15, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.14  */
-static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal14 = SNMP_SCALAR_CREATE_NODE_READONLY(14, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.13  */
-static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal13 = SNMP_SCALAR_CREATE_NODE_READONLY(13, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.12  */
-static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal12 = SNMP_SCALAR_CREATE_NODE_READONLY(12, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.11  */
-static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal11 = SNMP_SCALAR_CREATE_NODE_READONLY(11, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.10  */
-static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal10 = SNMP_SCALAR_CREATE_NODE_READONLY(10, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.9  */
-static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal9 = SNMP_SCALAR_CREATE_NODE_READONLY(9, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.8  */
-static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal8 = SNMP_SCALAR_CREATE_NODE(8, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_OCTET_STRING, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.7  */
-static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal7 = SNMP_SCALAR_CREATE_NODE(7, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.6  */
-static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE_READONLY(6, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal6 = SNMP_SCALAR_CREATE_NODE_READONLY(6, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.5  */
-static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE_READONLY(5, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal5 = SNMP_SCALAR_CREATE_NODE_READONLY(5, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.4  */
-static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal4 = SNMP_SCALAR_CREATE_NODE_READONLY(4, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.3  */
-static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal3 = SNMP_SCALAR_CREATE_NODE(3, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.2  */
-static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY, SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
+static const struct snmp_scalar_node signal2 = SNMP_SCALAR_CREATE_NODE(2, SNMP_NODE_INSTANCE_WRITE_ONLY,
+        SNMP_ASN1_TYPE_INTEGER, NULL, signal_set_test, signal_set_value);
 
 /* signal .1.3.6.1.4.1.41752.911.8.1.1  */
-static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING, signal_get_value);
+static const struct snmp_scalar_node signal1 = SNMP_SCALAR_CREATE_NODE_READONLY(1, SNMP_ASN1_TYPE_OCTET_STRING,
+        signal_get_value);
 
 
 // signals .1.3.6.1.4.1.41752.911.8.1
-static const struct snmp_node* const signals_nodes[] = {
-	&signal1.node.node,
-	&signal2.node.node,
-	&signal3.node.node,
-	&signal4.node.node,
-	&signal5.node.node,
-	&signal6.node.node,
-	&signal7.node.node,
-	&signal8.node.node,
-	&signal9.node.node,
-	&signal10.node.node,
-	&signal11.node.node,
-	&signal12.node.node,
-	&signal13.node.node,
-	&signal14.node.node,
-	&signal15.node.node,
-	&signal16.node.node,
-	&signal17.node.node,
-	&signal18.node.node,
-	&signal19.node.node,
-	&signal20.node.node,
-	&signal21.node.node,
-	&signal22.node.node,
-	&signal23.node.node,
-	&signal24.node.node,
-	&signal25.node.node,
-	&signal26.node.node,
-	&signal27.node.node,
-	&signal28.node.node,
-	&signal29.node.node,
-	&signal30.node.node,
-	&signal31.node.node,
-	&signal32.node.node,
-	&signal33.node.node,
-	&signal34.node.node,
-	&signal35.node.node,
-	&signal36.node.node,
-	&signal37.node.node,
-	&signal38.node.node,
-	&signal39.node.node,
-	&signal40.node.node,
-	&signal41.node.node,
-	&signal42.node.node,
-	&signal43.node.node,
-	&signal44.node.node,
-	&signal45.node.node,
-	&signal46.node.node,
-	&signal47.node.node,
-	&signal48.node.node,
-	&signal49.node.node,
+static const struct snmp_node *const signals_nodes[] = {
+    &signal1.node.node,
+    &signal2.node.node,
+    &signal3.node.node,
+    &signal4.node.node,
+    &signal5.node.node,
+    &signal6.node.node,
+    &signal7.node.node,
+    &signal8.node.node,
+    &signal9.node.node,
+    &signal10.node.node,
+    &signal11.node.node,
+    &signal12.node.node,
+    &signal13.node.node,
+    &signal14.node.node,
+    &signal15.node.node,
+    &signal16.node.node,
+    &signal17.node.node,
+    &signal18.node.node,
+    &signal19.node.node,
+    &signal20.node.node,
+    &signal21.node.node,
+    &signal22.node.node,
+    &signal23.node.node,
+    &signal24.node.node,
+    &signal25.node.node,
+    &signal26.node.node,
+    &signal27.node.node,
+    &signal28.node.node,
+    &signal29.node.node,
+    &signal30.node.node,
+    &signal31.node.node,
+    &signal32.node.node,
+    &signal33.node.node,
+    &signal34.node.node,
+    &signal35.node.node,
+    &signal36.node.node,
+    &signal37.node.node,
+    &signal38.node.node,
+    &signal39.node.node,
+    &signal40.node.node,
+    &signal41.node.node,
+    &signal42.node.node,
+    &signal43.node.node,
+    &signal44.node.node,
+    &signal45.node.node,
+    &signal46.node.node,
+    &signal47.node.node,
+    &signal48.node.node,
+    &signal49.node.node,
 };
 static const struct snmp_tree_node signals_node = SNMP_CREATE_TREE_NODE(1, signals_nodes);
 
 // bt_6703 .1.3.6.1.4.1.41752.911.8
-static const struct snmp_node* const bt6709_nodes[] = {
-  &signals_node.node
+static const struct snmp_node *const bt6709_nodes[] = {
+    &signals_node.node
 };
 static const struct snmp_tree_node bt6709_node = SNMP_CREATE_TREE_NODE(8, bt6709_nodes);
 
 // swt .1.3.6.1.4.1.41752.911
-static const struct snmp_node* const swt_nodes[] = {
-  &bt6709_node.node
+static const struct snmp_node *const swt_nodes[] = {
+    &bt6709_node.node
 };
 static const struct snmp_tree_node swt_node = SNMP_CREATE_TREE_NODE(911, swt_nodes);
 
 // rotek .1.3.6.1.4.1.41752
-static const struct snmp_node* const rotek_nodes[] = {
-  &swt_node.node
+static const struct snmp_node *const rotek_nodes[] = {
+    &swt_node.node
 };
 static const struct snmp_tree_node rotek_node = SNMP_CREATE_TREE_NODE(41752, rotek_nodes);
 
 // enterprises .1.3.6.1.4.1
-static const struct snmp_node* const enterprises_nodes[] = {
-  &rotek_node.node
+static const struct snmp_node *const enterprises_nodes[] = {
+    &rotek_node.node
 };
 static const struct snmp_tree_node enterprises_node = SNMP_CREATE_TREE_NODE(1, enterprises_nodes);
 
 // private .1.3.6.1.4
-static const struct snmp_node* const private_nodes[] = {
-  &enterprises_node.node
+static const struct snmp_node *const private_nodes[] = {
+    &enterprises_node.node
 };
 static const struct snmp_tree_node private_root = SNMP_CREATE_TREE_NODE(0, private_nodes);
 
-static const u32_t prvmib_base_oid[] = { 1,3,6,1,4 };
+static const u32_t prvmib_base_oid[] = { 1, 3, 6, 1, 4 };
 static const struct snmp_mib private_mib = SNMP_MIB_CREATE(prvmib_base_oid, &private_root.node);
 
 
@@ -324,651 +375,627 @@ uint32_t check_netsettings(char *addr, uint8_t len)
 	return 1;
 }
 
-static s16_t signal_get_value(struct snmp_node_instance* instance, void* value)
+static s16_t signal_get_value(struct snmp_node_instance *instance, void *value)
 {
-	u8_t *paramStr = (u8_t*)value;
-	u8_t paramLength = 0;
+    u8_t *paramStr = (u8_t *)value;
+    u8_t paramLength = 0;
     u32_t oid = instance->node->oid; // id сигнала
 
-    switch (oid){
-	case 1: /* FWVersion */
-		GetVersionStr((char*)paramStr, &paramLength);
-		break;
-	case 4: /* UPSModel*/
-		GetUPSModelStr((char*)paramStr, &paramLength);
-		break;
-	case 5: /* UPSSerial*/
-		GetUPSSerialStr((char*)paramStr, &paramLength);
-		break;
-	case 6: /* UPSVersion*/
-		GetUPSVersionStr((char*)paramStr, &paramLength);
-		break;
-	case 9: /* IntTemp */
-		GetInternalTempStr((char*)paramStr, &paramLength);
-		break;
-	case 10: /* InFreq */
-		GetInputFreqStr((char*)paramStr, &paramLength);
-		break;
-	case 11: /* InVoltVAC */
-		GetInputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 12: /* OutVoltVAC */
-		GetOutputVoltageStr((char*)paramStr, &paramLength);
-		break;
-	case 13: /* Power */
-		GetPowerStr((char*)paramStr, &paramLength);
-		break;
-	case 14: /* BatCap */
-		GetBatCapacityStr((char*)paramStr, &paramLength);
-		break;
-	case 15: /* BatTime */
-		GetRuntimeStr((char*)paramStr, &paramLength);
-		break;
-	case 16: /* ConnectMonitor */
-		GetConnectMonitorStr((char*)paramStr, &paramLength);
-		break;
-	case 17: /* Alarms */
-		GetAlarmStr((char*)paramStr, &paramLength);
-		break;
-	case 18: /* IP server1 (traps) */
-		GetManagerIp((char*)paramStr, &paramLength);
-		break;
-	case 19: /* IP server2 (traps) */
-		GetManagerIp2((char*)paramStr, &paramLength);
-		break;
-	case 20: /* IP server3 (traps) */
-		GetManagerIp3((char*)paramStr, &paramLength);
-		break;
-	case 21: /* IP server4 (traps) */
-		GetManagerIp4((char*)paramStr, &paramLength);
-		break;
-	case 22: /* IP server5 (traps) */
-		GetManagerIp5((char*)paramStr, &paramLength);
-		break;
-	case 23: /* WhiteList range 1 */
-		GetWhiteListSTR((char*)paramStr, &paramLength, 0);
-		break;
-	case 24: /* WhiteList range 2 */
-		GetWhiteListSTR((char*)paramStr, &paramLength, 1);
-		break;
-	case 25: /* WhiteList range 3 */
-		GetWhiteListSTR((char*)paramStr, &paramLength, 2);
-		break;
-	case 26: /* WhiteList range 4 */
-		GetWhiteListSTR((char*)paramStr, &paramLength, 3);
-		break;
-	case 27: /* WhiteList range 5 */
-		GetWhiteListSTR((char*)paramStr, &paramLength, 4);
-		break;
-	case 28: /* UPSVoltCellMin */
-		GetUPSVoltCellMinStr((char*)paramStr, &paramLength);
-		break;
-	case 29: /* UPSVoltCellMax */
-		GetUPSVoltCellMaxStr((char*)paramStr, &paramLength);
-		break;
-	case 30: /* VACAlarmHighRange */
-		GetVACAlarmHighRangeStr((char*)paramStr, &paramLength);
-		break;
-	case 31: /* VACAlarmLowRange */
-		GetVACAlarmLowRangeStr((char*)paramStr, &paramLength);
-		break;
-	case 32: /* VACAlarmHistRange */
-		GetVACAlarmHisteStr((char*)paramStr, &paramLength);
-		break;
-	case 33: /* TemperatureAlarmHighRange */
-		GetTemperatureAlarmHighRangeStr((char*)paramStr, &paramLength);
-		break;
-	case 34: /* TemperatureAlarmLowRange */
-		GetTemperatureAlarmLowRangeStr((char*)paramStr, &paramLength);
-		break;
-	case 35: /* TemperatureAlarmHistRange */
-		GetTemperatureAlarmHisteStr((char*)paramStr, &paramLength);
-		break;
-	case 36: /* LoadAlarmHighRange */
-		GetLoadAlarmHighRangeStr((char*)paramStr, &paramLength);
-		break;
-	case 37: /* LoadAlarmHistRange */
-		GetLoadAlarmHisteStr((char*)paramStr, &paramLength);
-		break;
-	case 38: /* SntpTimeZone */
-		GetSntpTimeZoneStr((char*)paramStr, &paramLength);
-		break;
-	case 39: /* SntpState */
-		GetSntpStateStr((char*)paramStr, &paramLength);
-		break;
-	case 40: /* SntpServerIp */
-		GetSntpServerIpStr((char*)paramStr, &paramLength);
-		break;
-	case 41: /* SntpLastData */
-		GetSntpLastDataStr((char*)paramStr, &paramLength);
-		break;
-	case 42: /* Date */
-		GetDateStr((char*)paramStr, &paramLength);
-		break;
-	case 43: /* Time */
-		GetTimeStr((char*)paramStr, &paramLength);
-		break;
-	case 44: /* AKBTimeWork */
-		GetAKBWorktimeStr((char*)paramStr, &paramLength);
-		break;
-	case 45: /* InputCurrent */
-		GetInputCurrentStr((char*)paramStr, &paramLength);
-		break;
-	case 46: /* OutputCurrent */
-		GetOutputCurrentStr((char*)paramStr, &paramLength);
-		break;
-	case 47: /* VoltageAKB */
-		GetVoltageAKBtStr((char*)paramStr, &paramLength);
-		break;
-	case 48: /* DataNextChangeAKB */
-		GetCapacityNominalAKBStr((char*)paramStr, &paramLength);
-		break;
-	case 49: /* CapacityNominalAKB */
-		GetDataNextChangeAKBStr((char*)paramStr, &paramLength);
-		break;
-	default:
-		break;
+    switch (oid) {
+        case 1: /* FWVersion */
+            GetVersionStr((char *)paramStr, &paramLength);
+            break;
+        case 4: /* UPSModel*/
+            GetUPSModelStr((char *)paramStr, &paramLength);
+            break;
+        case 5: /* UPSSerial*/
+            GetUPSSerialStr((char *)paramStr, &paramLength);
+            break;
+        case 6: /* UPSVersion*/
+            GetUPSVersionStr((char *)paramStr, &paramLength);
+            break;
+        case 9: /* IntTemp */
+            GetInternalTempStr((char *)paramStr, &paramLength);
+            break;
+        case 10: /* InFreq */
+            GetInputFreqStr((char *)paramStr, &paramLength);
+            break;
+        case 11: /* InVoltVAC */
+            GetInputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 12: /* OutVoltVAC */
+            GetOutputVoltageStr((char *)paramStr, &paramLength);
+            break;
+        case 13: /* Power */
+            GetPowerStr((char *)paramStr, &paramLength);
+            break;
+        case 14: /* BatCap */
+            GetBatCapacityStr((char *)paramStr, &paramLength);
+            break;
+        case 15: /* BatTime */
+            GetRuntimeStr((char *)paramStr, &paramLength);
+            break;
+        case 16: /* ConnectMonitor */
+            GetConnectMonitorStr((char *)paramStr, &paramLength);
+            break;
+        case 17: /* Alarms */
+            GetAlarmStr((char *)paramStr, &paramLength);
+            break;
+        case 18: /* IP server1 (traps) */
+            GetManagerIp((char *)paramStr, &paramLength);
+            break;
+        case 19: /* IP server2 (traps) */
+            GetManagerIp2((char *)paramStr, &paramLength);
+            break;
+        case 20: /* IP server3 (traps) */
+            GetManagerIp3((char *)paramStr, &paramLength);
+            break;
+        case 21: /* IP server4 (traps) */
+            GetManagerIp4((char *)paramStr, &paramLength);
+            break;
+        case 22: /* IP server5 (traps) */
+            GetManagerIp5((char *)paramStr, &paramLength);
+            break;
+        case 23: /* WhiteList range 1 */
+            GetWhiteListSTR((char *)paramStr, &paramLength, 0);
+            break;
+        case 24: /* WhiteList range 2 */
+            GetWhiteListSTR((char *)paramStr, &paramLength, 1);
+            break;
+        case 25: /* WhiteList range 3 */
+            GetWhiteListSTR((char *)paramStr, &paramLength, 2);
+            break;
+        case 26: /* WhiteList range 4 */
+            GetWhiteListSTR((char *)paramStr, &paramLength, 3);
+            break;
+        case 27: /* WhiteList range 5 */
+            GetWhiteListSTR((char *)paramStr, &paramLength, 4);
+            break;
+        case 28: /* UPSVoltCellMin */
+            GetUPSVoltCellMinStr((char *)paramStr, &paramLength);
+            break;
+        case 29: /* UPSVoltCellMax */
+            GetUPSVoltCellMaxStr((char *)paramStr, &paramLength);
+            break;
+        case 30: /* VACAlarmHighRange */
+            GetVACAlarmHighRangeStr((char *)paramStr, &paramLength);
+            break;
+        case 31: /* VACAlarmLowRange */
+            GetVACAlarmLowRangeStr((char *)paramStr, &paramLength);
+            break;
+        case 32: /* VACAlarmHistRange */
+            GetVACAlarmHisteStr((char *)paramStr, &paramLength);
+            break;
+        case 33: /* TemperatureAlarmHighRange */
+            GetTemperatureAlarmHighRangeStr((char *)paramStr, &paramLength);
+            break;
+        case 34: /* TemperatureAlarmLowRange */
+            GetTemperatureAlarmLowRangeStr((char *)paramStr, &paramLength);
+            break;
+        case 35: /* TemperatureAlarmHistRange */
+            GetTemperatureAlarmHisteStr((char *)paramStr, &paramLength);
+            break;
+        case 36: /* LoadAlarmHighRange */
+            GetLoadAlarmHighRangeStr((char *)paramStr, &paramLength);
+            break;
+        case 37: /* LoadAlarmHistRange */
+            GetLoadAlarmHisteStr((char *)paramStr, &paramLength);
+            break;
+        case 38: /* SntpTimeZone */
+            GetSntpTimeZoneStr((char *)paramStr, &paramLength);
+            break;
+        case 39: /* SntpState */
+            GetSntpStateStr((char *)paramStr, &paramLength);
+            break;
+        case 40: /* SntpServerIp */
+            GetSntpServerIpStr((char *)paramStr, &paramLength);
+            break;
+        case 41: /* SntpLastData */
+            GetSntpLastDataStr((char *)paramStr, &paramLength);
+            break;
+        case 42: /* Date */
+            GetDateStr((char *)paramStr, &paramLength);
+            break;
+        case 43: /* Time */
+            GetTimeStr((char *)paramStr, &paramLength);
+            break;
+        case 44: /* AKBTimeWork */
+            GetAKBWorktimeStr((char *)paramStr, &paramLength);
+            break;
+        case 45: /* InputCurrent */
+            GetInputCurrentStr((char *)paramStr, &paramLength);
+            break;
+        case 46: /* OutputCurrent */
+            GetOutputCurrentStr((char *)paramStr, &paramLength);
+            break;
+        case 47: /* VoltageAKB */
+            GetVoltageAKBtStr((char *)paramStr, &paramLength);
+            break;
+        case 48: /* DataNextChangeAKB */
+            GetCapacityNominalAKBStr((char *)paramStr, &paramLength);
+            break;
+        case 49: /* CapacityNominalAKB */
+            GetDataNextChangeAKBStr((char *)paramStr, &paramLength);
+            break;
+        default:
+            break;
     }
 
     return paramLength;
 
 }
 
-static snmp_err_t signal_set_value(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t len, void *value)
 {
 
-	u32_t oid = instance->node->oid; // id сигнала
-	char *val_string;
-	char str[20];
-	int8_t res = 0;
-	s32_t val;
-	bool enable_old_sntp;
-
-     memset(str, 0, 20);
-
-    switch (oid)
-    {
-      case 2: /* RestoreSignal */
-        val = *(s32_t*)value;
-        if (val == 1) {
-      //	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){
-#ifndef BT6702_SERVICE
-  	//	SNMP_SendUserTrap(DEVICE_REBOOTED);
-  		log_event_data(LOG_SYSTEM_BOOT, "Администратор");
-
-  		vTaskDelay(1010);
-  		LOG_Disable();
-#endif
-  		NVIC_SystemReset();
-        }
-  	  break;
-  	case 7: /* BatTest */
-  	  val =*(s32_t*)value;
-  	  if(val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_test);
-  		  if(res == 1){
-  			  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){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 100){
-  		  res = ups_metac_service_pdu(ups_test_10sec);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  else if(val == 999){
-  		  res = ups_metac_service_pdu(ups_test_low_bat);
-  		  if(res == 1){
-  			  log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-  		  }
-  	  }
-  	  break;
-  	case 8: /* Shutdown UPS */
-  	  val_string = (char*)value;
-  	  float shtdn_val = atof(val_string);
-  	  if(shtdn_val == 0){
-  		  res = ups_metac_service_pdu(ups_cancel_shut_down);
-  		 	if(res == 1){
-  		 		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, "Администратор");
-  	  }
-  	  break;
-  	case 18:
-	  val_string = (char*)value;
-	  SetManagerIp(val_string);
-	  break;
-  	case 19:
-	  val_string = (char*)value;
-	  SetManagerIp2(val_string);
-	  break;
-  	case 20:
-	  val_string = (char*)value;
-	  SetManagerIp3(val_string);
-	  break;
-  	case 21:
-	  val_string = (char*)value;
-	  SetManagerIp4(val_string);
-	  break;
-  	case 22:
-	  val_string = (char*)value;
-	  SetManagerIp5(val_string);
-	  break;
-  	case 28:
-	  val_string = (char*)value;
-	  SetUPSVoltCellMinStr(val_string);
-	  break;
-  	case 29:
-	  val_string = (char*)value;
-	  SetUPSVoltCellMaxStr(val_string);
-	  break;
-  	case 30:
-	  val_string = (char*)value;
-	  SetVACAlarmHighRangeStr(val_string);
-	  break;
-  	case 31:
-	  val_string = (char*)value;
-	  SetVACAlarmLowRangeStr(val_string);
-	  break;
-  	case 32:
-	  val_string = (char*)value;
-	  SetVACAlarmHisteStr(val_string);
-	  break;
-  	case 33:
-	  val_string = (char*)value;
-	  SetTemperatureAlarmHighRangeStr(val_string);
-	  break;
-  	case 34:
-	  val_string = (char*)value;
-	  SetTemperatureAlarmLowRangeStr(val_string);
-	  break;
-  	case 35:
-	  val_string = (char*)value;
-	  SetTemperatureAlarmHisteStr(val_string);
-	  break;
-  	case 36:
-	  val_string = (char*)value;
-	  SetLoadAlarmHighRangeStr(val_string);
-	  break;
-  	case 37:
-	  val_string = (char*)value;
-	  SetLoadAlarmHistStr(val_string);
-	  break;
-  	case 38:
-	  val_string = (char*)value;
-	  SetSntpTimeZoneStr(val_string);
-	  break;
-  	case 39:
-  	  enable_old_sntp = sSettings.sSNTP.sntpEnable;
-	  val_string = (char*)value;
-	  SetSntpStateStr(val_string);
-	  if(sSettings.sSNTP.sntpEnable != enable_old_sntp){
-		  SETTINGS_Save();
-		  log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
-		  SNTP_Init();
-		  //vTaskDelay(7000);
-		 SNTP_Poll();
-	  }
-	  break;
-  	case 40:
-	  val_string = (char*)value;
-	  if(strncmp(val_string, sSettings.sSNTP.ip, strlen(val_string)) != 0){
-		  SetSntpServerIpStr(val_string);
-		  SETTINGS_Save();
-		  log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
-		  SNTP_Init();
-		  //vTaskDelay(7000);
-		  SNTP_Poll();
-	  }
-	  break;
-  	case 41:
-	  break;
-  	case 42:
-	  val_string = (char*)value;
-	  SetDateStr(val_string);
-	  break;
-  	case 43:
-	  val_string = (char*)value;
-	  SetTimeStr(val_string);
-	  break;
-      default :
-    	  return SNMP_ERR_GENERROR;
-      break;
+    u32_t oid = instance->node->oid; // id сигнала
+    char *val_string;
+    char str[20];
+    int8_t res = 0;
+    s32_t val;
+    bool enable_old_sntp;
+
+    memset(str, 0, 20);
+
+    switch (oid) {
+        case 2: /* RestoreSignal */
+            val = *(s32_t *)value;
+            if (val == 1) {
+                //    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);
+            }
+            break;
+        case 7: /* BatTest */
+            val = *(s32_t *)value;
+            if (val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_test);
+                if (res == 1) {
+                    log_event_data(LOG_TEST_UPS, "Администратор (Останов)");
+                }
+            } else if (val > 0 && val < 100) {
+                TimeParam = val;
+                res = ups_metac_service_pdu(ups_test_time);
+                set_act_source(SNMP_ACT);
+            } else if (val == 100) {
+                res = ups_metac_service_pdu(ups_test_10sec);
+                set_act_source(SNMP_ACT);
+            } else if (val == 999) {
+                res = ups_metac_service_pdu(ups_test_low_bat);
+                set_act_source(SNMP_ACT);
+            }
+            break;
+        case 8: /* Shutdown UPS */
+            val_string = (char *)value;
+            float shtdn_val = atof(val_string);
+            if (shtdn_val == 0) {
+                res = ups_metac_service_pdu(ups_cancel_shut_down);
+                if (res == 1) {
+                    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, "Администратор");
+                }
+            }
+            break;
+        case 18:
+            val_string = (char *)value;
+            SetManagerIp(val_string);
+            break;
+        case 19:
+            val_string = (char *)value;
+            SetManagerIp2(val_string);
+            break;
+        case 20:
+            val_string = (char *)value;
+            SetManagerIp3(val_string);
+            break;
+        case 21:
+            val_string = (char *)value;
+            SetManagerIp4(val_string);
+            break;
+        case 22:
+            val_string = (char *)value;
+            SetManagerIp5(val_string);
+            break;
+        case 28:
+            val_string = (char *)value;
+            SetUPSVoltCellMinStr(val_string);
+            break;
+        case 29:
+            val_string = (char *)value;
+            SetUPSVoltCellMaxStr(val_string);
+            break;
+        case 30:
+            val_string = (char *)value;
+            SetVACAlarmHighRangeStr(val_string);
+            break;
+        case 31:
+            val_string = (char *)value;
+            SetVACAlarmLowRangeStr(val_string);
+            break;
+        case 32:
+            val_string = (char *)value;
+            SetVACAlarmHisteStr(val_string);
+            break;
+        case 33:
+            val_string = (char *)value;
+            SetTemperatureAlarmHighRangeStr(val_string);
+            break;
+        case 34:
+            val_string = (char *)value;
+            SetTemperatureAlarmLowRangeStr(val_string);
+            break;
+        case 35:
+            val_string = (char *)value;
+            SetTemperatureAlarmHisteStr(val_string);
+            break;
+        case 36:
+            val_string = (char *)value;
+            SetLoadAlarmHighRangeStr(val_string);
+            break;
+        case 37:
+            val_string = (char *)value;
+            SetLoadAlarmHistStr(val_string);
+            break;
+        case 38:
+            val_string = (char *)value;
+            SetSntpTimeZoneStr(val_string);
+            break;
+        case 39:
+            enable_old_sntp = sSettings.sSNTP.sntpEnable;
+            val_string = (char *)value;
+            SetSntpStateStr(val_string);
+            if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
+                SETTINGS_Save();
+                log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
+                SNTP_Init();
+                //vTaskDelay(7000);
+                SNTP_Poll();
+            }
+            break;
+        case 40:
+            val_string = (char *)value;
+            if (strncmp(val_string, sSettings.sSNTP.ip, strlen(val_string)) != 0) {
+                SetSntpServerIpStr(val_string);
+                SETTINGS_Save();
+                log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
+                SNTP_Init();
+                //vTaskDelay(7000);
+                SNTP_Poll();
+            }
+            break;
+        case 41:
+            break;
+        case 42:
+            val_string = (char *)value;
+            SetDateStr(val_string);
+            break;
+        case 43:
+            val_string = (char *)value;
+            SetTimeStr(val_string);
+            break;
+        default :
+            return SNMP_ERR_GENERROR;
+            break;
     };
 
-    if((oid >= 18 && oid <= 22)
-       || (oid >= 28 && oid <= 38)){
-    	SETTINGS_Save();
-    	log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
+    if ((oid >= 18 && oid <= 22)
+        || (oid >= 28 && oid <= 38)) {
+        SETTINGS_Save();
+        log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
     }
 
-  return SNMP_ERR_NOERROR;
+    return SNMP_ERR_NOERROR;
 }
 
-static snmp_err_t signal_set_test(struct snmp_node_instance* instance, u16_t len, void* value)
+static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len, void *value)
 {
-	snmp_err_t ret = SNMP_ERR_WRONGVALUE;
+    snmp_err_t ret = SNMP_ERR_WRONGVALUE;
     char *val_string;
     int32_t val;
     float tmp_value;
     uint8_t j;
     u32_t oid = instance->node->oid; // id сигнала
-	bool fail = false;
-
-    switch (oid)
-    {
-      case 2:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-
-      case 3:
-        if ( len == sizeof(s32_t) )
-        {
-        	ret = SNMP_ERR_NOERROR;
-        }
-        break;
-  	case 7: /* BatTest */
-  	   val = *((s32_t*)value);
-  	   if((val >= 0 && val <= 100) || val == 999){
-  		 ret = SNMP_ERR_NOERROR;
-  	   }
-  	  break;
-  	case 8: /* Shutdown UPS */
-  		if ( len <= 3 )
-  		{
-  		   val_string = (char*)value;
-  		   val_string[len] = 0;
-  		   if(atof(val_string) <= 10){
-  			 ret = SNMP_ERR_NOERROR;
-  		   }
-  		}
-  	  break;
-  	case 18:
-  	case 19:
-  	case 20:
-  	case 21:
-  	case 22:
-  	case 40:
-  		if ( len <= 15 )
-  		{
-			val_string = (char*)value;
-			val_string[len] = 0;
-			if(check_netsettings(val_string, len))
-				ret = SNMP_ERR_NOERROR;
-  		}
-  		break;
-  	case 28:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isfloatdigit(val_string[j])){
-				return ret;
-			}
-		}
-  		tmp_value = atof(val_string);
-  		if(tmp_value < sSettings.UPS_Setting.Ucellmax && tmp_value > MIN_VOLT_CELL_RANGE){
-  			ret = SNMP_ERR_NOERROR;
-  		}
-	  break;
-  	case 29:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isfloatdigit(val_string[j])){
-				return ret;
-			}
-		}
-  		tmp_value = atof(val_string);
-  		if(tmp_value > sSettings.UPS_Setting.Ucellmin && tmp_value <= MAX_VOLT_CELL_RANGE){
-  			ret = SNMP_ERR_NOERROR;
-  		}
-	  break;
-  	case 30:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= MAX_VAC_MIN_RANGE && tmp_value <= MAX_VAC_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 31:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= MIN_VAC_MIN_RANGE && tmp_value <= MIN_VAC_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 32:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= HIST_VAC_MIN_RANGE && tmp_value <= HIST_VAC_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 33:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= MAX_TEMP_MIN_RANGE && tmp_value <= MAX_TEMP_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 34:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				if(j == 0 && val_string[j] == '-'){
-					continue;
-				}
-				else{
-					return ret;
-				}
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= MIN_TEMP_MIN_RANGE && tmp_value <= MIN_TEMP_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 35:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isfloatdigit(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= HIST_TEMP_MIN_RANGE && tmp_value <= HIST_TEMP_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 36:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isdigit_int(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= MAX_LOAD_MIN_RANGE && tmp_value <= MAX_LOAD_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 37:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		for(j = 0; j < len; j ++){
-			if(!isfloatdigit(val_string[j])){
-				return ret;
-			}
-		}
-		tmp_value = atof(val_string);
-		if(tmp_value >= HIST_LOAD_MIN_RANGE && tmp_value <= HIST_LOAD_MAX_RANGE){
-			ret = SNMP_ERR_NOERROR;
-		}
-	  break;
-  	case 38:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		if(len > 1 && len < 5){
-  			bool fail = false;
-			if(val_string[0] != '-' && val_string[0] != '+')
-				fail = true;
-			if(!isdigit_int(val_string[1]) && (!isdigit_int(val_string[2]) && val_string[2] != '.')
-					&& (!isdigit_int(val_string[3]) && val_string[3] != '.'))
-				fail = true;
-			if(len == 5){
-				if(!isdigit_int(val_string[4]))
-					fail = true;
-			}
-			if(!fail){
-				tmp_value = atof(val_string);
-				if(tmp_value >= -12.0 && tmp_value <= 12.0){
-					ret = SNMP_ERR_NOERROR;
-				}
-			}
-  		}
-	  break;
-  	case 39:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-  		if(len == 1){
-			if(val_string[0] == '0' || val_string[0] == '1')
-			{
-				ret = SNMP_ERR_NOERROR;
-			}
-  		}
-	  break;
-  	case 42:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-		if(len == 10){
-			for(j = 0; j < len; j++)
-			{
-				  if(j != 4 && j != 7)
-				  {
-					  if(val_string[j] > 0x39 || val_string[j] < 0x30){
-						  fail = true;
-						  break;
-					  }
-				  }
-				  else if(j == 4 || j == 7){
-					  if(val_string[j] != '-'){
-						  fail = true;
-						  break;
-					  }
-				  }
-			}
-			if(!fail)
-			{
-				  uint16_t temp = 0;
-				  temp = 1000*(val_string[0] - 0x30) + 100*(val_string[1] - 0x30) + 10*(val_string[2] - 0x30) + val_string[3] - 0x30;
-				  if(temp > 2099 || temp < 2000)
-					  fail = true;
-				  temp = 0;
-				  temp = 10*(val_string[5] - 0x30) + (val_string[6] - 0x30);
-				  if(temp > 12)
-					  fail = true;
-				  temp = 0;
-				  temp = 10*(val_string[8] - 0x30) + (val_string[9] - 0x30);
-				  if(temp > 31)
-					  fail = true;
-			}
-			if(!fail){
-				ret = SNMP_ERR_NOERROR;
-			}
-		}
-	  break;
-  	case 43:
-  		val_string = (char*)value;
-  		val_string[len] = 0;
-		if(len == 5){
-			for(j = 0; j < len; j++)
-			{
-				  if(j != 2)
-				  {
-					  if(val_string[j] > 0x39 || val_string[j] < 0x30){
-						  fail = true;
-						  break;
-					  }
-
-				  }
-				  else if(j == 2){
-					  if(val_string[j]  != ':'){
-						  fail = true;
-						  break;
-					  }
-				  }
-			}
-			if(!fail)
-			{
-				  uint16_t temp = 0;
-				  temp = 10*(val_string[0] - 0x30) + (val_string[1] - 0x30);
-				  if(temp > 23)
-					  fail = true;
-				  temp = 0;
-				  temp = 10*(val_string[3] - 0x30) + (val_string[4] - 0x30);
-				  if(temp > 59)
-					  fail = true;
-			}
-			if(!fail){
-				ret = SNMP_ERR_NOERROR;
-			}
-		}
-	  break;
+    bool fail = false;
+
+    switch (oid) {
+        case 2:
+        case 3:
+            if ( len == sizeof(s32_t) ) {
+                val = *((s32_t *)value);
+                if (val == 1) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 7: /* BatTest */
+            val = *((s32_t *)value);
+            if ((val >= 0 && val <= 100) || val == 999) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 8: /* Shutdown UPS */
+            if ( len <= 3 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (atof(val_string) <= 10) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 18:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 40:
+            if ( len <= 15 ) {
+                val_string = (char *)value;
+                val_string[len] = 0;
+                if (check_netsettings(val_string, len)) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 28:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isfloatdigit(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value < sSettings.UPS_Setting.Ucellmax && tmp_value > MIN_VOLT_CELL_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 29:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isfloatdigit(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value > sSettings.UPS_Setting.Ucellmin && tmp_value <= MAX_VOLT_CELL_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 30:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= MAX_VAC_MIN_RANGE && tmp_value <= MAX_VAC_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 31:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= MIN_VAC_MIN_RANGE && tmp_value <= MIN_VAC_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 32:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= HIST_VAC_MIN_RANGE && tmp_value <= HIST_VAC_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 33:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= MAX_TEMP_MIN_RANGE && tmp_value <= MAX_TEMP_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 34:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    if (j == 0 && val_string[j] == '-') {
+                        continue;
+                    } else {
+                        return ret;
+                    }
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= MIN_TEMP_MIN_RANGE && tmp_value <= MIN_TEMP_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 35:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isfloatdigit(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= HIST_TEMP_MIN_RANGE && tmp_value <= HIST_TEMP_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 36:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isdigit_int(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= MAX_LOAD_MIN_RANGE && tmp_value <= MAX_LOAD_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 37:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            for (j = 0; j < len; j ++) {
+                if (!isfloatdigit(val_string[j])) {
+                    return ret;
+                }
+            }
+            tmp_value = atof(val_string);
+            if (tmp_value >= HIST_LOAD_MIN_RANGE && tmp_value <= HIST_LOAD_MAX_RANGE) {
+                ret = SNMP_ERR_NOERROR;
+            }
+            break;
+        case 38:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            if (len > 1 && len < 5) {
+                bool fail = false;
+                if (val_string[0] != '-' && val_string[0] != '+') {
+                    fail = true;
+                }
+                if (!isdigit_int(val_string[1]) && (!isdigit_int(val_string[2]) && val_string[2] != '.')
+                    && (!isdigit_int(val_string[3]) && val_string[3] != '.')) {
+                    fail = true;
+                }
+                if (len == 5) {
+                    if (!isdigit_int(val_string[4])) {
+                        fail = true;
+                    }
+                }
+                if (!fail) {
+                    tmp_value = atof(val_string);
+                    if (tmp_value >= -12.0 && tmp_value <= 12.0) {
+                        ret = SNMP_ERR_NOERROR;
+                    }
+                }
+            }
+            break;
+        case 39:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            if (len == 1) {
+                if (val_string[0] == '0' || val_string[0] == '1') {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 42:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            if (len == 10) {
+                for (j = 0; j < len; j++) {
+                    if (j != 4 && j != 7) {
+                        if (val_string[j] > 0x39 || val_string[j] < 0x30) {
+                            fail = true;
+                            break;
+                        }
+                    } else if (j == 4 || j == 7) {
+                        if (val_string[j] != '-') {
+                            fail = true;
+                            break;
+                        }
+                    }
+                }
+                if (!fail) {
+                    uint16_t temp = 0;
+                    temp = 1000 * (val_string[0] - 0x30) + 100 * (val_string[1] - 0x30) + 10 * (val_string[2] - 0x30) + val_string[3] -
+                        0x30;
+                    if (temp > 2099 || temp < 2000) {
+                        fail = true;
+                    }
+                    temp = 0;
+                    temp = 10 * (val_string[5] - 0x30) + (val_string[6] - 0x30);
+                    if (temp > 12) {
+                        fail = true;
+                    }
+                    temp = 0;
+                    temp = 10 * (val_string[8] - 0x30) + (val_string[9] - 0x30);
+                    if (temp > 31) {
+                        fail = true;
+                    }
+                }
+                if (!fail) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
+        case 43:
+            val_string = (char *)value;
+            val_string[len] = 0;
+            if (len == 5) {
+                for (j = 0; j < len; j++) {
+                    if (j != 2) {
+                        if (val_string[j] > 0x39 || val_string[j] < 0x30) {
+                            fail = true;
+                            break;
+                        }
+
+                    } else if (j == 2) {
+                        if (val_string[j]  != ':') {
+                            fail = true;
+                            break;
+                        }
+                    }
+                }
+                if (!fail) {
+                    uint16_t temp = 0;
+                    temp = 10 * (val_string[0] - 0x30) + (val_string[1] - 0x30);
+                    if (temp > 23) {
+                        fail = true;
+                    }
+                    temp = 0;
+                    temp = 10 * (val_string[3] - 0x30) + (val_string[4] - 0x30);
+                    if (temp > 59) {
+                        fail = true;
+                    }
+                }
+                if (!fail) {
+                    ret = SNMP_ERR_NOERROR;
+                }
+            }
+            break;
     };
 
 
-  return ret;
+    return ret;
 }
 
 #endif

modules/Ethernet/udp_netsetting.c

@@ -207,7 +207,7 @@ void udp_recieve_parser(char *buf, u16_t rcvlen)
 		SaveWEBparam();
 		HTTP_SaveSettings();
 
-		Reboot();
+		Reboot(OTHER_ACT);
 	  }
   }
 }

modules/HTTP_Server/http_server.c

@@ -129,6 +129,7 @@ static const char Content_Length[17] =
 {0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, };
 
 const char HTTP_304_NOT_MODIFIED[] = "HTTP/1.1 304 Not Modified\r\n\r\n";
+const char HTTP_401_NO_AUTH[] = "HTTP/1.1 401 No authorization\r\n\r\n";
 const char HTTP_403_NOT_WHITE_LIST[] = "HTTP/1.1 403 Forbidden\r\n\r\n";
 const char HTTP_500_SERVER_ERROR[] = "HTTP/1.1 500 Internal Server Error\r\n\r\n";
 const char HTTP_200_OK[] = "HTTP/1.1 200 OK\r\n\r\n";
@@ -339,9 +340,12 @@ static err_t http_recv(void *arg, struct tcp_pcb *pcb,  struct pbuf *p, err_t er
 #endif
 #ifdef HTTP_AUTH_ENABLE
                             if (h->accsess == TIME_ACCESS && !Authenticated) {
-                                fs_open("/login.html", &file);
-                                hs->file = file.data;
-                                hs->left = file.len;
+                                strcpy(sendBuf, HTTP_401_NO_AUTH);
+                                strcat(sendBuf,
+                                "<!DOCTYPE html><html lang=""><head><meta http-equiv=\"refresh\" content=\"0;url=/login.html\"/></head></html>\r\n");
+                                sendBufLoadLen = strlen(sendBuf);
+                                hs->file = sendBuf;
+                                hs->left = sendBufLoadLen;
                                 send_data(pcb, hs);
                                 tcp_sent(pcb, http_sent);
                                 tcp_err(pcb, http_err);
@@ -1147,7 +1151,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
         /* Блокируем управление ключем на тау секунд*/
         //IO_KeyBlockOn();
         vTaskDelay(1010);
-        Reboot();
+        Reboot(WEB_ACT);
     }
 
     telnet_act = false;
@@ -1459,37 +1463,32 @@ char *HTTP_UPSTest(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn
     if (strcmp(tempValue, "stop") == 0) {
         res = ups_metac_service_pdu(ups_cancel_test);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест остановлен!");
+            strcat(bufOut, "Команда \"Останов теста\" принята ИБП!");
             strcpy(log_string, name_login);
             strcat(log_string, " (Останов)");
             log_event_data(LOG_TEST_UPS, log_string);
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось остановить!");
+            strcat(bufOut, "Команда \"Останов теста\" отклонена ИБП!");
         }
     } else if (strcmp(tempValue, "discharge") == 0) {
         res = ups_metac_service_pdu(ups_test_low_bat);
+        set_act_source(WEB_ACT);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест запущен!");
-            strcpy(log_string, name_login);
-            strcat(log_string, " (Запущен)");
-            log_event_data(LOG_TEST_UPS, log_string);
+            strcat(bufOut, "Команда \"Запуск теста\" принята ИБП!");
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось запустить!");
+            strcat(bufOut, "Команда \"Запуск теста\" отклонена ИБП!");
         }
     } else if (strncmp(tempValue, "time", 6) == 0) {
         GetParamValue(bufIn, "=", tempValue2, &valueLen);
         TimeParam = atoi(tempValue2);
         res = ups_metac_service_pdu(ups_test_time);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест запущен!");
-            strcpy(log_string, name_login);
-            strcat(log_string, " (Запущен)");
-            log_event_data(LOG_TEST_UPS, log_string);
+            strcat(bufOut, "Команда \"Запуск теста\" принята ИБП!");
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось запустить!");
+            strcat(bufOut, "Команда \"Запуск теста\" отклонена ИБП!");
         }
     }
     *lenBufOut = strlen(bufOut);
@@ -1528,9 +1527,9 @@ char *HTTP_UPSshutdown(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
             strcpy(log_string, name_login);
             strcat(log_string, " (Останов)");
             log_event_data(LOG_SHUTDOWN_UPS, log_string);
-            strcat(bufOut, "Выключение нагрузки ИБП отменено!");
+            strcat(bufOut, "Команда \"Отмена выключения нагрузки\" принята ИБП!");
         } else {
-            strcat(bufOut, "Выключение нагрузки ИБП не удалось отменить!");
+            strcat(bufOut, "Команда \"Отмена выключения нагрузки\" отклонена ИБП!");
         }
     } else if (strncmp(tempValue, "off", 5) == 0) {
         memset(tempValue2, 0, 50);
@@ -1538,10 +1537,10 @@ char *HTTP_UPSshutdown(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
         TimeParamFloat = atof(tempValue2);
         res = ups_metac_service_pdu(ups_shutdown);
         if (res == 1) {
-            strcat(bufOut, "Отключение нагрузки ИБП!");
+            strcat(bufOut, "Команда \"Отключения нагрузки\" принята ИБП!");
             log_event_data(LOG_SHUTDOWN_UPS, name_login);
         } else {
-            strcat(bufOut, "Отключение нагрузки ИБП не удалось!");
+            strcat(bufOut, "Команда \"Отключения нагрузки\" отклонена ИБП!");
         }
     }
     *lenBufOut = strlen(bufOut);

modules/HTTP_Server/my_ssl_server.c

@@ -126,6 +126,7 @@ static const char Content_Length[17] =
 
 const char HTTP_304_NOT_MODIFIED[] = "HTTP/1.1 304 Not Modified\r\n\r\n";
 const char HTTP_403_NOT_WHITE_LIST[] = "HTTP/1.1 403 Forbidden\r\n\r\n";
+const char HTTP_401_NO_AUTH[] = "HTTP/1.1 401 No authorization\r\n\r\n";
 const char HTTP_500_SERVER_ERROR[] = "HTTP/1.1 500 Internal Server Error\r\n\r\n";
 const char HTTP_200_OK[] = "HTTP/1.1 200 OK\r\n\r\n";
 /* utf-8 marker to support MS Excel */
@@ -837,7 +838,7 @@ SSL_SERVER_STATE SSL_WriteRoutine(mbedtls_ssl_context *ssl, char *data, int data
 }
 
 //
-char *SSL_ProcessingRoutine(uint32_t *sendLen)
+char *SSL_ProcessingRoutine(uint16_t *sendLen)
 {
     web_func_handler_t *h;
 
@@ -852,12 +853,15 @@ char *SSL_ProcessingRoutine(uint32_t *sendLen)
         if (strncmp(receiveBuf, h->client_req, h->len) == 0) {
 #ifdef HTTP_AUTH_ENABLE
             if (h->accsess == TIME_ACCESS && !Authenticated) {
+                strcpy(sendBuf, HTTP_401_NO_AUTH);
                 if((sSettings.sRADIUS.RDSEnable == true) && (fl_raddius_net_err == false))
-                    fs_open("/rslogin.html", &file);
+                     strcat(sendBuf,
+                    "<!DOCTYPE html><html lang=""><head><meta http-equiv=\"refresh\" content=\"0;url=/rslogin.html\"/></head></html>\r\n");
                 else
-                    fs_open("/login.html", &file);
-                *sendLen = file.len;
-                return file.data;
+                    strcat(sendBuf,
+                    "<!DOCTYPE html><html lang=""><head><meta http-equiv=\"refresh\" content=\"0;url=/login.html\"/></head></html>\r\n");
+                *sendLen = strlen(sendBuf);
+                return sendBuf;
             }
 #endif
             return h->handler(0, receiveBuf, sendBuf, receivedBufLen, sendLen);
@@ -1306,7 +1310,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
         /* Блокируем управление ключем на тау секунд*/
         //IO_KeyBlockOn();
         vTaskDelay(1010);
-        Reboot();
+        Reboot(WEB_ACT);
     }
 
     HTTP_SaveSettings();
@@ -1356,12 +1360,11 @@ char *HTTP_Upload_Sert(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
         if ( DataOffset != NULL ) {
             DataOffset += 4;
         }
-    }
-    // case of MSIE8 : we do not receive data in the POST packet
-    if (DataOffset == NULL) {
+    } else {
         SSL_ReadRoutine(&ssl, (unsigned char *)bufIn);
         bufIn[receivedBufLen] = '\0';
-        printf("receive2 %s \r\n", bufIn);
+        lenBufIn = receivedBufLen;
+        pbound = Parce_Boundary(bufIn, lenBufIn, boundary, sizeof(boundary));
         if (pbound != NULL) {
             ContentOffset = strstr(bufIn, boundary);
             DataOffset = strstr(ContentOffset, "\r\n\r\n");
@@ -1370,7 +1373,18 @@ char *HTTP_Upload_Sert(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
             }
         }
     }
-
+    // case of MSIE8 : we do not receive data in the POST packet
+    if (DataOffset == NULL) {
+        SSL_ReadRoutine(&ssl, (unsigned char *)bufIn);
+        bufIn[receivedBufLen] = '\0';
+        lenBufIn = receivedBufLen;
+        //printf("receive2 %s \r\n", bufIn);
+        ContentOffset = strstr(bufIn, boundary);
+        DataOffset = strstr(ContentOffset, "\r\n\r\n");
+        if ( DataOffset != NULL ) {
+            DataOffset += 4;
+        }
+    }
     TotalReceived = lenBufIn - (uint32_t)(ContentOffset - bufIn);
     TotalData += TotalReceived;
     strncat(bufOut,  DataOffset, TotalReceived);
@@ -1387,7 +1401,7 @@ char *HTTP_Upload_Sert(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
         printf("size %d \r\n", size);
         printf("receive3 %s \r\n", (receiveBuf+receivedBufLen - 30));*/
     }
-    printf("TotalData %d \r\n", TotalData);
+    //printf("TotalData %d \r\n", TotalData);
     // check if last data packet
     if (TotalData == size) {
         // printf("receive %s \r\n", sendBuf);
@@ -1527,37 +1541,32 @@ char *HTTP_UPSTest(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBufIn
     if (strcmp(tempValue, "stop") == 0) {
         res = ups_metac_service_pdu(ups_cancel_test);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест остановлен!");
+            strcat(bufOut, "Команда \"Останов теста\" принята ИБП!");
             strcpy(log_string, name_login);
             strcat(log_string, " (Останов)");
             log_event_data(LOG_TEST_UPS, log_string);
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось остановить!");
+            strcat(bufOut, "Команда \"Останов теста\" отклонена ИБП!");
         }
     } else if (strcmp(tempValue, "discharge") == 0) {
         res = ups_metac_service_pdu(ups_test_low_bat);
+        set_act_source(WEB_ACT);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест запущен!");
-            strcpy(log_string, name_login);
-            strcat(log_string, " (Запущен)");
-            log_event_data(LOG_TEST_UPS, log_string);
+            strcat(bufOut, "Команда \"Запуск теста\" принята ИБП!");
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось запустить!");
+            strcat(bufOut, "Команда \"Запуск теста\" отклонена ИБП!");
         }
     } else if (strncmp(tempValue, "time", 6) == 0) {
         GetParamValue(bufIn, "=", tempValue2, &valueLen);
         TimeParam = atoi(tempValue2);
         res = ups_metac_service_pdu(ups_test_time);
         if (res == 1 || res == 0) {
-            strcat(bufOut, "Тест запущен!");
-            strcpy(log_string, name_login);
-            strcat(log_string, " (Запущен)");
-            log_event_data(LOG_TEST_UPS, log_string);
+            strcat(bufOut, "Команда \"Запуск теста\" принята ИБП!");
         }
         if (res == -1) {
-            strcat(bufOut, "Тест не удалось запустить!");
+            strcat(bufOut, "Команда \"Запуск теста\" отклонена ИБП!");
         }
     }
     *lenBufOut = strlen(bufOut);
@@ -1592,9 +1601,9 @@ char *HTTP_UPSshutdown(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
             strcpy(log_string, name_login);
             strcat(log_string, " (Останов)");
             log_event_data(LOG_SHUTDOWN_UPS, log_string);
-            strcat(bufOut, "Выключение нагрузки ИБП отменено!");
+            strcat(bufOut, "Команда \"Отмена выключения нагрузки\" принята ИБП!");
         } else {
-            strcat(bufOut, "Выключение нагрузки ИБП не удалось отменить!");
+            strcat(bufOut, "Команда \"Отмена выключения нагрузки\" отклонена ИБП!");
         }
     } else if (strncmp(tempValue, "off", 5) == 0) {
         memset(tempValue2, 0, 50);
@@ -1602,10 +1611,10 @@ char *HTTP_UPSshutdown(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenB
         TimeParamFloat = atof(tempValue2);
         res = ups_metac_service_pdu(ups_shutdown);
         if (res == 1) {
-            strcat(bufOut, "Отключение нагрузки ИБП!");
+            strcat(bufOut, "Команда \"Отключения нагрузки\" принята ИБП!");
             log_event_data(LOG_SHUTDOWN_UPS, name_login);
         } else {
-            strcat(bufOut, "Отключение нагрузки ИБП не удалось!");
+            strcat(bufOut, "Команда \"Отключения нагрузки\" отклонена ИБП!");
         }
     }
     *lenBufOut = strlen(bufOut);
@@ -1670,7 +1679,11 @@ char *HTTP_GetRequest(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t lenBu
                     break;
                 }
                 if (i == 3) {
-                    strcpy(filename, "/login.html");
+                    if((sSettings.sRADIUS.RDSEnable == true) && (fl_raddius_net_err == false)) {
+                        strcpy(filename, "/rslogin.html");
+                    } else {
+                        strcpy(filename, "/login.html");
+                    }
                 }
             }
         } else {

modules/HTTP_Server/my_ssl_server.h

@@ -243,7 +243,7 @@ void HTTP_SendHistory(void);
 void HTTP_SendLog(void);
 void HTTPS_Init();
 int SSL_ReadRoutine(mbedtls_ssl_context *ssl, unsigned char* recvBuf);
-char* SSL_ProcessingRoutine(uint32_t* sendLen);
+char* SSL_ProcessingRoutine(uint16_t* sendLen);
 SSL_SERVER_STATE SSL_WriteRoutine(mbedtls_ssl_context *ssl, char *data, int datalen);
 SSL_SERVER_STATE SSL_SendFrames(mbedtls_ssl_context *ssl, char *data, int datalen);
 SSL_SERVER_STATE SSL_Write(mbedtls_ssl_context *ssl, char *data, int datalen);

modules/HTTP_Server/web_params_api.c

@@ -804,16 +804,12 @@ void vTaskReboot(void *pvParameters)
             SetLoadMode();
             HTTP_SaveSettings();
             vTaskDelay(2000);
-            /* Блокируем управление ключем на тау секунд*/
-            //IO_KeyBlockOn();
             vTaskDelay(1010);
-            Reboot();
+            Reboot(WEB_ACT);
         } else {
             vTaskDelay(1000);
-            /* Блокируем управление ключем на тау секунд*/
-            //IO_KeyBlockOn();
             vTaskDelay(1010);
-            Reboot();
+            Reboot(SNMP_ACT);
         }
     }
 }

modules/buttons/buttons.c

@@ -173,7 +173,7 @@ void BUTTON_DEF_DownHandler(void)
   SETTINGS_Save();
 
   vTaskDelay(1010);
-  Reboot();
+  Reboot(OTHER_ACT);
   
   //taskEXIT_CRITICAL();
 }

modules/cli/CLI_Commands.c

@@ -695,7 +695,7 @@ static portBASE_TYPE prvTaskRebootCommand(cli_state_t *cli_state, int8_t *pcWrit
         return pdTRUE;
     } else {
         telnet_act = true;
-        Reboot();
+        Reboot(TELNET_ACT);
         return pdFALSE;
     }
 }
@@ -2323,7 +2323,7 @@ static portBASE_TYPE prvTaskNetConfigCommand(cli_state_t *cli_state, int8_t *pcW
                 telnet_act = true;
                 start = 0;
                 vTaskDelay(1010);
-                Reboot();
+                Reboot(TELNET_ACT);
             }
             break;
         case ARG_NETCONFIG_CONFIRM:
@@ -2777,36 +2777,34 @@ static portBASE_TYPE prvTaskUPSCommand(cli_state_t *cli_state, int8_t *pcWriteBu
             val = atoi(str);
             if (val == 0) {
                 res = ups_metac_service_pdu(ups_cancel_test);
+                set_act_source(TELNET_ACT);
                 if (res == 1) {
                     log_event_data(LOG_TEST_UPS, "Администратор (Останов)");
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест остановлен!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Останов теста\" принята ИБП!\r\n");
                 } else {
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест не удалось остановить!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Останов теста\" отклонена ИБП!\r\n");
                 }
             } else if (val > 0 && val < 100) {
                 TimeParam = val;
                 res = ups_metac_service_pdu(ups_test_time);
                 if (res == 1) {
-                    log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест запущен!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" принята ИБП!\r\n");
                 } else {
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест не удалось запустить!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" отклонена ИБП!\r\n");
                 }
             } else if (val == 100) {
                 res = ups_metac_service_pdu(ups_test_10sec);
                 if (res == 1) {
-                    log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест запущен!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" принята ИБП!\r\n");
                 } else {
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест не удалось запустить!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" отклонена ИБП!\r\n");
                 }
             } else if (val == 999) {
                 res = ups_metac_service_pdu(ups_test_low_bat);
                 if (res == 1) {
-                    log_event_data(LOG_TEST_UPS, "Администратор (Запущен)");
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест запущен!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" принята ИБП!\r\n");
                 } else {
-                    strcpy( ( char * ) pcWriteBuffer, "\t\tТест не удалось запустить!\r\n");
+                    strcpy( ( char * ) pcWriteBuffer, "\t\tКоманда \"Запуск теста\" отклонена ИБП!\r\n");
                 }
             } else {
                 strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInvalidCommand, strlen( ( char * ) pcInvalidCommand ) );

modules/common/hal.c

@@ -5,30 +5,52 @@
  *      Author: balbekova
  */
 
-
 #include "stm32f4xx.h"
 #ifndef BT6702_SERVICE
 #include "log.h"
 #include "snmp_api.h"
 #include "trap_api.h"
 #endif
+#include "hal.h"
 #include <stddef.h>
 #include "FreeRTOS.h"
 #include "task.h"
 
-void Reboot(void) {
+static source_act_t source_act = OTHER_ACT;
+
+void Reboot(source_act_t source_reset)
+{
 #ifndef BT6702_SERVICE
-	SNMP_SendUserTrap(DEVICE_REBOOTED);
+    SNMP_SendUserTrap(DEVICE_REBOOTED);
+    switch (source_reset) {
+        case WEB_ACT:
+            log_event_data(LOG_SYSTEM_BOOT, name_login);
+            break;
+        case SNMP_ACT:
+        case OTHER_ACT:
+            log_event_data(LOG_SYSTEM_BOOT, "Администратор");
+            break;
 #if defined HARDWARE_BT6707 || HARDWARE_BT6709
-	  if(telnet_act)
-		  log_event_data(LOG_SYSTEM_BOOT, name_login_telnet);
-	  else
+        case TELNET_ACT:
+            log_event_data(LOG_SYSTEM_BOOT, name_login_telnet);
+            break;
 #endif
-		  log_event_data(LOG_SYSTEM_BOOT, name_login);
-
-	vTaskDelay(1010);
-	LOG_Disable();
+        default:
+            break;
+    }
+    vTaskDelay(1010);
+    LOG_Disable();
 #endif
     NVIC_SystemReset();
 }
 
+void set_act_source(source_act_t source)
+{
+    source_act = source;
+}
+
+source_act_t get_act_source(void)
+{
+    return source_act;
+}
+

modules/common/hal.h

@@ -8,7 +8,15 @@
 #ifndef HAL_H_
 #define HAL_H_
 
-void Reboot(void);
+typedef enum {
+    WEB_ACT = 0,
+    SNMP_ACT,
+    TELNET_ACT,
+    OTHER_ACT
+} source_act_t;
 
+void Reboot(source_act_t source_reset);
+void set_act_source(source_act_t source);
+source_act_t get_act_source(void);
 
 #endif /* HAL_H_ */

modules/monitor/ups_monitor.c

@@ -18,6 +18,7 @@
 #include "led.h"
 #include "log.h"
 #include "rtc.h"
+#include "hal.h"
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -337,6 +338,7 @@ void UPS_TestFinishMonitor(void)
 {
   static uint8_t TestFinishState = 0;
   uint8_t TestFinishStateCurrent;
+  char log_string[50];
 
   TestFinishStateCurrent = (UPS.Status >> 2) & 0x01;
 
@@ -346,6 +348,27 @@ void UPS_TestFinishMonitor(void)
     if (!TestFinishStateCurrent){
       log_event_data(LOG_TEST_UPS, "Завершен");
       flUpdateLog = true;
+    } else {
+      memset(log_string, 0, sizeof(log_string));
+      switch (get_act_source()) {
+        case WEB_ACT:
+            strcpy(log_string, name_login);
+            break;
+        case SNMP_ACT:
+        case OTHER_ACT:
+            strcpy(log_string, "Администратор");
+            break;
+#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+        case TELNET_ACT:
+            strcpy(log_string, name_login_telnet);
+            break;
+#endif
+        default:
+            break;
+      }
+      strcat(log_string, " (Запущен)");
+      log_event_data(LOG_TEST_UPS, log_string);
+      flUpdateLog = true;
     }
   }
 

web_interface/src/wui-3/main.js

@@ -138,6 +138,10 @@ function formValidation(){
   if(!ValidateIPaddress(managerIP4, ' Сервер SNMP 4')) flag = false;
   if(!ValidateIPaddress(managerIP5, ' Сервер SNMP 5')) flag = false;
 
+  if ($('ntp-inp') && !$('ntp-inp').disabled) {
+    if(!ValidateIPaddress($('ntp-inp'), ' IP адрес NTP сервера')) flag = false;
+  }
+
   return flag;
 }
 
@@ -1112,6 +1116,7 @@ function SpinBox(container, options) {
   this.addEventListener(this.input, 'keydown',        this.handleKeyDown, [], true);
   this.addEventListener(this.input, 'keypress',       this.handleKeyPress, [], true);
   this.addEventListener(this.input, 'keyup',          this.stop);
+  this.addEventListener(this.input, 'blur',           this.loseFocus);
   this.addEventListener(upButton,   'mousedown',      this.start, [true]);
   this.addEventListener(upButton,   'mouseup',        this.stop);
   this.addEventListener(upButton,   'mouseout',       this.stop);
@@ -1129,6 +1134,11 @@ SpinBox.prototype.getValue = function () {
   // parse and return the value
   return parseFloat(this.input.value);
 
+};
+SpinBox.prototype.loseFocus = function () {
+  if ('minimum' in this.options && this.input.value < this.options.minimum) this.input.value = this.options.minimum.toFixed(this.options.decimals ? this.options.decimals : 0);
+  if ('maximum' in this.options && this.input.value > this.options.maximum) this.input.value = this.options.maximum.toFixed(this.options.decimals ? this.options.decimals : 0);
+
 };
 
 SpinBox.prototype.setName = function (name) {

web_interface/src/wui-3/role.js

@@ -158,6 +158,9 @@ function loadXMLDoc(url, method, callback, body) {
         if (typeof callback == 'function') {
           callback.apply(xmlhttp);
         }
+      } else if (status == 401) {
+        alert('Request failed with status code 401');
+        window.location.reload();
       } else {
         console.log('Error');
       }

web_interface/src/wui-3/settings.html

@@ -11,7 +11,7 @@
 <body>
 <div id="count-wrap">
   <div id='countdown'>
-    <p>Контроллер будет перезагружен через <span id="count-number">5</span> секунд.</p>
+    <p>Контроллер будет перезагружен через <span id="count-number">10</span> секунд.</p>
   </div>
   <div id='changePassword'>
     <form action="" method="post">
@@ -253,12 +253,12 @@
     <div class="col span_1_of_3">
       <h4 class="col span_2_of_2">Аккумуляторные батареи</h4>
       <div class="form-group">
-        <label for="" class="col span_1_of_2">Время теста (мин)</label>
+        <label for="" class="col span_1_of_2">Время теста (1-99 мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="test_time">
+          <span id="test_time"></span>
         </div>
       </div>
-      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').value });">Запуск теста</button>
+      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').children[0].value });">Запуск теста</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'discharge' });">Запуск теста до разряда</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'stop' });">Остановка теста</button>
     </div>
@@ -272,10 +272,29 @@
       <h4 class="col span_2_of_2">Нагрузка</h4>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'reboot'})">Отмена отключения</button>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'off', 'after': $('upspo_after').value})">Отключить</button>
-      <div class="form-group">
+      <div class="form-group col span_2_of_2">
         <label for="" class="col span_1_of_2">Откл. через (мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="upspo_after">
+          <select class="form-control" id="upspo_after">
+            <option value="0.2">0.2</option>
+            <option value="0.3">0.3</option>
+            <option value="0.4">0.4</option>
+            <option value="0.5">0.5</option>
+            <option value="0.6">0.6</option>
+            <option value="0.7">0.7</option>
+            <option value="0.8">0.8</option>
+            <option value="0.9">0.9</option>
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+            <option value="6">6</option>
+            <option value="7">7</option>
+            <option value="8">8</option>
+            <option value="9">9</option>
+            <option value="10">10</option>
+          </select>
         </div>
       </div>
     </div>
@@ -418,6 +437,7 @@ var ups_cell_min  = new SpinBox('ups_cell_min', {'name':'ups_cell_min','minimum'
 var ups_cell_max  = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum':0,'maximum':3,'step':0.01});
 var temp_hist     = new SpinBox('temp_hist', {'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var loadvolt_hist = new SpinBox('loadvolt_hist', {'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
+var test_time     = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
 settingsGET();
 // $('dev-update').onclick = function(){
 //   $('count-wrap').style.display = 'block';

web_interface/src/wui-7/main.js

@@ -133,6 +133,10 @@ function formValidation(){
   if(!ValidateIPaddress(managerIP4, ' Сервер SNMP 4')) flag = false;
   if(!ValidateIPaddress(managerIP5, ' Сервер SNMP 5')) flag = false;
 
+  if ($('ntp-inp') && !$('ntp-inp').disabled) {
+    if(!ValidateIPaddress($('ntp-inp'), ' IP адрес NTP сервера')) flag = false;
+  }
+
   return flag;
 }
 
@@ -289,7 +293,7 @@ function timesetType(el) {
 }
 
 function countdown(rel) {
-  var countDown = 5;
+  var countDown = 10;
   setInterval(function () {
     if (countDown == 1 && rel === true) {
       location.reload(true);
@@ -1098,6 +1102,7 @@ function SpinBox(container, options) {
   this.addEventListener(this.input, 'keydown',        this.handleKeyDown, [], true);
   this.addEventListener(this.input, 'keypress',       this.handleKeyPress, [], true);
   this.addEventListener(this.input, 'keyup',          this.stop);
+  this.addEventListener(this.input, 'blur',           this.loseFocus);
   this.addEventListener(upButton,   'mousedown',      this.start, [true]);
   this.addEventListener(upButton,   'mouseup',        this.stop);
   this.addEventListener(upButton,   'mouseout',       this.stop);
@@ -1115,6 +1120,11 @@ SpinBox.prototype.getValue = function () {
   // parse and return the value
   return parseFloat(this.input.value);
 
+};
+SpinBox.prototype.loseFocus = function () {
+  if ('minimum' in this.options && this.input.value < this.options.minimum) this.input.value = this.options.minimum.toFixed(this.options.decimals ? this.options.decimals : 0);
+  if ('maximum' in this.options && this.input.value > this.options.maximum) this.input.value = this.options.maximum.toFixed(this.options.decimals ? this.options.decimals : 0);
+
 };
 
 SpinBox.prototype.setName = function (name) {

web_interface/src/wui-7/role.js

@@ -158,6 +158,9 @@ function loadXMLDoc(url, method, callback, body) {
         if (typeof callback == 'function') {
           callback.apply(xmlhttp);
         }
+      } else if (status == 401) {
+        alert('Request failed with status code 401');
+        window.location.reload();
       } else {
         console.log('Error');
       }

web_interface/src/wui-7/settings.html

@@ -11,7 +11,7 @@
 <body>
 <div id="count-wrap">
   <div id='countdown'>
-    <p>Контроллер будет перезагружен через <span id="count-number">5</span> секунд.</p>
+    <p>Контроллер будет перезагружен через <span id="count-number">10</span> секунд.</p>
   </div>
   <div id='changePassword'>
     <form action="" method="post">
@@ -288,12 +288,12 @@
     <div class="col span_1_of_3">
       <h4 class="col span_2_of_2">Аккумуляторные батареи</h4>
       <div class="form-group">
-        <label for="" class="col span_1_of_2">Время теста (мин)</label>
+        <label for="" class="col span_1_of_2">Время теста (1-99 мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="test_time">
+          <span id="test_time"></span>
         </div>
       </div>
-      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').value });">Запуск теста</button>
+      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').children[0].value });">Запуск теста</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'discharge' });">Запуск теста до разряда</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'stop' });">Остановка теста</button>
     </div>
@@ -307,10 +307,29 @@
       <h4 class="col span_2_of_2">Нагрузка</h4>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'reboot'})">Отмена отключения</button>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'off', 'after': $('upspo_after').value})">Отключить</button>
-      <div class="form-group">
+      <div class="form-group col span_2_of_2">
         <label for="" class="col span_1_of_2">Откл. через (мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="upspo_after">
+          <select class="form-control" id="upspo_after">
+            <option value="0.2">0.2</option>
+            <option value="0.3">0.3</option>
+            <option value="0.4">0.4</option>
+            <option value="0.5">0.5</option>
+            <option value="0.6">0.6</option>
+            <option value="0.7">0.7</option>
+            <option value="0.8">0.8</option>
+            <option value="0.9">0.9</option>
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+            <option value="6">6</option>
+            <option value="7">7</option>
+            <option value="8">8</option>
+            <option value="9">9</option>
+            <option value="10">10</option>
+          </select>
         </div>
       </div>
     </div>
@@ -408,6 +427,7 @@ var ups_cell_max  = new SpinBox('ups_cell_max', {'name':'ups_cell_max','minimum'
 var temp_hist     = new SpinBox('temp_hist', {'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var loadvolt_hist = new SpinBox('loadvolt_hist', {'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var mainvolt_hist = new SpinBox('mainvolt_hist', {'name':'mainvolt_hist','minimum':10,'maximum':30,'step':1});
+var test_time     = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
 settingsGET();
 // $('dev-update').onclick = function(){
 //   $('count-wrap').style.display = 'block';

web_interface/src/wui-9/main.js

@@ -160,6 +160,10 @@ function formValidation(){
   if(!ValidateCIDRIPaddress(wtl_ip4, ' Маска/IP-адреса 4 белого списка')) flag = false;
   if(!ValidateCIDRIPaddress(wtl_ip5, ' Маска/IP-адреса 5 белого списка')) flag = false;
 
+  if ($('ntp-inp') && !$('ntp-inp').disabled) {
+    if(!ValidateIPaddress($('ntp-inp'), ' IP адрес NTP сервера')) flag = false;
+  }
+
   return flag;
 }
 
@@ -325,7 +329,7 @@ function timesetType(el) {
 }
 
 function countdown(rel) {
-  var countDown = 5;
+  var countDown = 10;
   setInterval(function () {
     if (countDown == 1 && rel === true) {
       location.reload(true);
@@ -1183,6 +1187,7 @@ function SpinBox(container, options) {
   this.addEventListener(this.input, 'keydown',        this.handleKeyDown, [], true);
   this.addEventListener(this.input, 'keypress',       this.handleKeyPress, [], true);
   this.addEventListener(this.input, 'keyup',          this.stop);
+  this.addEventListener(this.input, 'blur',           this.loseFocus);
   this.addEventListener(upButton,   'mousedown',      this.start, [true]);
   this.addEventListener(upButton,   'mouseup',        this.stop);
   this.addEventListener(upButton,   'mouseout',       this.stop);
@@ -1200,6 +1205,11 @@ SpinBox.prototype.getValue = function () {
   // parse and return the value
   return parseFloat(this.input.value);
 
+};
+SpinBox.prototype.loseFocus = function () {
+  if ('minimum' in this.options && this.input.value < this.options.minimum) this.input.value = this.options.minimum.toFixed(this.options.decimals ? this.options.decimals : 0);
+  if ('maximum' in this.options && this.input.value > this.options.maximum) this.input.value = this.options.maximum.toFixed(this.options.decimals ? this.options.decimals : 0);
+
 };
 
 SpinBox.prototype.setName = function (name) {

web_interface/src/wui-9/role.js

@@ -158,6 +158,9 @@ function loadXMLDoc(url, method, callback, body) {
         if (typeof callback == 'function') {
           callback.apply(xmlhttp);
         }
+      } else if (status == 401) {
+        alert('Request failed with status code 401');
+        window.location.reload();
       } else {
         console.log('Error');
       }

web_interface/src/wui-9/settings.html

@@ -11,7 +11,7 @@
 <body>
 <div id="count-wrap">
   <div id='countdown'>
-    <p>Контроллер будет перезагружен через <span id="count-number">5</span> секунд.</p>
+    <p>Контроллер будет перезагружен через <span id="count-number">10</span> секунд.</p>
   </div>
   <div id='changePassword'>
     <form action="" method="post">
@@ -273,12 +273,12 @@
     <div class="col span_1_of_3">
       <h4 class="col span_2_of_2">Аккумуляторные батареи</h4>
       <div class="form-group">
-        <label for="" class="col span_1_of_2">Время теста (мин)</label>
+        <label for="" class="col span_1_of_2">Время теста (1-99 мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="test_time">
+          <span id="test_time"></span>
         </div>
       </div>
-      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').value });">Запуск теста</button>
+      <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'time', 'time': $('test_time').children[0].value });">Запуск теста</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'discharge' });">Запуск теста до разряда</button>
       <button type="button" class="btn btn-default" onclick="batTest({ 'func': 'stop' });">Остановка теста</button>
     </div>
@@ -292,10 +292,29 @@
       <h4 class="col span_2_of_2">Нагрузка</h4>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'reboot'})">Отмена отключения</button>
       <button type="button" class="btn btn-default" onclick="UPSPowerOff({'func': 'off', 'after': $('upspo_after').value})">Отключить</button>
-      <div class="form-group">
+      <div class="form-group col span_2_of_2">
         <label for="" class="col span_1_of_2">Откл. через (мин)</label>
         <div class="col span_1_of_2">
-          <input type="text" class="form-control" value="10" maxlength="6" id="upspo_after">
+          <select class="form-control" id="upspo_after">
+            <option value="0.2">0.2</option>
+            <option value="0.3">0.3</option>
+            <option value="0.4">0.4</option>
+            <option value="0.5">0.5</option>
+            <option value="0.6">0.6</option>
+            <option value="0.7">0.7</option>
+            <option value="0.8">0.8</option>
+            <option value="0.9">0.9</option>
+            <option value="1">1</option>
+            <option value="2">2</option>
+            <option value="3">3</option>
+            <option value="4">4</option>
+            <option value="5">5</option>
+            <option value="6">6</option>
+            <option value="7">7</option>
+            <option value="8">8</option>
+            <option value="9">9</option>
+            <option value="10">10</option>
+          </select>
         </div>
       </div>
     </div>
@@ -398,6 +417,7 @@ var bat_charge    = new SpinBox('bat_charge', {'name':'bat_charge','minimum':12,
 var temp_hist     = new SpinBox('temp_hist', {'name':'temp_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var loadvolt_hist = new SpinBox('loadvolt_hist', {'name':'loadvolt_hist','minimum':0.5,'maximum':2.0,'step':0.1,'decimals':1, 'value': 0.5});
 var mainvolt_hist = new SpinBox('mainvolt_hist', {'name':'mainvolt_hist','minimum':10,'maximum':30,'step':1});
+var test_time     = new SpinBox('test_time', {'minimum':1,'maximum':99,'step':1, 'value': 1});
 
 settingsGET();
 // $('dev-update').onclick = function(){