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

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 140a8597f61e527424c5f165548597f07d4d4a40..fd2be22e9ec16710691bf7cae62e422ddb073a0c 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -924,6 +924,9 @@ enum sr_configkey {
        /** Output frequency in Hz. */
        SR_CONF_OUTPUT_FREQUENCY,
 
+       /** Output frequency target in Hz. */
+       SR_CONF_OUTPUT_FREQUENCY_TARGET,
+
        /** Measured quantity. */
        SR_CONF_MEASURED_QUANTITY,
 
@@ -933,9 +936,6 @@ enum sr_configkey {
        /** Equivalent circuit model. */
        SR_CONF_EQUIV_CIRCUIT_MODEL,
 
-       /* Output frequency target in Hz. */
-       SR_CONF_OUTPUT_FREQUENCY_TARGET,
-
        /** Over-temperature protection (OTP) active. */
        SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,
 

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 7c9045477f40e3f015bdc89aacdd57ed6013ff8f..99f3ee3fba0dc165af93cae435469aa4b382dcc9 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -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",
@@ -241,6 +243,7 @@ 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
 };
 
@@ -272,6 +275,7 @@ 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
 };