X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=0700276cb84db77f39ebdd0ee6e88ca5be9d89c7;hb=6433156c3275df933e4bf6dcfb020c91fca0ae86;hp=37bab71144e6de7c0cc36ce37ade0dbd5b8f8574;hpb=0176c92fea8f47f6f9030a4a02f84d414741068f;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 37bab711..0700276c 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",
@@ -163,7 +165,7 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Output frequency", NULL},
 	{SR_CONF_OUTPUT_FREQUENCY_TARGET, SR_T_FLOAT, "output_frequency_target",
 		"Output frequency target", NULL},
-	{SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
+	{SR_CONF_MEASURED_QUANTITY, SR_T_MQ, "measured_quantity",
 		"Measured quantity", NULL},
 	{SR_CONF_MEASURED_2ND_QUANTITY, SR_T_STRING, "measured_2nd_quantity",
 		"Measured secondary quantity", NULL},
@@ -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) {
@@ -295,6 +302,8 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
 		return G_VARIANT_TYPE_TUPLE;
 	case SR_T_KEYVALUE:
 		return G_VARIANT_TYPE_DICTIONARY;
+	case SR_T_MQ:
+		return G_VARIANT_TYPE_TUPLE;
 	default:
 		return NULL;
 	}
@@ -593,7 +602,7 @@ static int check_key(const struct sr_dev_driver *driver,
 
 	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
 		/* Driver publishes no options. */
-		sr_err("No options available%s.", srci->id, suffix);
+		sr_err("No options available%s.", suffix);
 		return SR_ERR_ARG;
 	}
 	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));