Browse Source

[ups_all_version] add ups serial & version to snmp description

balbekova 6 years ago
parent
commit
9a37ba6c37

+ 0 - 2
modules/Ethernet/snmp_api.c

@@ -193,10 +193,8 @@ void SNMP_SetObjDescr(void)
   strcat(sSettings.sSnmp.sysDescr, sSettings.sInfo.serialNumber);
   strcat(sSettings.sSnmp.sysDescr, sSettings.sInfo.serialNumber);
   strcat(sSettings.sSnmp.sysDescr, " ");
   strcat(sSettings.sSnmp.sysDescr, " ");
   strcat(sSettings.sSnmp.sysDescr, UPS.model);
   strcat(sSettings.sSnmp.sysDescr, UPS.model);
-#ifndef HARDWARE_BT6706
   strcat(sSettings.sSnmp.sysDescr, " ");
   strcat(sSettings.sSnmp.sysDescr, " ");
   strcat(sSettings.sSnmp.sysDescr, UPS.serial);
   strcat(sSettings.sSnmp.sysDescr, UPS.serial);
-#endif
   
   
   len = strlen(sSettings.sSnmp.sysDescr);
   len = strlen(sSettings.sSnmp.sysDescr);
   snmp_mib2_set_sysdescr((u8_t*)sSettings.sSnmp.sysDescr, &len);
   snmp_mib2_set_sysdescr((u8_t*)sSettings.sSnmp.sysDescr, &len);

+ 0 - 2
modules/HTTP_Server/web_params_api.c

@@ -360,11 +360,9 @@ void HTTP_GetInfo(char *buf)
   strcat(buf, "\",\"ups_model\":\"");
   strcat(buf, "\",\"ups_model\":\"");
   strncat(buf, str, len);
   strncat(buf, str, len);
 
 
-#ifndef HARDWARE_BT6706
   GetUPSSerialStr(str, &len);
   GetUPSSerialStr(str, &len);
   strcat(buf, "\",\"ups_sn\":\"");
   strcat(buf, "\",\"ups_sn\":\"");
   strncat(buf, str, len);
   strncat(buf, str, len);
-#endif
 
 
   GetUPSVersionStr(str, &len);
   GetUPSVersionStr(str, &len);
   strcat(buf, "\",\"ups_fwversion\":\"");
   strcat(buf, "\",\"ups_fwversion\":\"");

+ 1 - 1
modules/MegaTec/megatec.c

@@ -310,7 +310,7 @@ void ups_info_response(char *data)
 	data += 8;
 	data += 8;
 
 
 	strncpy(UPS.vertion, data, 2);
 	strncpy(UPS.vertion, data, 2);
-
+	SNMP_SetObjDescr();
 }
 }
 
 
 void ups_remain_time_response(char *data)
 void ups_remain_time_response(char *data)