Change Units on Noise Floor (#11790)

* Change Units on Noise Floor

I may be wrong, but I think this should just be dBm (i.e. integrated over the carrier bandwidth). The numbers look much too high to me to be on a per Hz basis.

If I am correct here, this should also be updated in the web interface.

Thanks!

* Update php, correct units for Wireless noise-floor

* Wireless Frequency, don't format_si, to avoid kMHz units

* Update Wireless noise-floor units, in RRD plots

doc/Developing/os/Wireless-Sensors.md

@@ -19,7 +19,7 @@ with the values we expect to see the data in:
 | errors      | count       | WirelessErrorsDiscovery      | The total bits of errored packets or bits, etc                                                  |
 | frequency   | MHz         | WirelessFrequencyDiscovery   | The frequency of the radio in MHz, channels can be converted                                    |
 | mse         | dB          | WirelessMseDiscovery         | The Mean Square Error                                                                           |
-| noise-floor | dBm/Hz      | WirelessNoiseFloorDiscovery  | The amount of noise received by the radio                                                       |
+| noise-floor | dBm      | WirelessNoiseFloorDiscovery  | The amount of noise received by the radio                                                       |
 | power       | dBm         | WirelessPowerDiscovery       | The power of transmit or receive, including signal level                                        |
 | quality     | %           | WirelessQualityDiscovery     | The % of quality of the link, 100% = perfect link                                               |
 | rate        | bps         | WirelessRateDiscovery        | The negotiated rate of the connection (not data transfer)                                       |

includes/html/functions.inc.php

@@ -1551,6 +1551,9 @@ function get_sensor_label_color($sensor, $type = 'sensors')
         $sensor['sensor_current'] = formatUptime($sensor['sensor_current'] * 60, 'short');
         return "<span class='label $label_style'>".trim($sensor['sensor_current'])."</span>";
     }
+    if ($sensor['sensor_class'] == 'frequency' && $sensor['sensor_type'] == 'openwrt') {
+        return "<span class='label $label_style'>".trim($sensor['sensor_current'])." ".$unit."</span>";
+    }
     return "<span class='label $label_style'>".trim(format_si($sensor['sensor_current']).$unit)."</span>";
 }
 

includes/html/graphs/device/wireless_noise-floor.inc.php

@@ -5,6 +5,6 @@ $scale_max = '0';
 
 $class     = 'noise-floor';
 $unit      = '';
-$unit_long = 'dBm/Hz';
+$unit_long = 'dBm';
 
 require 'includes/html/graphs/device/wireless-sensor.inc.php';

includes/html/graphs/wireless/noise-floor.inc.php

@@ -3,6 +3,6 @@ $scale_min = '-175';
 $scale_max = '0';
 
 $unit_long = 'Noise Floor (dBm/Hz)';
-$unit = 'dBm/Hz';
+$unit = 'dBm';
 
 include 'wireless-sensor.inc.php';

resources/lang/de/wireless.php

@@ -64,7 +64,7 @@ return [
     'noise-floor' => [
         'short' => 'Grundrauschen',
         'long' => 'Grundrauschen',
-        'unit' => 'dBm/Hz',
+        'unit' => 'dBm',
     ],
     'power' => [
         'short' => 'Signalstärke',

resources/lang/en/wireless.php

@@ -65,7 +65,7 @@ return [
     'noise-floor' => [
         'short' => 'Noise Floor',
         'long' => 'Noise Floor',
-        'unit' => 'dBm/Hz',
+        'unit' => 'dBm',
     ],
     'power' => [
         'short' => 'Power/Signal',

resources/lang/fr/wireless.php

@@ -64,7 +64,7 @@ return [
     'noise-floor' => [
         'short' => 'Bruit de fond',
         'long' => 'Bruit de fond',
-        'unit' => 'dBm/Hz',
+        'unit' => 'dBm',
     ],
     'power' => [
         'short' => 'Puissance/Signal',

resources/lang/uk/wireless.php

@@ -64,7 +64,7 @@ return [
     'noise-floor' => [
         'short' => 'Рівень шуму',
         'long' => 'Рівень шуму',
-        'unit' => 'dBm/Hz',
+        'unit' => 'dBm',
     ],
     'power' => [
         'short' => 'Сила сигналу',

resources/lang/zh-TW/wireless.php

@@ -64,7 +64,7 @@ return [
     'noise-floor' => [
         'short' => '背景雜訊',
         'long' => '背景雜訊',
-        'unit' => 'dBm/Hz',
+        'unit' => 'dBm',
     ],
     'power' => [
         'short' => '電力/訊號',