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

Rename SR_T_CHAR to SR_T_STRING. 

This is more correct and less confusing.
This commit is contained in:
Uwe Hermann 2014-05-06 20:18:54 +02:00
parent 05238d2830
commit ace218f922
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hwdriver.c
View File

@ -46,17 +46,17 @@
*/ */
static struct sr_config_info sr_config_info_data[] = { static struct sr_config_info sr_config_info_data[] = {
{SR_CONF_CONN, SR_T_CHAR, "conn", {SR_CONF_CONN, SR_T_STRING, "conn",
"Connection", NULL}, "Connection", NULL},
{SR_CONF_SERIALCOMM, SR_T_CHAR, "serialcomm", {SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
"Serial communication", NULL}, "Serial communication", NULL},
{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate", {SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
"Sample rate", NULL}, "Sample rate", NULL},
{SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio", {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
"Pre-trigger capture ratio", NULL}, "Pre-trigger capture ratio", NULL},
{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern", {SR_CONF_PATTERN_MODE, SR_T_STRING, "pattern",
"Pattern", NULL}, "Pattern", NULL},
{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype", {SR_CONF_TRIGGER_TYPE, SR_T_STRING, "triggertype",
"Trigger types", NULL}, "Trigger types", 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},
@ -64,9 +64,9 @@ static struct sr_config_info sr_config_info_data[] = {
"Swap channel order", NULL}, "Swap channel order", 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_SLOPE, SR_T_CHAR, "triggerslope", {SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
"Trigger slope", NULL}, "Trigger slope", NULL},
{SR_CONF_TRIGGER_SOURCE, SR_T_CHAR, "triggersource", {SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
"Trigger source", NULL}, "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},
@ -74,17 +74,17 @@ static struct sr_config_info sr_config_info_data[] = {
"Buffer size", NULL}, "Buffer size", NULL},
{SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase", {SR_CONF_TIMEBASE, SR_T_RATIONAL_PERIOD, "timebase",
"Time base", NULL}, "Time base", NULL},
{SR_CONF_FILTER, SR_T_CHAR, "filter", {SR_CONF_FILTER, SR_T_STRING, "filter",
"Filter targets", NULL}, "Filter targets", NULL},
{SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv", {SR_CONF_VDIV, SR_T_RATIONAL_VOLT, "vdiv",
"Volts/div", NULL}, "Volts/div", NULL},
{SR_CONF_COUPLING, SR_T_CHAR, "coupling", {SR_CONF_COUPLING, SR_T_STRING, "coupling",
"Coupling", NULL}, "Coupling", NULL},
{SR_CONF_DATALOG, SR_T_BOOL, "datalog", {SR_CONF_DATALOG, SR_T_BOOL, "datalog",
"Datalog", NULL}, "Datalog", NULL},
{SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq", {SR_CONF_SPL_WEIGHT_FREQ, SR_T_STRING, "spl_weight_freq",
"Sound pressure level frequency weighting", NULL}, "Sound pressure level frequency weighting", NULL},
{SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time", {SR_CONF_SPL_WEIGHT_TIME, SR_T_STRING, "spl_weight_time",
"Sound pressure level time weighting", NULL}, "Sound pressure level time weighting", NULL},
{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max", {SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
"Hold max", NULL}, "Hold max", NULL},
@ -96,7 +96,7 @@ static struct sr_config_info sr_config_info_data[] = {
"Voltage threshold", NULL }, "Voltage threshold", NULL },
{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off", {SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
"Power off", NULL}, "Power off", NULL},
{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source", {SR_CONF_DATA_SOURCE, SR_T_STRING, "data_source",
"Data source", NULL}, "Data source", NULL},
{SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels", {SR_CONF_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
"Number of logic channels", NULL}, "Number of logic channels", NULL},
@ -112,7 +112,7 @@ static struct sr_config_info sr_config_info_data[] = {
"Maximum output current", NULL}, "Maximum output current", NULL},
{SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled", {SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled",
"Output enabled", NULL}, "Output enabled", NULL},
{SR_CONF_OUTPUT_CHANNEL, SR_T_CHAR, "output_channel", {SR_CONF_OUTPUT_CHANNEL, SR_T_STRING, "output_channel",
"Output channel modes", NULL}, "Output channel modes", NULL},
{SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp", {SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp",
"Over-voltage protection", NULL}, "Over-voltage protection", NULL},
@ -120,7 +120,7 @@ static struct sr_config_info sr_config_info_data[] = {
"Over-current protection", NULL}, "Over-current protection", NULL},
{SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples", {SR_CONF_LIMIT_SAMPLES, SR_T_UINT64, "limit_samples",
"Sample limit", NULL}, "Sample limit", NULL},
{SR_CONF_CLOCK_EDGE, SR_T_CHAR, "clock_edge", {SR_CONF_CLOCK_EDGE, SR_T_STRING, "clock_edge",
"Clock edge", NULL}, "Clock edge", NULL},
{0, 0, NULL, NULL, NULL}, {0, 0, NULL, NULL, NULL},
}; };

4
libsigrok.h
View File

@ -137,7 +137,7 @@ typedef int (*sr_receive_data_callback)(int fd, int revents, void *cb_data);
/** Data types used by sr_config_info(). */ /** Data types used by sr_config_info(). */
enum sr_datatype { enum sr_datatype {
SR_T_UINT64 = 10000, SR_T_UINT64 = 10000,
SR_T_CHAR, SR_T_STRING,
SR_T_BOOL, SR_T_BOOL,
SR_T_FLOAT, SR_T_FLOAT,
SR_T_RATIONAL_PERIOD, SR_T_RATIONAL_PERIOD,
@ -569,7 +569,7 @@ struct sr_config {
struct sr_config_info { struct sr_config_info {
/** Config key like SR_CONF_CONN, etc. */ /** Config key like SR_CONF_CONN, etc. */
int key; int key;
/** Data type like SR_T_CHAR, etc. */ /** Data type like SR_T_STRING, etc. */
int datatype; int datatype;
/** Id string, e.g. "serialcomm". */ /** Id string, e.g. "serialcomm". */
char *id; char *id;