Remove polling pre-cache

Author: murrant

includes/polling/functions.inc.php

@@ -34,21 +34,6 @@ function bulk_sensor_snmpget($device, $sensors)
     return $cache;
 }
 
-/**
- * @param  $device
- * @param  string  $type  type/class of sensor
- * @return array
- */
-function sensor_precache($device, $type)
-{
-    $sensor_cache = [];
-    if (file_exists(LibrenmsConfig::get('install_dir') . '/includes/polling/sensors/pre-cache/' . $device['os'] . '.inc.php')) {
-        include LibrenmsConfig::get('install_dir') . '/includes/polling/sensors/pre-cache/' . $device['os'] . '.inc.php';
-    }
-
-    return $sensor_cache;
-}
-
 function poll_sensor($device, $class)
 {
     $sensors = [];
@@ -67,8 +52,6 @@ function poll_sensor($device, $class)
 
     $snmp_data = bulk_sensor_snmpget($device, $sensors);
 
-    $sensor_cache = sensor_precache($device, $class);
-
     foreach ($sensors as $sensor) {
         Log::info('Checking (' . $sensor['poller_type'] . ") $class " . $sensor['sensor_descr'] . '... ');
 

includes/polling/sensors/pre-cache/aos-emu2.inc.php

@@ -23,4 +23,7 @@
  * @copyright  2016 Neil Lathwood
  * @author     Neil Lathwood <neil@lathwood.co.uk>
  */
-$sensor_value = fahrenheit_to_celsius($sensor_value, $sensor_cache['scale']);
+
+$scale = SnmpQuery::cache()->get('PowerNet-MIB::emsStatusSysTempUnits.0')->value();
+
+$sensor_value = fahrenheit_to_celsius($sensor_value, $scale);

includes/polling/sensors/pre-cache/geist-watchdog.inc.php

@@ -23,6 +23,9 @@
  * @copyright  2017 Neil Lathwood
  * @author     Neil Lathwood <gh+n@laf.io>
  */
-if ($sensor_cache['geist_temp_unit'] === '0') {
+
+$temp_unit = SnmpQuery::cache()->get('GEIST-V4-MIB::temperatureUnits.0')->value();
+
+if ($temp_unit === '0') {
     $sensor_value = fahrenheit_to_celsius($sensor_value / 10) * 10;
 }