X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=contrib%2F60-libsigrok.rules;h=544683484d09dc40c58fd56fcc6408d15c22a264;hb=0540954d76ddcdb2563b53361ad1e98de2554d05;hp=24840a4ac63a6d69ea6c858df9822c2fd81f0741;hpb=5a01d09482d06a9b09709c3fed60a3dcfe032b56;p=libsigrok.git

diff --git a/contrib/60-libsigrok.rules b/contrib/60-libsigrok.rules
index 24840a4a..54468348 100644
--- a/contrib/60-libsigrok.rules
+++ b/contrib/60-libsigrok.rules
@@ -17,14 +17,20 @@
 ## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
+#
 # These rules do not grant any permission by itself, but flag devices
 # supported by libsigrok.
 # The access policy is stored in the 61-libsigrok-plugdev.rules and
 # 61-libsigrok-uaccess.rules.
+#
+# Note: Any syntax changes here will need to be tested against the
+# 'update-device-filter' Makefile target in the sigrok-androidutils
+# repo, since that parses this file.
+#
 
-##
-## Please keep this list sorted alphabetically by vendor/device name.
-##
+#
+# Please keep this list sorted alphabetically by vendor/device name.
+#
 
 ACTION!="add|change", GOTO="libsigrok_rules_end"
 SUBSYSTEM!="usb|usbmisc|usb_device", GOTO="libsigrok_rules_end"
@@ -36,6 +42,8 @@ ATTRS{idVendor}=="0957", ATTRS{idProduct}=="0618", ENV{ID_SIGROK}="1"
 ATTRS{idVendor}=="0957", ATTRS{idProduct}=="0607", ENV{ID_SIGROK}="1"
 # DSO1000 series
 ATTRS{idVendor}=="0957", ATTRS{idProduct}=="0588", ENV{ID_SIGROK}="1"
+# MSO7000A series
+ATTRS{idVendor}=="0957", ATTRS{idProduct}=="1735", ENV{ID_SIGROK}="1"
 
 # ASIX SIGMA
 # ASIX SIGMA2
@@ -143,6 +151,9 @@ ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="6022", ENV{ID_SIGROK}="1"
 # Hantek 6022BL, renumerates as 1d50:608e "sigrok fx2lafw", Serial: Hantek 6022BL
 ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="602a", ENV{ID_SIGROK}="1"
 
+# Hantek 4032L
+ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="4032", ENV{ID_SIGROK}="1"
+
 # IKALOGIC Scanalogic-2
 ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4123", ENV{ID_SIGROK}="1"
 
@@ -188,9 +199,15 @@ ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="04ce", ENV{ID_SIGROK}="1"
 # Rigol DS2000 series
 ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="04b0", ENV{ID_SIGROK}="1"
 
+# Rigol DS4000 series
+ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="04b1", ENV{ID_SIGROK}="1"
+
 # Rigol DG4000 series
 ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="0641", ENV{ID_SIGROK}="1"
 
+# Rigol DP800 series
+ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="0e11", ENV{ID_SIGROK}="1"
+
 # Rohde&Schwarz HMO1002 Series VCP/USBTMC mode
 ATTRS{idVendor}=="0aad", ATTRS{idProduct}=="0118", ENV{ID_SIGROK}="1"
 ATTRS{idVendor}=="0aad", ATTRS{idProduct}=="0119", ENV{ID_SIGROK}="1"
@@ -213,6 +230,12 @@ ATTRS{idVendor}=="21a9", ATTRS{idProduct}=="1001", ENV{ID_SIGROK}="1"
 # Saleae Logic Pro 16
 ATTRS{idVendor}=="21a9", ATTRS{idProduct}=="1006", ENV{ID_SIGROK}="1"
 
+# Siglent USBTMC devices.
+# f4ec:ee3a: E.g. SDS1052DL+ scope
+# f4ed:ee3a: E.g. SDS1202X-E scope or SDG1010 waveform generator
+ATTRS{idVendor}=="f4ec", ATTRS{idProduct}=="ee3a", ENV{ID_SIGROK}="1"
+ATTRS{idVendor}=="f4ed", ATTRS{idProduct}=="ee3a", ENV{ID_SIGROK}="1"
+
 # sigrok FX2 LA (8ch)
 # fx2grok-flat (before and after renumeration)
 ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608c", ENV{ID_SIGROK}="1"
@@ -223,6 +246,9 @@ ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608d", ENV{ID_SIGROK}="1"
 # sigrok FX2 DSO (2ch)
 ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608e", ENV{ID_SIGROK}="1"
 
+# sigrok usb-c-grok
+ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608f", ENV{ID_SIGROK}="1"
+
 # SysClk LWLA1016
 ATTRS{idVendor}=="2961", ATTRS{idProduct}=="6688", ENV{ID_SIGROK}="1"
 
@@ -258,6 +284,7 @@ ATTRS{idVendor}=="1244", ATTRS{idProduct}=="d237", ENV{ID_SIGROK}="1"
 # 0c12:7025: LAP-C(16128+)
 # 0c12:7100: AKIP-9101
 ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="7002", ENV{ID_SIGROK}="1"
+ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="7007", ENV{ID_SIGROK}="1"
 ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="7009", ENV{ID_SIGROK}="1"
 ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="700a", ENV{ID_SIGROK}="1"
 ATTRS{idVendor}=="0c12", ATTRS{idProduct}=="700b", ENV{ID_SIGROK}="1"