Index: includes/definitions/mibs/bdcom.inc.php
===================================================================
--- includes/definitions/mibs/bdcom.inc.php	(revision 9757)
+++ includes/definitions/mibs/bdcom.inc.php	(working copy)
@@ -2,6 +2,41 @@
 
 // BDCOM
 
+$mib                                  = 'NMS-IPAcl';
+$config['mibs'][$mib]['enable']       = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.2.5';
+$config['mibs'][$mib]['mib_dir']      = 'bdcom';
+$config['mibs'][$mib]['descr']        = '';
+//.1.3.6.1.4.1.3320.2.5.1.0 = INTEGER: 0
+//NMS-IPAcl::nmsAclTotal.0 = INTEGER: 0
+
+
+$mib = 'NMS-DHCP-SNOOPING-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.2.233';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+//NMS-DHCP-SNOOPING-MIB::dhcpSnoopingStatus.0 = INTEGER: disable(0)
+//.1.3.6.1.4.1.3320.2.233.1.0 = INTEGER: disable(0)
+
+
+$mib = 'NMS-LOG-SERVER-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.2.235';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+//NMS-LOG-SERVER-MIB::logServerOff.0 = INTEGER: on(0)
+//NMS-LOG-SERVER-MIB::logTrapAddr.10.99.1.125 = IpAddress: 10.99.1.125
+//NMS-LOG-SERVER-MIB::logTrapRowStatus.10.99.1.125 = INTEGER: active(1)
+//NMS-LOG-SERVER-MIB::logTrapRfcVer.10.99.1.125 = INTEGER: RFC5424(1)
+//NMS-LOG-SERVER-MIB::logTrap.0 = INTEGER: warning(4)
+//.1.3.6.1.4.1.3320.2.235.2.0 = INTEGER: on(0)
+//.1.3.6.1.4.1.3320.2.235.3.1.1.10.99.1.125 = IpAddress: 10.99.1.125
+//.1.3.6.1.4.1.3320.2.235.3.1.2.10.99.1.125 = INTEGER: active(1)
+//.1.3.6.1.4.1.3320.2.235.3.1.3.10.99.1.125 = INTEGER: RFC5424(1)
+//.1.3.6.1.4.1.3320.2.235.4.0 = INTEGER: warning(4)
+
+
 $mib                                  = 'NMS-OPTICAL-PORT-MIB';
 $config['mibs'][$mib]['enable']       = 1;
 $config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.183';
@@ -189,4 +224,450 @@
 NMS-CHASSIS::nmsElectricCurrent.0 = INTEGER: 2
 NMS-CHASSIS::nmsVoltageCurrent.0 = INTEGER: 12
 */
