X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=74d75e6a1e5bdad58909aabb93e207b8f68d7f1e;hb=HEAD;hp=f8d54ac8c73427776c3931720a9ec2acc069c870;hpb=63eec380738b001cf85242cc8f3b370970bd8d71;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index f8d54ac8..068a215a 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -63,6 +63,7 @@ static struct sr_key_info sr_key_info_config[] = {
 	{SR_CONF_SCALE, SR_T_STRING, NULL, "Scale", NULL},
 	{SR_CONF_SIGNAL_GENERATOR, SR_T_STRING, NULL, "Signal generator", NULL},
 	{SR_CONF_POWERMETER, SR_T_STRING, NULL, "Power meter", NULL},
+	{SR_CONF_MULTIPLEXER, SR_T_STRING, NULL, "Multiplexer", NULL},
 
 	/* Driver scan options */
 	{SR_CONF_CONN, SR_T_STRING, "conn",
@@ -73,6 +74,8 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Modbus slave address", NULL},
 	{SR_CONF_FORCE_DETECT, SR_T_STRING, "force_detect",
 		"Forced detection", NULL},
+	{SR_CONF_PROBE_NAMES, SR_T_STRING, "probe_names",
+		"Names of device's probes", NULL},
 
 	/* Device (or channel group) configuration */
 	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
@@ -205,6 +208,14 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Phase", NULL},
 	{SR_CONF_DUTY_CYCLE, SR_T_FLOAT, "output_duty_cycle",
 		"Duty Cycle", NULL},
+	{SR_CONF_POWER, SR_T_FLOAT, "power",
+		"Power", NULL},
+	{SR_CONF_POWER_TARGET, SR_T_FLOAT, "power_target",
+		"Power Target", NULL},
+	{SR_CONF_RESISTANCE_TARGET, SR_T_FLOAT, "resistance_target",
+		"Resistance Target", NULL},
+	{SR_CONF_OVER_CURRENT_PROTECTION_DELAY, SR_T_FLOAT, "ocp_delay",
+		"Over-current protection delay", NULL},
 
 	/* Special stuff */
 	{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
@@ -322,6 +333,8 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
 	switch (datatype) {
 	case SR_T_INT32:
 		return G_VARIANT_TYPE_INT32;
+	case SR_T_UINT32:
+		return G_VARIANT_TYPE_UINT32;
 	case SR_T_UINT64:
 		return G_VARIANT_TYPE_UINT64;
 	case SR_T_STRING: