From: Aurelien Jacobs Date: Fri, 13 Feb 2015 15:37:24 +0000 (+0100) Subject: rigol-ds: handle full word trigger slope in config_get(). X-Git-Tag: libsigrok-0.4.0~643 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d5c4144e2cd5129da947277c24b699066d0bec72;p=libsigrok.git rigol-ds: handle full word trigger slope in config_get(). Some scope can return POSITIVE/NEGATIVE instead of POS/NEG, so accept this as well. This closes bug #558. --- diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index b9b8a7d5..da1d8fb0 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -557,9 +557,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s *data = g_variant_new_string(tmp_str); break; case SR_CONF_TRIGGER_SLOPE: - if (!strcmp(devc->trigger_slope, "POS")) + if (!strncmp(devc->trigger_slope, "POS", 3)) tmp_str = "r"; - else if (!strcmp(devc->trigger_slope, "NEG")) + else if (!strncmp(devc->trigger_slope, "NEG", 3)) tmp_str = "f"; else return SR_ERR_NA;