X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=811c7292d064d36713f9618bae65809eb9701584;hb=bbb3996c06f2b1ebc9529d1e2181ddc55f70d9da;hp=7c9045477f40e3f015bdc89aacdd57ed6013ff8f;hpb=a1f7c854c502cca8fe7e5576b9a01ad1086f9170;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index 7c904547..811c7292 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -45,7 +45,7 @@ * @{ */ -/* Same key order/grouping as in enum sr_configkey (libsigrok.h). */ +/* Please use the same order/grouping as in enum sr_configkey (libsigrok.h). */ static struct sr_key_info sr_key_info_config[] = { /* Device classes */ {SR_CONF_LOGIC_ANALYZER, SR_T_STRING, NULL, "Logic analyzer", NULL}, @@ -59,6 +59,8 @@ static struct sr_key_info sr_key_info_config[] = { {SR_CONF_DEMODULATOR, SR_T_STRING, NULL, "Demodulator", NULL}, {SR_CONF_POWER_SUPPLY, SR_T_STRING, NULL, "Power supply", 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 */ {SR_CONF_CONN, SR_T_STRING, "conn", @@ -209,6 +211,7 @@ static struct sr_key_info sr_key_info_config[] = { {0, 0, NULL, NULL, NULL}, }; +/* Please use the same order as in enum sr_mq (libsigrok.h). */ static struct sr_key_info sr_key_info_mq[] = { {SR_MQ_VOLTAGE, 0, "voltage", "Voltage", NULL}, {SR_MQ_CURRENT, 0, "current", "Current", NULL}, @@ -241,9 +244,11 @@ static struct sr_key_info sr_key_info_mq[] = { {SR_MQ_COUNT, 0, "count", "Count", NULL}, {SR_MQ_POWER_FACTOR, 0, "power_factor", "Power factor", NULL}, {SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL}, + {SR_MQ_MASS, 0, "mass", "Mass", NULL}, ALL_ZERO }; +/* Please use the same order as in enum sr_mqflag (libsigrok.h). */ static struct sr_key_info sr_key_info_mqflag[] = { {SR_MQFLAG_AC, 0, "ac", "AC", NULL}, {SR_MQFLAG_DC, 0, "dc", "DC", NULL}, @@ -272,9 +277,11 @@ static struct sr_key_info sr_key_info_mqflag[] = { {SR_MQFLAG_DURATION, 0, "duration", "Duration", NULL}, {SR_MQFLAG_AVG, 0, "average", "Average", NULL}, {SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL}, + {SR_MQFLAG_UNSTABLE, 0, "unstable", "Unstable", NULL}, ALL_ZERO }; +/* This must handle all the keys from enum sr_datatype (libsigrok.h). */ SR_PRIV const GVariantType *sr_variant_type_get(int datatype) { switch (datatype) {