On Wed, Mar 04, 2015 at 10:40:46PM +0100, Nicolas Reinecke wrote:
> Tested with Rigol DS1054Z.
>     
> Signed-off-by: Nicolas Reinecke <n...@das-labor.org>
> ---
>  src/hardware/rigol-ds/api.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
> index a8f8bcd..1cc7fb7 100644
> --- a/src/hardware/rigol-ds/api.c
> +++ b/src/hardware/rigol-ds/api.c
> @@ -172,6 +172,7 @@ enum vendor {
>  enum series {
>         VS5000,
>         DS1000,
> +       DS1000Z,
>         DS2000,
>         DS2000A,
>         DSO1000,
> @@ -191,6 +192,8 @@ static const struct rigol_ds_series supported_series[] = {
>                 {50, 1}, {2, 1000}, 14, 2048, 0},
>         [DS1000] = {VENDOR(RIGOL), "DS1000", PROTOCOL_V2, FORMAT_IEEE488_2,
>                 {50, 1}, {2, 1000}, 12, 600, 1048576},
> +       [DS1000Z] = {VENDOR(RIGOL), "DS1000Z", PROTOCOL_V2, FORMAT_IEEE488_2,
> +               {50, 1}, {1, 1000}, 12, 1200, 12000},
>         [DS2000] = {VENDOR(RIGOL), "DS2000", PROTOCOL_V3, FORMAT_IEEE488_2,
>                 {500, 1}, {500, 1000000}, 14, 1400, 14000},
>         [DS2000A] = {VENDOR(RIGOL), "DS2000A", PROTOCOL_V3, FORMAT_IEEE488_2,

Does this really works ???

I mean, from a quick inspection of the respective programming guides
from Rigol, it looks like the DS1000Z uses pretty much the same SCPI
commands as the the DS2000 (ie. PROTOCOL_V3) and does not support the
same commands as the DS1000.
The only PROTOCOL_V3 commands I noticed that sigrok is using and that
are not supported by the DS1000Z are :WAV:STAT? and :WAV:END.

So I suggest you try to use PROTOCOL_V3 and you have a closer look at
the places where those 2 unsupported commands are used...

Aurel

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel

Reply via email to