[OpenWrt-Devel,v2] iwinfo: Complete device IDs for Ubiquiti airOS XM/XW devices
diff mbox series

Message ID 28c322f4-e46a-f566-34b0-ef84be5abcc8@ironai.com
State Accepted
Delegated to: Petr Štetiar
Headers show
Series
  • [OpenWrt-Devel,v2] iwinfo: Complete device IDs for Ubiquiti airOS XM/XW devices
Related show

Commit Message

Vincent Wiemann March 16, 2019, 9:32 p.m. UTC
This commit includes all power offsets and subsystem device IDs
for Ubiquiti XM and XW devices. The device ID is wildcarded.
Consistency has been tested among all Ubiquiti platforms.
These values seem to be PA gains and likely do not include
antenna gains. I expect the antenna gains to be defined in ART-
partitions.

Signed-off-by: Vincent Wiemann <vincent.wiemann@ironai.com>
---
 hardware.txt | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 98 insertions(+), 5 deletions(-)

Comments

Vincent Wiemann March 19, 2019, 7:29 p.m. UTC | #1
Hi Mathias,

I've put you in the CC as you have commit rights for the iwinfo repository.

Regards,

Vincent Wiemann (CodeFetch)

On 16.03.2019 22:32, Vincent Wiemann wrote:
> This commit includes all power offsets and subsystem device IDs
> for Ubiquiti XM and XW devices. The device ID is wildcarded.
> Consistency has been tested among all Ubiquiti platforms.
> These values seem to be PA gains and likely do not include
> antenna gains. I expect the antenna gains to be defined in ART-
> partitions.
> 
> Signed-off-by: Vincent Wiemann <vincent.wiemann@ironai.com>
> ---
>  hardware.txt | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 98 insertions(+), 5 deletions(-)
> 
> diff --git a/hardware.txt b/hardware.txt
> index f36c476..727c607 100644
> --- a/hardware.txt
> +++ b/hardware.txt
> @@ -17,6 +17,99 @@
>  0xffff 0xffff 0xffff 0xc105    5      0  "Ubiquiti" "NanoStation Loco5"
>  0xffff 0xffff 0xffff 0xc202   10      0  "Ubiquiti" "Bullet2"
>  0xffff 0xffff 0xffff 0xc205    5      0  "Ubiquiti" "Bullet5"
> +0x168c 0xffff 0x0777 0xe002    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe003    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe006    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe009    6      0  "Ubiquiti" "NanoStation Loco M9" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe012   10      0  "Ubiquiti" "NanoStation M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe035    3      0  "Ubiquiti" "NanoStation M3" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe0a2    2      0  "Ubiquiti" "NanoStation Loco M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe0a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe102    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe105    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe112   10      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe115    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1a3    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1a5    5      0  "Ubiquiti" "PowerBridge M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe1b2   10      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1b3    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1b5    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe1b6    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1b9    6      0  "Ubiquiti" "Rocket M9" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe1c2   10      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1c3    3      0  "Ubiquiti" "Rocket M3" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "Rocket M5 GPS" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1d2   10      0  "Ubiquiti" "Rocket M2 Titanium" /* airOS XM/XW */
> +0x168c 0xffff 0x0777 0xe1d3    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1d5    5      0  "Ubiquiti" "airOS XM/XW"
> +0x168c 0xffff 0x0777 0xe1d9    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1e3    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe1e5    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe205    6      0  "Ubiquiti" "Bullet M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe212    1      0  "Ubiquiti" "AirGrid M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe215    1      0  "Ubiquiti" "AirGrid M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe232    2      0  "Ubiquiti" "NanoBridge M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe233    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe235    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe239    6      0  "Ubiquiti" "NanoBridge M9" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe242    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe243    3      0  "Ubiquiti" "NanoBridge M3" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe245    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe252    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe255    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe2a3    3      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe2a5    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe2b2   10      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe2b5    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe2b9    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe2c2   10      0  "Ubiquiti" "NanoBeam M2 Int" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe2c3    6      0  "Ubiquiti" "Bullet M2 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe2c4    6      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe2d2   12      0  "Ubiquiti" "Bullet M2 Titanium HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe2d4    6      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe2d5    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe2e5    4      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe305    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe345    6      0  "Ubiquiti" "WispStation M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe3a5    5      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe3b5    6      0  "Ubiquiti" "airOS XM/XW"
> +0x168c 0xffff 0x0777 0xe3e5    4      0  "Ubiquiti" "PowerBeam M5 300" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe402   10      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe405    1      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe4a2    1      0  "Ubiquiti" "AirRouter" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe4a5    1      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe4b2    9      0  "Ubiquiti" "AirRouter HP" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe4d5    5      0  "Ubiquiti" "Rocket M5 Titanium" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe4e5    4      0  "Ubiquiti" "PowerBeam M5 400" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe5e5    4      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe6a2    1      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe6b2    1      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe6b5    5      0  "Ubiquiti" "Rocket M5 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe6c2    6      0  "Ubiquiti" "airOS XM"
> +0x168c 0xffff 0x0777 0xe6e5    4      0  "Ubiquiti" "PowerBeam M5 400 ISO" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe7f8    2      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe805    5      0  "Ubiquiti" "airOS XM" /* e.g. NanoStation M5, Bullet M5 */
> +0x168c 0xffff 0x0777 0xe812    6      0  "Ubiquiti" "NanoBeam M2 13" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe815    4      0  "Ubiquiti" "NanoBeam M5 16" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe825    4      0  "Ubiquiti" "NanoBeam M5 19" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe835    6      0  "Ubiquiti" "AirGrid M5 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe845    1      0  "Ubiquiti" "NanoStation Loco M5 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe855    5      0  "Ubiquiti" "NanoStation M5 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe865    6      0  "Ubiquiti" "LiteBeam M5" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe866    6      0  "Ubiquiti" "NanoStation M2 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe867    2      0  "Ubiquiti" "NanoStation Loco M2 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe868    7      0  "Ubiquiti" "Rocket M2 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe869    2      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe875    4      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe879    2      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe885    4      0  "Ubiquiti" "PowerBeam M5 620 XW" /* airOS XW */
> +0x168c 0xffff 0x0777 0xe895    4      0  "Ubiquiti" "airOS XW"
> +0x168c 0xffff 0x0777 0xe8a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
> +0x168c 0xffff 0x0777 0xe8b5    5      0  "Ubiquiti" "airOS XM"
>  0x168c 0x001b 0x0777 0x3002   10      0  "Ubiquiti" "XR2"
>  0x168c 0x001b 0x7777 0x3002   10      0  "Ubiquiti" "XR2"
>  0x168c 0x001b 0x0777 0x3b02   10      0  "Ubiquiti" "XR2.3"
> @@ -41,18 +134,18 @@
>  0x168c 0x0027 0x168c 0x2082    7      0  "Ubiquiti" "SR71A"
>  0x168c 0x0027 0x0777 0x4082    7      0  "Ubiquiti" "SR71"
>  0x168c 0x0029 0x0777 0x4005    7      0  "Ubiquiti" "SR71-15"
> -0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset */
> -0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset */
> -0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset */
> +0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset - Correct! */
> +0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset - Wrong! */
> +0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset - Correct! */
>  0x168c 0x002a 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2"
>  0x168c 0x002a 0x0777 0xe805    5      0  "Ubiquiti" "Bullet M5"
> -0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset */
> +0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset - Wrong! */
>  0x168c 0x0029 0x168c 0xa094    0      0  "Atheros"  "AR9220"
>  0x168c 0x0029 0x168c 0xa095    0      0  "Atheros"  "AR9223"
>  0x168c 0x002a 0x168c 0xa093    0      0  "Atheros"  "AR9280"
>  0x168c 0x002b 0x168c 0xa091    0      0  "Atheros"  "AR9285"
>  0x168c 0x002d 0x168c 0x209a    0      0  "Atheros"  "AR9287"
> -0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)"
> +0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)" /* wrong offset! */
>  0x168c 0x0033 0x168c 0xa120    0      0  "Atheros"  "AR9580"
>  0x168c 0x0033 0x168c 0xa136    0      0  "Atheros"  "AR9580"
>  0x168c 0x0033 0x19b6 0xd016    0      0  "Mikrotik" "R11e-2HPnD"
>
Vincent Wiemann April 20, 2019, 5:01 p.m. UTC | #2
Can someone merge this, please?

