Add device type SR_CONF_MULTIPLEXER.

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 5d3d23c9963f102bf0aac1b7127a412bf784829a..81a831b3b1814d2bc1b46504ce009b6395fc3dd6 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -723,6 +723,12 @@ enum sr_configkey {
        /** The device can measure power. */
        SR_CONF_POWERMETER,
 
        /** The device can measure power. */
        SR_CONF_POWERMETER,
 

+       /**
+        * The device can switch between multiple sources, e.g. a relay actuator
+        * or multiplexer.
+        */
+       SR_CONF_MULTIPLEXER,
+

        /* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
        /*--- Driver scan options -------------------------------------------*/
        /* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
        /*--- Driver scan options -------------------------------------------*/

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 349e65e9299f5caa1e0afa3cfaa19aae36903561..2850946ffaf4e8392737f9222b9fa2b6611715a3 100644 (file)
--- 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_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",
 
        /* Driver scan options */
        {SR_CONF_CONN, SR_T_STRING, "conn",