+
+
+$mib = 'NMS-MEMORY-POOL';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.48.1.0';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolUtilization.0 = INTEGER: 59
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolTotalMemorySize.0 = INTEGER: 134217728
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolImageRatio.0 = INTEGER: 1619
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolRegionRatio.0 = INTEGER: 19
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolHeapRatio.0 = INTEGER: 74
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolHeapUtilization.0 = INTEGER: 38
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolMessageBufferRatio.0 = INTEGER: 5
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolMessageBufferUtilization.0 = INTEGER: 0
+//NMS-MEMORY-POOL-MIB::nmsMemoryPoolTotalFlashSize.0 = INTEGER: 16777216
+
+
+$mib = 'NMS-IF-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.63';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+/* .1.3.6.1.4.1.3320.9.63.1.7 :
+NMS-IF-MIB::IfIndex.1 = INTEGER: 1
+NMS-IF-MIB::IfIndex.2 = INTEGER: 2
+NMS-IF-MIB::IfIndex.3 = INTEGER: 3
+NMS-IF-MIB::IfIndex.4 = INTEGER: 4
+NMS-IF-MIB::IfIndex.5 = INTEGER: 5
+NMS-IF-MIB::IfIndex.6 = INTEGER: 6
+NMS-IF-MIB::IfIndex.7 = INTEGER: 7
+NMS-IF-MIB::IfIndex.8 = INTEGER: 8
+NMS-IF-MIB::IfIndex.9 = INTEGER: 9
+NMS-IF-MIB::IfIndex.10 = INTEGER: 10
+NMS-IF-MIB::IfIndex.11 = INTEGER: 11
+NMS-IF-MIB::IfIndex.12 = INTEGER: 12
+NMS-IF-MIB::txPower1.1 = INTEGER: -65535
+NMS-IF-MIB::txPower1.2 = INTEGER: -65535
+NMS-IF-MIB::txPower1.3 = INTEGER: -65535
+NMS-IF-MIB::txPower1.4 = INTEGER: -65535
+NMS-IF-MIB::txPower1.5 = INTEGER: -65535
+NMS-IF-MIB::txPower1.6 = INTEGER: -65535
+NMS-IF-MIB::txPower1.7 = INTEGER: -65535
+NMS-IF-MIB::txPower1.8 = INTEGER: -65535
+NMS-IF-MIB::txPower1.9 = INTEGER: -65535
+NMS-IF-MIB::txPower1.10 = INTEGER: -65535
+NMS-IF-MIB::txPower1.11 = INTEGER: -65535
+NMS-IF-MIB::txPower1.12 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.1 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.2 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.3 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.4 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.5 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.6 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.7 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.8 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.9 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.10 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.11 = INTEGER: -65535
+NMS-IF-MIB::rxPower1.12 = INTEGER: -65535
+NMS-IF-MIB::temperature.1 = INTEGER: -65535
+NMS-IF-MIB::temperature.2 = INTEGER: -65535
+NMS-IF-MIB::temperature.3 = INTEGER: -65535
+NMS-IF-MIB::temperature.4 = INTEGER: -65535
+NMS-IF-MIB::temperature.5 = INTEGER: -65535
+NMS-IF-MIB::temperature.6 = INTEGER: -65535
+NMS-IF-MIB::temperature.7 = INTEGER: -65535
+NMS-IF-MIB::temperature.8 = INTEGER: -65535
+NMS-IF-MIB::temperature.9 = INTEGER: -65535
+NMS-IF-MIB::temperature.10 = INTEGER: -65535
+NMS-IF-MIB::temperature.11 = INTEGER: -65535
+NMS-IF-MIB::temperature.12 = INTEGER: -65535
+NMS-IF-MIB::vlotage.1 = INTEGER: -65535
+NMS-IF-MIB::vlotage.2 = INTEGER: -65535
+NMS-IF-MIB::vlotage.3 = INTEGER: -65535
+NMS-IF-MIB::vlotage.4 = INTEGER: -65535
+NMS-IF-MIB::vlotage.5 = INTEGER: -65535
+NMS-IF-MIB::vlotage.6 = INTEGER: -65535
+NMS-IF-MIB::vlotage.7 = INTEGER: -65535
+NMS-IF-MIB::vlotage.8 = INTEGER: -65535
+NMS-IF-MIB::vlotage.9 = INTEGER: -65535
+NMS-IF-MIB::vlotage.10 = INTEGER: -65535
+NMS-IF-MIB::vlotage.11 = INTEGER: -65535
+NMS-IF-MIB::vlotage.12 = INTEGER: -65535
+NMS-IF-MIB::curr1.1 = INTEGER: -65535
+NMS-IF-MIB::curr1.2 = INTEGER: -65535
+NMS-IF-MIB::curr1.3 = INTEGER: -65535
+NMS-IF-MIB::curr1.4 = INTEGER: -65535
+NMS-IF-MIB::curr1.5 = INTEGER: -65535
+NMS-IF-MIB::curr1.6 = INTEGER: -65535
+NMS-IF-MIB::curr1.7 = INTEGER: -65535
+NMS-IF-MIB::curr1.8 = INTEGER: -65535
+NMS-IF-MIB::curr1.9 = INTEGER: -65535
+NMS-IF-MIB::curr1.10 = INTEGER: -65535
+NMS-IF-MIB::curr1.11 = INTEGER: -65535
+NMS-IF-MIB::curr1.12 = INTEGER: -65535
+NMS-IF-MIB::vendname.1 = ""
+NMS-IF-MIB::vendname.2 = ""
+NMS-IF-MIB::vendname.3 = ""
+NMS-IF-MIB::vendname.4 = ""
+NMS-IF-MIB::vendname.5 = ""
+NMS-IF-MIB::vendname.6 = ""
+NMS-IF-MIB::vendname.7 = ""
+NMS-IF-MIB::vendname.8 = ""
+NMS-IF-MIB::vendname.9 = ""
+NMS-IF-MIB::vendname.10 = ""
+NMS-IF-MIB::vendname.11 = ""
+NMS-IF-MIB::vendname.12 = ""
+*/
+
+
+$mib = 'NMS-INTERFACE-EXT';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.64';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+
+$mib = 'NMS-PROCESS-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.109';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+/*
+NMS-PROCESS-MIB::nmspmCPUTotalIndex.1 = Gauge32: 1
+NMS-PROCESS-MIB::nmspmCPUTotalPhysicalIndex.1 = OID: iso.0
+NMS-PROCESS-MIB::nmspmCPUTotal5sec.1 = Gauge32: 10 percent
+NMS-PROCESS-MIB::nmspmCPUTotal1min.1 = Gauge32: 9 percent
+NMS-PROCESS-MIB::nmspmCPUTotal5min.1 = Gauge32: 9 percent
+NMS-PROCESS-MIB::nmspmCPUMaxUtilization.0 = Gauge32: 84 percent
+NMS-PROCESS-MIB::nmspmCPUClearMaxUtilization.0 = INTEGER: 0 percent
+NMS-PROCESS-MIB::nmspmCPU.4.0 = INTEGER: 80
+.1.3.6.1.4.1.3320.9.109.1.1.1.1.1.1 = Gauge32: 1
+.1.3.6.1.4.1.3320.9.109.1.1.1.1.2.1 = OID: .1.0
+.1.3.6.1.4.1.3320.9.109.1.1.1.1.3.1 = Gauge32: 9 percent
+.1.3.6.1.4.1.3320.9.109.1.1.1.1.4.1 = Gauge32: 9 percent
+.1.3.6.1.4.1.3320.9.109.1.1.1.1.5.1 = Gauge32: 9 percent
+.1.3.6.1.4.1.3320.9.109.1.1.2.0 = Gauge32: 84 percent
+.1.3.6.1.4.1.3320.9.109.1.1.3.0 = INTEGER: 0 percent
+.1.3.6.1.4.1.3320.9.109.1.1.4.0 = INTEGER: 80
+*/
+
+
+$mib = 'NMS-CARD-SYS-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.181';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+/* .1.3.6.1.4.1.3320.9.181
+NMS-CARD-SYS-MIB::cardSysIndex.1 = INTEGER: 2
+NMS-CARD-SYS-MIB::cardSysDescr.1 = STRING: "P3310C mother card"
+NMS-CARD-SYS-MIB::cardSysType.1 = INTEGER: 982
+NMS-CARD-SYS-MIB::cardCPUUtilThreshold.1 = INTEGER: 90
+NMS-CARD-SYS-MIB::cardMemUtilThreshold.1 = INTEGER: 90
+NMS-CARD-SYS-MIB::cardCPUTempThreshold.1 = INTEGER: 75
+NMS-CARD-SYS-MIB::cardCPUTempCurr.1 = INTEGER: 50
+NMS-CARD-SYS-MIB::cardCPUTempThresholdLow.1 = INTEGER: -15
+NMS-CARD-SYS-MIB::cardCPUTempStatus.1 = INTEGER: normal(1)
+NMS-CARD-SYS-MIB::cardMemUtilThresholdMax.1 = INTEGER: 0
+NMS-CARD-SYS-MIB::cardSystemTemptureNodeNumber.1 = INTEGER: 1
+.1.3.6.1.4.1.3320.9.181.1.1.1.1 = INTEGER: 2
+.1.3.6.1.4.1.3320.9.181.1.1.2.1 = STRING: "P3310C mother card"
+.1.3.6.1.4.1.3320.9.181.1.1.3.1 = INTEGER: 982
+.1.3.6.1.4.1.3320.9.181.1.1.4.1 = INTEGER: 90
+.1.3.6.1.4.1.3320.9.181.1.1.5.1 = INTEGER: 90
+.1.3.6.1.4.1.3320.9.181.1.1.6.1 = INTEGER: 75
+.1.3.6.1.4.1.3320.9.181.1.1.7.1 = INTEGER: 50
+.1.3.6.1.4.1.3320.9.181.1.1.8.1 = INTEGER: -15
+.1.3.6.1.4.1.3320.9.181.1.1.9.1 = INTEGER: normal(1)
+.1.3.6.1.4.1.3320.9.181.1.1.10.1 = INTEGER: 0
+.1.3.6.1.4.1.3320.9.181.1.1.11.1 = INTEGER: 1
+*/
+
+
+$mib = 'NMS-VLAN-EXT-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.182';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+/*
+NMS-VLAN-EXT-MIB::dot1qPvid.1 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.2 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.3 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.4 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.5 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.6 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.7 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.8 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.9 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPvid.10 = Gauge32: 1
+NMS-VLAN-EXT-MIB::dot1qPortType.1 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.2 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.3 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.4 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.5 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.6 = INTEGER: GigaEthernet(3)
+NMS-VLAN-EXT-MIB::dot1qPortType.7 = INTEGER: EPON(5)
+NMS-VLAN-EXT-MIB::dot1qPortType.8 = INTEGER: EPON(5)
+NMS-VLAN-EXT-MIB::dot1qPortType.9 = INTEGER: EPON(5)
+NMS-VLAN-EXT-MIB::dot1qPortType.10 = INTEGER: EPON(5)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.1 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.2 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.3 = INTEGER: Trunk(2)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.4 = INTEGER: Trunk(2)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.5 = INTEGER: Trunk(2)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.6 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.7 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.8 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.9 = INTEGER: Access(1)
+NMS-VLAN-EXT-MIB::dot1qPortSwitchingMode.10 = INTEGER: Access(1)
+*/
+
+
+$mib = 'NMS-CARD-OPERATION-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.184';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+
+$mib = 'NMS-FAN-TRAP';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.187';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+$config['mibs'][$mib]['status']['fan1RunningStatus']['indexes'][0] = array('descr' => 'Fan 1 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.1.0');
+$config['mibs'][$mib]['status']['fan2RunningStatus']['indexes'][0] = array('descr' => 'Fan 2 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.2.0');
+$config['mibs'][$mib]['status']['fan3RunningStatus']['indexes'][0] = array('descr' => 'Fan 3 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.3.0');
+$config['mibs'][$mib]['status']['fan4RunningStatus']['indexes'][0] = array('descr' => 'Fan 4 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.4.0');
+$config['mibs'][$mib]['status']['fan5RunningStatus']['indexes'][0] = array('descr' => 'Fan 5 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.5.0');
+$config['mibs'][$mib]['status']['fan6RunningStatus']['indexes'][0] = array('descr' => 'Fan 6 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.6.0');
+$config['mibs'][$mib]['status']['fan7RunningStatus']['indexes'][0] = array('descr' => 'Fan 7 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.7.0');
+$config['mibs'][$mib]['status']['fan8RunningStatus']['indexes'][0] = array('descr' => 'Fan 8 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.8.0');
+$config['mibs'][$mib]['status']['fan9RunningStatus']['indexes'][0] = array('descr' => 'Fan 9 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.9.0');
+$config['mibs'][$mib]['status']['fan10RunningStatus']['indexes'][0] = array('descr' => 'Fan 10 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.10.0');
+$config['mibs'][$mib]['status']['fan11RunningStatus']['indexes'][0] = array('descr' => 'Fan 11 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.11.0');
+$config['mibs'][$mib]['status']['fan12RunningStatus']['indexes'][0] = array('descr' => 'Fan 12 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.12.0');
+$config['mibs'][$mib]['status']['fan13RunningStatus']['indexes'][0] = array('descr' => 'Fan 13 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.13.0');
+$config['mibs'][$mib]['status']['fan14RunningStatus']['indexes'][0] = array('descr' => 'Fan 14 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.14.0');
+$config['mibs'][$mib]['status']['fan15RunningStatus']['indexes'][0] = array('descr' => 'Fan 15 Running Status', 'measured' => 'fan', 'type' => 'FanStatus', 'oid_num' => '.1.3.6.1.4.1.3320.9.187.3.15.0');
+
+/* Doesn't work
+$config['mibs'][$mib]['status']['FanRunningStatus']['tables'][] = array(
+  'table'    => 'FanRunningStatus',
+  'type'     => 'FanStatus',
+  'descr'    => 'Fan Running status',
+  'oid'      => 'FanStatus',
+  'oid_num'  => '.1.3.6.1.4.1.3320.9.187.3',
+  'measured' => 'fan'
+);
+
+*/
+$type = 'FanStatus';
+$config['mibs'][$mib]['states'][$type][1] = array('name' => 'normal', 'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][2] = array('name' => 'stop', 'event' => 'alert');
+$config['mibs'][$mib]['states'][$type][3] = array('name' => 'unused', 'event' => 'exclude');
+
+/* WORK, but show fake "normal" status
+$config['mibs'][$mib]['status']['FanTable']['tables'][] = array(
+  'table'    => 'FanTable',
+  'type'     => 'FanStatus',
+  'descr'    => 'Fan status',
+  'oid'      => 'FanStatus',
+  'oid_num'  => '.1.3.6.1.4.1.3320.9.187.4.1.2',
+  'measured' => 'fan'
+);
+*/
+
+//WTF - this device really have 2 fans.
+// Fake FanStatus and FanSpeed in Table. But normal status in fan_N_RunningStatus
+/*
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan1RunningStatus.0 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan2RunningStatus.0 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan3RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan4RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan5RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan6RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan7RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan8RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan9RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan10RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan11RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan12RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan13RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan14RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.fanRunningStatus.fan15RunningStatus.0 = INTEGER: unused(3)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.0 = INTEGER: 0
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.1 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.2 = INTEGER: 2
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.3 = INTEGER: 3
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.4 = INTEGER: 4
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.5 = INTEGER: 5
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.6 = INTEGER: 6
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.7 = INTEGER: 7
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanIndex.8 = INTEGER: 8
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.0 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.1 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.2 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.3 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.4 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.5 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.6 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.7 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanStatus.8 = INTEGER: normal(1)
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.0 = INTEGER: 3057
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.1 = INTEGER: 3058
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.2 = INTEGER: 3059
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.3 = INTEGER: 3060
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.4 = INTEGER: 3062
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.5 = INTEGER: 3063
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.6 = INTEGER: 3064
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.7 = INTEGER: 3065
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.FanSpeed.8 = INTEGER: 3067
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.0 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.1 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.2 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.3 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.4 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.5 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.6 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.7 = INTEGER: 1
+enterprises.nms.nmsMgmt.fanTrap.FanTable.FanTableEntry.4.8 = INTEGER: 1
+*/
+
+
+$mib = 'NMS-POWER-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.189';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+//.1.3.6.1.4.1.3320.9.189
+//NMS-POWER-MIB::powerStatus.0 = INTEGER: power-A-normal(1)
+
+
+$mib = 'NMS-POWER-EXT-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.9.251';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+$config['mibs'][$mib]['status']['PowerDeviceTable']['tables'][] = array(
+  'table'     => 'PowerDeviceTable',
+  'type'      => 'PowerStatus',
+//  'oid_descr' => '.1.3.6.1.4.1.3320.9.251.4.1.3',
+  'descr'    => 'Power Supply status %index%',
+  'oid'       => 'PowerDeviceStatus',
+  'oid_num'   => '.1.3.6.1.4.1.3320.9.251.4.1.4',
+  'measured'  => 'phase'
+);
+
+$type = 'PowerStatus';
+$config['mibs'][$mib]['states'][$type][1] = array('name' => 'ON',  'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][2] = array('name' => 'OFF', 'event' => 'alert');
+
+/*
+enterprises.nms.nmsMgmt.powerExt.power1Status.0 = INTEGER: up(1)
+enterprises.nms.nmsMgmt.powerExt.power2Status.0 = INTEGER: down(0)
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceIndex.0 = INTEGER: 1
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceIndex.1 = INTEGER: 2
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceType.0 = INTEGER: 1
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceType.1 = INTEGER: EMPTY-SHELF(0)
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceDescr.0 = STRING: "INPUT-- AC 100~240V , 50/60Hz"
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceDescr.1 = STRING: "INPUT-- AC 100~240V , 50/60Hz"
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceStatus.0 = INTEGER: ON(1)
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerDeviceStatus.1 = INTEGER: OFF(2)
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerShelfNum.0 = INTEGER: A(1)
+enterprises.nms.nmsMgmt.powerExt.PowerDeviceTable.PowerDeviceTableEntry.PowerShelfNum.1 = INTEGER: A(1)
+*/
+
+$mib = 'NMS-EPON-ONU';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.3320.101.10';
+$config['mibs'][$mib]['mib_dir'] = 'bdcom';
+$config['mibs'][$mib]['descr'] = '';
+
+$type = 'OnuStatus';
+$config['mibs'][$mib]['states'][$type][0] = array('name' => 'authenticated',  'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][1] = array('name' => 'registered',     'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][2] = array('name' => 'deregistered',   'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][3] = array('name' => 'auto-config',    'event' => 'ok');
+$config['mibs'][$mib]['states'][$type][4] = array('name' => 'lost',           'event' => 'alert');
+
+$config['mibs'][$mib]['status']['nmsepononuTable']['tables'][] = array(
+                                              'oid'            => 'onuStatus',
+                                              'table'          => 'nmsepononuTable',
+                                              'table_walk'     => FALSE, // too big table, walk by OIDs
+                                              'type'           => 'OnuStatus',
+                                              'descr'          => 'Status %port_label% %index%',
+                                              'oid_descr'      => 'opIfIndex',
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.1.1.26',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%opIfIndex%' ] ]);
+
+$config['mibs'][$mib]['sensor'][]     = array('oid'            => 'opModuleTemp',
+                                              'table'          => 'nmsepononuopticalportTable',
+                                              'descr'          => 'Temperature %port_label%',
+                                              'oid_extra'      => 'opIfIndex',
+                                              'class'          => 'temperature',
+                                              'scale'          => 0.00390625, // 1/256th
+                                              'invalid'        => -65535,
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.5.1.2',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%opIfIndex%' ] ]);
+
+$config['mibs'][$mib]['sensor'][]     = array('oid'            => 'opModuleVolt',
+                                              'table'          => 'nmsepononuopticalportTable',
+                                              'descr'          => 'Supply Voltage %port_label%',
+                                              'oid_extra'      => 'opIfIndex',
+                                              'class'          => 'voltage',
+                                              'scale'          => 0.0001,
+                                              'invalid'        => -65535,
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.5.1.3',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%opIfIndex%' ] ]);
+
+$config['mibs'][$mib]['sensor'][]     = array('oid'            => 'opModuleCurrent',
+                                              'table'          => 'nmsepononuopticalportTable',
+                                              'descr'          => 'TX bias %port_label%',
+                                              'oid_extra'      => 'opIfIndex',
+                                              'class'          => 'current',
+                                              'scale'          => 0.000002,
+                                              'invalid'        => -65535,
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.5.1.4',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%opIfIndex%' ] ]);
+
+$config['mibs'][$mib]['sensor'][]     = array('oid'            => 'opModuleRxPower',
+                                              'table'          => 'nmsepononuopticalportTable',
+                                              'descr'          => 'RX Power %port_label%',
+                                              'oid_extra'      => 'opIfIndex',
+                                              'class'          => 'dbm',
+                                              'scale'          => 0.1,
+                                              'invalid'        => -65535,
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.5.1.5',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%index%' ] ]);
+
+$config['mibs'][$mib]['sensor'][]     = array('oid'            => 'opModuleTxPower',
+                                              'table'          => 'nmsepononuopticalportTable',
+                                              'descr'          => 'TX Power %port_label%',
+                                              'oid_extra'      => 'opIfIndex',
+                                              'class'          => 'dbm',
+                                              'scale'          => 0.1,
+                                              'invalid'        => -65535,
+                                              'oid_num'        => '.1.3.6.1.4.1.3320.101.10.5.1.6',
+                                              'measured_match' => [ ['entity_type' => 'port', 'field' => 'ifIndex', 'match' => '%opIfIndex%' ] ]);
+
 // EOF
Index: includes/definitions/mibs/eltex.inc.php
===================================================================
--- includes/definitions/mibs/eltex.inc.php	(revision 9757)
+++ includes/definitions/mibs/eltex.inc.php	(working copy)
@@ -20,6 +20,7 @@
 $config['mibs'][$mib]['descr']        = 'Mib for eltex devices, that support OMS';
 $config['mibs'][$mib]['serial'][]     = array('oid' => 'omsSerialNumber.0');
 //ELTEX-OMS::omsFwRev.0 = STRING: Eltex LTP-8X:rev.C software version 3.26.1 build 1383 on 31.01.2017 11:35