On 19.03.2019 20:29, Vincent Wiemann wrote:
> Hi Mathias,
> 
> I've put you in the CC as you have commit rights for the iwinfo repository.
> 
> Regards,
> 
> Vincent Wiemann (CodeFetch)
> 
> On 16.03.2019 22:32, Vincent Wiemann wrote:
>> This commit includes all power offsets and subsystem device IDs
>> for Ubiquiti XM and XW devices. The device ID is wildcarded.
>> Consistency has been tested among all Ubiquiti platforms.
>> These values seem to be PA gains and likely do not include
>> antenna gains. I expect the antenna gains to be defined in ART-
>> partitions.
>>
>> Signed-off-by: Vincent Wiemann <vincent.wiemann@ironai.com>
>> ---
>>  hardware.txt | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
>>  1 file changed, 98 insertions(+), 5 deletions(-)
>>
>> diff --git a/hardware.txt b/hardware.txt
>> index f36c476..727c607 100644
>> --- a/hardware.txt
>> +++ b/hardware.txt
>> @@ -17,6 +17,99 @@
>>  0xffff 0xffff 0xffff 0xc105    5      0  "Ubiquiti" "NanoStation Loco5"
>>  0xffff 0xffff 0xffff 0xc202   10      0  "Ubiquiti" "Bullet2"
>>  0xffff 0xffff 0xffff 0xc205    5      0  "Ubiquiti" "Bullet5"
>> +0x168c 0xffff 0x0777 0xe002    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe003    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe006    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe009    6      0  "Ubiquiti" "NanoStation Loco M9" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe012   10      0  "Ubiquiti" "NanoStation M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe035    3      0  "Ubiquiti" "NanoStation M3" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe0a2    2      0  "Ubiquiti" "NanoStation Loco M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe0a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe102    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe105    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe112   10      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe115    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1a3    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1a5    5      0  "Ubiquiti" "PowerBridge M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe1b2   10      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1b3    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1b5    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe1b6    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1b9    6      0  "Ubiquiti" "Rocket M9" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe1c2   10      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1c3    3      0  "Ubiquiti" "Rocket M3" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "Rocket M5 GPS" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1d2   10      0  "Ubiquiti" "Rocket M2 Titanium" /* airOS XM/XW */
>> +0x168c 0xffff 0x0777 0xe1d3    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1d5    5      0  "Ubiquiti" "airOS XM/XW"
>> +0x168c 0xffff 0x0777 0xe1d9    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1e3    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe1e5    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe205    6      0  "Ubiquiti" "Bullet M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe212    1      0  "Ubiquiti" "AirGrid M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe215    1      0  "Ubiquiti" "AirGrid M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe232    2      0  "Ubiquiti" "NanoBridge M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe233    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe235    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe239    6      0  "Ubiquiti" "NanoBridge M9" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe242    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe243    3      0  "Ubiquiti" "NanoBridge M3" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe245    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe252    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe255    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe2a3    3      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe2a5    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe2b2   10      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe2b5    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe2b9    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe2c2   10      0  "Ubiquiti" "NanoBeam M2 Int" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe2c3    6      0  "Ubiquiti" "Bullet M2 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe2c4    6      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe2d2   12      0  "Ubiquiti" "Bullet M2 Titanium HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe2d4    6      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe2d5    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe2e5    4      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe305    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe345    6      0  "Ubiquiti" "WispStation M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe3a5    5      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe3b5    6      0  "Ubiquiti" "airOS XM/XW"
>> +0x168c 0xffff 0x0777 0xe3e5    4      0  "Ubiquiti" "PowerBeam M5 300" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe402   10      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe405    1      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe4a2    1      0  "Ubiquiti" "AirRouter" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe4a5    1      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe4b2    9      0  "Ubiquiti" "AirRouter HP" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe4d5    5      0  "Ubiquiti" "Rocket M5 Titanium" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe4e5    4      0  "Ubiquiti" "PowerBeam M5 400" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe5e5    4      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe6a2    1      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe6b2    1      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe6b5    5      0  "Ubiquiti" "Rocket M5 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe6c2    6      0  "Ubiquiti" "airOS XM"
>> +0x168c 0xffff 0x0777 0xe6e5    4      0  "Ubiquiti" "PowerBeam M5 400 ISO" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe7f8    2      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe805    5      0  "Ubiquiti" "airOS XM" /* e.g. NanoStation M5, Bullet M5 */
>> +0x168c 0xffff 0x0777 0xe812    6      0  "Ubiquiti" "NanoBeam M2 13" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe815    4      0  "Ubiquiti" "NanoBeam M5 16" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe825    4      0  "Ubiquiti" "NanoBeam M5 19" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe835    6      0  "Ubiquiti" "AirGrid M5 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe845    1      0  "Ubiquiti" "NanoStation Loco M5 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe855    5      0  "Ubiquiti" "NanoStation M5 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe865    6      0  "Ubiquiti" "LiteBeam M5" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe866    6      0  "Ubiquiti" "NanoStation M2 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe867    2      0  "Ubiquiti" "NanoStation Loco M2 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe868    7      0  "Ubiquiti" "Rocket M2 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe869    2      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe875    4      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe879    2      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe885    4      0  "Ubiquiti" "PowerBeam M5 620 XW" /* airOS XW */
>> +0x168c 0xffff 0x0777 0xe895    4      0  "Ubiquiti" "airOS XW"
>> +0x168c 0xffff 0x0777 0xe8a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
>> +0x168c 0xffff 0x0777 0xe8b5    5      0  "Ubiquiti" "airOS XM"
>>  0x168c 0x001b 0x0777 0x3002   10      0  "Ubiquiti" "XR2"
>>  0x168c 0x001b 0x7777 0x3002   10      0  "Ubiquiti" "XR2"
>>  0x168c 0x001b 0x0777 0x3b02   10      0  "Ubiquiti" "XR2.3"
>> @@ -41,18 +134,18 @@
>>  0x168c 0x0027 0x168c 0x2082    7      0  "Ubiquiti" "SR71A"
>>  0x168c 0x0027 0x0777 0x4082    7      0  "Ubiquiti" "SR71"
>>  0x168c 0x0029 0x0777 0x4005    7      0  "Ubiquiti" "SR71-15"
>> -0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset */
>> -0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset */
>> -0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset */
>> +0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset - Correct! */
>> +0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset - Wrong! */
>> +0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset - Correct! */
>>  0x168c 0x002a 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2"
>>  0x168c 0x002a 0x0777 0xe805    5      0  "Ubiquiti" "Bullet M5"
>> -0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset */
>> +0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset - Wrong! */
>>  0x168c 0x0029 0x168c 0xa094    0      0  "Atheros"  "AR9220"
>>  0x168c 0x0029 0x168c 0xa095    0      0  "Atheros"  "AR9223"
>>  0x168c 0x002a 0x168c 0xa093    0      0  "Atheros"  "AR9280"
>>  0x168c 0x002b 0x168c 0xa091    0      0  "Atheros"  "AR9285"
>>  0x168c 0x002d 0x168c 0x209a    0      0  "Atheros"  "AR9287"
>> -0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)"
>> +0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)" /* wrong offset! */
>>  0x168c 0x0033 0x168c 0xa120    0      0  "Atheros"  "AR9580"
>>  0x168c 0x0033 0x168c 0xa136    0      0  "Atheros"  "AR9580"
>>  0x168c 0x0033 0x19b6 0xd016    0      0  "Mikrotik" "R11e-2HPnD"
>>

