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

cem-dt-885x: Support for SR_CONF_DATA_SOURCE 

This device can do both live and memory-based acquisition.
This commit is contained in:
Bert Vermeulen 2013-06-19 12:23:30 +02:00
parent 6caeef6ee5
commit 662172d4f4
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hardware/cem-dt-885x/api.c
View File

@ -39,6 +39,7 @@ static const int32_t hwcaps[] = {
SR_CONF_HOLD_MAX, SR_CONF_HOLD_MAX,
SR_CONF_HOLD_MIN, SR_CONF_HOLD_MIN,
SR_CONF_POWER_OFF, SR_CONF_POWER_OFF,
SR_CONF_DATA_SOURCE,
}; };
static const char *weight_freq[] = { static const char *weight_freq[] = {
@ -58,6 +59,10 @@ static const uint64_t meas_ranges[][2] = {
{ 80, 130 }, { 80, 130 },
}; };
static const char *data_sources[] = {
"Live",
"Memory",
};
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info; SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
static struct sr_dev_driver *di = &cem_dt_885x_driver_info; static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
@ -112,6 +117,7 @@ static GSList *scan(GSList *options)
devc->cur_mqflags = 0; devc->cur_mqflags = 0;
devc->recording = -1; devc->recording = -1;
devc->cur_meas_range = 0; devc->cur_meas_range = 0;
devc->cur_data_source = DATA_SOURCE_LIVE;
if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM))) if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
return NULL; return NULL;
@ -236,6 +242,12 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
case SR_CONF_POWER_OFF: case SR_CONF_POWER_OFF:
*data = g_variant_new_boolean(FALSE); *data = g_variant_new_boolean(FALSE);
break; 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: default:
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -313,6 +325,15 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
if (g_variant_get_boolean(data)) if (g_variant_get_boolean(data))
ret = cem_dt_885x_power_off(sdi); ret = cem_dt_885x_power_off(sdi);
break; 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;
break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
} }
@ -355,6 +376,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
} }
*data = g_variant_builder_end(&gvb); *data = g_variant_builder_end(&gvb);
break; break;
case SR_CONF_DATA_SOURCE:
*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
} }

6
hardware/cem-dt-885x/protocol.h
View File

@ -75,12 +75,18 @@ enum {
CMD_TOGGLE_POWER_OFF = 0x33, CMD_TOGGLE_POWER_OFF = 0x33,
}; };
enum {
DATA_SOURCE_LIVE,
DATA_SOURCE_MEMORY,
};
/** Private, per-device-instance driver context. */ /** Private, per-device-instance driver context. */
struct dev_context { struct dev_context {
/* Device state */ /* Device state */
uint64_t cur_mqflags; uint64_t cur_mqflags;
int recording; int recording;
int cur_meas_range; int cur_meas_range;
int cur_data_source;
/* Acquisition settings */ /* Acquisition settings */
uint64_t limit_samples; uint64_t limit_samples;