X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=349e65e9299f5caa1e0afa3cfaa19aae36903561;hb=33306b13acdc34fb50b35a56d362f1ab56fc0afd;hp=342abeb9ef780f4d7b3040de8555dc03cc5a1478;hpb=97a000748a1a4ca7370121af0c84d0e2281d527a;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 342abeb9..349e65e9 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -71,6 +71,8 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Serial communication", NULL},
 	{SR_CONF_MODBUSADDR, SR_T_UINT64, "modbusaddr",
 		"Modbus slave address", NULL},
+	{SR_CONF_FORCE_DETECT, SR_T_STRING, "force_detect",
+		"Forced detection", NULL},
 
 	/* Device (or channel group) configuration */
 	{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
@@ -81,20 +83,14 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Pattern", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run length encoding", NULL},
-	{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
-		"Trigger source", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_STRING, "triggerslope",
 		"Trigger slope", NULL},
-	{SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern",
-		"Trigger pattern", NULL},
-	{SR_CONF_HIGH_RESOLUTION, SR_T_BOOL, "highresolution",
-		"High resolution", NULL},
-	{SR_CONF_PEAK_DETECTION, SR_T_BOOL, "peakdetection",
-		"Peak detection", NULL},
 	{SR_CONF_AVERAGING, SR_T_BOOL, "averaging",
 		"Averaging", NULL},
 	{SR_CONF_AVG_SAMPLES, SR_T_UINT64, "avg_samples",
 		"Number of samples to average over", NULL},
+	{SR_CONF_TRIGGER_SOURCE, SR_T_STRING, "triggersource",
+		"Trigger source", NULL},
 	{SR_CONF_HORIZ_TRIGGERPOS, SR_T_FLOAT, "horiz_triggerpos",
 		"Horizontal trigger position", NULL},
 	{SR_CONF_BUFFERSIZE, SR_T_UINT64, "buffersize",
@@ -127,10 +123,6 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Hold min", NULL},
 	{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
 		"Voltage threshold", NULL },
-	{SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold",
-		"Logic threshold (predefined)", NULL},
-	{SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom",
-		"Logic threshold (custom)", NULL},
 	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
 		"External clock mode", NULL},
 	{SR_CONF_SWAP, SR_T_BOOL, "swap",
@@ -195,6 +187,30 @@ static struct sr_key_info sr_key_info_config[] = {
 		"External clock source", NULL},
 	{SR_CONF_OFFSET, SR_T_FLOAT, "offset",
 		"Offset", NULL},
+	{SR_CONF_TRIGGER_PATTERN, SR_T_STRING, "triggerpattern",
+		"Trigger pattern", NULL},
+	{SR_CONF_HIGH_RESOLUTION, SR_T_BOOL, "highresolution",
+		"High resolution", NULL},
+	{SR_CONF_PEAK_DETECTION, SR_T_BOOL, "peakdetection",
+		"Peak detection", NULL},
+	{SR_CONF_LOGIC_THRESHOLD, SR_T_STRING, "logic_threshold",
+		"Logic threshold (predefined)", NULL},
+	{SR_CONF_LOGIC_THRESHOLD_CUSTOM, SR_T_FLOAT, "logic_threshold_custom",
+		"Logic threshold (custom)", NULL},
+	{SR_CONF_RANGE, SR_T_STRING, "range",
+		"Range", NULL},
+	{SR_CONF_DIGITS, SR_T_STRING, "digits",
+		"Digits", NULL},
+	{SR_CONF_PHASE, SR_T_FLOAT, "phase",
+		"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},
 
 	/* Special stuff */
 	{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
@@ -266,6 +282,8 @@ static struct sr_key_info sr_key_info_mq[] = {
 	{SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL},
 	{SR_MQ_MASS, 0, "mass", "Mass", NULL},
 	{SR_MQ_HARMONIC_RATIO, 0, "harmonic_ratio", "Harmonic ratio", NULL},
+	{SR_MQ_ENERGY, 0, "energy", "Energy", NULL},
+	{SR_MQ_ELECTRIC_CHARGE, 0, "electric_charge", "Electric charge", NULL},
 	ALL_ZERO
 };