Patch
diff mbox series

diff --git a/hardware.txt b/hardware.txt
index f36c476..727c607 100644
--- a/hardware.txt
+++ b/hardware.txt
@@ -17,6 +17,99 @@ 
 0xffff 0xffff 0xffff 0xc105    5      0  "Ubiquiti" "NanoStation Loco5"
 0xffff 0xffff 0xffff 0xc202   10      0  "Ubiquiti" "Bullet2"
 0xffff 0xffff 0xffff 0xc205    5      0  "Ubiquiti" "Bullet5"
+0x168c 0xffff 0x0777 0xe002    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe003    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe006    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe009    6      0  "Ubiquiti" "NanoStation Loco M9" /* airOS XM */
+0x168c 0xffff 0x0777 0xe012   10      0  "Ubiquiti" "NanoStation M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe035    3      0  "Ubiquiti" "NanoStation M3" /* airOS XM */
+0x168c 0xffff 0x0777 0xe0a2    2      0  "Ubiquiti" "NanoStation Loco M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe0a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe102    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe105    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe112   10      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe115    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1a3    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1a5    5      0  "Ubiquiti" "PowerBridge M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe1b2   10      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1b3    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1b5    5      0  "Ubiquiti" "Rocket M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe1b6    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1b9    6      0  "Ubiquiti" "Rocket M9" /* airOS XM */
+0x168c 0xffff 0x0777 0xe1c2   10      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1c3    3      0  "Ubiquiti" "Rocket M3" /* airOS XM */
+0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "Rocket M5 GPS" /* airOS XM */
+0x168c 0xffff 0x0777 0xe1c5    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1d2   10      0  "Ubiquiti" "Rocket M2 Titanium" /* airOS XM/XW */
+0x168c 0xffff 0x0777 0xe1d3    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1d5    5      0  "Ubiquiti" "airOS XM/XW"
+0x168c 0xffff 0x0777 0xe1d9    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1e3    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe1e5    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe205    6      0  "Ubiquiti" "Bullet M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe212    1      0  "Ubiquiti" "AirGrid M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe215    1      0  "Ubiquiti" "AirGrid M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe232    2      0  "Ubiquiti" "NanoBridge M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe233    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe235    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe239    6      0  "Ubiquiti" "NanoBridge M9" /* airOS XM */
+0x168c 0xffff 0x0777 0xe242    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe243    3      0  "Ubiquiti" "NanoBridge M3" /* airOS XM */
+0x168c 0xffff 0x0777 0xe245    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe252    9      0  "Ubiquiti" "AirGrid M2 HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe255    6      0  "Ubiquiti" "AirGrid M5 HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe2a3    3      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe2a5    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe2b2   10      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe2b5    1      0  "Ubiquiti" "NanoBridge M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe2b9    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe2c2   10      0  "Ubiquiti" "NanoBeam M2 Int" /* airOS XW */
+0x168c 0xffff 0x0777 0xe2c3    6      0  "Ubiquiti" "Bullet M2 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe2c4    6      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe2d2   12      0  "Ubiquiti" "Bullet M2 Titanium HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe2d4    6      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe2d5    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe2e5    4      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* airOS XM */
+0x168c 0xffff 0x0777 0xe305    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe345    6      0  "Ubiquiti" "WispStation M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe3a5    5      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe3b5    6      0  "Ubiquiti" "airOS XM/XW"
+0x168c 0xffff 0x0777 0xe3e5    4      0  "Ubiquiti" "PowerBeam M5 300" /* airOS XW */
+0x168c 0xffff 0x0777 0xe402   10      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe405    1      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe4a2    1      0  "Ubiquiti" "AirRouter" /* airOS XM */
+0x168c 0xffff 0x0777 0xe4a5    1      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe4b2    9      0  "Ubiquiti" "AirRouter HP" /* airOS XM */
+0x168c 0xffff 0x0777 0xe4d5    5      0  "Ubiquiti" "Rocket M5 Titanium" /* airOS XW */
+0x168c 0xffff 0x0777 0xe4e5    4      0  "Ubiquiti" "PowerBeam M5 400" /* airOS XW */
+0x168c 0xffff 0x0777 0xe5e5    4      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe6a2    1      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe6b2    1      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe6b5    5      0  "Ubiquiti" "Rocket M5 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe6c2    6      0  "Ubiquiti" "airOS XM"
+0x168c 0xffff 0x0777 0xe6e5    4      0  "Ubiquiti" "PowerBeam M5 400 ISO" /* airOS XW */
+0x168c 0xffff 0x0777 0xe7f8    2      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe805    5      0  "Ubiquiti" "airOS XM" /* e.g. NanoStation M5, Bullet M5 */
+0x168c 0xffff 0x0777 0xe812    6      0  "Ubiquiti" "NanoBeam M2 13" /* airOS XW */
+0x168c 0xffff 0x0777 0xe815    4      0  "Ubiquiti" "NanoBeam M5 16" /* airOS XW */
+0x168c 0xffff 0x0777 0xe825    4      0  "Ubiquiti" "NanoBeam M5 19" /* airOS XW */
+0x168c 0xffff 0x0777 0xe835    6      0  "Ubiquiti" "AirGrid M5 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe845    1      0  "Ubiquiti" "NanoStation Loco M5 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe855    5      0  "Ubiquiti" "NanoStation M5 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe865    6      0  "Ubiquiti" "LiteBeam M5" /* airOS XW */
+0x168c 0xffff 0x0777 0xe866    6      0  "Ubiquiti" "NanoStation M2 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe867    2      0  "Ubiquiti" "NanoStation Loco M2 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe868    7      0  "Ubiquiti" "Rocket M2 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe869    2      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe875    4      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe879    2      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe885    4      0  "Ubiquiti" "PowerBeam M5 620 XW" /* airOS XW */
+0x168c 0xffff 0x0777 0xe895    4      0  "Ubiquiti" "airOS XW"
+0x168c 0xffff 0x0777 0xe8a5    1      0  "Ubiquiti" "NanoStation Loco M5" /* airOS XM */
+0x168c 0xffff 0x0777 0xe8b5    5      0  "Ubiquiti" "airOS XM"
 0x168c 0x001b 0x0777 0x3002   10      0  "Ubiquiti" "XR2"
 0x168c 0x001b 0x7777 0x3002   10      0  "Ubiquiti" "XR2"
 0x168c 0x001b 0x0777 0x3b02   10      0  "Ubiquiti" "XR2.3"
