X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fapi.c;h=ea67039dfce7da8305a04d7ab76fe54e89d3453c;hb=f670835f1fbc03525e995d6970a5495976ab7c1a;hp=74d4042abb7e9b198a60c4fb8ffc73b345c37b6f;hpb=6ace179e6d33c9e0ad85cbd10d51bfde86993ee0;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c index 74d4042a..ea67039d 100644 --- a/src/hardware/agilent-dmm/api.c +++ b/src/hardware/agilent-dmm/api.c @@ -40,11 +40,29 @@ static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, + SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -extern const struct agdmm_job agdmm_jobs_u12xx[]; +static const uint64_t samplerates[] = { + SR_HZ(1), + SR_HZ(20), + SR_HZ(1), +}; + +static const char *data_sources[] = { + "Live", + "Log-Hand", + "Log-Trig", + "Log-Auto", + "Log-Export", +}; + +extern const struct agdmm_job agdmm_jobs_live[]; +extern const struct agdmm_job agdmm_jobs_log[]; extern const struct agdmm_recv agdmm_recvs_u123x[]; extern const struct agdmm_recv agdmm_recvs_u124x[]; +extern const struct agdmm_recv agdmm_recvs_u124xc[]; extern const struct agdmm_recv agdmm_recvs_u125x[]; extern const struct agdmm_recv agdmm_recvs_u128x[]; @@ -53,24 +71,27 @@ extern const struct agdmm_recv agdmm_recvs_u128x[]; #define SERIALCOMM "9600/8n1" static const struct agdmm_profile supported_agdmm[] = { - { AGILENT_U1231, "U1231A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x }, - { AGILENT_U1232, "U1232A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x }, - { AGILENT_U1233, "U1233A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x }, - - { AGILENT_U1241, "U1241A", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1242, "U1242A", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1241, "U1241B", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1242, "U1242B", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x }, - - { AGILENT_U1251, "U1251A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1252, "U1252A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1253, "U1253A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1251, "U1251B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1252, "U1252B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1253, "U1253B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x }, - - { KEYSIGHT_U1281, "U1281A", 3, agdmm_jobs_u12xx, agdmm_recvs_u128x }, - { KEYSIGHT_U1282, "U1282A", 3, agdmm_jobs_u12xx, agdmm_recvs_u128x }, + { AGILENT_U1231, "U1231A", 1, agdmm_jobs_live, NULL, agdmm_recvs_u123x }, + { AGILENT_U1232, "U1232A", 1, agdmm_jobs_live, NULL, agdmm_recvs_u123x }, + { AGILENT_U1233, "U1233A", 1, agdmm_jobs_live, NULL, agdmm_recvs_u123x }, + + { AGILENT_U1241, "U1241A", 2, agdmm_jobs_live, NULL, agdmm_recvs_u124x }, + { AGILENT_U1242, "U1242A", 2, agdmm_jobs_live, NULL, agdmm_recvs_u124x }, + { AGILENT_U1241, "U1241B", 2, agdmm_jobs_live, NULL, agdmm_recvs_u124x }, + { AGILENT_U1242, "U1242B", 2, agdmm_jobs_live, NULL, agdmm_recvs_u124x }, + + { KEYSIGHT_U1241C, "U1241C", 2, agdmm_jobs_live, agdmm_jobs_log, agdmm_recvs_u124xc }, + { KEYSIGHT_U1242C, "U1242C", 2, agdmm_jobs_live, agdmm_jobs_log, agdmm_recvs_u124xc }, + + { AGILENT_U1251, "U1251A", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + { AGILENT_U1252, "U1252A", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + { AGILENT_U1253, "U1253A", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + { AGILENT_U1251, "U1251B", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + { AGILENT_U1252, "U1252B", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + { AGILENT_U1253, "U1253B", 3, agdmm_jobs_live, NULL, agdmm_recvs_u125x }, + + { KEYSIGHT_U1281, "U1281A", 3, agdmm_jobs_live, agdmm_jobs_log, agdmm_recvs_u128x }, + { KEYSIGHT_U1282, "U1282A", 3, agdmm_jobs_live, agdmm_jobs_log, agdmm_recvs_u128x }, ALL_ZERO }; @@ -135,6 +156,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) devc = g_malloc0(sizeof(struct dev_context)); sr_sw_limits_init(&devc->limits); devc->profile = &supported_agdmm[i]; + devc->data_source = DEFAULT_DATA_SOURCE; + devc->cur_samplerate = 5; if (supported_agdmm[i].nb_channels > 1) { int temp_chan = supported_agdmm[i].nb_channels - 1; devc->cur_mq[temp_chan] = SR_MQ_TEMPERATURE; @@ -176,10 +199,16 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s ret = SR_OK; switch (key) { + case SR_CONF_SAMPLERATE: + *data = g_variant_new_uint64(devc->cur_samplerate); + break; case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_MSEC: ret = sr_sw_limits_config_get(&devc->limits, key, data); break; + case SR_CONF_DATA_SOURCE: + *data = g_variant_new_string(data_sources[devc->data_source]); + break; default: return SR_ERR_NA; } @@ -191,6 +220,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd const struct sr_channel_group *cg) { struct dev_context *devc; + uint64_t samplerate; + const char *tmp_str; + unsigned int i; int ret; (void)cg; @@ -202,10 +234,28 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd ret = SR_OK; switch (key) { + case SR_CONF_SAMPLERATE: + samplerate = g_variant_get_uint64(data); + if (samplerate < samplerates[0] || samplerate > samplerates[1]) + ret = SR_ERR_ARG; + else + devc->cur_samplerate = g_variant_get_uint64(data); + break; case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_MSEC: ret = sr_sw_limits_config_set(&devc->limits, key, data); break; + case SR_CONF_DATA_SOURCE: { + tmp_str = g_variant_get_string(data, NULL); + for (i = 0; i < ARRAY_SIZE(data_sources); i++) + if (!strcmp(tmp_str, data_sources[i])) { + devc->data_source = i; + break; + } + if (i == ARRAY_SIZE(data_sources)) + return SR_ERR; + break; + } default: ret = SR_ERR_NA; } @@ -216,6 +266,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { + GVariant *gvar; + GVariantBuilder gvb; + if (key == SR_CONF_SCAN_OPTIONS) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); @@ -236,6 +289,16 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; + case SR_CONF_SAMPLERATE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates, + ARRAY_SIZE(samplerates), sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); + *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; } @@ -248,21 +311,33 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc->cur_channel = sr_next_enabled_channel(sdi, NULL); devc->cur_conf = sr_next_enabled_channel(sdi, NULL); + devc->cur_sample = 1; devc->cur_mq[0] = -1; if (devc->profile->nb_channels > 2) devc->cur_mq[1] = -1; + if (devc->data_source == DATA_SOURCE_LIVE) { + devc->jobs = devc->profile->jobs_live; + } else { + devc->jobs = devc->profile->jobs_log; + if (!devc->jobs) { + sr_err("Log data source is not implemented for this model."); + return SR_ERR_NA; + } + if (!((struct sr_channel *)sdi->channels->data)->enabled) { + sr_err("Log data is only available for channel P1."); + return SR_ERR_NA; + } + } + sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); - /* Poll every 100ms, or whenever some data comes in. */ + /* Poll every 10ms, or whenever some data comes in. */ serial = sdi->conn; - serial_source_add(sdi->session, serial, G_IO_IN, 100, + serial_source_add(sdi->session, serial, G_IO_IN, 10, agdmm_receive_data, (void *)sdi); return SR_OK;