SR_CONF_SOUNDLEVELMETER,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
- SR_CONF_DATALOG,
SR_CONF_SPL_WEIGHT_FREQ,
+ SR_CONF_SPL_WEIGHT_TIME,
+ SR_CONF_SPL_MEASUREMENT_RANGE,
+ SR_CONF_DATALOG,
+ SR_CONF_HOLD_MAX,
+ SR_CONF_HOLD_MIN,
+ SR_CONF_POWER_OFF,
+ SR_CONF_DATA_SOURCE,
};
static const char *weight_freq[] = {
"C",
};
+static const char *weight_time[] = {
+ "F",
+ "S",
+};
+
+static const uint64_t meas_ranges[][2] = {
+ { 30, 130 },
+ { 30, 80 },
+ { 50, 100 },
+ { 80, 130 },
+};
+
+static const char *data_sources[] = {
+ "Live",
+ "Memory",
+};
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
struct sr_config *src;
struct sr_serial_dev_inst *serial;
struct sr_dev_inst *sdi;
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *l, *devices;
gint64 start;
const char *conn;
}
devc->cur_mqflags = 0;
devc->recording = -1;
+ devc->cur_meas_range = 0;
+ devc->cur_data_source = DATA_SOURCE_LIVE;
+ devc->enable_data_source_memory = FALSE;
if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
return NULL;
sdi->inst_type = SR_INST_SERIAL;
sdi->priv = devc;
sdi->driver = di;
- if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "SPL")))
+ if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
return NULL;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
break;
static GSList *dev_list(void)
{
- struct drv_context *drvc;
-
- drvc = di->priv;
-
- return drvc->instances;
-}
-
-static int dev_clear(void)
-{
- return std_dev_clear(di, NULL);
+ return ((struct drv_context *)(di->priv))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int dev_close(struct sr_dev_inst *sdi)
-{
- struct sr_serial_dev_inst *serial;
-
- serial = sdi->conn;
- if (serial && serial->fd != -1) {
- serial_close(serial);
- sdi->status = SR_ST_INACTIVE;
- }
-
- return SR_OK;
-}
-
static int cleanup(void)
{
- return dev_clear();
+ return std_dev_clear(di, NULL);
}
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- int tmp;
+ GVariant *range[2];
+ uint64_t low, high;
+ int tmp, ret;
+
+ (void)cg;
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
+ ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
*data = g_variant_new_uint64(devc->limit_samples);
break;
case SR_CONF_DATALOG:
- *data = g_variant_new_boolean(cem_dt_885x_recording_get(sdi));
+ if ((ret = cem_dt_885x_recording_get(sdi, &tmp)) == SR_OK)
+ *data = g_variant_new_boolean(tmp);
break;
case SR_CONF_SPL_WEIGHT_FREQ:
tmp = cem_dt_885x_weight_freq_get(sdi);
else
return SR_ERR;
break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ tmp = cem_dt_885x_weight_time_get(sdi);
+ if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_F)
+ *data = g_variant_new_string("F");
+ else if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_S)
+ *data = g_variant_new_string("S");
+ else
+ return SR_ERR;
+ break;
+ case SR_CONF_HOLD_MAX:
+ if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+ *data = g_variant_new_boolean(tmp == SR_MQFLAG_MAX);
+ break;
+ case SR_CONF_HOLD_MIN:
+ if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+ *data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
+ break;
+ case SR_CONF_SPL_MEASUREMENT_RANGE:
+ if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) {
+ range[0] = g_variant_new_uint64(low);
+ range[1] = g_variant_new_uint64(high);
+ *data = g_variant_new_tuple(range, 2);
+ }
+ break;
+ case SR_CONF_POWER_OFF:
+ *data = g_variant_new_boolean(FALSE);
+ break;
+ case SR_CONF_DATA_SOURCE:
+ if (devc->cur_data_source == DATA_SOURCE_LIVE)
+ *data = g_variant_new_string("Live");
+ else
+ *data = g_variant_new_string("Memory");
+ break;
default:
return SR_ERR_NA;
}
- return SR_OK;
+ return ret;
}
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- uint64_t tmp_u64;
- int ret;
+ uint64_t tmp_u64, low, high;
+ unsigned int i;
+ int tmp, ret;
const char *tmp_str;
+ (void)cg;
+
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
ret = SR_OK;
break;
case SR_CONF_DATALOG:
- if (g_variant_get_boolean(data)) {
- /* Start logging. */
- ret = cem_dt_885x_recording_set(sdi, TRUE);
- } else {
- /* Stop logging. */
- ret = cem_dt_885x_recording_set(sdi, FALSE);
- }
+ ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data));
break;
case SR_CONF_SPL_WEIGHT_FREQ:
tmp_str = g_variant_get_string(data, NULL);
else
return SR_ERR_ARG;
break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ tmp_str = g_variant_get_string(data, NULL);
+ if (!strcmp(tmp_str, "F"))
+ ret = cem_dt_885x_weight_time_set(sdi,
+ SR_MQFLAG_SPL_TIME_WEIGHT_F);
+ else if (!strcmp(tmp_str, "S"))
+ ret = cem_dt_885x_weight_time_set(sdi,
+ SR_MQFLAG_SPL_TIME_WEIGHT_S);
+ else
+ return SR_ERR_ARG;
+ break;
+ case SR_CONF_HOLD_MAX:
+ tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0;
+ ret = cem_dt_885x_holdmode_set(sdi, tmp);
+ break;
+ case SR_CONF_HOLD_MIN:
+ tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0;
+ ret = cem_dt_885x_holdmode_set(sdi, tmp);
+ break;
+ case SR_CONF_SPL_MEASUREMENT_RANGE:
+ g_variant_get(data, "(tt)", &low, &high);
+ ret = SR_ERR_ARG;
+ for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+ if (meas_ranges[i][0] == low && meas_ranges[i][1] == high) {
+ ret = cem_dt_885x_meas_range_set(sdi, low, high);
+ break;
+ }
+ }
+ break;
+ case SR_CONF_POWER_OFF:
+ if (g_variant_get_boolean(data))
+ ret = cem_dt_885x_power_off(sdi);
+ break;
+ case SR_CONF_DATA_SOURCE:
+ tmp_str = g_variant_get_string(data, NULL);
+ if (!strcmp(tmp_str, "Live"))
+ devc->cur_data_source = DATA_SOURCE_LIVE;
+ else if (!strcmp(tmp_str, "Memory"))
+ devc->cur_data_source = DATA_SOURCE_MEMORY;
+ else
+ return SR_ERR;
+ devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY;
+ break;
default:
ret = SR_ERR_NA;
}
return ret;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+ const struct sr_channel_group *cg)
{
+ GVariant *tuple, *range[2];
+ GVariantBuilder gvb;
+ unsigned int i;
int ret;
(void)sdi;
+ (void)cg;
ret = SR_OK;
switch (key) {
case SR_CONF_SPL_WEIGHT_FREQ:
*data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+ break;
+ case SR_CONF_SPL_MEASUREMENT_RANGE:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+ range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+ range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+ tuple = g_variant_new_tuple(range, 2);
+ g_variant_builder_add_value(&gvb, tuple);
+ }
+ *data = g_variant_builder_end(&gvb);
+ break;
+ case SR_CONF_DATA_SOURCE:
+ *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
+ break;
default:
return SR_ERR_NA;
}
/* Poll every 100ms, or whenever some data comes in. */
serial = sdi->conn;
- sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data,
- (void *)sdi);
+ serial_source_add(sdi->session, serial, G_IO_IN, 150,
+ cem_dt_885x_receive_data, (void *)sdi);
return SR_OK;
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- (void)cb_data;
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+ return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
sdi->conn, LOG_PREFIX);
-
- return SR_OK;
}
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
.cleanup = cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
+ .dev_clear = NULL,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
.dev_open = dev_open,
- .dev_close = dev_close,
+ .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
projects / libsigrok.git / blobdiff