Browse Source

[BT-6711]change MIB

balbekova 3 years ago
parent
commit
6ef4f09456
2 changed files with 48 additions and 48 deletions
  1. 32 32
      docs/bt6711/BT6711.MIB
  2. 16 16
      modules/Ethernet/private_mib_bt6711.c

+ 32 - 32
docs/bt6711/BT6711.MIB

@@ -122,78 +122,78 @@ IMPORTS
     DESCRIPTION
     "Power, %" 
     ::= { signals 13 }
-
-    currInput OBJECT-TYPE
+	
+    batCap OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "UPS input current, A" 
+    "Battery capacity, %" 
     ::= { signals 14 }
-
-    currOutput OBJECT-TYPE
+    
+    batTime OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "UPS output current, A" 
+    "Rest working time of battery, min" 
     ::= { signals 15 }
-	
-    batCap OBJECT-TYPE
+		
+    connectMonitor OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "Battery capacity, %" 
+    "Connect status:
+	0 - normal;
+	1 - connect fail" 
     ::= { signals 16 }
-
-    upsMode OBJECT-TYPE
+    
+    alarms OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "UPS mode" 
+    "bit 7 - utility fail
+	bit 6 - battery low
+	bit 5 - bypass/boost or buck active
+	bit 4 - UPS fail
+	bit 3 - UPS Type is Standby (0 is On_line)
+	bit 2 - Test in Progress
+	bit 1 - Shutdown Active
+	bit 0 - Beeper On" 
     ::= { signals 17 }
-    
-    batTime OBJECT-TYPE
+
+    currInput OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "Rest working time of battery, min" 
+    "UPS input current, A" 
     ::= { signals 18 }
 
-    voltAKB OBJECT-TYPE
+    currOutput OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "AKB current voltage, V" 
+    "UPS output current, A" 
     ::= { signals 19 }
-		
-    connectMonitor OBJECT-TYPE
+
+    upsMode OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "Connect status:
-	0 - normal;
-	1 - connect fail" 
+    "UPS mode" 
     ::= { signals 20 }
-    
-    alarms OBJECT-TYPE
+
+    voltAKB OBJECT-TYPE
     SYNTAX  OCTET STRING
     MAX-ACCESS  read-only
     STATUS  current
     DESCRIPTION
-    "bit 7 - utility fail
-	bit 6 - battery low
-	bit 5 - bypass/boost or buck active
-	bit 4 - UPS fail
-	bit 3 - UPS Type is Standby (0 is On_line)
-	bit 2 - Test in Progress
-	bit 1 - Shutdown Active
-	bit 0 - Beeper On" 
+    "AKB current voltage, V" 
     ::= { signals 21 }
     
     server1 OBJECT-TYPE

+ 16 - 16
modules/Ethernet/private_mib_bt6711.c

@@ -471,30 +471,30 @@ static s16_t signal_get_value(struct snmp_node_instance *instance, void *value)
         case 13: /* Power */
             GetPowerStr((char *)paramStr, &paramLength);
             break;
-         case 14: /* InputCurrent */
-            GetInputCurrentStr((char *)paramStr, &paramLength);
-            break;
-        case 15: /* OutputCurrent */
-            GetOutputCurrentStr((char *)paramStr, &paramLength);
-            break;
-        case 16: /* BatCap */
+        case 14: /* BatCap */
             GetBatCapacityStr((char *)paramStr, &paramLength);
             break;
-         case 17: /* UPS mode */
-            GetModeStr((char *)paramStr, &paramLength);
-            break;
-        case 18: /* BatTime */
+        case 15: /* BatTime */
             GetRuntimeStr((char *)paramStr, &paramLength);
             break;
-        case 19: /* VoltageAKB */
-            GetVoltageAKBtStr((char *)paramStr, &paramLength);
-            break;
-        case 20: /* ConnectMonitor */
+        case 16: /* ConnectMonitor */
             GetConnectMonitorStr((char *)paramStr, &paramLength);
             break;
-        case 21: /* Alarms */
+        case 17: /* Alarms */
             GetAlarmStr((char *)paramStr, &paramLength);
             break;
+         case 18: /* InputCurrent */
+            GetInputCurrentStr((char *)paramStr, &paramLength);
+            break;
+        case 19: /* OutputCurrent */
+            GetOutputCurrentStr((char *)paramStr, &paramLength);
+            break;
+        case 20: /* UPS mode */
+            GetModeStr((char *)paramStr, &paramLength);
+            break;
+        case 21: /* VoltageAKB */
+            GetVoltageAKBtStr((char *)paramStr, &paramLength);
+            break;
         case 22: /* IP server1 (traps) */
             GetManagerIp((char *)paramStr, &paramLength);
             break;