X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fapi.c;h=8f1609c9b6aec0576daf1d8c1f2c0d258aa01d7b;hb=d2f6abf6dececc58813760312749bffc343f7cc3;hp=27db616202d4c356dec9fa958ea88cb7ff51a977;hpb=1b38775baa3016fb4d613c971dce5a4f26cacb7b;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c index 27db6162..8f1609c9 100644 --- a/src/hardware/agilent-dmm/api.c +++ b/src/hardware/agilent-dmm/api.c @@ -25,7 +25,7 @@ #include #include #include "libsigrok-internal.h" -#include "agilent-dmm.h" +#include "protocol.h" static const uint32_t scanopts[] = { SR_CONF_CONN, @@ -46,27 +46,31 @@ extern const struct agdmm_job agdmm_jobs_u12xx[]; extern const struct agdmm_recv agdmm_recvs_u123x[]; extern const struct agdmm_recv agdmm_recvs_u124x[]; extern const struct agdmm_recv agdmm_recvs_u125x[]; +extern const struct agdmm_recv agdmm_recvs_u128x[]; /* This works on all the Agilent U12xxA series, although the * U127xA can apparently also run at 19200/8n1. */ #define SERIALCOMM "9600/8n1" static const struct agdmm_profile supported_agdmm[] = { - { AGILENT_U1231, "U1231A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, - { AGILENT_U1232, "U1232A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, - { AGILENT_U1233, "U1233A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, - - { AGILENT_U1241, "U1241A", agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1242, "U1242A", agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1241, "U1241B", agdmm_jobs_u12xx, agdmm_recvs_u124x }, - { AGILENT_U1242, "U1242B", agdmm_jobs_u12xx, agdmm_recvs_u124x }, - - { AGILENT_U1251, "U1251A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1252, "U1252A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1253, "U1253A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1251, "U1251B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1252, "U1252B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, - { AGILENT_U1253, "U1253B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, + { 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 }, ALL_ZERO }; @@ -117,24 +121,35 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return NULL; tokens = g_strsplit(buf, ",", 4); - if (!strcmp("Agilent Technologies", tokens[0]) + if ((!strcmp("Agilent Technologies", tokens[0]) || + !strcmp("Keysight Technologies", tokens[0])) && tokens[1] && tokens[2] && tokens[3]) { for (i = 0; supported_agdmm[i].model; i++) { if (strcmp(supported_agdmm[i].modelname, tokens[1])) continue; sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->vendor = g_strdup("Agilent"); + sdi->vendor = g_strdup(tokens[0][0] == 'A' ? "Agilent" : "Keysight"); sdi->model = g_strdup(tokens[1]); sdi->version = g_strdup(tokens[3]); devc = g_malloc0(sizeof(struct dev_context)); sr_sw_limits_init(&devc->limits); devc->profile = &supported_agdmm[i]; - devc->cur_mq = -1; + if (supported_agdmm[i].nb_channels > 1) { + int temp_chan = supported_agdmm[i].nb_channels - 1; + devc->cur_mq[temp_chan] = SR_MQ_TEMPERATURE; + devc->cur_unit[temp_chan] = SR_UNIT_CELSIUS; + devc->cur_digits[temp_chan] = 1; + devc->cur_encoding[temp_chan] = 2; + } sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; sdi->priv = devc; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); + if (supported_agdmm[i].nb_channels > 1) + sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "P2"); + if (supported_agdmm[i].nb_channels > 2) + sr_channel_new(sdi, 2, SR_CHANNEL_ANALOG, TRUE, "P3"); devices = g_slist_append(devices, sdi); break; } @@ -197,6 +212,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) 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_mq[0] = -1; + if (devc->profile->nb_channels > 2) + devc->cur_mq[1] = -1; + sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); @@ -208,11 +229,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi) -{ - return std_serial_dev_acquisition_stop(sdi); -} - static struct sr_dev_driver agdmm_driver_info = { .name = "agilent-dmm", .longname = "Agilent U12xx series DMMs", @@ -228,7 +244,7 @@ static struct sr_dev_driver agdmm_driver_info = { .dev_open = std_serial_dev_open, .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, - .dev_acquisition_stop = dev_acquisition_stop, + .dev_acquisition_stop = std_serial_dev_acquisition_stop, .context = NULL, }; SR_REGISTER_DEV_DRIVER(agdmm_driver_info);