Browse Source

fix snmp sys info

balbekova 7 years ago
parent
commit
0a1a655c05
2 changed files with 20 additions and 4 deletions
  1. 19 3
      modules/MegaTec/megatec.c
  2. 1 1
      modules/settings_api.c

+ 19 - 3
modules/MegaTec/megatec.c

@@ -9,6 +9,7 @@
 #include "usart.h"
 #include "megatec.h"
 #include "log.h"
+#include "snmp_api.h"
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
 #endif
@@ -19,6 +20,8 @@
 #include <string.h>
 #include <math.h>
 
+
+
 #define UPS_PDU_MAX_LEN 50
 
 float TimeParamFloat = 0;
@@ -244,12 +247,25 @@ void ups_info_response(char *data)
 	if(i < 11){
 		endValue = strpbrk(data," ");
 		len = endValue - data;
-		strncpy(UPS.model, data, len);
+		if(UPS.model[0] == 0){
+			strncpy(UPS.model, data, len);
+			SNMP_SetObjDescr();
+		}
+		else{
+			strncpy(UPS.model, data, len);
+		}
+
 		data += (len + 1);
 	}
 	else
 	{
-		strcpy(UPS.model, "RTMP II");
+		if(UPS.model[0] == 0){
+			strcpy(UPS.model, "RTMP II");
+			SNMP_SetObjDescr();
+		}
+		else{
+			strcpy(UPS.model, "RTMP II");
+		}
 	}
 
 	endValue = strpbrk(data,"\r");
@@ -338,7 +354,7 @@ void request_task(void)
 						UPS.Alarm = 0;
 						UPS.Present = false;
 
-						memset(UPS.model, 0, 11);
+						//memset(UPS.model, 0, 11);
 						memset(UPS.vertion, 0, 11);
 					}
 				}

+ 1 - 1
modules/settings_api.c

@@ -81,7 +81,7 @@ void SETTINGS_SetSnmpDef(void)
   strcpy(sSettings.sSnmp.readCommunity, "public");
   strcpy(sSettings.sSnmp.writeCommunity, "public");
   strcpy(sSettings.sSnmp.sysContact, "");
-  strcpy(sSettings.sSnmp.sysName, SERIAL);
+  strcpy(sSettings.sSnmp.sysName, "BT6702");
   strcpy(sSettings.sSnmp.sysLocation, "");
   strcpy(sSettings.sSnmp.managerIP, "0.0.0.0");
   strcpy(sSettings.sSnmp.managerIP2, "0.0.0.0");