* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <dirent.h>
#include <string.h>
#include <glib.h>
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
* @{
*/
-/* 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},
{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",
"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},
{SR_CONF_EQUIV_CIRCUIT_MODEL, SR_T_STRING, "equiv_circuit_model",
"Equivalent circuit model", NULL},
{SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE, SR_T_BOOL, "otp_active",
{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},
{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},
{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) {
return G_VARIANT_TYPE_TUPLE;
case SR_T_KEYVALUE:
return G_VARIANT_TYPE_DICTIONARY;
- case SR_T_MQLIST:
- return G_VARIANT_TYPE_ARRAY;
+ case SR_T_MQ:
+ return G_VARIANT_TYPE_TUPLE;
default:
return NULL;
}
GVariant *gvar_opts;
const uint32_t *opts;
uint32_t pub_opt;
- char *suffix, *opstr;
+ const char *suffix;
+ const char *opstr;
if (sdi && cg)
suffix = " for this device and channel group";
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));