From: Dan Horák <redacted>
Date: Sat, 2 Nov 2013 15:47:11 +0000 (+0100)
Subject: rigol-ds1xx2: detect Rigol DS1xx2 with upgraded bandwith
X-Git-Tag: libsigrok-0.2.2~16
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b775d753e3874d69ee342b1d6c0961a6f1494f18;p=libsigrok.git

rigol-ds1xx2: detect Rigol DS1xx2 with upgraded bandwith

The bandwith in Rigol DS1xx2D/E scopes can be upgraded to 150 MHz in software.
So detect also scopes with the upgraded bandwith.

using libsigrok-0.2.1 + this change + commit da970d24ec (required for newer kernels):

[dan@eagle sigrok]$ sigrok-cli --scan -d rigol-ds1xx2 -l 5
sr: libsigrok loglevel set to 5.
sr: Sanity-checking all drivers.
sr: Sanity-checking all input modules.
sr: Sanity-checking all output modules.
srd: libsigrokdecode loglevel set to 5.
sr: hwdriver: Initializing driver 'rigol-ds1xx2'.
sr: serial: Opening serial port '/dev/usbtmc0' (flags 1).
sr: serial: Opened serial port '/dev/usbtmc0' (fd 7).
sr: serial: Wrote 5/5 bytes (fd 7).
sr: serial: Closing serial port /dev/usbtmc0 (fd 7).
sr: rigol-ds1xx2: response: /dev/usbtmc0 [Rigol Technologies,DS1152D,DS1EU150XXXXXX,00.04.01.00.02]
sr: hwdriver: Scan of 'rigol-ds1xx2' found 1 devices.
The following devices were found:
rigol-ds1xx2 - Rigol Technologies DS1152D 00.04.01.00.02 with 18 probes: CH1 CH2 D0 D1 D2 D3 D4 D5 D6 D7 D8 D9 D10 D11 D12 D13 D14 D15
---

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 000de312..ba59c215 100644
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -133,8 +133,10 @@ static const char *coupling[] = {
 static const char *supported_models[] = {
 	"DS1052E",
 	"DS1102E",
+	"DS1152E",
 	"DS1052D",
 	"DS1102D",
+	"DS1152D",
 };
 
 SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;