+//ELTEX-OMS::omsProductClass.0 = STRING: 0x23 (TAU36_4v0)
 
 $config['mibs'][$mib]['hardware'][] = array('oid'             => 'omsFwRev.0',
                                             'transformations' => array('action' => 'regex_replace',
@@ -160,4 +161,59 @@
 $config['mibs'][$mib]['states']['BoolValue'][0] = array('name' => 'false', 'event' => 'ok');
 $config['mibs'][$mib]['states']['BoolValue'][1] = array('name' => 'true', 'event' => 'ok');
 
+
+//http://kcs.eltex.nsk.ru/articles/933
+$mib = 'ELTEX-FXS72';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.35265.1.9';
+$config['mibs'][$mib]['mib_dir'] = 'eltex';
+$config['mibs'][$mib]['descr'] = 'Mib for fxs72 mib';
+
+$config['mibs'][$mib]['mempool']['fxsRam'] = array('type'     => 'static', 'descr' => 'RAM', 'scale' => 1024,
+                                                   'oid_free' => 'fxsFreeRam.0', 'oid_free_num' => '.1.3.6.1.4.1.35265.1.9.5.0', //ELTEX-FXS72::fxsFreeRam.0 = STRING: 13616kB
+// WTF? Why STRING?
+                                                   'total'    => 44700, // 44700 kB
+);
+
+$config['mibs'][$mib]['sensor'][] = array('descr'    => 'fxsMonitoringTemp1',
+                                          'oid'      => 'fxsMonitoringTemp1',
+                                          'min'      => 0,
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.5',
+                                          'class'    => 'temperature',
+                                          'measured' => 'device');
+$config['mibs'][$mib]['sensor'][] = array('descr'    => 'fxsMonitoringTemp2',
+                                          'oid'      => 'fxsMonitoringTemp2',
+                                          'min'      => 0,
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.6',
+                                          'class'    => 'temperature',
+                                          'measured' => 'device');
+$config['mibs'][$mib]['sensor'][] = array('descr'    => 'fxsMonitoringTemp3',
+                                          'oid'      => 'fxsMonitoringTemp3',
+                                          'min'      => 0,
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.7',
+                                          'class'    => 'temperature',
+                                          'measured' => 'device');
+$config['mibs'][$mib]['sensor'][] = array('descr'    => 'fxsMonitoringTemp4',
+                                          'oid'      => 'fxsMonitoringTemp4',
+                                          'min'      => 0,
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.8',
+                                          'class'    => 'temperature',
+                                          'measured' => 'device');
+
+$config['mibs'][$mib]['sensor'][] = array('oid'      => 'fxsMonitoringVBat',
+                                          'class'    => 'voltage',
+                                          'descr'    => 'Voltage in',
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.2',
+                                          'min'      => 0);
+$config['mibs'][$mib]['sensor'][] = array('oid'      => 'fxsMonitoringVRing1',
+                                          'class'    => 'voltage',
+                                          'descr'    => 'Voltage out 1-36',
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.3',
+                                          'min'      => 0);
+$config['mibs'][$mib]['sensor'][] = array('oid'      => 'fxsMonitoringVRing2',
+                                          'class'    => 'voltage',
+                                          'descr'    => 'Voltage out 37-72',
+                                          'oid_num'  => '.1.3.6.1.4.1.35265.1.9.10.4',
+                                          'min'      => 0);
+
 // EOF
Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php	(revision 9757)
+++ includes/definitions/os.inc.php	(working copy)
@@ -1112,6 +1112,9 @@
 $config['os'][$os]['sysDescr_regex'][]      = '/BDCOM(?:\(tm\)|.*Internetwork Operating System Software)? (?<hardware>(?:\w+ )?\S+) (?:Series )?Software, Version (?<version>\d\S+) (?:.*Serial num:(?<serial>\S+))?/';
 $config['os'][$os]['mibs'][]                = "NMS-CHASSIS";
 $config['os'][$os]['mibs'][]                = "NMS-OPTICAL-PORT-MIB";
+$config['os'][$os]['mibs'][]                = "NMS-FAN-TRAP";
+$config['os'][$os]['mibs'][]                = "NMS-POWER-EXT-MIB";
+$config['os'][$os]['mibs'][]                = "NMS-EPON-ONU";
 
 // Billion
 
@@ -2166,6 +2169,15 @@
 $config['os'][$os]['remote_access']         = array('http');
 $config['os'][$os]['mibs'][]                = "SNR-ERD-2";
 
+/*$os = "snr-erd-3";
+$config['os'][$os]['text']                  = "SNR ERD-3";
+$config['os'][$os]['vendor']                = "SNR";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.40418.2.3";
+$config['os'][$os]['type']                  = "environment";
+$config['os'][$os]['ports_skip_ifType']     = TRUE;
+$config['os'][$os]['remote_access']         = array('http');
+$config['os'][$os]['mibs'][]                = "SNR-ERD-3";
+
 $os = "snr-erd-4";
 $config['os'][$os]['text']                  = "SNR ERD-4";
 $config['os'][$os]['vendor']                = "SNR";
@@ -2189,6 +2214,7 @@
 $config['os'][$os]['text']                  = "QTech GBN Switch";
 $config['os'][$os]['vendor']                = "QTech";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.27514.1.3";
+$config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.27514.1.10";
 $config['os'][$os]['type']                  = "network";
 $config['os'][$os]['mibs'][]                = "GBNPlatformOAM-MIB";
 
@@ -2374,6 +2400,8 @@
   'sysName'                                 => '/^(SMG|TAU|SBC|RG|TSU|MC)/i',
 );
 $config['os'][$os]['remote_access']         = array('http');
+$config['os'][$os]['mibs'][]                = "ELTEX-OMS";
+$config['os'][$os]['mibs'][]                = "ELTEX-FXS72";
 
 $os = "eltex-gpon";
 $config['os'][$os]['text']                  = "Eltex GPON";
Index: mibs/bdcom/NMS-CARD-OPERATION-MIB
===================================================================
--- mibs/bdcom/NMS-CARD-OPERATION-MIB	(revision 9757)
+++ mibs/bdcom/NMS-CARD-OPERATION-MIB	(working copy)
@@ -38,8 +38,8 @@
 
 
 
-               cardResetTable OBJECT-TYPE
-                   SYNTAX  SEQUENCE OF CardResetTableEntry
+               slotStatusTable OBJECT-TYPE
+                   SYNTAX  SEQUENCE OF cardStatusTableEntry
                    ACCESS  not-accessible
                    STATUS  mandatory
                    DESCRIPTION
@@ -46,29 +46,29 @@
                             "A list of cards reset entries."
                    ::= { cardOper 2 }
 
-               CardResetTableEntry OBJECT-TYPE
-                   SYNTAX  CardResetTableEntry
+               cardStatusTableEntry OBJECT-TYPE
+                   SYNTAX  cardStatusTableEntry
                    ACCESS  not-accessible
                    STATUS  mandatory
                    DESCRIPTION
                             "A collection of cards to be reset."
-                   INDEX { cardIndex }
-               ::= { cardResetTable 1 }
+                   INDEX { nmsSlotIndex }
+               ::= { slotStatusTable 1 }
 
-               CardResetTableEntry ::=
+               cardStatusTableEntry ::=
                    SEQUENCE {
-                       nmscardIndex
+                       nmsSlotIndex
                            INTEGER,
-                       nmscardType
+                       nmsCardType
                            INTEGER,
-                       nmscardDescr
+                       nmsCardDescr
                        	   DisplayString,
-                       nmscardReset
+                       nmsSlotOperation
                        	   INTEGER
                   }
 
 
-               nmscardIndex OBJECT-TYPE
+               nmsSlotIndex OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-only
                    STATUS  mandatory
@@ -75,28 +75,28 @@
                    DESCRIPTION
                            "Index into cardTable (not physical chassis
                            slot number), the same with the nmscardIndex of nmscardTable in NMS-CHASSIS-MIB."
-                   ::= { cardResetTableEntry 1 }
+                   ::= { cardStatusTableEntry 1 }
 
 
-               nmscardType OBJECT-TYPE
+               nmsCardType OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
                            "Type of card, the same with the nmscardIndex of nmscardTable in NMS-CHASSIS-MIB."
-                   ::= { cardResetTableEntry 2 }
+                   ::= { cardStatusTableEntry 2 }
 
 
 
-               nmscardDescr OBJECT-TYPE
+               nmsCardDescr OBJECT-TYPE
                    SYNTAX  DisplayString
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
                            "Text description of this card, the same value with the nmscardIndex of nmscardTable in NMS-CHASSIS-MIB."
-                   ::= { cardResetTableEntry 3 }
+                   ::= { cardStatusTableEntry 3 }
 
-               nmscardReset OBJECT-TYPE
+               nmsSlotOperation OBJECT-TYPE
                    SYNTAX  INTEGER{ 
                                     no-reset(0),
                                     reset(1),
@@ -108,7 +108,7 @@
                    STATUS  mandatory
                    DESCRIPTION
                            "When value is set to reset(1), that means card reset; when value is set to shutdown-slot(2), no-shutdown-slot(3), only shut down or no shut down the corresponding slot."
-                   ::= { cardResetTableEntry 4 }
+                   ::= { cardStatusTableEntry 4 }
                    
                    
                    
Index: mibs/bdcom/NMS-CARD-SYS-MIB
===================================================================
--- mibs/bdcom/NMS-CARD-SYS-MIB	(revision 9757)
+++ mibs/bdcom/NMS-CARD-SYS-MIB	(working copy)
@@ -7,7 +7,6 @@
 -- All rights reserved.
 -- *****************************************************************
 
-
 NMS-CARD-SYS-MIB DEFINITIONS ::= BEGIN 
 
 IMPORTS
@@ -25,8 +24,6 @@
 
                cardSys         OBJECT IDENTIFIER ::= { nmsMgmt 181 }
 
-	        
-
                cardSystemSetTable OBJECT-TYPE
                    SYNTAX  SEQUENCE OF CardSystemSetEntry
                    ACCESS  not-accessible
@@ -59,10 +56,17 @@
                        cardCPUTempThreshold
                        	   INTEGER,
                        cardCPUTempCurr
-                       	   INTEGER
+                       	   INTEGER,
+                       cardCPUTempThresholdLow
+                       	   INTEGER,
+                       cardCPUTempStatus
+                       	   INTEGER,
+                       cardMemUtilThresholdMax
+                       	   INTEGER,
+                      cardSystemTemptureNodeNumber 
+                      `	   INTEGER
                   }
 
-
                cardSysIndex OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-only
@@ -104,7 +108,6 @@
                            "Card memory utilization upper limit value."
                    ::= { cardSystemSetEntry 5 }
 
-
                cardCPUTempThreshold OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-write
@@ -121,8 +124,41 @@
                            "Card CPU current temperature."
                    ::= { cardSystemSetEntry 7 }
 
+               cardCPUTempThresholdLow OBJECT-TYPE
+                   SYNTAX  INTEGER(-125..125)
+                   ACCESS  read-write
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Minimal threshold of card CPU temperature. The range is (-125~+125)."
+                   ::= { cardSystemSetEntry 8 }
 
-	        
+               cardCPUTempStatus OBJECT-TYPE
+                   SYNTAX  INTEGER{ 
+                                   normal(1),
+                                   alarm(2)
+                                  }
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "The card CPU temperature status, 1 means normal, 2 means alarm. "
+                   ::= { cardSystemSetEntry 9 }
+
+               cardMemUtilThresholdMax OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Maximal value of card memory utilization . For example, 60 means the maxmial value of memory utilization is 60%, maximal value is 100."
+                   ::= { cardSystemSetEntry 10 }
+
+               cardSystemTemptureNodeNumber OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Total number of  tempture Node."
+                   ::= { cardSystemSetEntry 11 }
+
                cardElementStatus OBJECT-TYPE
                    SYNTAX  INTEGER{
                    		normal(1),
@@ -146,12 +182,11 @@
                            "Card element status, only use for variable binding in card system notifications."
                    ::= { cardSys 3 }
 
-
--- Notifications   --cardCPUUtil
+-- Notifications   
+--cardCPUUtil
 	cardSysNotifications OBJECT IDENTIFIER
                                 ::= { cardSys 4 }
 
-
 	cardSysNotification NOTIFICATION-TYPE
     		OBJECTS {
         		nmscardIndex,
@@ -165,8 +200,67 @@
         	"The agent generates this notification when certain card element value exceeds upper limit defined above. "
     		::= { cardSysNotifications 1 }
 
+-- cardSystemTemptureNodeTable(°å¿šÎÂ¶ÈœÚµãÎÂ¶ÈÁÐ±í)
 
+               cardSystemTemptureNodeTable OBJECT-TYPE
+                   SYNTAX  SEQUENCE OF CardSystemTemptureNodeEntry
+                   ACCESS  not-accessible
+                   STATUS  mandatory
+                   DESCRIPTION
+                            "A list of cards system temparature related set value entries."
+                   ::= { cardSys 5 }
 
+               cardSystemTemptureNodeEntry OBJECT-TYPE
+                   SYNTAX  CardSystemTemptureNodeEntry
+                   ACCESS  not-accessible
+                   STATUS  mandatory
+                   DESCRIPTION
+                            "A collection of cards to be reset."
+                   INDEX { cardSysTempIndex, temptureNodeIndex}
+               ::= { cardSystemTemptureNodeTable 1 }
 
+               CardSystemTemptureNodeEntry::=
+                   SEQUENCE {
+                       cardSysTempIndex
+                           INTEGER,
+                       temptureNodeIndex
+                           INTEGER,
+                       temptureNodeDescr
+                       	   DisplayString,
+                       temptureNodeCur
+                       	   INTEGER
+                  }
 
+               cardSysIndex OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Index of slot. "
+                   ::= { cardSystemTemptureNodeEntry 1 }
+
+               temptureNodeIndex OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Index of tempture node. "
+                   ::= { cardSystemTemptureNodeEntry 2 }
+
+               temptureNodeDescr OBJECT-TYPE
+                   SYNTAX  DisplayString
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Descript of tempture node. "
+                   ::= { cardSystemTemptureNodeEntry 3 }
+
+               temptureNodeCur OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Current tempture of tempture node. "
+                   ::= { cardSystemTemptureNodeEntry 4 }
+
 END
Index: mibs/bdcom/NMS-EPON-ONU
===================================================================
--- mibs/bdcom/NMS-EPON-ONU	(revision 9757)
+++ mibs/bdcom/NMS-EPON-ONU	(working copy)
@@ -24,6 +24,25 @@
           
                nmsEponOnu         OBJECT IDENTIFIER ::= { nmsEPONGroup 10 }
                
+
+               IDiv10 ::= TEXTUAL-CONVENTION
+                   DISPLAY-HINT "d-1"
+                   STATUS current
+                   DESCRIPTION "/10"
+                   SYNTAX Integer32 (-2147483648..2147483647)
+
+               IDiv1000 ::= TEXTUAL-CONVENTION
+                   DISPLAY-HINT "d-3"
+                   STATUS current
+                   DESCRIPTION "/1000"
+                   SYNTAX Integer32 (-2147483648..2147483647)
+
+               IDiv10000 ::= TEXTUAL-CONVENTION
+                   DISPLAY-HINT "d-4"
+                   STATUS current
+                   DESCRIPTION "/10000"
+                   SYNTAX Integer32 (-2147483648..2147483647)
+
                nmsepononuTable OBJECT-TYPE
                    SYNTAX  SEQUENCE OF NMSEponOnuEntry
                    ACCESS  not-accessible
@@ -415,11 +434,11 @@
                    ::= { nmsEponOnuEntry 25 } 
 
                onuStatus OBJECT-TYPE
-                   SYNTAX  INTEGER{
+                   SYNTAX  INTEGER {
                           authenticated(0),
                           registered(1),
                           deregistered(2),
-                          auto_config(3),
+                          auto-config(3),
                           lost(4)
                    }
                    ACCESS  read-only
@@ -859,9 +878,9 @@
                    ::= { nmsEponOnuEntry 74 } 
 
                onuCurrentPONInUse OBJECT-TYPE
-                   SYNTAX  INTEGER{
-                   	in_use(1),  
-                   	not_in_use(2)
+                   SYNTAX  INTEGER {
+                   	in-use(1),  
+                   	not-in-use(2)
                    }
                    ACCESS  read-only
                    STATUS  mandatory
@@ -1314,6 +1333,7 @@
 
                opModuleTemp OBJECT-TYPE
                    SYNTAX  INTEGER
+                   UNITS   "/256 C"
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
@@ -1321,7 +1341,8 @@
                    ::= { nmsEponOnuOpticalPortEntry 2 } 
 	
                opModuleVolt OBJECT-TYPE
-                   SYNTAX  INTEGER
+                   SYNTAX  IDiv10000
+                   UNITS   "V"
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
@@ -1329,25 +1350,28 @@
                    ::= { nmsEponOnuOpticalPortEntry 3 } 
 	
                opModuleCurrent OBJECT-TYPE
-                   SYNTAX  INTEGER
+                   SYNTAX  IDiv1000
+                   UNITS   "*2 mA"
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
                            "ONU PON port optical module volt. Unit is 2uA."
                    ::= { nmsEponOnuOpticalPortEntry 4 } 
-	
+
                opModuleRxPower OBJECT-TYPE
-                   SYNTAX  INTEGER
+                   SYNTAX  IDiv10
+                   UNITS   "dBm"
                    ACCESS  read-only
-                   STATUS  mandatory
+                   STATUS  current
                    DESCRIPTION
                            "ONU PON port optical receive power. Unit is 0.1dB."
                    ::= { nmsEponOnuOpticalPortEntry 5 } 
 	
                opModuleTxPower OBJECT-TYPE
-                   SYNTAX  INTEGER
+                   SYNTAX  IDiv10
+                   UNITS   "dBm"
                    ACCESS  read-only
-                   STATUS  mandatory
+                   STATUS  current
                    DESCRIPTION
                            "ONU PON port optical send power. Unit is 0.1dB."
                    ::= { nmsEponOnuOpticalPortEntry 6 } 
Index: mibs/bdcom/NMS-FAN-TRAP
===================================================================
--- mibs/bdcom/NMS-FAN-TRAP	(revision 9757)
+++ mibs/bdcom/NMS-FAN-TRAP	(working copy)
@@ -9,9 +9,6 @@
 
 NMS-FAN-TRAP DEFINITIONS ::= BEGIN
 
-
-
-
 IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE,INTEGER,
     Integer32, Unsigned32                       FROM SNMPv2-SMI
@@ -19,12 +16,8 @@
     NOTIFICATION-GROUP                          FROM SNMPv2-CONF
     nmsEPONGroup,nmsMgmt                                 FROM NMS-SMI;
 
-
                fanTrap         OBJECT IDENTIFIER ::= { nmsMgmt 187 }
 
-
-
-    
 -- Notifications
           fanStatus OBJECT-TYPE
               SYNTAX  INTEGER {
@@ -41,7 +34,6 @@
 	nmsFanNotifications OBJECT IDENTIFIER
                                 ::= { fanTrap 2 }
 
-
 	nmsFanNotification NOTIFICATION-TYPE
     		OBJECTS {
                        fanStatus
@@ -52,7 +44,7 @@
     		::= { nmsFanNotifications 1 }
     		
         fanRunningStatus        OBJECT IDENTIFIER ::= { fanTrap 3 }
-    		
+
         fan1RunningStatus OBJECT-TYPE
               SYNTAX  INTEGER {
                           normal(1),     
@@ -64,7 +56,7 @@
               DESCRIPTION
                       "Fan 1 status, 1-normal, 2-stop, unused(3)."
               ::= { fanRunningStatus 1 }
-    		
+
         fan2RunningStatus OBJECT-TYPE
               SYNTAX  INTEGER {
                           normal(1),     
@@ -258,10 +250,11 @@
                        FanStatus
                            INTEGER,
                        FanSpeed
+                       	   INTEGER,
+                       FanShelfNum
                        	   INTEGER
                   }
 
-
                FanIndex OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-only
@@ -270,12 +263,11 @@
                            "Index of fan-device"
                    ::= { FanTableEntry 1 }
 
-
                FanStatus OBJECT-TYPE
                    SYNTAX  INTEGER{ 
                           normal(1),     
                           stop(2),
-                          unused(3)                                    
+                          unused(3)
                                    }
                    ACCESS  read-only
                    STATUS  mandatory
@@ -283,8 +275,6 @@
                            "Fan-device status."
                    ::= { FanTableEntry 2 }
 
-
-
                FanSpeed OBJECT-TYPE
                    SYNTAX  INTEGER
                    ACCESS  read-only
@@ -292,7 +282,14 @@
                    DESCRIPTION
                            "Fan-device speed."
                    ::= { FanTableEntry 3 }
-                       
 
+               FanShelfNum OBJECT-TYPE
+                   SYNTAX  INTEGER
+                   ACCESS  read-only
+                   STATUS  mandatory
+                   DESCRIPTION
+                           "Fan-device shelf number."
+                   ::= { FanTableEntry 4 }                       
+
               
 END
Index: mibs/bdcom/NMS-IF-MIB
===================================================================
--- mibs/bdcom/NMS-IF-MIB	(revision 9757)
+++ mibs/bdcom/NMS-IF-MIB	(working copy)
@@ -120,8 +120,8 @@
               SYNTAX  INTEGER {
                           other(1),          -- none of the following
                           voiceEM(100),       -- voice recEive and transMit
-                   		  voiceFXO(101),      -- voice Foreign Exchange Office
-                   		  voiceFXS(102)       -- voice Foreign Exchange Station
+                          voiceFXO(101),      -- voice Foreign Exchange Office
+                          voiceFXS(102)       -- voice Foreign Exchange Station
                       }
               ACCESS  read-only
               STATUS  mandatory
@@ -160,8 +160,8 @@
           vifAdminStatus OBJECT-TYPE
               SYNTAX  INTEGER {
                           up(1),       -- ready to pass packets
-                   		  down(2),
-                   		  testing(3)   -- in some test mode
+                          down(2),
+                          testing(3)   -- in some test mode
                       }
               ACCESS  read-write
               STATUS  mandatory
@@ -198,9 +198,7 @@
                       initialization of the local network management
                       subsystem, then this object contains a zero
                       value."
-              ::= { vifEntry 9 }              
-              
-              
+              ::= { vifEntry 9 }
 
           ifStormControlTable OBJECT-TYPE
               SYNTAX  SEQUENCE OF IfStormControlEntry
@@ -247,7 +245,6 @@
                       initialization."
               ::= { ifStormControlEntry 1 }
 
-
           ifStormControlBroadcast OBJECT-TYPE
               SYNTAX  INTEGER(10..1000000)
               ACCESS  read-write
@@ -272,7 +269,7 @@
                       "Interface Storm Control Unicast, range is 10-1000000kbps"
               ::= { ifStormControlEntry 4 }
 
- --ifSfpParameterTable
+--ifSfpParameterTable
              ifSfpParameterTable OBJECT-TYPE
                  SYNTAX  SEQUENCE OF ifSfpParameterEntry
                  ACCESS  not-accessible
@@ -295,16 +292,36 @@
                  SEQUENCE {
                      IfIndex
                          INTEGER,
-                     txPower
+                     txPower1
                          INTEGER,
-                     rxPower
+                     rxPower1
                          INTEGER,   
                      temperature
                          INTEGER,
                      vlotage
                          INTEGER,
-                     curr
-                         INTEGER                           
+                     curr1
+                         INTEGER,
+                     vendname
+                         OCTET STRING,
+                     txPower2
+                         INTEGER,
+                     rxPower2
+                         INTEGER,   
+                     curr2
+                         INTEGER,
+                     txPower3
+                         INTEGER,
+                     rxPower3
+                         INTEGER,   
+                     curr3
+                         INTEGER,
+                     txPower4
+                         INTEGER,
+                     rxPower4
+                         INTEGER,   
+                     curr4
+                         INTEGER
                  }
 
              IfIndex OBJECT-TYPE
@@ -314,23 +331,23 @@
                  DESCRIPTION
                          "The only diid of port in System."
                  ::= { ifSfpParameterEntry 1 } 
-        
-             txPower OBJECT-TYPE
+
+             txPower1 OBJECT-TYPE
                  SYNTAX  INTEGER
                  ACCESS  read-only
                  STATUS  mandatory
                  DESCRIPTION
-                         "The tx power of optical module. The unit is 0.1DBm."
+                         "The tx power 1 of optical module. The unit is 1DBm."
                  ::= { ifSfpParameterEntry 2 } 
-    
-             rxPower OBJECT-TYPE
+
+             rxPower1 OBJECT-TYPE
                  SYNTAX  INTEGER
                  ACCESS  read-only
                  STATUS  mandatory
                  DESCRIPTION
-                         "The rx power of optical module. The unit is 0.1DBm."
+                         "The rx power 1 of optical module. The unit is 1DBm."
                  ::= { ifSfpParameterEntry 3 } 
-     
+
              temperature OBJECT-TYPE
                  SYNTAX  INTEGER
                  ACCESS  read-only
@@ -338,7 +355,7 @@
                  DESCRIPTION
                          "Sfp module temperature. The unit is 1/256 degree."
                  ::= { ifSfpParameterEntry 4 } 
-    
+
              vlotage OBJECT-TYPE
                  SYNTAX  INTEGER
                  ACCESS  read-only
@@ -346,17 +363,150 @@
                  DESCRIPTION
                          "Sfp module volt. The unit is 0.1mV."
                  ::= { ifSfpParameterEntry 5 } 
-    
-             curr OBJECT-TYPE
+
+             curr1 OBJECT-TYPE
                  SYNTAX  INTEGER
                  ACCESS  read-only
                  STATUS  mandatory
                  DESCRIPTION
-                         "Sfp module bias current. The unit is 2mA."
+                         "Sfp module bias current 1. The unit is 2uA."
                  ::= { ifSfpParameterEntry 6 }
-              
-              
-              
-                 
+
+             vendname OBJECT-TYPE
+                 SYNTAX  OCTET STRING
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "Sfp module vend name."
+                 ::= { ifSfpParameterEntry 7 }
+            txPower2 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The tx 2 power of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 8 } 
+            rxPower2 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The rx 2 power of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 9 } 
+            curr2 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "Sfp module bias current 2. The unit is 2uA."
+                 ::= { ifSfpParameterEntry 10 }
+            txPower3 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The tx 3 power of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 11 } 
+            rxPower3 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The rx 3 power of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 12 } 
+            curr3 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "Sfp module bias current 3. The unit is 2uA."
+                 ::= { ifSfpParameterEntry 13 }
+            txPower4 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The tx 4 power  of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 14 } 
+            rxPower4 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The rx 4 power of optical module. The unit is 1DBm."
+                 ::= { ifSfpParameterEntry 15 } 
+            curr4 OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "Sfp module bias current 4. The unit is 2uA."
+                 ::= { ifSfpParameterEntry 16 }    
+
+ --cableDiagnoseTable
+             cableDiagnoseTable OBJECT-TYPE
+                 SYNTAX  SEQUENCE OF CableDiagnoseEntry
+                 ACCESS  not-accessible
+                 STATUS  mandatory
+                 DESCRIPTION
+                          "A interface list of cable diagnose table entries."
+                 ::= { nmsIfObjects 8 }
+
+             cableDiagnoseEntry OBJECT-TYPE
+                 SYNTAX CableDiagnoseEntry
+                 ACCESS  not-accessible
+                 STATUS  mandatory
+                 DESCRIPTION
+                          "A collection of cable diagnose objects in the
+                          interface table."
+                 INDEX { ifIndex }
+             ::= { cableDiagnoseTable 1 }
+
+             CableDiagnoseEntry ::=
+                 SEQUENCE {
+                     ifIndex
+                         INTEGER,
+                     enable
+                         INTEGER,
+                     period
+                         INTEGER,   
+                     description 
+                         OCTET STRING                      
+                 }
+
+             ifIndex OBJECT-TYPE
+                 SYNTAX  INTEGER
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "The only diid of port in System."
+                 ::= { cableDiagnoseEntry 1 } 
+
+             enable OBJECT-TYPE
+                 SYNTAX  INTEGER{
+                                enable(1),
+                                disable(2)
+                                }
+                 ACCESS  read-write
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "enable=1,disable=2."
+                 ::= { cableDiagnoseEntry 2 } 
+
+             period OBJECT-TYPE
+                 SYNTAX  INTEGER(0..32767)
+                 ACCESS  read-write
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "period=0 means manual scanning, the range of auto scanning period is 1-32767."
+                 ::= { cableDiagnoseEntry 3 } 
+
+             description OBJECT-TYPE
+                 SYNTAX  OCTET STRING 
+                 ACCESS  read-only
+                 STATUS  mandatory
+                 DESCRIPTION
+                         "cable diagnoisis descpription."
+                 ::= { cableDiagnoseEntry 4 } 
+
 END
-
Index: mibs/bdcom/NMS-INTERFACE-EXT
===================================================================
--- mibs/bdcom/NMS-INTERFACE-EXT	(revision 9757)
+++ mibs/bdcom/NMS-INTERFACE-EXT	(working copy)
@@ -18,7 +18,7 @@
             MacAddress,TruthValue,DisplayString
 				FROM SNMPv2-TC;
  nmsIfExtMIB  MODULE-IDENTITY
-        LAST-UPDATED    "20030918"
+        LAST-UPDATED    "200309180000Z"
         ORGANIZATION    ""
         CONTACT-INFO
                 	""
@@ -877,13 +877,13 @@
 
           ifDisableCause OBJECT-TYPE
               SYNTAX  INTEGER{
-                              loopback_detected(1),
-                              bpdu_guard(2),
-                              oam_remote_failure(3),
-                              oam_link_monitor(4),
-                              system_mac_addr_filtered(5),
-                              inconsistent_ring_port(6),
-                              link_unstable(7)
+                              loopback-detected(1),
+                              bpdu-guard(2),
+                              oam-remote-failure(3),
+                              oam-link-monitor(4),
+                              system-mac-addr-filtered(5),
+                              inconsistent-ring-port(6),
+                              link-unstable(7)
                              }
               ACCESS  read-only
               STATUS  mandatory
@@ -933,8 +933,8 @@
 
           ifExtGlobalLinkTrapSwitch OBJECT-TYPE
               SYNTAX  INTEGER{
-                            global_disable(0),
-              		    global_enable(1)
+                            global-disable(0),
+              		    global-enable(1)
                              }
               ACCESS  read-write
               STATUS  mandatory
Index: mibs/bdcom/NMS-MEMORY-POOL-MIB
===================================================================
--- mibs/bdcom/NMS-MEMORY-POOL-MIB	(revision 9757)
+++ mibs/bdcom/NMS-MEMORY-POOL-MIB	(working copy)
@@ -48,7 +48,7 @@
     ::= { nmsMemoryPoolMIB 1 }
 
 nmsMemoryPoolTotalMemorySize OBJECT-TYPE
-    SYNTAX        Unsigned32
+    SYNTAX        INTEGER
     MAX-ACCESS    read-only
     STATUS        current
     DESCRIPTION
@@ -159,31 +159,36 @@
 
 -- units of conformance
 
-nmsMemoryPoolGroup OBJECT-GROUP
-    OBJECTS {
-        nmsMemoryPoolName,
-        nmsMemoryPoolAlternate,
-        nmsMemoryPoolValid,
-        nmsMemoryPoolUsed,
-        nmsMemoryPoolFree,
-        nmsMemoryPoolLargestFree
-    }
-    STATUS        current
-    DESCRIPTION
-        "A collection of objects providing memory pool monitoring."
-    ::= { nmsMemoryPoolGroups 1 }
+nmsMemoryPoolGroup
+    OBJECT IDENTIFIER ::= { nmsMemoryPoolGroups 1 }
 
-nmsMemoryPoolUtilizationGroup OBJECT-GROUP
-    OBJECTS {
-        nmsMemoryPoolUtilization1Min,
-        nmsMemoryPoolUtilization5Min,
-        nmsMemoryPoolUtilization10Min
-    }
-    STATUS        current
-    DESCRIPTION
-        "An optional group providing a collection of memory pool
-        utilization objects."
-    ::= { nmsMemoryPoolGroups 2 }
+--nmsMemoryPoolGroup OBJECT-GROUP
+--    OBJECTS {
+--        nmsMemoryPoolName,
+--        nmsMemoryPoolAlternate,
+--        nmsMemoryPoolValid,
+--        nmsMemoryPoolUsed,
+--        nmsMemoryPoolFree,
+--        nmsMemoryPoolLargestFree
+--    }
+--    STATUS        current
+--    DESCRIPTION
+--        "A collection of objects providing memory pool monitoring."
+--    ::= { nmsMemoryPoolGroups 1 }
 
+nmsMemoryPoolUtilizationGroup
+    OBJECT IDENTIFIER ::= { nmsMemoryPoolGroups 2 }
+--nmsMemoryPoolUtilizationGroup OBJECT-GROUP
+--    OBJECTS {
+--        nmsMemoryPoolUtilization1Min,
+--        nmsMemoryPoolUtilization5Min,
+--        nmsMemoryPoolUtilization10Min
+--    }
+--    STATUS        current
+--    DESCRIPTION
+--        "An optional group providing a collection of memory pool
+--        utilization objects."
+--    ::= { nmsMemoryPoolGroups 2 }
 
+
 END
Index: mibs/bdcom/NMS-POWER-EXT-MIB
===================================================================
--- mibs/bdcom/NMS-POWER-EXT-MIB	(revision 9757)
+++ mibs/bdcom/NMS-POWER-EXT-MIB	(working copy)
@@ -103,7 +103,9 @@
 
 
                PowerDeviceType OBJECT-TYPE
-                   SYNTAX  INTEGER
+                   SYNTAX  INTEGER  { 
+                                    EMPTY-SHELF(0)                                  
+                                   }
                    ACCESS  read-only
                    STATUS  mandatory
                    DESCRIPTION
Index: mibs/bdcom/NMS-SWITCH-MIB
===================================================================
--- mibs/bdcom/NMS-SWITCH-MIB	(revision 9757)
+++ mibs/bdcom/NMS-SWITCH-MIB	(working copy)
@@ -41,7 +41,7 @@
 			FROM INET-ADDRESS-MIB;  			
                        
 switchMIB  MODULE-IDENTITY
-        LAST-UPDATED    "20090113"
+        LAST-UPDATED    "200901130000Z"
         ORGANIZATION    ""
         CONTACT-INFO
                 	""
@@ -109,8 +109,8 @@
 						SYNTAX		INTEGER { 
 										none                (1)
 										dynamic				(2),
-										static_accept		(3),
-										static_reject		(4)
+										static-accept		(3),
+										static-reject		(4)
 									}
 						MAX-ACCESS	read-write
 						STATUS		current
Index: mibs/d-link/DGS3627G-L2MGMT-MIB
===================================================================
--- mibs/d-link/DGS3627G-L2MGMT-MIB	(revision 9757)
+++ mibs/d-link/DGS3627G-L2MGMT-MIB	(working copy)
@@ -4331,8 +4331,8 @@
     swL2LoopDetectTrapMode OBJECT-TYPE
         SYNTAX      INTEGER {
                        none(1),
-                       loop_detected(2),
-                       loop_cleared(3),
+                       loop-detected(2),
+                       loop-cleared(3),
                        both(4)
                     }
         MAX-ACCESS  read-write
Index: mibs/eltex/ELTEX-FXS72
===================================================================
--- mibs/eltex/ELTEX-FXS72	(revision 9757)
+++ mibs/eltex/ELTEX-FXS72	(working copy)
@@ -793,7 +793,7 @@
 		
 	fxsMonitoringTemp1 OBJECT-TYPE
 		SYNTAX		Integer32
-		UNITS		"ÃÂ°C"
+		UNITS		"°C"
 		MAX-ACCESS	read-only
 		STATUS		current
 		DESCRIPTION
@@ -802,7 +802,7 @@
 		
 	fxsMonitoringTemp2 OBJECT-TYPE
 		SYNTAX		Integer32
-		UNITS		"ÃÂ°C"
+		UNITS		"°C"
 		MAX-ACCESS	read-only
 		STATUS		current
 		DESCRIPTION
@@ -811,7 +811,7 @@
 		
 	fxsMonitoringTemp3 OBJECT-TYPE
 		SYNTAX		Integer32
-		UNITS		"ÃÂ°C"
+		UNITS		"°C"
 		MAX-ACCESS	read-only
 		STATUS		current
 		DESCRIPTION
@@ -820,7 +820,7 @@
 	
 	fxsMonitoringTemp4 OBJECT-TYPE
 		SYNTAX		Integer32
-		UNITS		"ÃÂ°C"
+		UNITS		"°C"
 		MAX-ACCESS	read-only
 		STATUS		current
 		DESCRIPTION
Index: mibs/mikrotik/MIKROTIK-MIB
===================================================================
--- mibs/mikrotik/MIKROTIK-MIB	(revision 9757)
+++ mibs/mikrotik/MIKROTIK-MIB	(working copy)
@@ -7,11 +7,11 @@
 OBJECT-GROUP, NOTIFICATION-GROUP FROM SNMPv2-CONF;
 
 mikrotikExperimentalModule MODULE-IDENTITY
-  LAST-UPDATED "201801030000Z"
+  LAST-UPDATED "201812050000Z"
   ORGANIZATION "MikroTik"
   CONTACT-INFO "support@mikrotik.com"
   DESCRIPTION ""
-  REVISION "201801030000Z"
+  REVISION "201812050000Z"
   DESCRIPTION ""
   ::= { mikrotik 1 }
 
@@ -129,7 +129,9 @@
     mtxrWlStatSsid DisplayString,
     mtxrWlStatBssid MacAddress,
     mtxrWlStatFreq Integer32,
-    mtxrWlStatBand DisplayString
+    mtxrWlStatBand DisplayString,
+    mtxrWlStatTxCCQ Counter32,
+    mtxrWlStatRxCCQ Counter32
 }
 
 mtxrWlStatIndex OBJECT-TYPE
@@ -188,6 +190,21 @@
     DESCRIPTION ""
     ::= { mtxrWlStatEntry 8 }
 
+mtxrWlStatTxCCQ OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlStatEntry 9 }
+
+mtxrWlStatRxCCQ OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlStatEntry 10 }
+
+-- WlRtabTable
 mtxrWlRtabTable OBJECT-TYPE
     SYNTAX SEQUENCE OF MtxrWlRtabEntry
     MAX-ACCESS not-accessible
@@ -500,7 +517,8 @@
     mtxrWlCMRtabRxRate Gauge32,
     mtxrWlCMRtabTxStrength Integer32,
     mtxrWlCMRtabRxStrength Integer32,
-    mtxrWlCMRtabSsid DisplayString
+    mtxrWlCMRtabSsid DisplayString,
+    mtxrWlCMRtabEapIdent DisplayString
 }
 
 mtxrWlCMRtabAddr OBJECT-TYPE
@@ -588,6 +606,13 @@
     DESCRIPTION ""
     ::= { mtxrWlCMRtabEntry 12 }
 
+mtxrWlCMRtabEapIdent OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRtabEntry 13 }
+
 mtxrWlCMRtabEntryCount OBJECT-TYPE
     SYNTAX Gauge32
     MAX-ACCESS read-only
@@ -595,6 +620,13 @@
     DESCRIPTION "Wireless CAPSMAN registration table entry count"
     ::= { mtxrWireless 6 }
 
+mtxrWlCMREntryCount OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "Wireless CAPSMAN remote-cap entry count"
+    ::= { mtxrWireless 10 }
+
 mtxrWlCMTable OBJECT-TYPE
     SYNTAX SEQUENCE OF MtxrWlCMEntry
     MAX-ACCESS not-accessible
@@ -613,7 +645,9 @@
 MtxrWlCMEntry ::= SEQUENCE {
     mtxrWlCMIndex ObjectIndex,
     mtxrWlCMRegClientCount Counter32,
-    mtxrWlCMAuthClientCount Counter32
+    mtxrWlCMAuthClientCount Counter32,
+    mtxrWlCMState DisplayString,
+    mtxrWlCMChannel DisplayString
 }
 
 mtxrWlCMIndex OBJECT-TYPE
@@ -637,6 +671,79 @@
     DESCRIPTION ""
     ::= { mtxrWlCMEntry 3 }
 
+mtxrWlCMState OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMEntry 4 }
+
+mtxrWlCMChannel OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "for master only"
+    ::= { mtxrWlCMEntry 5 }
+
+--
+mtxrWlCMRemoteTable OBJECT-TYPE
+    SYNTAX SEQUENCE OF MtxrWlCMRemoteEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWireless 11 }
+
+mtxrWlCMRemoteEntry OBJECT-TYPE
+    SYNTAX MtxrWlCMRemoteEntry
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION "CAPSMAN remote-cap list"
+    INDEX { mtxrWlCMRemoteIndex }
+    ::= { mtxrWlCMRemoteTable 1 }
+
+MtxrWlCMRemoteEntry ::= SEQUENCE {
+    mtxrWlCMRemoteIndex ObjectIndex,
+    mtxrWlCMRemoteName DisplayString,
+    mtxrWlCMRemoteState DisplayString,
+    mtxrWlCMRemoteAddress DisplayString,
+    mtxrWlCMRemoteRadios Counter32
+}
+
+mtxrWlCMRemoteIndex OBJECT-TYPE
+    SYNTAX ObjectIndex
+    MAX-ACCESS not-accessible
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRemoteEntry 1 }
+
+mtxrWlCMRemoteName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRemoteEntry 2 }
+
+mtxrWlCMRemoteState OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRemoteEntry 3 }
+
+mtxrWlCMRemoteAddress OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRemoteEntry 4 }
+
+mtxrWlCMRemoteRadios OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWlCMRemoteEntry 5 }
+
 -- W60G
 mtxrWl60GTable OBJECT-TYPE
     SYNTAX SEQUENCE OF MtxrWl60GEntry
@@ -663,7 +770,9 @@
     mtxrWl60GMcs Integer32,
     mtxrWl60GSignal Integer32,
     mtxrWl60GTxSector Integer32,
-    mtxrWl60GRxSector Integer32
+    mtxrWl60GTxSectorInfo DisplayString,
+    mtxrWl60GRssi Integer32,
+    mtxrWl60GPhyRate Gauge32
 }
 
 mtxrWl60GIndex OBJECT-TYPE
@@ -734,13 +843,27 @@
     DESCRIPTION ""
     ::= { mtxrWl60GEntry 9 }
 
-mtxrWl60GRxSector OBJECT-TYPE
+mtxrWl60GTxSectorInfo OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWl60GEntry 11 }
+
+mtxrWl60GRssi OBJECT-TYPE
     SYNTAX Integer32
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION ""
-    ::= { mtxrWl60GEntry 10 }
+    ::= { mtxrWl60GEntry 12 }
 
+mtxrWl60GPhyRate OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION ""
+    ::= { mtxrWl60GEntry 13 }
+
 -- W60GSta
 mtxrWl60GStaTable OBJECT-TYPE
     SYNTAX SEQUENCE OF MtxrWl60GStaEntry
@@ -764,7 +887,9 @@
     mtxrWl60GStaMcs Integer32,
     mtxrWl60GStaSignal Integer32,
     mtxrWl60GStaTxSector Integer32,
-    mtxrWl60GStaRxSector Integer32
+    mtxrWl60GStaPhyRate Gauge32,
+    mtxrWl60GStaRssi Integer32,
+    mtxrWl60GStaDistance Integer32
 }
 
 mtxrWl60GStaIndex OBJECT-TYPE
@@ -809,14 +934,28 @@
     DESCRIPTION ""
     ::= { mtxrWl60GStaEntry 6 }
 
-mtxrWl60GStaRxSector OBJECT-TYPE
+mtxrWl60GStaPhyRate OBJECT-TYPE
+    SYNTAX Gauge32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "Mbits per second"
+    ::= { mtxrWl60GStaEntry 8 }
+
+mtxrWl60GStaRssi OBJECT-TYPE
     SYNTAX Integer32
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION ""
-    ::= { mtxrWl60GStaEntry 7 }
+    ::= { mtxrWl60GStaEntry 9 }
 
+mtxrWl60GStaDistance OBJECT-TYPE
+    SYNTAX Integer32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "meters"
+    ::= { mtxrWl60GStaEntry 10 }
 
+
 mtxrWirelessGroup OBJECT-GROUP OBJECTS {
         mtxrWlStatTxRate,
 	mtxrWlStatRxRate,
@@ -825,6 +964,8 @@
         mtxrWlStatBssid,
 	mtxrWlStatFreq,
 	mtxrWlStatBand,
+        mtxrWlStatTxCCQ,
+        mtxrWlStatRxCCQ,
 	mtxrWlRtabStrength,
 	mtxrWlRtabTxBytes,
         mtxrWlRtabRxBytes,
@@ -865,6 +1006,7 @@
         mtxrWlCMRtabRxStrength,
         mtxrWlCMRtabSsid,
         mtxrWlCMRtabEntryCount,
+        mtxrWlCMREntryCount,
         mtxrWlCMRegClientCount,
         mtxrWlCMAuthClientCount,
         mtxrWl60GMode,
@@ -875,13 +1017,14 @@
         mtxrWl60GMcs,
         mtxrWl60GSignal,
         mtxrWl60GTxSector,
-        mtxrWl60GRxSector,
+        mtxrWl60GTxSectorInfo,
+        mtxrWl60GRssi,
+        mtxrWl60GPhyRate,
         mtxrWl60GStaConnected,
         mtxrWl60GStaRemote,
         mtxrWl60GStaMcs,
         mtxrWl60GStaSignal,
-        mtxrWl60GStaTxSector,
-        mtxrWl60GStaRxSector
+        mtxrWl60GStaTxSector
     }
     STATUS current
     DESCRIPTION ""
@@ -1251,7 +1394,7 @@
     ::= { mtxrHealth 16 }
 
 mtxrHlFanSpeed1 OBJECT-TYPE
-    SYNTAX DisplayString
+    SYNTAX Gauge32
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION "rpm"
@@ -1258,7 +1401,7 @@
     ::= { mtxrHealth 17 }
 
 mtxrHlFanSpeed2 OBJECT-TYPE
-    SYNTAX DisplayString
+    SYNTAX Gauge32
     MAX-ACCESS read-only
     STATUS current
     DESCRIPTION "rpm"
@@ -1594,6 +1737,13 @@
     DESCRIPTION "Upgrade firmware version"
     ::= { mtxrSystem 7 }
 
+mtxrBoardName OBJECT-TYPE
+    SYNTAX DisplayString
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION "board name"
+    ::= { mtxrSystem 8 }
+
 mtxrSystemGroup OBJECT-GROUP OBJECTS {
         mtxrSystemReboot,
         mtxrUSBPowerReset,
@@ -1601,7 +1751,8 @@
         mtxrFirmwareVersion,
         mtxrNote,
         mtxrBuildTime,
-        mtxrFirmwareUpgradeVersion
+        mtxrFirmwareUpgradeVersion,
+        mtxrBoardName
     }
     STATUS current
     DESCRIPTION ""
Index: mibs/snr/SNR-ERD-4
===================================================================
--- mibs/snr/SNR-ERD-4	(revision 9757)
+++ mibs/snr/SNR-ERD-4	(working copy)
@@ -12,7 +12,7 @@
 	; 
 
 snr MODULE-IDENTITY
-	LAST-UPDATED	"201504291200Z"
+	LAST-UPDATED	"201810261200Z"
 	ORGANIZATION	"NAG "
 	CONTACT-INFO	"erd@nag.ru"
 	DESCRIPTION
@@ -20,790 +20,1200 @@
 	REVISION		"201504291200Z"
 	DESCRIPTION
 		"Initial revision." 
-	::= { enterprises 40418 }
-
-
-snr-erd			OBJECT IDENTIFIER	::= { snr 2 }
-snr-erd-4		OBJECT IDENTIFIER	::= { snr-erd 6 }
-
-measurements		OBJECT IDENTIFIER	::= { snr-erd-4 1 }
-sensesstate		OBJECT IDENTIFIER	::= { snr-erd-4 2 }
-management		OBJECT IDENTIFIER	::= { snr-erd-4 3 }
-counters		OBJECT IDENTIFIER	::= { snr-erd-4 8 }
-options			OBJECT IDENTIFIER	::= { snr-erd-4 10 }
-
-snrSensors		OBJECT IDENTIFIER	::= { measurements 1 }
-temperatureSensors	OBJECT IDENTIFIER	::= { snrSensors 1 }
-powerSensors		OBJECT IDENTIFIER	::= { snrSensors 2 }
-alarmSensCnts		OBJECT IDENTIFIER	::= { counters 2 }
-
-erd4Traps	OBJECT IDENTIFIER	::= { snr-erd-4 0 }
-
-
--- measurements
-
-voltageSensor		OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { measurements 2 }
-
-
--- snrSensors
-
-serialS1			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 10 }
-
-serialS2			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 11 }
-
-serialS3			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 12 }
-
-serialS4			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 13 }
-
-serialS5			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 14 }
-
-serialS6			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 15 }
-
-serialS7			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 16 }
-
-serialS8			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 17 }
-
-serialS9			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 18 }
-
-serialS10			OBJECT-TYPE
-	SYNTAX			OCTET STRING
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { snrSensors 19 }
-
-
-
--- temperatureSensors
-
-temperatureS1			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 1 }
-
-temperatureS2			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 2 }
-
-temperatureS3			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 3 }
-
-temperatureS4			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 4 }
-
-temperatureS5			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 5 }
-
-temperatureS6			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 6 }
-
-temperatureS7			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 7 }
-
-temperatureS8			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 8 }
-
-temperatureS9			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 9 }
-
-temperatureS10			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { temperatureSensors 10 }
-
-
--- powerSensors
-
-voltageS1			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 1 }
-
-currentS1			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 2 }
-
-voltageS2			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 4 }
-
-currentS2			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 5 }
-
-voltageS3			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 7 }
-
-currentS3			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 8 }
-
-voltageS4			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 10 }
-
-currentS4			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 11 }
-
-voltageS5			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 13 }
-
-currentS5			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 14 }
-
-voltageS6			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 16 }
-
-currentS6			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 17 }
-
-voltageS7			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 19 }
-
-currentS7			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 20 }
-
-voltageS8			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 22 }
-
-currentS8			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 23 }
-
-voltageS9			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 25 }
-
-currentS9			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 26 }
-
-voltageS10			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 28 }
-
-currentS10			OBJECT-TYPE
-	SYNTAX			INTEGER
-	MAX-ACCESS		read-only
-	STATUS			current
-	DESCRIPTION		"qwerty"
-::= { powerSensors 29 }
-
-
--- sensesstate
-
-alarmSensor1		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				high	(1),
-				low	(0),
-				off	(2)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 1 }
-
-alarmSensor2		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				high	(1),
-				low	(0),
-				off	(2)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 2 }
-
-alarmSensor3		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				high	(1),
-				low	(0),
-				off	(2)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 3 }
-
-alarmSensor4		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				high	(1),
-				low	(0),
-				off	(2)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 4 }
-
-alarmSensor5		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				high	(1),
-				low	(0),
-				off	(2)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 5 }
-
-uSensor			OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				no	(1),
-				yes	(0)
-			}
-        MAX-ACCESS	read-only
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { sensesstate 6 }
-
-
--- management
-
-releState		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 1 }
-
-smart1State	OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 2 }
-
-smart2State	OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 3 }
-
-smart3State	OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 4 }
-
-smart4State	OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 5 }
-
-smart5State	OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				on	(1),
-				off	(0),
-				reset	(2) 
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 6 }
-
-releResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 11 }
-
-smart1ResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 12 }
-
-smart2ResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 13 }
-
-smart3ResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 14 }
-
-smart4ResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 15 }
-
-smart5ResetTime	OBJECT-TYPE
-	SYNTAX		INTEGER
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { management 16 }
-
-
--- counters
-
-alarmSensor1cnt		OBJECT-TYPE
-	SYNTAX		Counter
-	MAX-ACCESS	read-write
-	STATUS		current
-	DESCRIPTION	"qwerty"
-::= { alarmSensCnts 1 }
-
-alarmSensor2cnt		OBJECT-TYPE
-	SYNTAX		Counter
-	MAX-ACCESS	read-write
-	STATUS		current
-	DESCRIPTION	"qwerty"
-::= { alarmSensCnts 2 }
-
-alarmSensor3cnt		OBJECT-TYPE
-	SYNTAX		Counter
-	MAX-ACCESS	read-write
-	STATUS		current
-	DESCRIPTION	"qwerty"
-::= { alarmSensCnts 3 }
-
-alarmSensor4cnt		OBJECT-TYPE
-	SYNTAX		Counter
-	MAX-ACCESS	read-write
-	STATUS		current
-	DESCRIPTION	"qwerty"
-::= { alarmSensCnts 4 }
-
-alarmSensor5cnt		OBJECT-TYPE
-	SYNTAX		Counter
-	MAX-ACCESS	read-write
-	STATUS		current
-	DESCRIPTION	"qwerty"
-::= { alarmSensCnts 5 }
-
-
-
--- options
-
-dataType		OBJECT-TYPE
-	SYNTAX		INTEGER
-			{
-				integer	(0),
-				float	(1),
-				ufloat	(2)
-			}
-        MAX-ACCESS	read-write
-        STATUS		current
-        DESCRIPTION	"qwerty"
-::= { options 1 }
-
-
--- Traps
-
-aSense1Alarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 1 }
-
-aSense1Release		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 2 }
-
-aSense2Alarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 3 }
-
-aSense2Release	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 4 }
-
-aSense3Alarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 5 }
-
-aSense3Release	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 6 }
-
-aSense4Alarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 7 }
-
-aSense4Release	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 8 }
-
-aSense5Alarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 9 }
-
-aSense5Release	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 10 }
-
-uSenseAlarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 11 }
-
-uSenseRelease		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 12 }
-
-reloutThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 13 }
-
-reloutThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 14 }
-
-smart1ThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 15 }
-
-smart1ThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 16 }
-
-smart2ThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 17 }
-
-smart2ThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 18 }
-
-smart3ThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 19 }
-
-smart3ThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 20 }
-
-smart4ThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 21 }
-
-smart4ThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 22 }
-
-smart5ThermoOn		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 23 }
-
-smart5ThermoOff		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 24 }
-
-tempSensorAlarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 29 }
-
-tempSensorRelease	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 30 }
-
-voltSensorAlarm		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 31 }
-
-voltSensorRelease	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 32 }
-
-task1Done		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 36 }
-
-task2Done		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 37 }
-
-task3Done		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 38 }
-
-task4Done		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 39 }
-
-pingLost		NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 45 }
-
-batteryChargeLow	NOTIFICATION-TYPE
-	STATUS		current
-	DESCRIPTION	"Check the text of message"		
-::= { erd4Traps 47 }
-
-
-erd4Group		NOTIFICATION-GROUP  
-	NOTIFICATIONS 
-	{
-		aSense1Alarm,
-		aSense1Release,
-		aSense2Alarm,
-		aSense2Release,
-		aSense3Alarm,
-		aSense3Release,
-		aSense4Alarm,
-		aSense4Release,
-		aSense5Alarm,
-		aSense5Release,
-		uSenseAlarm,
-		uSenseRelease,
-		reloutThermoOn,
-		reloutThermoOff,
-		smart1ThermoOn,
-		smart1ThermoOff,
-		smart2ThermoOn,
-		smart2ThermoOff,
-		smart3ThermoOn,
-		smart3ThermoOff,
-		smart4ThermoOn,
-		smart4ThermoOff,
-		smart5ThermoOn,
-		smart5ThermoOff,
-		tempSensorAlarm,
-		tempSensorRelease,
-		voltSensorAlarm,
-		voltSensorRelease,
-		task1Done,
-		task2Done,
-		task3Done,
-		task4Done,
-		pingLost,
-		batteryChargeLow
+	::= { enterprises 40418 }
+
+TempInteger ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "d"
+    UNITS        "degrees Centigrade"
+    STATUS       current
+    DESCRIPTION
+            "This data type is for temperature between -55 and +125."
+    SYNTAX       INTEGER (-55..125)
+
+TempNotif ::= TEXTUAL-CONVENTION
+    STATUS    current
+    DESCRIPTION
+        "Notification option status."
+    SYNTAX    INTEGER {Off (0),
+                        On (1)}
+
+
+snr-erd		OBJECT IDENTIFIER	::= { snr 2 }
+snr-erd-4	OBJECT IDENTIFIER	::= { snr-erd 6 }
+
+measurements		OBJECT IDENTIFIER	 ::= { snr-erd-4 1 }
+
+dio			OBJECT IDENTIFIER	::= { snr-erd-4 2 }
+modules			OBJECT IDENTIFIER	::= { snr-erd-4 5 }
+options			OBJECT IDENTIFIER	::= { snr-erd-4 10 }
+diffparams		OBJECT IDENTIFIER	::= { snr-erd-4 11 }
+
+
+oneWire		OBJECT IDENTIFIER	::= { measurements 1 }
+sp			OBJECT IDENTIFIER	::= { measurements 30 }
+
+GSM			OBJECT IDENTIFIER	::= { modules 1 }
+RF			OBJECT IDENTIFIER	::= { modules 2 }
+
+upsStatus		OBJECT IDENTIFIER	::= { diffparams 1 }
+
+pid			OBJECT IDENTIFIER	::= { diffparams 10 }
+
+traps			OBJECT IDENTIFIER	::= { snr-erd-4 0 }
+
+crit			OBJECT IDENTIFIER	::= { options 10 }
+
+-- measurements
+
+adcSensor		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"ADC sensor value"
+::= { measurements 2 }
+
+temperatureDHT		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"DHT temperature value"
+::= { measurements 8 }
+
+humidityDHT		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"DHT humidity value"
+::= { measurements 9 }
+
+-- dtsTable
+
+dtsTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF dtsEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION	"A list of temperature sensors values"
+    ::= { oneWire 1 }
+
+dtsEntry OBJECT-TYPE
+    SYNTAX      dtsEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION	"An entry (conceptual row) in the dtsTable"
+    INDEX   { dtsId } 
+::= { dtsTable 1 }
+
+dtsEntry ::=
+    SEQUENCE {
+        dtsId           	UInteger32,
+	dtsName			OctetString,
+        dtsTemp            	TempInteger,
+	tempCritNotif		Integer,
+	tempCritMin		TempInteger,
+	tempCritMax		TempInteger
+    }
+
+dtsId 		OBJECT-TYPE
+    SYNTAX      UInteger32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION	"Temperature sensor id"
+    ::= { dtsEntry 1 }
+
+dtsName 	OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION	"Name (max 20)"
+    ::= { dtsEntry 2 }
+
+dtsTemp 	OBJECT-TYPE
+    SYNTAX      TempInteger
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Temperature value"
+    ::= { dtsEntry 3 }
+	
+tempCritNotif	OBJECT-TYPE
+	SYNTAX		TempNotif
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Enable notifications on the critical temperature"
+::= { dtsEntry 10 }
+	
+tempCritMin		OBJECT-TYPE
+	SYNTAX		TempInteger
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Minimal critical temperature. 
+Up to -55 \B0C"
+::= { dtsEntry 15 }
+
+tempCritMax	OBJECT-TYPE
+	SYNTAX		TempInteger
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Maximum critical temperature. 
+Up to +125\B0C"
+::= { dtsEntry 16 }
+
+-- shuntTable
+
+shuntTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF shuntEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "A list of SNR-SHUNT values"
+    ::= { oneWire 2 }
+
+shuntEntry OBJECT-TYPE
+    SYNTAX      shuntEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "An entry (conceptual row) in the shuntTable"
+    INDEX   { pwrSensIdent }
+    ::= { shuntTable 1 }
+
+shuntEntry ::=
+    SEQUENCE {
+        shuntId      	UInteger32,
+	shuntName	OctetString,
+        shuntTemp       Integer,
+        shuntVolt       Integer,
+	shuntCurrent	Integer,
+	shuntCapacity	Integer,
+	shuntChrgCap	Integer,
+	shuntDischCap	Integer,
+	shuntEndOfChrg	OctetString,
+	shuntDiscn	OctetString,
+	shuntBatLive	TimeTicks,
+	shuntDischTime	TimeTicks
+    }
+
+shuntId 	OBJECT-TYPE
+    SYNTAX      UInteger32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "SNR-SHUNT id"
+    ::= { shuntEntry 1 }
+
+shuntName OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+            "Name (max 20)"
+    ::= { shuntEntry 2 }
+
+shuntTemp OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Temperature value"
+    ::= { shuntEntry 3 }
+
+shuntVolt OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+            "Voltage"
+    ::= { shuntEntry 4 }
+
+shuntCurrent OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+            "Current"
+    ::= { shuntEntry 5 }
+
+shuntChrgLvl OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+            "Battery charge level (0..100%)"
+    ::= { shuntEntry 6 }
+
+shuntChrgCap 	OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Charge capacity"
+    ::= { shuntEntry 7 }
+
+shuntDischCap OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Discharge capacity"
+    ::= { shuntEntry 8 }
+
+shuntEndOfChrg OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "End of charge time"
+    ::= { shuntEntry 9 }
+
+shuntDiscn OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Disconnect time"
+    ::= { shuntEntry 10 }
+
+shuntBatLive OBJECT-TYPE
+    SYNTAX      TimeTicks
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Battery using period"
+    ::= { shuntEntry 11 }
+
+shuntDischTime OBJECT-TYPE
+    SYNTAX      TimeTicks
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Time to full discharge"
+    ::= { shuntEntry 12 }
+
+
+-- wirelessSensors
+
+rfshtpTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF rfshtpEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "A list of wireless sensors values"
+    ::= { measurements 10 }
+
+rfshtpEntry OBJECT-TYPE
+    SYNTAX      rfshtpEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+            "An entry (conceptual row) 
+in the wrlssSensTable"
+    INDEX   { wrlssSensIdent }
+    ::= { rfshtpTable 1 }
+
+rfshtpEntry ::=
+    SEQUENCE {
+        rfshtpId           OctetString,
+        rfshtpName         OctetString,
+        rfshtpTemp         Integer,
+	rfshtpHum	   Integer,
+	rfshtpPres	   Integer
+    }
+
+rfshtpId OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Wireless sensor id"
+    ::= { rfshtpEntry 1 }
+
+rfshtpName OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+            "Name (max 20)"
+    ::= { rfshtpEntry 2 }
+
+rfshtpTemp OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Temperature value"
+    ::= { rfshtpEntry 3 }
+
+rfshtpHum OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Humidity value"
+    ::= { rfshtpEntry 4 }
+
+rfshtpPres OBJECT-TYPE
+    SYNTAX      INTEGER
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+            "Pressure value"
+    ::= { rfshtpEntry 5 }
+
+-- sp
+
+-- rsshtpTable
+rsshtpTable		OBJECT-TYPE
+	SYNTAX		SEQUENCE OF rsshtpEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"A list of SNR-RSsensor-H/T/P values"
+::= { sp 1 }
+
+rsshtpEntry OBJECT-TYPE
+	SYNTAX		rsshtpEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"An entry (conceptual row) 
+in the rsshtpTable"
+	INDEX		{ rsshtpIdent }
+::= { rsshtpTable 1 }
+
+rsshtpEntry ::= SEQUENCE 
+{
+    rsshtpIdent	OctetString,
+	rsshtpName	OctetString,
+    rsshtpTemp	Integer,
+	rsshtpHum	Integer,
+	rsshtpPssr	Integer,
+	tempCritNotif		Integer,
+	tempCritMin			Integer,
+	tempCritMax			Integer
+}
+
+rsshtpIdent		OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"SNR-RSsensor-H/T/P id"
+::= { rsshtpEntry 1 }
+
+rsshtpName		OBJECT-TYPE
+    	SYNTAX      	OCTET STRING
+    	MAX-ACCESS  	read-write
+    	STATUS      	current
+    	DESCRIPTION 	"Name (max 20)"
+::= { rsshtpEntry 2 }
+
+rsshtpTemp		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Temperature value 1"
+::= { rsshtpEntry 3 }
+
+rsshtpHum		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Humidity value"
+::= { rsshtpEntry 4 }
+
+rsshtpPssr		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Pressure value"
+::= { rsshtpEntry 6 }
+
+tempCritNotif	OBJECT-TYPE
+	SYNTAX		INTEGER
+		{
+				No	(0),
+				Yes	(1),
+		}
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Enable notifications on the critical temperature"
+::= { rsshtpEntry 10 }
+	
+tempCritMin		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Minimal critical temperature. 
+Up to -55 \B0C"
+::= { rsshtpEntry 15 }
+
+tempCritMax	OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Maximum critical temperature. 
+Up to +125\B0C"
+::= { rsshtpEntry 16 }
+
+-- rscounterTable
+
+rscounterTable		OBJECT-TYPE
+	SYNTAX		SEQUENCE OF rscounterEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"A list of SNR-RS-Counter"
+::= { sp 5 }
+
+rscounterEntry OBJECT-TYPE
+	SYNTAX		rscounterEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"An entry (conceptual row) 
+in the rscounterTable"
+	INDEX		{ rscounterIdent }
+::= { rscounterTable 1 }
+
+rscounterEntry ::= SEQUENCE 
+{
+    rscounterIdent	OctetString,
+	rscounterName	OctetString,
+}
+
+rscounterIdent		OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"SNR-RS-Counter id"
+::= { rscounterEntry 1 }
+
+rscounterName		OBJECT-TYPE
+    	SYNTAX      	OCTET STRING
+    	MAX-ACCESS  	read-write
+    	STATUS      	current
+    	DESCRIPTION 	"Name (max 20)"
+::= { rscounterEntry 2 }
+
+
+-- rsshtp1WTable
+rsshtp1WTable		OBJECT-TYPE
+	SYNTAX		SEQUENCE OF rsshtp1WEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"A list of temperature sensors 
+are connected to SNR-RSsensor-H/T/P"
+::= { sp 100 }
+
+rsshtp1WEntry 		OBJECT-TYPE
+	SYNTAX		rsshtp1WEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"An entry (conceptual row) 
+in the rsshtp1WTable"
+	INDEX		{ rsshtp1WIdent }
+::= { rsshtp1WTable 1 }
+
+rsshtp1WEntry ::= SEQUENCE 
+{
+        rsshtp1WIdent	UInteger32,
+	rsshtp1WName	OctetString,
+        rsshtp1WTemp	Integer,
+	rsshtp1WMaster	OctetString,
+	tempCritNotif		Integer,
+	tempCritMin			Integer,
+	tempCritMax			Integer
+}
+
+rsshtp1WIdent		OBJECT-TYPE
+	SYNTAX		UInteger32
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Temperature sensor id"
+::= { rsshtp1WEntry 1 }
+
+rsshtp1WName OBJECT-TYPE
+    	SYNTAX      OCTET STRING
+    	MAX-ACCESS  read-write
+    	STATUS      current
+    	DESCRIPTION "Name (max 20)"
+::= { rsshtp1WEntry 2 }
+
+rsshtp1WTemp		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Temperature value"
+::= { rsshtp1WEntry 3 }
+
+rsshtp1WMaster		OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Name of the SNR-RSsensor-H/T/P 
+which this temperature sensor 
+is connected to"
+::= { rsshtp1WEntry 4 }
+
+tempCritNotif	OBJECT-TYPE
+	SYNTAX		INTEGER
+		{
+				No	(0),
+				Yes	(1),
+		}
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Enable notifications on the critical temperature"
+::= { rsshtp1WEntry 10 }
+	
+tempCritMin		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Minimal critical temperature. 
+Up to -55 \B0C"
+::= { rsshtp1WEntry 15 }
+
+tempCritMax	OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Maximum critical temperature. 
+Up to +125\B0C"
+::= { rsshtp1WEntry 16 }
+
+-- dio
+
+diTable			OBJECT-TYPE
+	SYNTAX		SEQUENCE OF diEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"A list of digital inputs values"
+::= { dio 1 }
+
+diEntry 		OBJECT-TYPE
+	SYNTAX		diEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"An entry (conceptual row) 
+in the diTable"
+::= { diTable 1 }
+
+diEntry ::= SEQUENCE 
+{
+	diName		OctetString,
+    diAlarmName	OctetString,
+	diState		Integer,
+	diCnt		Counter
+}
+
+diName			OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Digital input name"
+::= { diEntry 1 }
+
+diAlarmName		OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION	"Alarm name"
+::= { diEntry 2 }
+
+diState			OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				low	(0),
+				high	(1),
+				off	(2)
+			}
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Digital input state"
+::= { diEntry 3 }
+
+diCnt			OBJECT-TYPE
+	SYNTAX		Counter
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Digital input impulse counter"
+::= { diEntry 4 }
+
+
+doTable			OBJECT-TYPE
+	SYNTAX		SEQUENCE OF doEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"A list of digital outputs values"
+::= { dio 2 }
+
+doEntry 		OBJECT-TYPE
+	SYNTAX		doEntry
+	MAX-ACCESS	not-accessible
+	STATUS		current
+	DESCRIPTION	"An entry (conceptual row) 
+in the doTable"
+::= { doTable 1 }
+
+doEntry ::= SEQUENCE 
+{
+	doName			OctetString,
+	doDeviceName	OctetString,
+	doState			Integer,
+	doResetTime		Integer
+}
+
+doName			OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Digital output name"
+::= { doEntry 1 }
+
+doDeviceName	OBJECT-TYPE
+	SYNTAX		OCTET STRING
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION	"Digital output custom name"
+::= { doEntry 2 }
+
+doState			OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				off	(0),
+				on	(1),
+				reload	(2)
+			}
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION	"Digital output state"
+::= { doEntry 3 }
+
+doResetDelay		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-write
+	STATUS		current
+	DESCRIPTION	"Reload period (sec)"
+::= { doEntry 4 }
+
+uSenseState		OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				off	(0),
+				on	(1)
+			}
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Voltage sensor state"
+::= { dio 3 }
+
+-- GSM
+
+GsmModuleStatus		OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				No	(0),
+				Yes	(1),
+				NoSim	(2),
+				Error	(3),
+				Connected	(4)
+			}
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"the status of the gsm module"
+::= { GSM 1 }
+
+GsmStrength		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"the level of signal in dBm"
+::= { GSM 2 }
+
+ReconnCount		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"the number of connection attempts"
+::= { GSM 10 }
+
+-- RF
+
+RfModuleStatus		OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				No	(0),
+				Yes	(1)
+			}
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"the status of the rf module"
+::= { RF 1 }
+
+-- options
+
+dataType		OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				integer	(0),
+				float	(1),
+				ufloat	(2)
+			}
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Values data type"
+::= { options 1 }
+
+-- crit
+
+tempCritDHT		OBJECT-TYPE
+	SYNTAX		TempInteger
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Critical temperature. 
+From -55 to +125\B0C"
+::= { crit 10 }
+
+humCrit		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"Critical humidity. 
+From 0 to 100%"
+::= { crit 20 }
+
+adcCritMin		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"ADC IN critical min"
+::= { crit 30 }
+
+adcCritMax		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"ADC IN critical max"
+::= { crit 31 }
+
+adcHysteresis	OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-write
+        STATUS		current
+        DESCRIPTION	"ADC IN hysteresis"
+::= { crit 35 }
+
+-- diffparams
+
+-- upsStatus
+
+statusUPS		OBJECT-TYPE
+	SYNTAX		INTEGER
+			{
+				fail	(1),
+				ok	(0),
+				unknown	(2) 
+			}
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"UPS status"
+::= { upsStatus 1 }
+
+batteryVoltageUPS	OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Battery voltage value"
+::= { upsStatus 2 }
+
+temperatureUPS		OBJECT-TYPE
+	SYNTAX		INTEGER
+	MAX-ACCESS	read-only
+	STATUS		current
+	DESCRIPTION	"Temperature value"
+::= { upsStatus 3 }
+
+inputVoltageUPS		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Input voltage value"
+::= { upsStatus 4 }
+
+outputVoltageUPS	OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Output voltage value"
+::= { upsStatus 5 }
+
+currentUPS		OBJECT-TYPE
+	SYNTAX		INTEGER
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Current value"
+::= { upsStatus 6 }
+
+lastBatteryChangeUPS	OBJECT-TYPE
+	SYNTAX		OCTET STRING
+        MAX-ACCESS	read-only
+        STATUS		current
+        DESCRIPTION	"Last battery change date and time. 
+APC only"
+::= { upsStatus 7 }
+
+
+-- pid
+
+inputPID		OBJECT-TYPE
+	
+	SYNTAX		INTEGER
+        
+	MAX-ACCESS	read-write
+
+        STATUS		current
+
+        DESCRIPTION	"PID SNMP input value"
+
+::= { pid 1 }
+
+
+	
+outputPercentPID	OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"PID output value. 
+0 to 100%"
+
+::= { pid 2 }
+
+
+
+outputRealPID		OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"PID output value 
+(voltage if PID runs in analog mode 
+or time if PID runs in PWM mode)"
+
+::= { pid 3 }
+
+
+
+ypPID			OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"Proportional gain"
+
+::= { pid 4 }
+
+
+
+yiPID			OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"Integral gain"
+
+::= { pid 5 }
+
+
+
+ydPID			OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"Derivative gain"
+
+::= { pid 6 }
+
+
+
+errorPID		OBJECT-TYPE
+
+	SYNTAX		INTEGER
+
+        MAX-ACCESS	read-only
+
+        STATUS		current
+
+        DESCRIPTION	"Error. Difference between setpoint 
+and input value"
+
+::= { pid 7 }
+
+
+-- Traps
+
+DI1Alarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 1 Alarm fires"		
+::= { traps 1 }
+
+DI1Release		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 1 Alarm released"		
+::= { traps 2 }
+
+DI2Alarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 2 Alarm fires"		
+::= { traps 3 }
+
+DI2Release		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 2 Alarm released"		
+::= { traps 4 }
+
+DI3Alarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 3 Alarm fires"		
+::= { traps 5 }
+
+DI3Release		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 3 Alarm released"		
+::= { traps 6 }
+
+DI4Alarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 4 Alarm fires"		
+::= { traps 7 }
+
+DI4Release		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 4 Alarm released"		
+::= { traps 8 }
+
+DI5Alarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 5 Alarm fires"		
+::= { traps 9 }
+
+DI5Release		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Input 5 Alarm released"		
+::= { traps 10 }
+
+uSenseAlarm		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Phase sensor 
+Alarm fires"		
+::= { traps 11 }
+
+uSenseRelease	NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Phase sensor 
+Alarm released"		
+::= { traps 12 }
+
+reloutOn		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Rele was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 13 }
+
+reloutOff		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Rele was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 14 }
+
+DO1On			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 1 was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 15 }
+
+DO1Off			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 1 was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 16 }
+
+DO2On			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 2 was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 17 }
+
+DO2Off			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 2 was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 18 }
+
+DO3On			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 3 was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 19 }
+
+DO3Off			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 3 was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 20 }
+
+DO4On			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 4 was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 21 }
+
+DO4Off			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 4 was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 22 }
+
+DO5On			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 5 was swithed on 
+by Thermostat or Gigrostat mode"		
+::= { traps 23 }
+
+DO5Off			NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Signifies that Output 5 was swithed off 
+by Thermostat or Gigrostat mode"		
+::= { traps 24 }
+
+tempSensorAlarm		NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Temperature alarm"		
+::= { traps 29 }
+
+tempSensorRelease	NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Temperature release"		
+::= { traps 30 }
+
+adcSensorAlarm		NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Voltage sensor alarm"		
+::= { traps 31 }
+
+adcSensorRelease	NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Voltage sensor release"		
+::= { traps 32 }
+
+humSensorAlarm		NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Humidity alarm"		
+::= { traps 33 }
+
+humSensorRelease	NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Humidity release"		
+::= { traps 34 }
+
+task1Done		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Task 1 done"		
+::= { traps 36 }
+
+task2Done		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Task 2 done"		
+::= { traps 37 }
+
+task3Done		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Task 3 done"		
+::= { traps 38 }
+
+task4Done		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Task 4 done"		
+::= { traps 39 }
+
+pingLost		NOTIFICATION-TYPE
+	STATUS		current
+	DESCRIPTION	"Ping lost"		
+::= { traps 45 }
+
+batteryChargeLow	NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"Battery charge is low"		
+::= { traps 47 }
+
+upsUtilityFail		NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"UPS utility fail"		
+::= { traps 50 }
+
+upsUtilityOk		NOTIFICATION-TYPE
+	STATUS			current
+	DESCRIPTION		"UPS utility OK"		
+::= { traps 51 }
+
+-- erd4Group
+
+erd4Group		NOTIFICATION-GROUP  
+	NOTIFICATIONS 
+	{
+		DI1Alarm,
+		DI1Release,
+		DI2Alarm,
+		DI2Release,
+		DI3Alarm,
+		DI3Release,
+		DI4Alarm,
+		DI4Release,
+		DI5Alarm,
+		DI5Release,
+		uSenseAlarm,
+		uSenseRelease,
+		reloutOn,
+		reloutOff,
+		DO1On,
+		DO1Off,
+		DO2On,
+		DO2Off,
+		DO3On,
+		DO3Off,
+		DO4On,
+		DO4Off,
+		DO5On,
+		DO5Off,
+		tempSensorAlarm,
+		tempSensorRelease,
+		adcSensorAlarm,
+		adcSensorRelease,
+		humSensorAlarm,
+		humSensorRelease,
+		task1Done,
+		task2Done,
+		task3Done,
+		task4Done,
+		pingLost,
+		batteryChargeLow,
+		upsUtilityFail,
+		upsUtilityOk
 	}
-  
-	STATUS current
+	STATUS			current
+	DESCRIPTION		"Notifications"
+::= { snr-erd-4 99 }
 
-	DESCRIPTION
-
-		" "
-
-::= { snr-erd-4 99 }
-
-END
-
+END
