ar71xx: add support for Compex WPJ342

[openwrt/openwrt.git] / target / linux / ar71xx / base-files / lib / ar71xx.sh

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 0e92ee7912ea5f601aeb13ab99887960d59df16c..b3eda6c469b5b5b93b86286b5af7f91127610ebb 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -37,8 +37,9 @@ wndr3700_board_detect() {
                machine="NETGEAR WNDR3700"
                ;;
        "33373031")
-               # Use awk to remove everything after the first zero byte
-               model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
+               model="$(ar71xx_get_mtd_offset_size_format art 41 32 %c)"
+               # Use awk to remove everything unprintable
+               model_stripped="$(ar71xx_get_mtd_offset_size_format art 41 32 %c | LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}')"
                case $model in
                $'\xff'*)
                        if [ "${model:24:1}" = 'N' ]; then
@@ -48,14 +49,14 @@ wndr3700_board_detect() {
                        fi
                        ;;
                '29763654+16+64'*)
-                       machine="NETGEAR ${model:14}"
+                       machine="NETGEAR ${model_stripped:14}"
                        ;;
                '29763654+16+128'*)
-                       machine="NETGEAR ${model:15}"
+                       machine="NETGEAR ${model_stripped:15}"
                        ;;
                *)
                        # Unknown ID
-                       machine="NETGEAR $model"
+                       machine="NETGEAR ${model_stripped}"
                esac
        esac
 
@@ -98,7 +99,7 @@ tplink_board_detect() {
        hwid=$(tplink_get_hwid)
        mid=$(tplink_get_mid)
        hwver=${hwid:6:2}
-       hwver="v${hwver#0}"
+       hwver=" v${hwver#0}"
 
        case "$hwid" in
        "015000"*)
@@ -113,20 +114,33 @@ tplink_board_detect() {
        "044403"*)
                model="ANTMINER-S3"
                ;;
+       "44440101"*)
+               model="ANTROUTER-R1"
+               ;;
        "120000"*)
                model="MERCURY MAC1200R"
                ;;
+       "007260"*)
+               model="TellStick ZNet Lite"
+               ;;
+       "066602"*)
+               model="OMYlink OMY-X1"
+               ;;
        "3C0001"*)
                model="OOLITE"
                ;;
        "3C0002"*)
                model="MINIBOX_V1"
                ;;
-       "070300"*)
+       "070301"*)
                model="TP-Link TL-WR703N"
                ;;
        "071000"*)
                model="TP-Link TL-WR710N"
+
+               if [ "$hwid" = '07100002' -a "$mid" = '00000002' ]; then
+                       hwver=' v2.1'
+               fi
                ;;
        "072001"*)
                model="TP-Link TL-WR720N"
@@ -161,12 +175,16 @@ tplink_board_detect() {
        "083000"*)
                model="TP-Link TL-WA830RE"
 
-               if [ "$hwver" = 'v10' ]; then
-                       hwver='v1'
+               if [ "$hwver" = ' v10' ]; then
+                       hwver=' v1'
                fi
                ;;
        "084100"*)
                model="TP-Link TL-WR841N/ND"
+
+               if [ "$hwid" = '08410002' -a "$mid" = '00000002' ]; then
+                       hwver=' v1.5'
+               fi
                ;;
        "084200"*)
                model="TP-Link TL-WR842N/ND"
@@ -267,7 +285,7 @@ tplink_board_detect() {
                ;;
        esac
 
-       AR71XX_MODEL="$model $hwver"
+       AR71XX_MODEL="$model$hwver"
 }
 
 tplink_pharos_get_model_string() {
@@ -338,6 +356,9 @@ ar71xx_board_detect() {
        *"AirRouter")
                name="airrouter"
                ;;
+       *"ALFA Network AP120C")
+               name="alfa-ap120c"
+               ;;
        *"ALFA Network AP96")
                name="alfa-ap96"
                ;;
@@ -365,7 +386,7 @@ ar71xx_board_detect() {
        *AP113)
                name="ap113"
                ;;
-       *AP121)
+       *"AP121 reference board")
                name="ap121"
                ;;
        *AP121-MINI)
