From 6aff2636c042d5ac7e007bbd56ef89d703bc3a76 Mon Sep 17 00:00:00 2001
From: Steve AB7PA <69524416+ab7pa@users.noreply.github.com>
Date: Tue, 7 Jun 2022 19:31:30 -0700
Subject: [PATCH] report node hardware better on Status page 06/07/2022 (#383)
* report hwtype better for UBNT nodes
* add Ubiquiti mfg to radios.json
* change field name
* edit field name to model
---
files/etc/radios.json | 108 +++++++++++++++++++--------------------
files/www/cgi-bin/status | 2 +-
2 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/files/etc/radios.json b/files/etc/radios.json
index 938a2557..2241b27a 100644
--- a/files/etc/radios.json
+++ b/files/etc/radios.json
@@ -464,7 +464,7 @@
"rfband" : "5800ubntus"
},
"0xe005" : {
- "name" : "NanoStation M5",
+ "name" : "Ubiquiti NanoStation M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -473,7 +473,7 @@
"rfband" : "5800ubntus"
},
"0xe009" : {
- "name" : "NanoStation Loco M9",
+ "name" : "Ubiquiti NanoStation Loco M9",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -482,7 +482,7 @@
"rfband" : "900"
},
"0xe012" : {
- "name" : "NanoStation M2",
+ "name" : "Ubiquiti NanoStation M2",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -491,7 +491,7 @@
"rfband" : "2400"
},
"0xe035" : {
- "name" : "NanoStation M3",
+ "name" : "Ubiquiti NanoStation M3",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -500,7 +500,7 @@
"rfband" : "3400"
},
"0xe0a2" : {
- "name" : "NanoStation Loco M2",
+ "name" : "Ubiquiti NanoStation Loco M2",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -509,7 +509,7 @@
"rfband" : "2400"
},
"0xe0a5" : {
- "name" : "NanoStation Loco M5",
+ "name" : "Ubiquiti NanoStation Loco M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -518,7 +518,7 @@
"rfband" : "5800ubntus"
},
"0xe105" : {
- "name" : "Rocket M5",
+ "name" : "Ubiquiti Rocket M5",
"comment" : "Rocket M5 with USB",
"supported" : "1",
"maxpower" : "22",
@@ -527,7 +527,7 @@
"rfband" : "5800ubntus"
},
"0xe112" : {
- "name" : "Rocket M2 with USB",
+ "name" : "Ubiquiti Rocket M2 with USB",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -536,7 +536,7 @@
"rfband" : "2400"
},
"0xe1b2" : {
- "name" : "Rocket M2",
+ "name" : "Ubiquiti Rocket M2",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -545,7 +545,7 @@
"rfband" : "2400"
},
"0xe1b5" : {
- "name" : "Rocket M5",
+ "name" : "Ubiquiti Rocket M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -554,7 +554,7 @@
"rfband" : "5800ubntus"
},
"0xe1b9" : {
- "name" : "Rocket M9",
+ "name" : "Ubiquiti Rocket M9",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -563,7 +563,7 @@
"rfband" : "900"
},
"0xe1c3" : {
- "name" : "Rocket M3",
+ "name" : "Ubiquiti Rocket M3",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -572,8 +572,8 @@
"rfband" : "3400"
},
"0xe1c5" : {
- "name" : "Rocket M5 GPS",
- "comment" : "Rocket M5 with GPS",
+ "name" : "Ubiquiti Rocket M5 GPS",
+ "comment" : "Ubiquiti Rocket M5 with GPS",
"supported" : "1",
"maxpower" : "22",
"pwroffset" : "5",
@@ -581,7 +581,7 @@
"rfband" : "5800ubntus"
},
"0xe1d2" : {
- "name" : "Rocket M2 Titanium",
+ "name" : "Ubiquiti Rocket M2 Titanium",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -590,7 +590,7 @@
"rfband" : "2400"
},
"0xe1d5" : {
- "name" : "Rocket M5 Titanium GPS",
+ "name" : "Ubiquiti Rocket M5 Titanium GPS",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -599,7 +599,7 @@
"rfband" : "5800ubntus"
},
"0xe202" : {
- "name" : "Bullet M2 HP",
+ "name" : "Ubiquiti Bullet M2 HP",
"comment" : "",
"supported" : "1",
"maxpower" : "16",
@@ -608,7 +608,7 @@
"rfband" : "2400"
},
"0xe205" : {
- "name" : "Bullet M5",
+ "name" : "Ubiquiti Bullet M5",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -617,7 +617,7 @@
"rfband" : "5800ubntus"
},
"0xe212" : {
- "name" : "airGrid M2",
+ "name" : "Ubiquiti airGrid M2",
"comment" : "",
"supported" : "1",
"maxpower" : "28",
@@ -626,7 +626,7 @@
"rfband" : "2400"
},
"0xe215" : {
- "name" : "airGrid M5",
+ "name" : "Ubiquiti airGrid M5",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -635,7 +635,7 @@
"rfband" : "5800ubntus"
},
"0xe232" : {
- "name" : "NanoBridge M2",
+ "name" : "Ubiquiti NanoBridge M2",
"comment" : "",
"supported" : "1",
"maxpower" : "21",
@@ -644,7 +644,7 @@
"rfband" : "2400"
},
"0xe235" : {
- "name" : "NanoBridge M5",
+ "name" : "Ubiquiti NanoBridge M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -653,7 +653,7 @@
"rfband" : "5800ubntus"
},
"0xe239" : {
- "name" : "NanoBridge M9",
+ "name" : "Ubiquiti NanoBridge M9",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -671,7 +671,7 @@
"rfband" : "2400"
},
"0xe243" : {
- "name" : "NanoBridge M3",
+ "name" : "Ubiquiti NanoBridge M3",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -680,7 +680,7 @@
"rfband" : "3400"
},
"0xe252" : {
- "name" : "airGrid M2 HP",
+ "name" : "Ubiquiti airGrid M2 HP",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -689,7 +689,7 @@
"rfband" : "2400"
},
"0xe245" : {
- "name" : "airGrid M5 HP",
+ "name" : "Ubiquiti airGrid M5 HP",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -698,7 +698,7 @@
"rfband" : "5800ubntus"
},
"0xe255" : {
- "name" : "airGrid M5 HP",
+ "name" : "Ubiquiti airGrid M5 HP",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -707,7 +707,7 @@
"rfband" : "5800ubntus"
},
"0xe2b5" : {
- "name" : "NanoBridge M5",
+ "name" : "Ubiquiti NanoBridge M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -716,7 +716,7 @@
"rfband" : "5800ubntus"
},
"0xe2c2" : {
- "name" : "NanoBeam M2 International",
+ "name" : "Ubiquiti NanoBeam M2 International",
"comment" : "",
"supported" : "1",
"maxpower" : "18",
@@ -725,7 +725,7 @@
"rfband" : "2400"
},
"0xe2c4" : {
- "name" : "Bullet M2 XW",
+ "name" : "Ubiquiti Bullet M2 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -734,7 +734,7 @@
"rfband" : "2400"
},
"0xe2d2" : {
- "name" : "Bullet M2 Titanium HP",
+ "name" : "Ubiquiti Bullet M2 Titanium HP",
"comment" : "",
"supported" : "1",
"maxpower" : "16",
@@ -743,7 +743,7 @@
"rfband" : "2400"
},
"0xe2d5" : {
- "name" : "Bullet M5 Titanium",
+ "name" : "Ubiquiti Bullet M5 Titanium",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -752,7 +752,7 @@
"rfband" : "5800ubntus"
},
"0xe302" : {
- "name" : "PicoStation M2",
+ "name" : "Ubiquiti PicoStation M2",
"comment" : "",
"supported" : "1",
"maxpower" : "16",
@@ -761,7 +761,7 @@
"rfband" : "2400"
},
"0xe3e5" : {
- "name" : "PowerBeam M5 XW 300",
+ "name" : "Ubiquiti PowerBeam M5 XW 300",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -770,7 +770,7 @@
"rfband" : "5800ubntus"
},
"0xe4a2" : {
- "name" : "AirRouter",
+ "name" : "Ubiquiti AirRouter",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -779,7 +779,7 @@
"rfband" : "2400"
},
"0xe4b2" : {
- "name" : "AirRouter HP",
+ "name" : "Ubiquiti AirRouter HP",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -788,7 +788,7 @@
"rfband" : "2400"
},
"0xe4d5" : {
- "name" : "Rocket M5 Titanium",
+ "name" : "Ubiquiti Rocket M5 Titanium",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -797,7 +797,7 @@
"rfband" : "5800ubntus"
},
"0xe4e5" : {
- "name" : "PowerBeam M5 400",
+ "name" : "Ubiquiti PowerBeam M5 400",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -806,7 +806,7 @@
"rfband" : "5800ubntus"
},
"0xe6e5" : {
- "name" : "PowerBeam M5 400-ISO",
+ "name" : "Ubiquiti PowerBeam M5 400-ISO",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -815,7 +815,7 @@
"rfband" : "5800ubntus"
},
"0xe805" : {
- "name" : "NanoStation M5",
+ "name" : "Ubiquiti NanoStation M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -824,7 +824,7 @@
"rfband" : "5800ubntus"
},
"0xe825" : {
- "name" : "NanoBeam M5 19",
+ "name" : "Ubiquiti NanoBeam M5 19",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -833,7 +833,7 @@
"rfband" : "5800ubntus"
},
"0xe835" : {
- "name" : "AirGrid M5 XW",
+ "name" : "Ubiquiti AirGrid M5 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -842,7 +842,7 @@
"rfband" : "5800ubntus"
},
"0xe845" : {
- "name" : "NanoStation Loco M5 XW",
+ "name" : "Ubiquiti NanoStation Loco M5 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -851,7 +851,7 @@
"rfband" : "5800ubntus"
},
"0xe855" : {
- "name" : "NanoStation M5 XW",
+ "name" : "Ubiquiti NanoStation M5 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -860,7 +860,7 @@
"rfband" : "5800ubntus"
},
"0xe865" : {
- "name" : "LiteBeam M5",
+ "name" : "Ubiquiti LiteBeam M5",
"comment" : "",
"supported" : "1",
"maxpower" : "19",
@@ -869,7 +869,7 @@
"rfband" : "5800ubntus"
},
"0xe866" : {
- "name" : "NanoStation M2 XW",
+ "name" : "Ubiquiti NanoStation M2 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -878,7 +878,7 @@
"rfband" : "2400"
},
"0xe867" : {
- "name" : "NanoStation Loco M2 XW",
+ "name" : "Ubiquiti NanoStation Loco M2 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "21",
@@ -887,7 +887,7 @@
"rfband" : "2400"
},
"0xe868" : {
- "name" : "Rocket M2 XW",
+ "name" : "Ubiquiti Rocket M2 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "21",
@@ -896,7 +896,7 @@
"rfband" : "2400"
},
"0xe885" : {
- "name" : "PowerBeam M5 620 XW",
+ "name" : "Ubiquiti PowerBeam M5 620 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -905,7 +905,7 @@
"rfband" : "5800ubntus"
},
"0xe8a5" : {
- "name" : "NanoStation Loco M5",
+ "name" : "Ubiquiti NanoStation Loco M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -914,7 +914,7 @@
"rfband" : "5800ubntus"
},
"0xe6b5" : {
- "name" : "Rocket M5 XW",
+ "name" : "Ubiquiti Rocket M5 XW",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -923,7 +923,7 @@
"rfband" : "5800ubntus"
},
"0xe812" : {
- "name" : "NanoBeam M2 13",
+ "name" : "Ubiquiti NanoBeam M2 13",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -932,7 +932,7 @@
"rfband" : "2400"
},
"0xe815" : {
- "name" : "NanoBeam M5 16",
+ "name" : "Ubiquiti NanoBeam M5 16",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
@@ -941,7 +941,7 @@
"rfband" : "5800ubntus"
},
"0xe1a5" : {
- "name" : "PowerBridge M5",
+ "name" : "Ubiquiti PowerBridge M5",
"comment" : "",
"supported" : "1",
"maxpower" : "22",
diff --git a/files/www/cgi-bin/status b/files/www/cgi-bin/status
index bd8df865..a4112652 100755
--- a/files/www/cgi-bin/status
+++ b/files/www/cgi-bin/status
@@ -360,7 +360,7 @@ if config == "mesh" and not wifi_disabled then
col2[#col2] = col2[#col2] .. " "
end
-col2[#col2 + 1] = "firmware version
hardware type | " .. read_all("/etc/mesh-release") .. "
" .. aredn.hardware.get_type() .. " | ";
+col2[#col2 + 1] = "firmware version
model | " .. read_all("/etc/mesh-release") .. "
" .. aredn.hardware.get_radio().name .. " | ";
local sysinfo = nixio.sysinfo()
local uptime = string.format("%d:%02d", math.floor(sysinfo.uptime / 3600) % 24, math.floor(sysinfo.uptime / 60) % 60)