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

hwdriver.c: Fix key order, add missing items.

This commit is contained in:
Uwe Hermann 2015-08-28 14:01:09 +02:00
parent 607dcdeae1
commit 29ae6f0880
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libsigrok/libsigrok.h
View File

@ -924,6 +924,9 @@ enum sr_configkey {
/** Output frequency in Hz. */ /** Output frequency in Hz. */
SR_CONF_OUTPUT_FREQUENCY, SR_CONF_OUTPUT_FREQUENCY,
/** Output frequency target in Hz. */
SR_CONF_OUTPUT_FREQUENCY_TARGET,
/** Measured quantity. */ /** Measured quantity. */
SR_CONF_MEASURED_QUANTITY, SR_CONF_MEASURED_QUANTITY,
@ -933,9 +936,6 @@ enum sr_configkey {
/** Equivalent circuit model. */ /** Equivalent circuit model. */
SR_CONF_EQUIV_CIRCUIT_MODEL, SR_CONF_EQUIV_CIRCUIT_MODEL,
/* Output frequency target in Hz. */
SR_CONF_OUTPUT_FREQUENCY_TARGET,
/** Over-temperature protection (OTP) active. */ /** Over-temperature protection (OTP) active. */
SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,

4
src/hwdriver.c
View File

@ -59,6 +59,8 @@ static struct sr_key_info sr_key_info_config[] = {
{SR_CONF_DEMODULATOR, SR_T_STRING, NULL, "Demodulator", NULL}, {SR_CONF_DEMODULATOR, SR_T_STRING, NULL, "Demodulator", NULL},
{SR_CONF_POWER_SUPPLY, SR_T_STRING, NULL, "Power supply", NULL}, {SR_CONF_POWER_SUPPLY, SR_T_STRING, NULL, "Power supply", NULL},
{SR_CONF_LCRMETER, SR_T_STRING, NULL, "LCR meter", NULL}, {SR_CONF_LCRMETER, SR_T_STRING, NULL, "LCR meter", NULL},
{SR_CONF_ELECTRONIC_LOAD, SR_T_STRING, NULL, "Electronic load", NULL},
{SR_CONF_SCALE, SR_T_STRING, NULL, "Scale", NULL},
/* Driver scan options */ /* Driver scan options */
{SR_CONF_CONN, SR_T_STRING, "conn", {SR_CONF_CONN, SR_T_STRING, "conn",
@ -241,6 +243,7 @@ static struct sr_key_info sr_key_info_mq[] = {
{SR_MQ_COUNT, 0, "count", "Count", NULL}, {SR_MQ_COUNT, 0, "count", "Count", NULL},
{SR_MQ_POWER_FACTOR, 0, "power_factor", "Power factor", NULL}, {SR_MQ_POWER_FACTOR, 0, "power_factor", "Power factor", NULL},
{SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL}, {SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL},
{SR_MQ_MASS, 0, "mass", "Mass", NULL},
ALL_ZERO ALL_ZERO
}; };
@ -272,6 +275,7 @@ static struct sr_key_info sr_key_info_mqflag[] = {
{SR_MQFLAG_DURATION, 0, "duration", "Duration", NULL}, {SR_MQFLAG_DURATION, 0, "duration", "Duration", NULL},
{SR_MQFLAG_AVG, 0, "average", "Average", NULL}, {SR_MQFLAG_AVG, 0, "average", "Average", NULL},
{SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL}, {SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL},
{SR_MQFLAG_UNSTABLE, 0, "unstable", "Unstable", NULL},
ALL_ZERO ALL_ZERO
}; };