@@ -41,18 +134,18 @@ 
 0x168c 0x0027 0x168c 0x2082    7      0  "Ubiquiti" "SR71A"
 0x168c 0x0027 0x0777 0x4082    7      0  "Ubiquiti" "SR71"
 0x168c 0x0029 0x0777 0x4005    7      0  "Ubiquiti" "SR71-15"
-0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset */
-0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset */
-0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset */
+0x168c 0x002a 0x0777 0xe302   12      0  "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset - Correct! */
+0x168c 0x002a 0x0777 0xe012   12      0  "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset - Wrong! */
+0x168c 0x002a 0x0777 0xe005    5      0  "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset - Correct! */
 0x168c 0x002a 0x0777 0xe202   12      0  "Ubiquiti" "Bullet M2"
 0x168c 0x002a 0x0777 0xe805    5      0  "Ubiquiti" "Bullet M5"
-0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset */
+0x168c 0x002a 0x0777 0xe345    0      0  "Ubiquiti" "WispStation M5" /* ToDo: confirm offset - Wrong! */
 0x168c 0x0029 0x168c 0xa094    0      0  "Atheros"  "AR9220"
 0x168c 0x0029 0x168c 0xa095    0      0  "Atheros"  "AR9223"
 0x168c 0x002a 0x168c 0xa093    0      0  "Atheros"  "AR9280"
 0x168c 0x002b 0x168c 0xa091    0      0  "Atheros"  "AR9285"
 0x168c 0x002d 0x168c 0x209a    0      0  "Atheros"  "AR9287"
-0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)"
+0x168c 0x002e 0x0777 0xe0a2    8      0  "Ubiquiti" "NanoStation Loco M2 (XM)" /* wrong offset! */
 0x168c 0x0033 0x168c 0xa120    0      0  "Atheros"  "AR9580"
 0x168c 0x0033 0x168c 0xa136    0      0  "Atheros"  "AR9580"
 0x168c 0x0033 0x19b6 0xd016    0      0  "Mikrotik" "R11e-2HPnD"