SR_ERR_NA = -6, /**< Not applicable. */
SR_ERR_DEV_CLOSED = -7, /**< Device is closed, but needs to be open. */
SR_ERR_TIMEOUT = -8, /**< A timeout occurred. */
+ SR_ERR_PROBE_GROUP= -9, /**< A probe group must be specified. */
/*
* Note: When adding entries here, don't forget to also update the
SR_T_RATIONAL_PERIOD,
SR_T_RATIONAL_VOLT,
SR_T_KEYVALUE,
+ SR_T_UINT64_RANGE,
+ SR_T_DOUBLE_RANGE,
};
/** Value for sr_datafeed_packet.type. */
* represented as the fraction of number of particles of the substance.
*/
SR_UNIT_CONCENTRATION,
+ SR_UNIT_REVOLUTIONS_PER_MINUTE,
+ SR_UNIT_VOLT_AMPERE,
+ SR_UNIT_WATT,
+ SR_UNIT_WATT_HOUR,
};
/** Values for sr_datafeed_analog.flags. */
char *trigger;
};
+/** Structure for groups of probes that have common properties. */
+struct sr_probe_group {
+ /** Name of the probe group. */
+ char *name;
+ /** List of sr_probe structs of the probes belonging to this group. */
+ GSList *probes;
+ /** Private data for driver use. */
+ void *priv;
+};
+
struct sr_config {
int key;
GVariant *data;
/** The device can measure humidity. */
SR_CONF_HYGROMETER,
+ /** The device can measure energy consumption. */
+ SR_CONF_ENERGYMETER,
+
/*--- Driver scan options -------------------------------------------*/
/**
/** Number of vertical divisions, as related to SR_CONF_VDIV. */
SR_CONF_NUM_VDIV,
+ /** Sound pressure level frequency weighting. */
+ SR_CONF_SPL_WEIGHT_FREQ,
+
+ /** Sound pressure level time weighting. */
+ SR_CONF_SPL_WEIGHT_TIME,
+
+ /** Sound pressure level measurement range. */
+ SR_CONF_SPL_MEASUREMENT_RANGE,
+
+ /** Max hold mode. */
+ SR_CONF_HOLD_MAX,
+
+ /** Min hold mode. */
+ SR_CONF_HOLD_MIN,
+
+ /** Logic low-high threshold range. */
+ SR_CONF_VOLTAGE_THRESHOLD,
+
+ /** The device supports using a external clock. */
+ SR_CONF_EXTERNAL_CLOCK,
+
+ /**
+ * The device supports swapping channels. Typical this is between
+ * buffered and unbuffered channels.
+ */
+ SR_CONF_SWAP,
+
/*--- Special stuff -------------------------------------------------*/
/** Scan options supported by the driver. */
/** The device supports setting the number of probes. */
SR_CONF_CAPTURE_NUM_PROBES,
+ /** Power off the device. */
+ SR_CONF_POWER_OFF,
+
+ /** Data source for acquisition. If not present, acquisition from
+ * the device is always "live", i.e. acquisition starts when the
+ * frontend asks and the results are sent out as soon as possible.
+ *
+ * If present, it indicates that either the device has no live
+ * acquisition capability (for example a pure data logger), or
+ * there is a choice. sr_config_list() returns those choices.
+ *
+ * In any case if a device has live acquisition capabilities, it
+ * is always the default. */
+ SR_CONF_DATA_SOURCE,
+
/*--- Acquisition modes ---------------------------------------------*/
/**
char *model;
char *version;
GSList *probes;
+ /* List of sr_probe_group structs */
+ GSList *probe_groups;
void *conn;
void *priv;
};
GSList *(*dev_list) (void);
int (*dev_clear) (void);
int (*config_get) (int id, GVariant **data,
- const struct sr_dev_inst *sdi);
+ const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group);
int (*config_set) (int id, GVariant *data,
- const struct sr_dev_inst *sdi);
+ const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group);
int (*config_list) (int info_id, GVariant **data,
- const struct sr_dev_inst *sdi);
+ const struct sr_dev_inst *sdi,
+ const struct sr_probe_group *probe_group);
/* Device-specific */
int (*dev_open) (struct sr_dev_inst *sdi);
/** List of struct datafeed_callback pointers. */
GSList *datafeed_callbacks;
GTimeVal starttime;
+ gboolean running;
unsigned int num_sources;