X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=38d74964e906d115262c39a181c98bdcb9709147;hb=f6129c8f0c92e45de5d70b4101bf2bd759a5fdf7;hp=27ca060d9d8f2c0f91e450888f807c309f6ebb23;hpb=4fa4db2c7983235fff5891127f5f4648a3762172;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index 27ca060d..38d74964 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -83,8 +83,6 @@ static struct sr_key_info sr_key_info_config[] = { "Run length encoding", NULL}, {SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope", "Trigger slope", NULL}, - {SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern", - "Trigger pattern", NULL}, {SR_CONF_AVERAGING, SR_T_BOOL, "averaging", "Averaging", NULL}, {SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples", @@ -123,10 +121,6 @@ static struct sr_key_info sr_key_info_config[] = { "Hold min", NULL}, {SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold", "Voltage threshold", NULL }, - {SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold", - "Logic threshold (predefined)", NULL}, - {SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom", - "Logic threshold (custom)", NULL}, {SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock", "External clock mode", NULL}, {SR_CONF_SWAP, SR_T_BOOL, "swap", @@ -191,6 +185,16 @@ static struct sr_key_info sr_key_info_config[] = { "External clock source", NULL}, {SR_CONF_OFFSET, SR_T_FLOAT, "offset", "Offset", NULL}, + {SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern", + "Trigger pattern", NULL}, + {SR_CONF_HIGH_RESOLUTION, SR_T_BOOL, "highresolution", + "High resolution", NULL}, + {SR_CONF_PEAK_DETECTION, SR_T_BOOL, "peakdetection", + "Peak detection", NULL}, + {SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold", + "Logic threshold (predefined)", NULL}, + {SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom", + "Logic threshold (custom)", NULL}, /* Special stuff */ {SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",