Эх сурвалжийг харах

[megatec] change parserfor qmd

balbekova 5 жил өмнө
parent
commit
4429b9cf7d

+ 6 - 9
modules/MegaTec/megatec.c

@@ -512,8 +512,6 @@ void ups_akb_info_response(char *data)
 
 
 void ups_model_response(char *data)
 void ups_model_response(char *data)
 {
 {
-    char value[20];
-    uint8_t len = 0;
     uint8_t j = 0;
     uint8_t j = 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] != '(') {
@@ -528,20 +526,19 @@ void ups_model_response(char *data)
 
 
     DBG printf("UPS ups_akb_info_parser_start: %s\r\n", data);
     DBG printf("UPS ups_akb_info_parser_start: %s\r\n", data);
 
 
-    len = get_ups_param(data, " ", value);
     if (UPS.model[0] == 0) {
     if (UPS.model[0] == 0) {
-        for (uint8_t i = 0; i < len; i ++) {
-            if (value[i] != '#') {
-                UPS.model[j] = value[i];
+        for (uint8_t i = 0; i < MODEL_LENGTH; i ++) {
+            if (data[i] != '#') {
+                UPS.model[j] = data[i];
                 j ++;
                 j ++;
             }
             }
         }
         }
         SNMP_SetObjDescr();
         SNMP_SetObjDescr();
     } else {
     } else {
         j = 0;
         j = 0;
-        for (uint8_t i = 0; i < len; i ++) {
-            if (value[i] != '#') {
-                UPS.model[j] = value[i];
+        for (uint8_t i = 0; i < MODEL_LENGTH; i ++) {
+            if (data[i] != '#') {
+                UPS.model[j] = data[i];
                 j ++;
                 j ++;
             }
             }
         }
         }

+ 2 - 0
modules/MegaTec/megatec.h

@@ -16,6 +16,8 @@
 #define AKB_VOLTAGE			12
 #define AKB_VOLTAGE			12
 #define AKB_NUM_CELL		6
 #define AKB_NUM_CELL		6
 
 
+#define MODEL_LENGTH		15
+
 typedef enum{
 typedef enum{
 	ups_status_req,
 	ups_status_req,
 	ups_test_10sec,
 	ups_test_10sec,