|
@@ -514,6 +514,7 @@ void ups_model_response(char *data)
|
|
{
|
|
{
|
|
uint8_t j = 0;
|
|
uint8_t j = 0;
|
|
char value[20];
|
|
char value[20];
|
|
|
|
+ uint8_t len = 0;
|
|
DBG printf("ups_akb_info_response: %s\r\n", data);
|
|
DBG printf("ups_akb_info_response: %s\r\n", data);
|
|
if (data[0] != '(') {
|
|
if (data[0] != '(') {
|
|
return;
|
|
return;
|
|
@@ -535,25 +536,15 @@ void ups_model_response(char *data)
|
|
j ++;
|
|
j ++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(strncmp(value, "WPHV", 4) == 0 || value[0] != 0) {
|
|
|
|
|
|
+ if(strncmp(value, "WPHV", 4) == 0 || value[0] == 0) {
|
|
strcpy(UPS.model, "RTMP II");
|
|
strcpy(UPS.model, "RTMP II");
|
|
} else {
|
|
} else {
|
|
- strcpy(UPS.model, value);
|
|
|
|
|
|
+ len = strlen(value);
|
|
|
|
+ strncpy(UPS.model, value, len);
|
|
}
|
|
}
|
|
SNMP_SetObjDescr();
|
|
SNMP_SetObjDescr();
|
|
} else {
|
|
} else {
|
|
- j = 0;
|
|
|
|
- for (uint8_t i = 0; i < VOLTRONIC_MODEL_LENGTH; i ++) {
|
|
|
|
- if (data[i] != '#') {
|
|
|
|
- value[j] = data[i];
|
|
|
|
- j ++;
|
|
|
|
- }
|
|
|
|
- if(strncmp(value, "WPHV", 4) == 0 || value[0] != 0) {
|
|
|
|
- strcpy(UPS.model, "RTMP II");
|
|
|
|
- } else {
|
|
|
|
- strcpy(UPS.model, value);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|