From 3dba5cd39d26ff9b7a63faeab1e346710c261f44 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 4 Nov 2017 16:25:13 -0500 Subject: [PATCH] newdevice: Support Avtech RoomAlert 32E/W and RoomAlert 11E (#7614) * newdevice: support Avtech RoomAlert 32E/W Move avtech discovery to yaml, took a bit of trickery * More flexibility when checking pre-cached data A little cleanup * Add support for RoomAlert 32E/W external and wish temp sensors Add RoomAlert 11E support (just temp sensors) Updated ROOMALERT32E-MIB --- includes/definitions/discovery/avtech.yaml | 188 ++++ includes/discovery/functions.inc.php | 188 +--- includes/discovery/sensors.inc.php | 13 +- .../sensors/pre-cache/avtech.inc.php | 61 ++ .../discovery/sensors/state/avtech.inc.php | 26 - .../sensors/temperature/avtech.inc.php | 112 --- mibs/avtech/ROOMALERT32E.MIB | 929 +++--------------- tests/FunctionsTest.php | 37 + tests/bootstrap.php | 2 +- 9 files changed, 473 insertions(+), 1083 deletions(-) create mode 100644 includes/definitions/discovery/avtech.yaml create mode 100644 includes/discovery/sensors/pre-cache/avtech.inc.php delete mode 100644 includes/discovery/sensors/state/avtech.inc.php delete mode 100644 includes/discovery/sensors/temperature/avtech.inc.php diff --git a/includes/definitions/discovery/avtech.yaml b/includes/definitions/discovery/avtech.yaml new file mode 100644 index 0000000000..aa59c0667e --- /dev/null +++ b/includes/definitions/discovery/avtech.yaml @@ -0,0 +1,188 @@ +modules: + sensors: + temperature: + options: + divisor: 100 + skip_values: 0 + data: + - # RoomAlert 3E internal + oid: .1.3.6.1.4.1.20916.1.9.1.1.1.1.0 + num_oid: .1.3.6.1.4.1.20916.1.9.1.1.1.1. + index: 0 + descr: .1.3.6.1.4.1.20916.1.9.1.1.1.3.0 + - # RoomAlert 3E sen1 + oid: .1.3.6.1.4.1.20916.1.9.1.1.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.9.1.1.2.1. + index: 1 + descr: .1.3.6.1.4.1.20916.1.9.1.1.2.6.0 + + - # RoomAlert 4E internal + oid: .1.3.6.1.4.1.20916.1.6.1.1.1.2.0 + num_oid: .1.3.6.1.4.1.20916.1.6.1.1.1.2. + divisor: 1 + index: 0 + descr: .1.3.6.1.4.1.20916.1.6.1.1.2.1.0 + - # RoomAlert 4E sen1 + oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1. + divisor: 1 + index: 1 + descr: .1.3.6.1.4.1.20916.1.6.1.2.1.6.0 + - # RoomAlert 4E sen2 + oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.6.1.2.2.1. + divisor: 1 + index: 2 + descr: .1.3.6.1.4.1.20916.1.6.1.2.2.6.0 + + - # RoomAlert 11E sensor 2 + oid: .1.3.6.1.4.1.20916.1.3.1.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.3.1.2.1. + divisor: 1 + index: 2 + descr: .1.3.6.1.4.1.20916.1.3.1.2.6.0 + - # RoomAlert 11E sensor 3 + oid: .1.3.6.1.4.1.20916.1.3.1.3.1.0 + num_oid: .1.3.6.1.4.1.20916.1.3.1.3.1. + divisor: 1 + index: 3 + descr: .1.3.6.1.4.1.20916.1.3.1.3.6.0 + - # RoomAlert 11E sensor 4 + oid: .1.3.6.1.4.1.20916.1.3.1.4.1.0 + num_oid: .1.3.6.1.4.1.20916.1.3.1.4.1. + divisor: 1 + index: 4 + descr: .1.3.6.1.4.1.20916.1.3.1.4.6.0 + + - # RoomAlert 32E/W internal temp + oid: .1.3.6.1.4.1.20916.1.8.1.1.1.2.0 + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.1.2. + index: 0 + descr: Internal Temperature + - # RoomAlert 32E/W internal heat + oid: .1.3.6.1.4.1.20916.1.8.1.1.4.2.0 + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.4.2. + index: 1 + descr: Internal Heat Index + - # RoomAlert 32E/W ext temp + oid: ra32-ext-temp + num_oid: .1.3.6.1.4.1.20916.1.8.1.2. + value: value + descr: Sensor {{ $id }} + - # RoomAlert 32W wish temp + oid: ra32-wish-temp + num_oid: .1.3.6.1.4.1.20916.1.8.1.4. + value: value + descr: WiSH {{ $id }} Internal + + - # TemPageR 3E internal + oid: .1.3.6.1.4.1.20916.1.7.1.1.1.1.0 + num_oid: .1.3.6.1.4.1.20916.1.7.1.1.1.1. + index: 0 + descr: .1.3.6.1.4.1.20916.1.7.1.1.2.0 + - # TemPageR 3E sen1 + oid: .1.3.6.1.4.1.20916.1.7.1.2.1.1.0 + num_oid: .1.3.6.1.4.1.20916.1.7.1.2.1.1. + index: 1 + descr: .1.3.6.1.4.1.20916.1.7.1.2.1.3.0 + - # TemPageR 3E sen2 + oid: .1.3.6.1.4.1.20916.1.7.1.2.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.7.1.2.2.1. + index: 2 + descr: .1.3.6.1.4.1.20916.1.7.1.2.2.3.0 + + - # TemPageR 4E internal + oid: .1.3.6.1.4.1.20916.1.1.1.1.1.0 + num_oid: .1.3.6.1.4.1.20916.1.1.1.1.1. + index: 0 + descr: Internal + high_limit: .1.3.6.1.4.1.20916.1.1.3.1.0 + low_limit: .1.3.6.1.4.1.20916.1.1.3.2.0 + - # TemPageR 4E sen1 + oid: .1.3.6.1.4.1.20916.1.1.1.1.2.0 + num_oid: .1.3.6.1.4.1.20916.1.1.1.1.2. + index: 1 + descr: Sensor 1 + high_limit: .1.3.6.1.4.1.20916.1.1.3.3.0 + low_limit: .1.3.6.1.4.1.20916.1.1.3.4.0 + - # TemPageR 4E sen2 + oid: .1.3.6.1.4.1.20916.1.1.1.1.3.0 + num_oid: .1.3.6.1.4.1.20916.1.1.1.1.3. + index: 2 + descr: Sensor 2 + high_limit: .1.3.6.1.4.1.20916.1.1.3.5.0 + low_limit: .1.3.6.1.4.1.20916.1.1.3.6.0 + - # TemPageR 4E sen3 + oid: .1.3.6.1.4.1.20916.1.1.1.1.4.0 + num_oid: .1.3.6.1.4.1.20916.1.1.1.1.4. + index: 3 + descr: Sensor 3 + high_limit: .1.3.6.1.4.1.20916.1.1.3.7.0 + low_limit: .1.3.6.1.4.1.20916.1.1.3.8.0 + humidity: + options: + divisor: 100 + data: + - # RoomAlert 32E/W + oid: .1.3.6.1.4.1.20916.1.8.1.1.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.2.1. + index: 0 + descr: Internal Humidity + voltage: + data: + - # RoomAlert 32E/W analog + oid: ra32-analog + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.5. + value: value + low_limit: 0 + high_limit: 5 + descr: Analog {{ $id }} + state: + data: + - # RoomAlert 3E switch + oid: .1.3.6.1.4.1.20916.1.9.1.2.1.0 + num_oid: .1.3.6.1.4.1.20916.1.9.1.2.1. + index: 0 + descr: .1.3.6.1.4.1.20916.1.9.1.2.2.0 + states: + - { value: 0, generic: -1, graph: 1, descr: Off } + - { value: 1, generic: 0, graph: 1, descr: On } + + - # RoomAlert 4E switch + oid: .1.3.6.1.4.1.20916.1.6.1.3.1.0 + num_oid: .1.3.6.1.4.1.20916.1.6.1.3.1. + index: 0 + descr: .1.3.6.1.4.1.20916.1.6.1.3.2.0 + state_name: switch + states: + - { value: 0, generic: -1, graph: 1, descr: Off } + - { value: 1, generic: 0, graph: 1, descr: On } + + - # RoomAlert 32E/W power + oid: .1.3.6.1.4.1.20916.1.8.1.1.3.1.0 + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.3.1. + index: 0 + descr: Power Source + state_name: power + states: + - { value: 0, generic: 1, graph: 1, descr: Battery } + - { value: 1, generic: 0, graph: 1, descr: AC } + - # RoomAlert 32E/W relays + oid: ra32-relay + value: value + num_oid: .1.3.6.1.4.1.20916.1.8.1.1.6. + descr: Relay {{ $id }} + state_name: relay + states: + - { value: 0, generic: 0, graph: 1, descr: Open } + - { value: 1, generic: 0, graph: 1, descr: Closed } + - # RoomAlert 32E/W switches + oid: ra32-switch + value: value + num_oid: .1.3.6.1.4.1.20916.1.8.1.3. + descr: Switch {{ $id }} + state_name: switch + states: + - { value: 0, generic: -1, graph: 1, descr: Off } + - { value: 1, generic: 0, graph: 1, descr: On } + diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 2189662b96..4830a5b55f 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -805,126 +805,6 @@ function check_entity_sensor($string, $device) return true; } - -/** - * Helper function to improve readability - * Can't use mib based polling, because the snmp implentation and mibs are terrible - * - * @param array $device device array - * @param array $sensor array(id, oid, type, descr, descr_oid, min, max, divisor) - * @param array $valid valid sensors array - * @return bool - */ -function avtech_add_sensor($device, $sensor, &$valid) -{ - // set the id, must be unique - if (isset($sensor['id'])) { - $id = $sensor['id']; - } else { - d_echo('Error: No id set for this sensor' . "\n"); - return false; - } - d_echo('Sensor id: ' . $id . "\n"); - - - // set the sensor oid - if ($sensor['oid']) { - $oid = $sensor['oid']; - } else { - d_echo('Error: No oid set for this sensor' . "\n"); - return false; - } - d_echo('Sensor oid: ' . $oid . "\n"); - - // get the type - $type = $sensor['type'] ? $sensor['type'] : 'temperature'; - d_echo('Sensor type: ' . $type . "\n"); - - // get the sensor value - $value = snmp_get($device, $oid, '-OvQ'); - // if the sensor doesn't exist abort - if ($value === false || ($type == 'temperature' && $value == 0)) { - //issue unfortunately some non-existant sensors return 0 - d_echo('Error: sensor returned no data, skipping' . "\n"); - return false; - } - d_echo('Sensor value: ' . $value . "\n"); - - $type_name = $device['os']; - if ($type == 'switch') { - // set up state sensor - $type_name .= ucfirst($type); - $type = 'state'; - $state_index_id = create_state_index($type_name); - - //Create State Translation - if (isset($state_index_id)) { - $states = array( - array($state_index_id,'Off',1,0,-1), - array($state_index_id,'On',1,1,0), - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } - } - - // set the description - if ($sensor['descr_oid']) { - $descr = trim(snmp_get($device, $sensor['descr_oid'], '-OvQ'), '"'); - } elseif ($sensor['descr']) { - $descr = $sensor['descr']; - } else { - d_echo('Error: No description set for this sensor' . "\n"); - return false; - } - d_echo('Sensor description: ' . $descr . "\n"); - - // set divisor - if ($sensor['divisor']) { - $divisor = $sensor['divisor']; - } elseif ($type == 'temperature') { - $divisor = 100; - } else { - $divisor = 1; - } - d_echo('Sensor divisor: ' . $divisor . "\n"); - - - // set min for alarm - if ($sensor['min_oid']) { - $min = snmp_get($device, $sensor['min_oid'], '-OvQ') / $divisor; - } else { - $min = null; - } - d_echo('Sensor alarm min: ' . $min . "\n"); - - // set max for alarm - if ($sensor['max_oid']) { - $max = snmp_get($device, $sensor['max_oid'], '-OvQ') / $divisor; - } else { - $max = null; - } - d_echo('Sensor alarm max: ' . $max . "\n"); - - // add the sensor - discover_sensor($valid['sensor'], $type, $device, $oid, $id, $type_name, $descr, $divisor, '1', $min, null, null, $max, $value/$divisor); - - if ($type == 'state') { - create_sensor_to_state_index($device, $type_name, $id); - } - - return true; -} - - /** * Get the device divisor, account for device specific quirks * The default divisor is 10 @@ -1084,7 +964,6 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) foreach ($device['dynamic_discovery']['modules']['sensors'][$sensor_type]['data'] as $data) { $tmp_name = $data['oid']; $raw_data = (array)$pre_cache[$tmp_name]; - $cached_data = $pre_cache['__cached'] ?: array(); d_echo("Data $tmp_name: "); d_echo($raw_data); @@ -1106,7 +985,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) } elseif ($sensor_type === 'state') { // translate string states to values (poller does this as well) $states = array_column($data['states'], 'value', 'descr'); - $value = isset($states[$snmp_data[$data_name]]) ? $states[$snmp_data[$data_name]] : false; + $value = isset($states[$tmp_value]) ? $states[$tmp_value] : false; } else { $value = false; } @@ -1115,28 +994,26 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) if (can_skip_sensor($value, $data, $sensor_options) === false && is_numeric($value)) { $oid = $data['num_oid'] . $index; - if (isset($snmp_data[$data['descr']])) { - $descr = $snmp_data[$data['descr']]; - } else { + + // process the description + $descr = dynamic_discovery_get_value('descr', $index, $data, $pre_cache); + if (is_null($descr)) { $descr = str_replace('{{ $index }}', $index, $data['descr']); - preg_match_all('/({{ [\$a-zA-Z0-9]+ }})/', $descr, $tmp_var, PREG_PATTERN_ORDER); - $tmp_vars = $tmp_var[0]; - foreach ($tmp_vars as $k => $tmp_var) { - $tmp_var = preg_replace('/({{ | }}|\$)/', '', $tmp_var); - if (isset($snmp_data[$tmp_var])) { - $descr = str_replace("{{ \$$tmp_var }}", $snmp_data[$tmp_var], $descr); - } - if (isset($cached_data[$index][$tmp_var])) { - $descr = str_replace("{{ \$$tmp_var }}", $cached_data[$index][$tmp_var], $descr); + preg_match_all('/{{ \$([a-zA-Z0-9.]+) }}/', $descr, $matches); + foreach ($matches[1] as $tmp_var) { + $replace = dynamic_discovery_get_value($tmp_var, $index, $data, $pre_cache, null); + if (!is_null($replace)) { + $descr = str_replace("{{ \$$tmp_var }}", $replace, $descr); } } } + $divisor = $data['divisor'] ?: ($sensor_options['divisor'] ?: 1); $multiplier = $data['multiplier'] ?: ($sensor_options['multiplier'] ?: 1); - $low_limit = is_numeric($data['low_limit']) ? $data['low_limit'] : ($snmp_data[$data['low_limit']] ?: 'null'); - $low_warn_limit = is_numeric($data['low_warn_limit']) ? $data['low_warn_limit'] : ($snmp_data[$data['low_warn_limit']] ?: 'null'); - $warn_limit = is_numeric($data['warn_limit']) ? $data['warn_limit'] : ($snmp_data[$data['warn_limit']] ?: 'null'); - $high_limit = is_numeric($data['high_limit']) ? $data['high_limit'] : ($snmp_data[$data['high_limit']] ?: 'null'); + $low_limit = is_numeric($data['low_limit']) ? $data['low_limit'] : dynamic_discovery_get_value('low_limit', $index, $data, $pre_cache, 'null'); + $low_warn_limit = is_numeric($data['low_warn_limit']) ? $data['low_warn_limit'] : dynamic_discovery_get_value('low_warn_limit', $index, $data, $pre_cache, 'null'); + $warn_limit = is_numeric($data['warn_limit']) ? $data['warn_limit'] : dynamic_discovery_get_value('warn_limit', $index, $data, $pre_cache, 'null'); + $high_limit = is_numeric($data['high_limit']) ? $data['high_limit'] : dynamic_discovery_get_value('high_limit', $index, $data, $pre_cache, 'null'); $sensor_name = $device['os']; if ($sensor_type === 'state') { @@ -1163,6 +1040,41 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) } } +/** + * Helper function for dynamic discovery to search for data from pre_cached snmp data + * + * @param string $name The name of the field from the discovery data or just an oid + * @param int $index The index of the current sensor + * @param array $discovery_data The discovery data for the current sensor + * @param array $pre_cache all pre-cached snmp data + * @param mixed $default The default value to return if data is not found + * @return mixed + */ +function dynamic_discovery_get_value($name, $index, $discovery_data, $pre_cache, $default = null) +{ + if (isset($discovery_data[$name])) { + $name = $discovery_data[$name]; + } + + if (isset($pre_cache[$discovery_data['oid']][$index][$name])) { + return $pre_cache[$discovery_data['oid']][$index][$name]; + } + + if (isset($pre_cache[$name])) { + if (is_array($pre_cache[$name])) { + if (count($pre_cache[$name]) === 1) { + return current($pre_cache[$name]); + } elseif (isset($pre_cache[$index][$name])) { + return $pre_cache[$index][$name]; + } + } else { + return $pre_cache[$name]; + } + } + + return $default; +} + /** * @param $types * @param $device diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php index 9e114c6975..e187b933c6 100644 --- a/includes/discovery/sensors.inc.php +++ b/includes/discovery/sensors.inc.php @@ -12,24 +12,19 @@ if (is_file($pre_cache_file)) { d_echo($pre_cache); } -if (isset($device['dynamic_discovery']['modules']['sensors'])) { +// TODO change to exclude os with pre-cache php file, but just exclude them by hand for now (like avtech) +if (isset($device['dynamic_discovery']['modules']['sensors']) && $device['os'] != 'avtech') { foreach ($device['dynamic_discovery']['modules']['sensors'] as $key => $data_array) { foreach ($data_array['data'] as $data) { foreach ((array)$data['oid'] as $oid) { - $tmp_name = $oid; - if (!isset($pre_cache[$tmp_name])) { + if (!isset($pre_cache[$oid])) { if (isset($data['snmp_flags'])) { $snmp_flag = $data['snmp_flags']; } else { $snmp_flag = '-OeQUs'; } $snmp_flag .= ' -Ih'; - if ($key === 'pre-cache') { - $array_data = '__cached'; - } else { - $array_data = $tmp_name; - } - $pre_cache[$array_data] = snmpwalk_cache_oid($device, $oid, $pre_cache[$array_data], $device['dynamic_discovery']['mib'], null, $snmp_flag); + $pre_cache[$oid] = snmpwalk_cache_oid($device, $oid, $pre_cache[$array_data], $device['dynamic_discovery']['mib'], null, $snmp_flag); } } } diff --git a/includes/discovery/sensors/pre-cache/avtech.inc.php b/includes/discovery/sensors/pre-cache/avtech.inc.php new file mode 100644 index 0000000000..a36aeeb581 --- /dev/null +++ b/includes/discovery/sensors/pre-cache/avtech.inc.php @@ -0,0 +1,61 @@ +. + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2017 Tony Murray + * @author Tony Murray + */ + + +// table name => regex (first group is index, second group is id) +$virtual_tables = array( + 'ra32-analog' => '/\.1\.3\.6\.1\.4\.1\.20916\.1\.8\.1\.1\.5\.((\d+)\.0)/', + 'ra32-relay' => '/\.1\.3\.6\.1\.4\.1\.20916\.1\.8\.1\.1\.6\.((\d+)\.0)/', + 'ra32-ext-temp' => '/\.1\.3\.6\.1\.4\.1\.20916\.1\.8\.1\.2\.((\d+)\.1\.0)/', + 'ra32-switch' => '/\.1\.3\.6\.1\.4\.1\.20916\.1\.8\.1\.3\.((\d+)\.0)/', + 'ra32-wish-temp' => '/\.1\.3\.6\.1\.4\.1\.20916\.1\.8\.1\.4\.((\d+)\.4\.1\.2\.0)/', +); + +$data = snmp_walk($device, '.1.3.6.1.4.1.20916.1', '-OQn'); +foreach (explode(PHP_EOL, $data) as $line) { + list($oid, $value) = explode(' = ', $line); + + $processed = false; + foreach ($virtual_tables as $vt_name => $vt_regex) { + if (preg_match($vt_regex, $oid, $matches)) { + $index = $matches[1]; + $id = $matches[2]; + + $pre_cache[$vt_name][$index] = array( + 'value' => $value, + 'id' => $id, + ); + + $processed = true; + break; // skip rest + } + } + + if (!$processed) { + $pre_cache[$oid] = array($value); + } +} + +unset($data); diff --git a/includes/discovery/sensors/state/avtech.inc.php b/includes/discovery/sensors/state/avtech.inc.php deleted file mode 100644 index 9d1c7e3f0a..0000000000 --- a/includes/discovery/sensors/state/avtech.inc.php +++ /dev/null @@ -1,26 +0,0 @@ - 0, - 'type' => 'switch', - 'oid' => $device_oid.'1.2.1.0', - 'descr_oid' => $device_oid.'1.2.2.0', - ); - avtech_add_sensor($device, $switch, $valid); -} elseif (ends_with($device['sysObjectID'], '.20916.1.6')) { - // RoomAlert 4E - $device_oid = '.1.3.6.1.4.1.20916.1.6.'; - - $switch = array( - 'id' => 0, - 'type' => 'switch', - 'oid' => $device_oid.'1.3.1.0', - 'descr_oid' => $device_oid.'1.3.2.0', - ); - avtech_add_sensor($device, $switch, $valid); -} diff --git a/includes/discovery/sensors/temperature/avtech.inc.php b/includes/discovery/sensors/temperature/avtech.inc.php deleted file mode 100644 index fce45e6550..0000000000 --- a/includes/discovery/sensors/temperature/avtech.inc.php +++ /dev/null @@ -1,112 +0,0 @@ - 0, - 'oid' => $device_oid.'1.1.1.1.0', - 'descr_oid' => $device_oid.'1.1.2.0', - ); - avtech_add_sensor($device, $internal, $valid); - - $sen1 = array( - 'id' => 1, - 'oid' => $device_oid.'1.2.1.1.0', - 'descr_oid' => $device_oid.'1.2.1.3.0', - ); - avtech_add_sensor($device, $sen1, $valid); - - $sen2 = array( - 'id' => 2, - 'oid' => $device_oid.'1.2.2.1.0', - 'descr_oid' => $device_oid.'1.2.2.3.0', - ); - avtech_add_sensor($device, $sen2, $valid); -} elseif (ends_with($device['sysObjectID'], '.20916.1.9')) { - // RoomAlert 3E - $device_oid = '.1.3.6.1.4.1.20916.1.9.'; - - $internal = array( - 'id' => 0, - 'oid' => $device_oid.'1.1.1.1.0', - 'descr_oid' => $device_oid.'1.1.1.3.0', - ); - avtech_add_sensor($device, $internal, $valid); - - $sen1 = array( - 'id' => 1, - 'oid' => $device_oid.'1.1.2.1.0', - 'descr_oid' => $device_oid.'1.1.2.6.0', - ); - avtech_add_sensor($device, $sen1, $valid); -} elseif (ends_with($device['sysObjectID'], '.20916.1.1')) { - // TemPageR 4E - $device_oid = '.1.3.6.1.4.1.20916.1.1.'; - - $internal = array( - 'id' => 0, - 'oid' => $device_oid.'1.1.1.0', - 'descr' => 'Internal', - 'max_oid' => $device_oid.'3.1.0', - 'min_oid' => $device_oid.'3.2.0', - ); - avtech_add_sensor($device, $internal, $valid); - - $sen1 = array( - 'id' => 1, - 'oid' => $device_oid.'1.1.2.0', - 'descr' => 'Sensor 1', - 'max_oid' => $device_oid.'3.3.0', - 'min_oid' => $device_oid.'3.4.0', - ); - avtech_add_sensor($device, $sen1, $valid); - - $sen2 = array( - 'id' => 2, - 'oid' => $device_oid.'1.1.3.0', - 'descr' => 'Sensor 2', - 'max_oid' => $device_oid.'3.5.0', - 'min_oid' => $device_oid.'3.6.0', - ); - avtech_add_sensor($device, $sen2, $valid); - - $sen3 = array( - 'id' => 3, - 'oid' => $device_oid.'1.1.4.0', - 'descr' => 'Sensor 3', - 'max_oid' => $device_oid.'3.7.0', - 'min_oid' => $device_oid.'3.8.0', - ); - avtech_add_sensor($device, $sen3, $valid); -} elseif (ends_with($device['sysObjectID'], '.20916.1.6')) { - // RoomAlert 4E - $device_oid = '.1.3.6.1.4.1.20916.1.6.'; - $divisor = 1; - - $internal = array( - 'id' => 0, - 'oid' => $device_oid.'1.1.1.2.0', - 'descr_oid' => $device_oid.'1.1.2.1.0', - 'divisor' => $divisor, - ); - avtech_add_sensor($device, $internal, $valid); - - $sen1 = array( - 'id' => 1, - 'oid' => $device_oid.'1.2.2.1.0', - 'descr_oid' => $device_oid.'1.2.1.6.0', - 'divisor' => $divisor, - ); - avtech_add_sensor($device, $sen1, $valid); - - $sen2 = array( - 'id' => 2, - 'oid' => $device_oid.'1.2.2.1.0', - 'descr_oid' => $device_oid.'1.2.2.6.0', - 'divisor' => $divisor, - ); - avtech_add_sensor($device, $sen2, $valid); -} diff --git a/mibs/avtech/ROOMALERT32E.MIB b/mibs/avtech/ROOMALERT32E.MIB index 7e8aa6d005..3dea310d63 100644 --- a/mibs/avtech/ROOMALERT32E.MIB +++ b/mibs/avtech/ROOMALERT32E.MIB @@ -2,12 +2,12 @@ --defines ROOMALERT32E-MIB for SNMP agent extension of Room Alert 32E --Contents: Global Registration Module -- Room Alert OIDs - Enterprise 20916 ---Version: 1.0.0 ---Date: WEB_RELEASE_DATE_PLACEHOLDER +--Version: 3.1.0 +--Date: 13 September 2017 --Developed By: AVTECH Software, Inc. -- ---Copyright (c) COPYRIGHT_YEAR_PLACEHOLDER AVTECH Software, Inc. +--Copyright (c) 2017 AVTECH Software, Inc. -- ROOMALERT32E-MIB DEFINITIONS ::= BEGIN @@ -147,35 +147,35 @@ internal-tempf OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "The internal temperature reading in Fahrenheit. Because the SNMP Protocol does not support floating point numbers, values are scaled by 100 and should be divided by 100 to get the actual value." + DESCRIPTION "The internal temperature reading in Fahrenheit." ::= { temperature 1 } internal-tempc OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "The internal temperature reading in Celsius. Because the SNMP Protocol does not support floating point numbers, values are scaled by 100 and should be divided by 100 to get the actual value." + DESCRIPTION "The internal temperature reading in Celsius." ::= { temperature 2 } internal-humidity OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "The internal relative humidity reading in %RH. Because the SNMP Protocol does not support floating point numbers, values are scaled by 100 and should be divided by 100 to get the actual value." + DESCRIPTION "The internal relative humidity reading in %RH." ::= { humidity 1 } internal-heat-index OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS optional - DESCRIPTION "The internal heat index reading in Fahrenheit. Because the SNMP Protocol does not support floating point numbers, values are scaled by 100 and should be divided by 100 to get the actual value." + DESCRIPTION "The internal heat index reading in Fahrenheit." ::= { heat-index 1 } internal-heat-indexC OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS optional - DESCRIPTION "The internal heat index reading in Celsius. Because the SNMP Protocol does not support floating point numbers, values are scaled by 100 and should be divided by 100 to get the actual value." + DESCRIPTION "The internal heat index reading in Celsius." ::= { heat-index 2 } internal-power OBJECT-TYPE @@ -217,28 +217,28 @@ digital-sen1-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen1 1 } digital-sen1-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen1 2 } digital-sen1-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen1 3 } digital-sen1-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen1 4 } digital-sen1-5 OBJECT-TYPE @@ -252,28 +252,28 @@ digital-sen2-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen2 1 } digital-sen2-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen2 2 } digital-sen2-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen2 3 } digital-sen2-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen2 4 } digital-sen2-5 OBJECT-TYPE @@ -287,28 +287,28 @@ digital-sen3-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen3 1 } digital-sen3-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen3 2 } digital-sen3-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen3 3 } digital-sen3-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen3 4 } digital-sen3-5 OBJECT-TYPE @@ -322,28 +322,28 @@ digital-sen4-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen4 1 } digital-sen4-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen4 2 } digital-sen4-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen4 3 } digital-sen4-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen4 4 } digital-sen4-5 OBJECT-TYPE @@ -357,28 +357,28 @@ digital-sen5-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen5 1 } digital-sen5-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen5 2 } digital-sen5-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen5 3 } digital-sen5-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen5 4 } digital-sen5-5 OBJECT-TYPE @@ -392,28 +392,28 @@ digital-sen6-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen6 1 } digital-sen6-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen6 2 } digital-sen6-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen6 3 } digital-sen6-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen6 4 } digital-sen6-5 OBJECT-TYPE @@ -427,28 +427,28 @@ digital-sen7-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen7 1 } digital-sen7-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen7 2 } digital-sen7-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen7 3 } digital-sen7-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen7 4 } digital-sen7-5 OBJECT-TYPE @@ -462,28 +462,28 @@ digital-sen8-1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Celsius." ::= { digital-sen8 1 } digital-sen8-2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity, Temp/Analog, or Temp/Active Power sensor, this value represents the current temperature in Fahrenheit." ::= { digital-sen8 2 } digital-sen8-3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog sensor, this value represents the current Voltage reading. If this is a Temp/Active Power sensor, this value represents the current power state (1=Power Detected, 0=No Power Detected)." ::= { digital-sen8 3 } digital-sen8-4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current custom reading." ::= { digital-sen8 4 } digital-sen8-5 OBJECT-TYPE @@ -655,31 +655,31 @@ wish-1-external-1-type OBJECT-TYPE ::= { wish-1-external-1 1 } wish-1-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + SYNTAX INTEGER(0..65535) + ACCESS read-only + STATUS mandatory + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-1-external-1 2 } wish-1-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + SYNTAX INTEGER(0..65535) + ACCESS read-only + STATUS mandatory + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-1-external-1 3 } wish-1-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + SYNTAX INTEGER(0..65535) + ACCESS read-only + STATUS mandatory + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-1-external-1 4 } wish-1-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + SYNTAX INTEGER(0..65535) + ACCESS read-only + STATUS mandatory + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-1-external-1 5 } wish-1-external-1-val5 OBJECT-TYPE @@ -700,28 +700,28 @@ wish-1-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-1-external-2 2 } wish-1-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-1-external-2 3 } wish-1-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-1-external-2 4 } wish-1-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-1-external-2 5 } wish-1-external-2-val5 OBJECT-TYPE @@ -791,28 +791,28 @@ wish-2-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-2-external-1 2 } wish-2-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-2-external-1 3 } wish-2-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-2-external-1 4 } wish-2-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-2-external-1 5 } wish-2-external-1-val5 OBJECT-TYPE @@ -833,28 +833,28 @@ wish-2-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-2-external-2 2 } wish-2-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-2-external-2 3 } wish-2-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-2-external-2 4 } wish-2-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-2-external-2 5 } wish-2-external-2-val5 OBJECT-TYPE @@ -924,28 +924,28 @@ wish-3-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-3-external-1 2 } wish-3-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-3-external-1 3 } wish-3-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-3-external-1 4 } wish-3-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-3-external-1 5 } wish-3-external-1-val5 OBJECT-TYPE @@ -966,28 +966,28 @@ wish-3-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-3-external-2 2 } wish-3-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-3-external-2 3 } wish-3-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-3-external-2 4 } wish-3-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-3-external-2 5 } wish-3-external-2-val5 OBJECT-TYPE @@ -1057,28 +1057,28 @@ wish-4-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-4-external-1 2 } wish-4-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-4-external-1 3 } wish-4-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-4-external-1 4 } wish-4-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-4-external-1 5 } wish-4-external-1-val5 OBJECT-TYPE @@ -1099,28 +1099,28 @@ wish-4-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-4-external-2 2 } wish-4-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-4-external-2 3 } wish-4-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-4-external-2 4 } wish-4-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-4-external-2 5 } wish-4-external-2-val5 OBJECT-TYPE @@ -1190,28 +1190,28 @@ wish-5-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-5-external-1 2 } wish-5-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-5-external-1 3 } wish-5-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-5-external-1 4 } wish-5-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-5-external-1 5 } wish-5-external-1-val5 OBJECT-TYPE @@ -1232,28 +1232,28 @@ wish-5-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-5-external-2 2 } wish-5-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-5-external-2 3 } wish-5-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-5-external-2 4 } wish-5-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-5-external-2 5 } wish-5-external-2-val5 OBJECT-TYPE @@ -1323,28 +1323,28 @@ wish-6-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-6-external-1 2 } wish-6-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-6-external-1 3 } wish-6-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-6-external-1 4 } wish-6-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-6-external-1 5 } wish-6-external-1-val5 OBJECT-TYPE @@ -1365,28 +1365,28 @@ wish-6-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-6-external-2 2 } wish-6-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-6-external-2 3 } wish-6-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-6-external-2 4 } wish-6-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-6-external-2 5 } wish-6-external-2-val5 OBJECT-TYPE @@ -1456,28 +1456,28 @@ wish-7-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-7-external-1 2 } wish-7-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-7-external-1 3 } wish-7-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-7-external-1 4 } wish-7-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-7-external-1 5 } wish-7-external-1-val5 OBJECT-TYPE @@ -1498,28 +1498,28 @@ wish-7-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-7-external-2 2 } wish-7-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-7-external-2 3 } wish-7-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-7-external-2 4 } wish-7-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-7-external-2 5 } wish-7-external-2-val5 OBJECT-TYPE @@ -1589,28 +1589,28 @@ wish-8-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-8-external-1 2 } wish-8-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-8-external-1 3 } wish-8-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-8-external-1 4 } wish-8-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-8-external-1 5 } wish-8-external-1-val5 OBJECT-TYPE @@ -1631,28 +1631,28 @@ wish-8-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-8-external-2 2 } wish-8-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-8-external-2 3 } wish-8-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-8-external-2 4 } wish-8-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-8-external-2 5 } wish-8-external-2-val5 OBJECT-TYPE @@ -1722,28 +1722,28 @@ wish-9-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-9-external-1 2 } wish-9-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-9-external-1 3 } wish-9-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-9-external-1 4 } wish-9-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-9-external-1 5 } wish-9-external-1-val5 OBJECT-TYPE @@ -1764,28 +1764,28 @@ wish-9-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-9-external-2 2 } wish-9-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-9-external-2 3 } wish-9-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-9-external-2 4 } wish-9-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-9-external-2 5 } wish-9-external-2-val5 OBJECT-TYPE @@ -1855,28 +1855,28 @@ wish-10-external-1-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-10-external-1 2 } wish-10-external-1-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-10-external-1 3 } wish-10-external-1-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-10-external-1 4 } wish-10-external-1-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-10-external-1 5 } wish-10-external-1-val5 OBJECT-TYPE @@ -1897,28 +1897,28 @@ wish-10-external-2-val1 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Celsius." ::= { wish-10-external-2 2 } wish-10-external-2-val2 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." + DESCRIPTION "If this sensor is a Temperature, Temp/Humidity or Temp/Analog sensor, this value represents the current temperature in Fahrenheit." ::= { wish-10-external-2 3 } wish-10-external-2-val3 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Temp/Analog Sensor, this value represents the Voltage reading in Volts." ::= { wish-10-external-2 4 } wish-10-external-2-val4 OBJECT-TYPE SYNTAX INTEGER(0..65535) ACCESS read-only STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." + DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Temp/Analog sensor, this value represents the current Custom Value." ::= { wish-10-external-2 5 } wish-10-external-2-val5 OBJECT-TYPE @@ -1935,671 +1935,6 @@ wish-10-external-switch OBJECT-TYPE DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." ::= { wish-10-external 3 } -wish-11-enabled OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current 'enabled' status for this WiSH/WiSPR Sensor. A '0' indicates the WiSH/WiSPR is disabled. A '1' indicates the WiSH/WiSPR is enabled." -::= { wish-11 1 } - -wish-11-serial-num OBJECT-TYPE - SYNTAX OCTET STRING - ACCESS read-only - STATUS mandatory - DESCRIPTION "The unique serial number for this WiSH/WiSPR Sensor." -::= { wish-11 2 } - -wish-11-updates OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current update interval for this WiSH/WiSPR Sensor." -::= { wish-11 3 } - -wish-11-battery-voltage OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current voltage reading of the internal battery for this WiSH/WiSPR Sensor." -::= { wish-11-internal 1 } - -wish-11-internal-tempc OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Celsius (C) for this WiSH/WiSPR Sensor." -::= { wish-11-internal 2 } - -wish-11-internal-tempf OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Fahrenheit (F) for this WiSH/WiSPR Sensor." -::= { wish-11-internal 3 } - -wish-11-external-1-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-11-external-1 1 } - -wish-11-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-11-external-1 2 } - -wish-11-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-11-external-1 3 } - -wish-11-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-11-external-1 4 } - -wish-11-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-11-external-1 5 } - -wish-11-external-1-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-11-external-1 6 } - -wish-11-external-2-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-11-external-2 1 } - -wish-11-external-2-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-11-external-2 2 } - -wish-11-external-2-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-11-external-2 3 } - -wish-11-external-2-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-11-external-2 4 } - -wish-11-external-2-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-11-external-2 5 } - -wish-11-external-2-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-11-external-2 6 } - -wish-11-external-switch OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." -::= { wish-11-external 3 } - -wish-12-enabled OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current 'enabled' status for this WiSH/WiSPR Sensor. A '0' indicates the WiSH/WiSPR is disabled. A '1' indicates the WiSH/WiSPR is enabled." -::= { wish-12 1 } - -wish-12-serial-num OBJECT-TYPE - SYNTAX OCTET STRING - ACCESS read-only - STATUS mandatory - DESCRIPTION "The unique serial number for this WiSH/WiSPR Sensor." -::= { wish-12 2 } - -wish-12-updates OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current update interval for this WiSH/WiSPR Sensor." -::= { wish-12 3 } - -wish-12-battery-voltage OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current voltage reading of the internal battery for this WiSH/WiSPR Sensor." -::= { wish-12-internal 1 } - -wish-12-internal-tempc OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Celsius (C) for this WiSH/WiSPR Sensor." -::= { wish-12-internal 2 } - -wish-12-internal-tempf OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Fahrenheit (F) for this WiSH/WiSPR Sensor." -::= { wish-12-internal 3 } - -wish-12-external-1-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-12-external-1 1 } - -wish-12-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-12-external-1 2 } - -wish-12-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-12-external-1 3 } - -wish-12-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-12-external-1 4 } - -wish-12-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-12-external-1 5 } - -wish-12-external-1-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-12-external-1 6 } - -wish-12-external-2-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-12-external-2 1 } - -wish-12-external-2-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-12-external-2 2 } - -wish-12-external-2-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-12-external-2 3 } - -wish-12-external-2-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-12-external-2 4 } - -wish-12-external-2-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-12-external-2 5 } - -wish-12-external-2-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-12-external-2 6 } - -wish-12-external-switch OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." -::= { wish-12-external 3 } - -wish-13-enabled OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current 'enabled' status for this WiSH/WiSPR Sensor. A '0' indicates the WiSH/WiSPR is disabled. A '1' indicates the WiSH/WiSPR is enabled." -::= { wish-13 1 } - -wish-13-serial-num OBJECT-TYPE - SYNTAX OCTET STRING - ACCESS read-only - STATUS mandatory - DESCRIPTION "The unique serial number for this WiSH/WiSPR Sensor." -::= { wish-13 2 } - -wish-13-updates OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current update interval for this WiSH/WiSPR Sensor." -::= { wish-13 3 } - -wish-13-battery-voltage OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current voltage reading of the internal battery for this WiSH/WiSPR Sensor." -::= { wish-13-internal 1 } - -wish-13-internal-tempc OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Celsius (C) for this WiSH/WiSPR Sensor." -::= { wish-13-internal 2 } - -wish-13-internal-tempf OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Fahrenheit (F) for this WiSH/WiSPR Sensor." -::= { wish-13-internal 3 } - -wish-13-external-1-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-13-external-1 1 } - -wish-13-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-13-external-1 2 } - -wish-13-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-13-external-1 3 } - -wish-13-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-13-external-1 4 } - -wish-13-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-13-external-1 5 } - -wish-13-external-1-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-13-external-1 6 } - -wish-13-external-2-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-13-external-2 1 } - -wish-13-external-2-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-13-external-2 2 } - -wish-13-external-2-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-13-external-2 3 } - -wish-13-external-2-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-13-external-2 4 } - -wish-13-external-2-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-13-external-2 5 } - -wish-13-external-2-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-13-external-2 6 } - -wish-13-external-switch OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." -::= { wish-13-external 3 } - -wish-14-enabled OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current 'enabled' status for this WiSH/WiSPR Sensor. A '0' indicates the WiSH/WiSPR is disabled. A '1' indicates the WiSH/WiSPR is enabled." -::= { wish-14 1 } - -wish-14-serial-num OBJECT-TYPE - SYNTAX OCTET STRING - ACCESS read-only - STATUS mandatory - DESCRIPTION "The unique serial number for this WiSH/WiSPR Sensor." -::= { wish-14 2 } - -wish-14-updates OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current update interval for this WiSH/WiSPR Sensor." -::= { wish-14 3 } - -wish-14-battery-voltage OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current voltage reading of the internal battery for this WiSH/WiSPR Sensor." -::= { wish-14-internal 1 } - -wish-14-internal-tempc OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Celsius (C) for this WiSH/WiSPR Sensor." -::= { wish-14-internal 2 } - -wish-14-internal-tempf OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Fahrenheit (F) for this WiSH/WiSPR Sensor." -::= { wish-14-internal 3 } - -wish-14-external-1-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-14-external-1 1 } - -wish-14-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-14-external-1 2 } - -wish-14-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-14-external-1 3 } - -wish-14-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-14-external-1 4 } - -wish-14-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-14-external-1 5 } - -wish-14-external-1-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-14-external-1 6 } - -wish-14-external-2-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-14-external-2 1 } - -wish-14-external-2-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-14-external-2 2 } - -wish-14-external-2-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-14-external-2 3 } - -wish-14-external-2-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-14-external-2 4 } - -wish-14-external-2-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-14-external-2 5 } - -wish-14-external-2-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-14-external-2 6 } - -wish-14-external-switch OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." -::= { wish-14-external 3 } - -wish-15-enabled OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current 'enabled' status for this WiSH/WiSPR Sensor. A '0' indicates the WiSH/WiSPR is disabled. A '1' indicates the WiSH/WiSPR is enabled." -::= { wish-15 1 } - -wish-15-serial-num OBJECT-TYPE - SYNTAX OCTET STRING - ACCESS read-only - STATUS mandatory - DESCRIPTION "The unique serial number for this WiSH/WiSPR Sensor." -::= { wish-15 2 } - -wish-15-updates OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current update interval for this WiSH/WiSPR Sensor." -::= { wish-15 3 } - -wish-15-battery-voltage OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current voltage reading of the internal battery for this WiSH/WiSPR Sensor." -::= { wish-15-internal 1 } - -wish-15-internal-tempc OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Celsius (C) for this WiSH/WiSPR Sensor." -::= { wish-15-internal 2 } - -wish-15-internal-tempf OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The current temperature of the internal sensor in Fahrenheit (F) for this WiSH/WiSPR Sensor." -::= { wish-15-internal 3 } - -wish-15-external-1-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-15-external-1 1 } - -wish-15-external-1-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-15-external-1 2 } - -wish-15-external-1-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-15-external-1 3 } - -wish-15-external-1-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-15-external-1 4 } - -wish-15-external-1-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-15-external-1 5 } - -wish-15-external-1-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-15-external-1 6 } - -wish-15-external-2-type OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The sensor type of the digital sensor attached to this digital sensor port on the WiSH/WiSPR Sensor." -::= { wish-15-external-2 1 } - -wish-15-external-2-val1 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Celsius. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Current reading in Amperage." -::= { wish-15-external-2 2 } - -wish-15-external-2-val2 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temperature or Temp/Humidity sensor, this value represents the current temperature in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Power reading in Watts." -::= { wish-15-external-2 3 } - -wish-15-external-2-val3 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current relative humidity in % Relative Humidity. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Voltage reading in Volts." -::= { wish-15-external-2 4 } - -wish-15-external-2-val4 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Fahrenheit. If this sensor is a Digital Power Sensor and connection of a Digital Power Sensor is supported by your model, this value represents the Reference reading in Volts." -::= { wish-15-external-2 5 } - -wish-15-external-2-val5 OBJECT-TYPE - SYNTAX INTEGER(0..65535) - ACCESS read-only - STATUS mandatory - DESCRIPTION "If this sensor is a Temp/Humidity sensor, this value represents the current heat index in Celsius." -::= { wish-15-external-2 6 } - -wish-15-external-switch OBJECT-TYPE - SYNTAX INTEGER(0..1) - ACCESS read-only - STATUS mandatory - DESCRIPTION "The reading for switch sensor contacts of this WiSH/WiSPR Sensor (0 = OPEN, 1 = CLOSED)." -::= { wish-15-external 3 } - alarmmessage OBJECT-TYPE SYNTAX OCTET STRING ACCESS read-only diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php index ac60d007b8..e6e7743185 100644 --- a/tests/FunctionsTest.php +++ b/tests/FunctionsTest.php @@ -67,4 +67,41 @@ sdfsd $this->assertSame($expected, linkify($input)); } + + public function testDynamicDiscoveryGetValue() + { + $pre_cache = array( + 'firstdata' => array( + 0 => array('temp' => 1), + 1 => array('temp'=> 2), + ), + 'high' => array( + 0 => array('high' => 3), + 1 => array('high' => 4), + ), + 'table' => array( + 0 => array('first' => 5, 'second' => 6), + 1 => array('first' => 7, 'second' => 8), + ), + 'single' => array('something' => 9), + 'oneoff' => 10, + ); + + $data = array('value' => 'temp', 'oid' => 'firstdata'); + $this->assertNull(dynamic_discovery_get_value('missing', 0, $data, $pre_cache)); + $this->assertSame('yar', dynamic_discovery_get_value('default', 0, $data, $pre_cache, 'yar')); + $this->assertSame(2, dynamic_discovery_get_value('value', 1, $data, $pre_cache)); + + $data = array('oid' => 'high'); + $this->assertSame(3, dynamic_discovery_get_value('high', 0, $data, $pre_cache)); + + $data = array('oid' => 'table'); + $this->assertSame(5, dynamic_discovery_get_value('first', 0, $data, $pre_cache)); + $this->assertSame(7, dynamic_discovery_get_value('first', 1, $data, $pre_cache)); + $this->assertSame(6, dynamic_discovery_get_value('second', 0, $data, $pre_cache)); + $this->assertSame(8, dynamic_discovery_get_value('second', 1, $data, $pre_cache)); + + $this->assertSame(9, dynamic_discovery_get_value('single', 0, $data, $pre_cache)); + $this->assertSame(10, dynamic_discovery_get_value('oneoff', 3, $data, $pre_cache)); + } } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 3e6e3735bd..f077f2c8e4 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -27,7 +27,7 @@ global $config; $install_dir = realpath(__DIR__ . '/..'); -$init_modules = array('web'); +$init_modules = array('web', 'discovery'); if (!getenv('SNMPSIM')) { $init_modules[] = 'mocksnmp';