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

rigol-ds1xx2: Fix setting trigger parameters.

This commit is contained in:
Martin Ling 2012-12-30 14:17:08 +01:00 committed by Uwe Hermann
parent 542843f76f
commit 4e108ace13
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
break; break;
case SR_HWCAP_TRIGGER_SLOPE: case SR_HWCAP_TRIGGER_SLOPE:
tmp_u64 = *(const int *)value; tmp_u64 = *(const int *)value;
rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:%s\n", tmp_u64 ? "POS" : "NEG"); rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SLOP %s\n", tmp_u64 ? "POS" : "NEG");
break; break;
case SR_HWCAP_HORIZ_TRIGGERPOS: case SR_HWCAP_HORIZ_TRIGGERPOS:
tmp_float = *(const float *)value; tmp_float = *(const float *)value;
@ -315,9 +315,11 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
else if (!strcmp(value, "AC Line")) else if (!strcmp(value, "AC Line"))
channel = "ACL"; channel = "ACL";
else else
{
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
break; break;
rigol_ds1xx2_send_data(devc->fd, ":TRIG:SOUR %s\n", channel); }
rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SOUR %s\n", channel);
break; break;
case SR_HWCAP_VDIV: case SR_HWCAP_VDIV:
/* TODO: Not supporting vdiv per channel yet. */ /* TODO: Not supporting vdiv per channel yet. */