|
@@ -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);
|
|
|
}
|
|
|
}
|