*/
#define SERIALCOMM "9600/8n2"
-static const int32_t hwopts[] = {
+static const int32_t scanopts[] = {
SR_CONF_CONN,
SR_CONF_SERIALCOMM,
};
static const int32_t devopts[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
-};
-
-static const int32_t devopts_sdi[] = {
- SR_CONF_POWER_SUPPLY,
- SR_CONF_CONTINUOUS,
SR_CONF_OUTPUT_CHANNEL,
SR_CONF_OVER_CURRENT_PROTECTION,
};
-static const int32_t devopts_pg[] = {
- SR_CONF_POWER_SUPPLY,
- SR_CONF_CONTINUOUS,
+static const int32_t devopts_cg[] = {
SR_CONF_OUTPUT_VOLTAGE,
SR_CONF_OUTPUT_VOLTAGE_MAX,
SR_CONF_OUTPUT_CURRENT,
struct drv_context *drvc;
struct dev_context *devc;
struct sr_config *src;
- struct sr_probe *probe;
- struct sr_probe_group *pg;
+ struct sr_channel *ch;
+ struct sr_channel_group *cg;
struct sr_serial_dev_inst *serial;
GSList *l, *devices;
struct pps_model *model;
return NULL;
serial_flush(serial);
- /* This is how the vendor software probes for hardware. */
+ /* This is how the vendor software channels for hardware. */
memset(packet, 0, PACKET_SIZE);
packet[0] = 0xaa;
packet[1] = 0xaa;
sdi->conn = serial;
for (i = 0; i < MAX_CHANNELS; i++) {
snprintf(channel, 10, "CH%d", i + 1);
- probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel);
- sdi->probes = g_slist_append(sdi->probes, probe);
- pg = g_malloc(sizeof(struct sr_probe_group));
- pg->name = g_strdup(channel);
- pg->probes = g_slist_append(NULL, probe);
- pg->priv = NULL;
- sdi->probe_groups = g_slist_append(sdi->probe_groups, pg);
+ ch = sr_channel_new(i, SR_PROBE_ANALOG, TRUE, channel);
+ sdi->channels = g_slist_append(sdi->channels, ch);
+ cg = g_malloc(sizeof(struct sr_channel_group));
+ cg->name = g_strdup(channel);
+ cg->channels = g_slist_append(NULL, ch);
+ cg->priv = NULL;
+ sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
devc = g_malloc0(sizeof(struct dev_context));
return ((struct drv_context *)(di->priv))->instances;
}
-static int dev_clear(void)
-{
- return std_dev_clear(di, NULL);
-}
-
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,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *ch;
int channel, ret;
if (!sdi)
devc = sdi->priv;
ret = SR_OK;
- if (!probe_group) {
- /* No probe group: global options. */
+ if (!cg) {
+ /* No channel group: global options. */
switch (key) {
case SR_CONF_OUTPUT_CHANNEL:
- *data = g_variant_new_string(channel_modes[devc->channel_mode - 1]);
+ *data = g_variant_new_string(channel_modes[devc->channel_mode]);
break;
case SR_CONF_OVER_CURRENT_PROTECTION:
*data = g_variant_new_boolean(devc->over_current_protection);
return SR_ERR_NA;
}
} else {
- /* We only ever have one channel per probe group in this driver. */
- probe = probe_group->probes->data;
- channel = probe->index;
+ /* We only ever have one channel per channel group in this driver. */
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_OUTPUT_VOLTAGE:
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *ch;
gdouble dval;
int channel, ret, ival;
const char *sval;
ret = SR_OK;
devc = sdi->priv;
- if (!probe_group) {
- /* No probe group: global options. */
+ if (!cg) {
+ /* No channel group: global options. */
switch (key) {
case SR_CONF_OUTPUT_CHANNEL:
sval = g_variant_get_string(data, NULL);
/* Nothing to do. */
break;
devc->channel_mode_set = ival;
- if (devc->acquisition_running)
- send_config(sdi);
+ devc->config_dirty = TRUE;
break;
case SR_CONF_OVER_CURRENT_PROTECTION:
bval = g_variant_get_boolean(data);
/* Nothing to do. */
break;
devc->over_current_protection_set = bval;
- if (devc->acquisition_running)
- send_config(sdi);
+ devc->config_dirty = TRUE;
break;
default:
return SR_ERR_NA;
}
} else {
- /* Probe group specified: per-channel options. */
- /* We only ever have one channel per probe group in this driver. */
- probe = probe_group->probes->data;
- channel = probe->index;
+ /* Channel group specified: per-channel options. */
+ /* We only ever have one channel per channel group in this driver. */
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_OUTPUT_VOLTAGE_MAX:
if (dval < 0 || dval > devc->model->channels[channel].voltage[1])
ret = SR_ERR_ARG;
devc->config[channel].output_voltage_max = dval;
- if (devc->acquisition_running)
- send_config(sdi);
+ devc->config_dirty = TRUE;
break;
case SR_CONF_OUTPUT_CURRENT_MAX:
dval = g_variant_get_double(data);
if (dval < 0 || dval > devc->model->channels[channel].current[1])
ret = SR_ERR_ARG;
devc->config[channel].output_current_max = dval;
- if (devc->acquisition_running)
- send_config(sdi);
+ devc->config_dirty = TRUE;
break;
case SR_CONF_OUTPUT_ENABLED:
bval = g_variant_get_boolean(data);
/* Nothing to do. */
break;
devc->config[channel].output_enabled_set = bval;
- if (devc->acquisition_running)
- send_config(sdi);
+ devc->config_dirty = TRUE;
break;
default:
ret = SR_ERR_NA;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_probe *probe;
+ struct sr_channel *ch;
GVariant *gvar;
GVariantBuilder gvb;
int channel, ret, i;
/* Always available, even without sdi. */
if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+ scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
return SR_OK;
}
- if (!sdi) {
- if (key == SR_CONF_DEVICE_OPTIONS) {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
- return SR_OK;
-
- } else {
- /* Everything else needs an sdi. */
- return SR_ERR_ARG;
- }
- }
+ if (!sdi)
+ return SR_ERR_ARG;
devc = sdi->priv;
ret = SR_OK;
- if (!probe_group) {
- /* No probe group: global options. */
+ if (!cg) {
+ /* No channel group: global options. */
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- devopts_sdi, ARRAY_SIZE(devopts_sdi), sizeof(int32_t));
+ devopts, ARRAY_SIZE(devopts), sizeof(int32_t));
break;
case SR_CONF_OUTPUT_CHANNEL:
if (devc->model->channel_modes == CHANMODE_INDEPENDENT) {
return SR_ERR_NA;
}
} else {
- /* Probe group specified: per-channel options. */
+ /* Channel group specified: per-channel options. */
if (!sdi)
return SR_ERR_ARG;
- /* We only ever have one channel per probe group in this driver. */
- probe = probe_group->probes->data;
- channel = probe->index;
+ /* We only ever have one channel per channel group in this driver. */
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- devopts_pg, ARRAY_SIZE(devopts_pg), sizeof(int32_t));
+ devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t));
break;
case SR_CONF_OUTPUT_VOLTAGE_MAX:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
return ret;
}
+static int dev_close(struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+
+ devc = sdi->priv;
+ if (devc->config_dirty)
+ /* Some configuration changes were queued up but didn't
+ * get sent to the device, likely because we were never
+ * in acquisition mode. Send them out now. */
+ send_config(sdi);
+
+ return std_serial_dev_close(sdi);
+}
+
static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data)
{
serial_source_add(serial, G_IO_IN, 50, atten_pps3xxx_receive_data, (void *)sdi);
std_session_send_df_header(cb_data, LOG_PREFIX);
- /* Send a "probe" configuration packet now. */
+ /* Send a "channel" configuration packet now. */
memset(packet, 0, PACKET_SIZE);
packet[0] = 0xaa;
packet[1] = 0xaa;
.cleanup = cleanup,
.scan = scan_3203,
.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 = std_serial_dev_open,
- .dev_close = std_serial_dev_close,
+ .dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL,
projects / libsigrok.git / blobdiff