@@ -410,6 +431,12 @@ ar71xx_board_detect() {
        *AW-NR580)
                name="aw-nr580"
                ;;
+       *CAP324)
+               name="cap324"
+               ;;
+       *C-55)
+               name="c-55"
+               ;;
        *CAP4200AG)
                name="cap4200ag"
                ;;
@@ -420,6 +447,12 @@ ar71xx_board_detect() {
                name="cpe510"
                tplink_pharos_board_detect
                ;;
+       *CR3000)
+               name="cr3000"
+               ;;
+       *CR5000)
+               name="cr5000"
+               ;;
        *"DB120 reference board")
                name="db120"
                ;;
@@ -453,15 +486,24 @@ ar71xx_board_detect() {
        *"DIR-835 rev. A1")
                name="dir-835-a1"
                ;;
+       *"dLAN Hotspot")
+               name="dlan-hotspot"
+               ;;
        *"dLAN pro 500 Wireless+")
                name="dlan-pro-500-wp"
                ;;
        *"dLAN pro 1200+ WiFi ac")
                name="dlan-pro-1200-ac"
                ;;
+       *DR344)
+               name="dr344"
+               ;;
        *"Dragino v2")
                name="dragino2"
                ;;
+       *"Domino Pi")
+               name="gl-domino"
+               ;;
        *"EAP300 v2")
                name="eap300v2"
                ;;
@@ -478,6 +520,12 @@ ar71xx_board_detect() {
                name="gl-inet"
                gl_inet_board_detect
                ;;
+       *"GL AR150")
+               name="gl-ar150"
+               ;;
+       *"GL AR300")
+               name="gl-ar300"
+               ;;
        *"EnGenius EPG5000")
                name="epg5000"
                ;;
@@ -535,6 +583,9 @@ ar71xx_board_detect() {
        *MR16)
                name="mr16"
                ;;
+       *MR18)
+               name="mr18"
+               ;;
        *MR600v2)
                name="mr600v2"
                ;;
@@ -595,6 +646,15 @@ ar71xx_board_detect() {
        *"OM5P AN")
                name="om5p-an"
                ;;
+       *"OM5P AC")
+               name="om5p-ac"
+               ;;
+       *"OM5P ACv2")
+               name="om5p-acv2"
+               ;;
+       *"OMY-X1")
+               name="omy-x1"
+               ;;
        *"Onion Omega")
                name="onion-omega"
                ;;
@@ -715,6 +775,9 @@ ar71xx_board_detect() {
        "Smart Electronics Black Swift board"*)
                name="bsb"
                ;;
+       *"Telldus TellStick ZNet Lite")
+               name="tellstick-znet-lite"
+               ;;
        *TEW-632BRP)
                name="tew-632brp"
                ;;
@@ -727,6 +790,9 @@ ar71xx_board_detect() {
        *TEW-732BR)
                name="tew-732br"
                ;;
+       *TEW-823DRU)
+               name="tew-823dru"
+               ;;
        *"TL-WR1041N v2")
                name="tl-wr1041n-v2"
                ;;
@@ -787,6 +853,9 @@ ar71xx_board_detect() {
        *"TL-WA801ND v2")
                name="tl-wa801nd-v2"
                ;;
+       *"TL-WA801ND v3")
+               name="tl-wa801nd-v3"
+               ;;
        *TL-WA901ND)
                name="tl-wa901nd"
                ;;
@@ -868,6 +937,9 @@ ar71xx_board_detect() {
        *UniFi)
                name="unifi"
                ;;
+       *"UniFi-AC")
+               name="unifiac"
+               ;;
        *"UniFi AP Pro")
                name="uap-pro"
                ;;
@@ -895,6 +967,9 @@ ar71xx_board_detect() {
        *WPE72)
                name="wpe72"
                ;;
+       *WPJ342)
+               name="wpj342"
+               ;;
        *WPJ344)
                name="wpj344"
                ;;
@@ -937,6 +1012,9 @@ ar71xx_board_detect() {
        *"WNR1000 V2")
                name="wnr1000-v2"
                ;;
+       *WPN824N)
+               name="wpn824n"
+               ;;
        *WRT160NL)
                name="wrt160nl"
                ;;