BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

atten-pps3xxx: Push configured settings even without acquisition.

This commit is contained in:
Bert Vermeulen 2014-01-10 02:10:51 +01:00
parent 81c9e1a064
commit ab988ecb23
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hardware/atten-pps3xxx/api.c
View File

@ -319,8 +319,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
/* Nothing to do. */ /* Nothing to do. */
break; break;
devc->channel_mode_set = ival; devc->channel_mode_set = ival;
if (devc->acquisition_running) devc->config_dirty = TRUE;
send_config(sdi);
break; break;
case SR_CONF_OVER_CURRENT_PROTECTION: case SR_CONF_OVER_CURRENT_PROTECTION:
bval = g_variant_get_boolean(data); bval = g_variant_get_boolean(data);
@ -328,8 +327,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
/* Nothing to do. */ /* Nothing to do. */
break; break;
devc->over_current_protection_set = bval; devc->over_current_protection_set = bval;
if (devc->acquisition_running) devc->config_dirty = TRUE;
send_config(sdi);
break; break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
@ -346,16 +344,14 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
if (dval < 0 || dval > devc->model->channels[channel].voltage[1]) if (dval < 0 || dval > devc->model->channels[channel].voltage[1])
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
devc->config[channel].output_voltage_max = dval; devc->config[channel].output_voltage_max = dval;
if (devc->acquisition_running) devc->config_dirty = TRUE;
send_config(sdi);
break; break;
case SR_CONF_OUTPUT_CURRENT_MAX: case SR_CONF_OUTPUT_CURRENT_MAX:
dval = g_variant_get_double(data); dval = g_variant_get_double(data);
if (dval < 0 || dval > devc->model->channels[channel].current[1]) if (dval < 0 || dval > devc->model->channels[channel].current[1])
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
devc->config[channel].output_current_max = dval; devc->config[channel].output_current_max = dval;
if (devc->acquisition_running) devc->config_dirty = TRUE;
send_config(sdi);
break; break;
case SR_CONF_OUTPUT_ENABLED: case SR_CONF_OUTPUT_ENABLED:
bval = g_variant_get_boolean(data); bval = g_variant_get_boolean(data);
@ -363,8 +359,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
/* Nothing to do. */ /* Nothing to do. */
break; break;
devc->config[channel].output_enabled_set = bval; devc->config[channel].output_enabled_set = bval;
if (devc->acquisition_running) devc->config_dirty = TRUE;
send_config(sdi);
break; break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
@ -463,6 +458,20 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
return ret; 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, static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data) void *cb_data)
{ {
@ -522,7 +531,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = {
.config_set = config_set, .config_set = config_set,
.config_list = config_list, .config_list = config_list,
.dev_open = std_serial_dev_open, .dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close, .dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.priv = NULL, .priv = NULL,

1
hardware/atten-pps3xxx/protocol.c
View File

@ -122,6 +122,7 @@ SR_PRIV void send_config(const struct sr_dev_inst *sdi)
value += packet[i]; value += packet[i];
packet[i] = value & 0xff; packet[i] = value & 0xff;
send_packet(sdi, packet); send_packet(sdi, packet);
devc->config_dirty = FALSE;
} }

1
hardware/atten-pps3xxx/protocol.h
View File

@ -81,6 +81,7 @@ struct dev_context {
gboolean acquisition_running; gboolean acquisition_running;
/* Operational state */ /* Operational state */
gboolean config_dirty;
struct per_channel_config *config; struct per_channel_config *config;
/* Received from device. */ /* Received from device. */
int channel_mode; int channel_mode;