From: Uwe Hermann <redacted>
Date: Mon, 28 May 2012 21:40:12 +0000 (+0200)
Subject: sr: ARMFLY AX-Pro is supported by fx2lafw (LA only).
X-Git-Tag: libsigrok-0.1.1~16
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=9f05304e4e1b842f875cfdaccf9e93cae0012937;p=libsigrok.git

sr: ARMFLY AX-Pro is supported by fx2lafw (LA only).
---

diff --git a/NEWS b/NEWS
index 61f90175..1c89e0a1 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ This release does NOT change the libsigrok API.
 
    This new driver (+ firmware) currently supports the following devices:
 
+     - ARMFLY AX-Pro
      - Braintechnology USB-LPS
      - EE Electronics ESLA100
      - EE Electronics ESLA201A
@@ -35,7 +36,7 @@ This release does NOT change the libsigrok API.
  * ZEROPLUS Logic Cube LAP-C (16032): Fix a segfault.
 
  * udev file: Add entries for Robomotic BugLogic 3, Velleman PCSU1000,
-   and Ideofy LA-08.
+   and Ideofy LA-08, ARMFLY AX-Pro.
 
  * The zlib dependency has been removed (no longer needed),
 
diff --git a/contrib/z60_libsigrok.rules b/contrib/z60_libsigrok.rules
index dcbd5832..b7e5a182 100644
--- a/contrib/z60_libsigrok.rules
+++ b/contrib/z60_libsigrok.rules
@@ -58,6 +58,10 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", MODE="664", GROUP="plugdev"
 # EE Electronics ESLA201A
 # http://eeelec.com/xla/
 # lsusb: "08a9:0014" (no string for the vendor name available)
+#
+# ARMFLY AX-Pro
+# http://www.armfly.com/product/AX-Pro/ax-pro.htm
+# lsusb: "08a9:0014" (no string for the vendor name available)
 ATTRS{idVendor}=="08a9", ATTRS{idProduct}=="0014", MODE="664", GROUP="plugdev"
 
 # CWAV USBee SX
diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 8132251f..a13e9d80 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -32,6 +32,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	/*
 	 * CWAV USBee AX
 	 * EE Electronics ESLA201A
+	 * ARMFLY AX-Pro
 	 */
 	{ 0x08a9, 0x0014, "CWAV", "USBee AX", NULL,
 		FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", 8 },