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

config keys: Revert re-orderings to avoid ABI changes.

This commit is contained in:
Uwe Hermann 2019-07-30 20:50:47 +02:00
parent 1838d9f13f
commit ea9e7a3e82
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/libsigrok/libsigrok.h
View File

@ -767,21 +767,9 @@ enum sr_configkey {
/** The device supports run-length encoding (RLE). */ /** The device supports run-length encoding (RLE). */
SR_CONF_RLE, SR_CONF_RLE,
/** Trigger source. */
SR_CONF_TRIGGER_SOURCE,
/** The device supports setting trigger slope. */ /** The device supports setting trigger slope. */
SR_CONF_TRIGGER_SLOPE, SR_CONF_TRIGGER_SLOPE,
/** The device supports setting a pattern for the logic trigger. */
SR_CONF_TRIGGER_PATTERN,
/** High resolution mode. */
SR_CONF_HIGH_RESOLUTION,
/** Peak detection. */
SR_CONF_PEAK_DETECTION,
/** The device supports averaging. */ /** The device supports averaging. */
SR_CONF_AVERAGING, SR_CONF_AVERAGING,
@ -791,6 +779,9 @@ enum sr_configkey {
*/ */
SR_CONF_AVG_SAMPLES, SR_CONF_AVG_SAMPLES,
/** Trigger source. */
SR_CONF_TRIGGER_SOURCE,
/** Horizontal trigger position. */ /** Horizontal trigger position. */
SR_CONF_HORIZ_TRIGGERPOS, SR_CONF_HORIZ_TRIGGERPOS,
@ -839,12 +830,6 @@ enum sr_configkey {
/** Logic low-high threshold range. */ /** Logic low-high threshold range. */
SR_CONF_VOLTAGE_THRESHOLD, SR_CONF_VOLTAGE_THRESHOLD,
/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
SR_CONF_LOGIC_THRESHOLD,
/** Logic threshold: custom numerical value. */
SR_CONF_LOGIC_THRESHOLD_CUSTOM,
/** The device supports using an external clock. */ /** The device supports using an external clock. */
SR_CONF_EXTERNAL_CLOCK, SR_CONF_EXTERNAL_CLOCK,
@ -1015,6 +1000,21 @@ enum sr_configkey {
/** Offset of a source without strictly-defined MQ. */ /** Offset of a source without strictly-defined MQ. */
SR_CONF_OFFSET, SR_CONF_OFFSET,
/** The device supports setting a pattern for the logic trigger. */
SR_CONF_TRIGGER_PATTERN,
/** High resolution mode. */
SR_CONF_HIGH_RESOLUTION,
/** Peak detection. */
SR_CONF_PEAK_DETECTION,
/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
SR_CONF_LOGIC_THRESHOLD,
/** Logic threshold: custom numerical value. */
SR_CONF_LOGIC_THRESHOLD_CUSTOM,
/* Update sr_key_info_config[] (hwdriver.c) upon changes! */ /* Update sr_key_info_config[] (hwdriver.c) upon changes! */
/*--- Special stuff -------------------------------------------------*/ /*--- Special stuff -------------------------------------------------*/

24
src/hwdriver.c
View File

@ -81,20 +81,14 @@ static struct sr_key_info sr_key_info_config[] = {
"Pattern", NULL}, "Pattern", NULL},
{SR_CONF_RLE, SR_T_BOOL, "rle", {SR_CONF_RLE, SR_T_BOOL, "rle",
"Run length encoding", NULL}, "Run length encoding", NULL},
{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
"Trigger source", NULL},
{SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope", {SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
"Trigger slope", NULL}, "Trigger slope", 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_AVERAGING, SR_T_BOOL, "averaging", {SR_CONF_AVERAGING, SR_T_BOOL, "averaging",
"Averaging", NULL}, "Averaging", NULL},
{SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples", {SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples",
"Number of samples to average over", NULL}, "Number of samples to average over", NULL},
{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
"Trigger source", NULL},
{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos", {SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
"Horizontal trigger position", NULL}, "Horizontal trigger position", NULL},
{SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize", {SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
@ -127,10 +121,6 @@ static struct sr_key_info sr_key_info_config[] = {
"Hold min", NULL}, "Hold min", NULL},
{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold", {SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
"Voltage threshold", NULL }, "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", {SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
"External clock mode", NULL}, "External clock mode", NULL},
{SR_CONF_SWAP, SR_T_BOOL, "swap", {SR_CONF_SWAP, SR_T_BOOL, "swap",
@ -195,6 +185,16 @@ static struct sr_key_info sr_key_info_config[] = {
"External clock source", NULL}, "External clock source", NULL},
{SR_CONF_OFFSET, SR_T_FLOAT, "offset", {SR_CONF_OFFSET, SR_T_FLOAT, "offset",
"Offset", NULL}, "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 */ /* Special stuff */
{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile", {SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",