BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds1xx2: fix channel numbers 

Copyright bump, too.
This commit is contained in:
Bert Vermeulen 2013-04-08 12:01:00 +02:00
parent a3df166f02
commit 88e429c97f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hardware/rigol-ds1xx2/api.c
View File

@ -2,6 +2,7 @@
* This file is part of the libsigrok project. * This file is part of the libsigrok project.
* *
* Copyright (C) 2012 Martin Ling <martin-git@earth.li> * Copyright (C) 2012 Martin Ling <martin-git@earth.li>
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -394,8 +395,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
if (vdivs[i][0] != p || vdivs[i][1] != q) if (vdivs[i][0] != p || vdivs[i][1] != q)
continue; continue;
devc->scale = (float)vdivs[i][0] / vdivs[i][1]; devc->scale = (float)vdivs[i][0] / vdivs[i][1];
rigol_ds1xx2_send_data(devc->fd, ":CHAN0:SCAL %.3f",
devc->scale);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL %.3f", rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL %.3f",
devc->scale); devc->scale);
break; break;
@ -408,10 +407,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
tmp_str = g_variant_get_string(data, NULL); tmp_str = g_variant_get_string(data, NULL);
for (i = 0; i < ARRAY_SIZE(coupling); i++) { for (i = 0; i < ARRAY_SIZE(coupling); i++) {
if (!strcmp(tmp_str, coupling[i])) { if (!strcmp(tmp_str, coupling[i])) {
rigol_ds1xx2_send_data(devc->fd, ":CHAN0:COUP %s",
coupling[i]);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:COUP %s", rigol_ds1xx2_send_data(devc->fd, ":CHAN1:COUP %s",
coupling[i]); coupling[i]);
rigol_ds1xx2_send_data(devc->fd, ":CHAN2:COUP %s",
coupling[i]);
break; break;
} }
} }

1
hardware/rigol-ds1xx2/protocol.c
View File

@ -2,6 +2,7 @@
* This file is part of the libsigrok project. * This file is part of the libsigrok project.
* *
* Copyright (C) 2012 Martin Ling <martin-git@earth.li> * Copyright (C) 2012 Martin Ling <martin-git@earth.li>
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

1
hardware/rigol-ds1xx2/protocol.h
View File

@ -2,6 +2,7 @@
* This file is part of the libsigrok project. * This file is part of the libsigrok project.
* *
* Copyright (C) 2012 Martin Ling <martin-git@earth.li> * Copyright (C) 2012 Martin Ling <martin-git@earth.li>
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by