X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=d6391fa08d71f4c14949ab20594d4818ead7c123;hb=3b20367381bcd955e604c40d05f489f2221c036a;hp=1662afc45481fc60831d12f02a6c32c60be5b9af;hpb=883a2e9e71d4d0f84d9f8df6a6a5e754052bad8a;p=libsigrok.git diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c index 1662afc4..d6391fa0 100644 --- a/hardware/fluke-dmm/api.c +++ b/hardware/fluke-dmm/api.c @@ -18,17 +18,42 @@ */ #include +#include +#include +#include +#include +#include #include "libsigrok.h" #include "libsigrok-internal.h" -#include "config.h" +#include "fluke-dmm.h" +static const int hwopts[] = { + SR_HWOPT_CONN, + SR_HWOPT_SERIALCOMM, + 0, +}; + +static const int hwcaps[] = { + SR_HWCAP_MULTIMETER, + SR_HWCAP_LIMIT_SAMPLES, + SR_HWCAP_LIMIT_MSEC, + SR_HWCAP_CONTINUOUS, + 0, +}; + +static const char *probe_names[] = { + "Probe", + NULL, +}; -SR_PRIV struct sr_dev_driver driver_info; -static struct sr_dev_driver *di = &driver_info; +SR_PRIV struct sr_dev_driver flukedmm_driver_info; +static struct sr_dev_driver *di = &flukedmm_driver_info; + +static const struct flukedmm_profile supported_flukedmm[] = { + { FLUKE_187, "187", 100 }, + { FLUKE_287, "287", 100 }, +}; -/* TODO move to header file */ -struct drv_context { GSList *instances; }; -struct dev_context { }; /* Properly close and free all devices. */ static int clear_instances(void) @@ -38,24 +63,18 @@ static int clear_instances(void) struct dev_context *devc; GSList *l; + if (!(drvc = di->priv)) + return SR_OK; + drvc = di->priv; for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("TODO: %s: sdi was NULL, continuing", __func__); + if (!(sdi = l->data)) continue; - } - if (!(devc = sdi->priv)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("TODO: %s: sdi->priv was NULL, continuing", __func__); + if (!(devc = sdi->priv)) continue; - } - - /* TODO */ - + sr_serial_dev_inst_free(devc->serial); sr_dev_inst_free(sdi); } - g_slist_free(drvc->instances); drvc->instances = NULL; @@ -67,28 +86,128 @@ static int hw_init(void) struct drv_context *drvc; if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("TODO: driver context malloc failed."); - return SR_ERR; + sr_err("Driver context malloc failed."); + return SR_ERR_MALLOC; } - /* TODO */ - di->priv = drvc; return SR_OK; } -static GSList *hw_scan(GSList *options) +static GSList *fluke_scan(const char *conn, const char *serialcomm) { + struct sr_dev_inst *sdi; struct drv_context *drvc; + struct dev_context *devc; + struct sr_probe *probe; + struct sr_serial_dev_inst *serial; GSList *devices; + int retry, len, i, s; + char buf[128], *b, **tokens; + + if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) + return NULL; + + if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return NULL; - (void)options; - devices = NULL; drvc = di->priv; - drvc->instances = NULL; + b = buf; + retry = 0; + devices = NULL; + /* We'll try the discovery sequence three times in case the device + * is not in an idle state when we send ID. */ + while (!devices && retry < 3) { + retry++; + serial_flush(serial); + if (serial_write(serial, "ID\r", 3) == -1) { + sr_err("Unable to send ID string: %s.", + strerror(errno)); + continue; + } + + /* Response is first a CMD_ACK byte (ASCII '0' for OK, + * or '1' to signify an error. */ + len = 128; + serial_readline(serial, &b, &len, 150); + if (len != 1) + continue; + if (buf[0] != '0') + continue; - /* TODO */ + /* If CMD_ACK was OK, ID string follows. */ + len = 128; + serial_readline(serial, &b, &len, 150); + if (len < 10) + continue; + tokens = g_strsplit(buf, ",", 3); + if (!strncmp("FLUKE", tokens[0], 5) + && tokens[1] && tokens[2]) { + for (i = 0; supported_flukedmm[i].model; i++) { + if (strcmp(supported_flukedmm[i].modelname, tokens[0] + 6)) + continue; + /* Skip leading spaces in version number. */ + for (s = 0; tokens[1][s] == ' '; s++); + if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Fluke", + tokens[0] + 6, tokens[1] + s))) + return NULL; + if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { + sr_err("Device context malloc failed."); + return NULL; + } + devc->profile = &supported_flukedmm[i]; + devc->serial = serial; + sdi->priv = devc; + sdi->driver = di; + if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + drvc->instances = g_slist_append(drvc->instances, sdi); + devices = g_slist_append(devices, sdi); + break; + } + } + g_strfreev(tokens); + } + serial_close(serial); + if (!devices) + sr_serial_dev_inst_free(serial); + + return devices; +} + +static GSList *hw_scan(GSList *options) +{ + struct sr_hwopt *opt; + GSList *l, *devices; + const char *conn, *serialcomm; + + conn = serialcomm = NULL; + for (l = options; l; l = l->next) { + opt = l->data; + switch (opt->hwopt) { + case SR_HWOPT_CONN: + conn = opt->value; + break; + case SR_HWOPT_SERIALCOMM: + serialcomm = opt->value; + break; + } + } + if (!conn) + return NULL; + + if (serialcomm) { + /* Use the provided comm specs. */ + devices = fluke_scan(conn, serialcomm); + } else { + /* Try 115200, as used on 287/289. */ + devices = fluke_scan(conn, "115200/8n1"); + if (!devices) + /* Fall back to 9600 for 187/189. */ + devices = fluke_scan(conn, "9600/8n1"); + } return devices; } @@ -104,16 +223,34 @@ static GSList *hw_dev_list(void) static int hw_dev_open(struct sr_dev_inst *sdi) { + struct dev_context *devc; - /* TODO */ + if (!(devc = sdi->priv)) { + sr_err("sdi->priv was NULL."); + return SR_ERR_BUG; + } + + if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + return SR_ERR; + + sdi->status = SR_ST_ACTIVE; return SR_OK; } static int hw_dev_close(struct sr_dev_inst *sdi) { + struct dev_context *devc; - /* TODO */ + if (!(devc = sdi->priv)) { + sr_err("sdi->priv was NULL."); + return SR_ERR_BUG; + } + + if (devc->serial && devc->serial->fd != -1) { + serial_close(devc->serial); + sdi->status = SR_ST_INACTIVE; + } return SR_OK; } @@ -123,8 +260,6 @@ static int hw_cleanup(void) clear_instances(); - /* TODO */ - return SR_OK; } @@ -132,9 +267,21 @@ static int hw_info_get(int info_id, const void **data, const struct sr_dev_inst *sdi) { + (void)sdi; switch (info_id) { - /* TODO */ + case SR_DI_HWOPTS: + *data = hwopts; + break; + case SR_DI_HWCAPS: + *data = hwcaps; + break; + case SR_DI_NUM_PROBES: + *data = GINT_TO_POINTER(1); + break; + case SR_DI_PROBE_NAMES: + *data = probe_names; + break; default: return SR_ERR_ARG; } @@ -145,45 +292,113 @@ static int hw_info_get(int info_id, const void **data, static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, const void *value) { - int ret; + struct dev_context *devc; if (sdi->status != SR_ST_ACTIVE) return SR_ERR; - ret = SR_OK; + if (!(devc = sdi->priv)) { + sr_err("sdi->priv was NULL."); + return SR_ERR_BUG; + } + switch (hwcap) { - /* TODO */ + case SR_HWCAP_LIMIT_MSEC: + /* TODO: not yet implemented */ + if (*(const uint64_t *)value == 0) { + sr_err("LIMIT_MSEC can't be 0."); + return SR_ERR; + } + devc->limit_msec = *(const uint64_t *)value; + sr_dbg("Setting time limit to %" PRIu64 "ms.", + devc->limit_msec); + break; + case SR_HWCAP_LIMIT_SAMPLES: + devc->limit_samples = *(const uint64_t *)value; + sr_dbg("Setting sample limit to %" PRIu64 ".", + devc->limit_samples); + break; default: - ret = SR_ERR_ARG; + sr_err("Unknown capability: %d.", hwcap); + return SR_ERR; + break; } - return ret; + return SR_OK; } static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) { + struct sr_datafeed_packet packet; + struct sr_datafeed_header header; + struct sr_datafeed_meta_analog meta; + struct dev_context *devc; + + if (!(devc = sdi->priv)) { + sr_err("sdi->priv was NULL."); + return SR_ERR_BUG; + } + + sr_dbg("Starting acquisition."); + + devc->cb_data = cb_data; + + /* Send header packet to the session bus. */ + sr_dbg("Sending SR_DF_HEADER."); + packet.type = SR_DF_HEADER; + packet.payload = (uint8_t *)&header; + header.feed_version = 1; + gettimeofday(&header.starttime, NULL); + sr_session_send(devc->cb_data, &packet); + + /* Send metadata about the SR_DF_ANALOG packets to come. */ + sr_dbg("Sending SR_DF_META_ANALOG."); + packet.type = SR_DF_META_ANALOG; + packet.payload = &meta; + meta.num_probes = 1; + sr_session_send(devc->cb_data, &packet); + + /* Poll every 100ms, or whenever some data comes in. */ + sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi); - /* TODO */ + if (serial_write(devc->serial, "QM\r", 3) == -1) { + sr_err("Unable to send QM: %s.", strerror(errno)); + return SR_ERR; + } + devc->cmd_sent_at = g_get_monotonic_time() / 1000; + devc->expect_response = TRUE; return SR_OK; } -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data) +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - - (void)cb_data; + struct sr_datafeed_packet packet; + struct dev_context *devc; if (sdi->status != SR_ST_ACTIVE) return SR_ERR; - /* TODO */ + if (!(devc = sdi->priv)) { + sr_err("sdi->priv was NULL."); + return SR_ERR_BUG; + } + + sr_dbg("Stopping acquisition."); + + sr_source_remove(devc->serial->fd); + hw_dev_close((struct sr_dev_inst *)sdi); + + /* Send end packet to the session bus. */ + sr_dbg("Sending SR_DF_END."); + packet.type = SR_DF_END; + sr_session_send(cb_data, &packet); return SR_OK; } -SR_PRIV struct sr_dev_driver driver_info = { +SR_PRIV struct sr_dev_driver flukedmm_driver_info = { .name = "fluke-dmm", .longname = "Fluke 18x/28x series DMMs", .api_version = 1,