0,
};
-static const char *probe_names[] = {
- "Probe",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver flukedmm_driver_info;
static struct sr_dev_driver *di = &flukedmm_driver_info;
+static char *scan_conn[] = {
+ /* 287/289 */
+ "115200/8n1",
+ /* 187/189 */
+ "9600/8n1",
+ /* Scopemeter 190 series */
+ "1200/8n1",
+ NULL
+};
+
static const struct flukedmm_profile supported_flukedmm[] = {
- { FLUKE_187, "187", 100 },
- { FLUKE_287, "287", 100 },
+ { FLUKE_187, "187", 100, 1000 },
+ { FLUKE_287, "287", 100, 1000 },
+ { FLUKE_190, "199B", 1000, 3500 },
};
return SR_OK;
}
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
return SR_ERR_MALLOC;
}
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
struct drv_context *drvc;
struct dev_context *devc;
struct sr_probe *probe;
+ struct sr_serial_dev_inst *serial;
GSList *devices;
- int fd, retry, len, i, s;
+ int retry, len, i, s;
char buf[128], *b, **tokens;
- if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
- sr_err("Unable to open %s: %s.", conn, strerror(errno));
+ if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
return NULL;
- }
- if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
- sr_err("Unable to set serial parameters.");
+
+ if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return NULL;
- }
drvc = di->priv;
b = buf;
* is not in an idle state when we send ID. */
while (!devices && retry < 3) {
retry++;
- serial_flush(fd);
- if (serial_write(fd, "ID\r", 3) == -1) {
+ 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(fd, &b, &len, 150);
+ serial_readline(serial, &b, &len, 150);
if (len != 1)
continue;
if (buf[0] != '0')
/* If CMD_ACK was OK, ID string follows. */
len = 128;
- serial_readline(fd, &b, &len, 150);
+ serial_readline(serial, &b, &len, 850);
if (len < 10)
continue;
- tokens = g_strsplit(buf, ",", 3);
+ if (strcspn(buf, ",") < 15)
+ /* Looks like it's comma-separated. */
+ tokens = g_strsplit(buf, ",", 3);
+ else
+ /* Fluke 199B, at least, uses semicolon. */
+ tokens = g_strsplit(buf, ";", 3);
if (!strncmp("FLUKE", tokens[0], 5)
&& tokens[1] && tokens[2]) {
for (i = 0; supported_flukedmm[i].model; i++) {
return NULL;
}
devc->profile = &supported_flukedmm[i];
- devc->serial = sr_serial_dev_inst_new(conn, -1);
- devc->serialcomm = g_strdup(serialcomm);
+ devc->serial = serial;
sdi->priv = devc;
sdi->driver = di;
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
}
}
g_strfreev(tokens);
+ if (devices)
+ /* Found one. */
+ break;
}
- serial_close(fd);
+ serial_close(serial);
+ if (!devices)
+ sr_serial_dev_inst_free(serial);
return devices;
}
static GSList *hw_scan(GSList *options)
{
- struct sr_hwopt *opt;
+ struct sr_config *src;
GSList *l, *devices;
+ int i;
const char *conn, *serialcomm;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
- opt = l->data;
- switch (opt->hwopt) {
+ src = l->data;
+ switch (src->key) {
case SR_HWOPT_CONN:
- conn = opt->value;
+ conn = src->value;
break;
case SR_HWOPT_SERIALCOMM:
- serialcomm = opt->value;
+ serialcomm = src->value;
break;
}
}
/* 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");
+ for (i = 0; scan_conn[i]; i++) {
+ if ((devices = fluke_scan(conn, scan_conn[i])))
+ break;
+ /* The Scopemeter 199B, at least, requires this
+ * after all the 115k/9.6k confusion. */
+ g_usleep(5000);
+ }
}
return devices;
return SR_ERR_BUG;
}
- devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
- if (devc->serial->fd == -1) {
- sr_err("Couldn't open serial port '%s'.", devc->serial->port);
+ if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return SR_ERR;
- }
- if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
- sr_err("Unable to set serial parameters.");
- return SR_ERR;
- }
+
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
if (devc->serial && devc->serial->fd != -1) {
- serial_close(devc->serial->fd);
- devc->serial->fd = -1;
+ serial_close(devc->serial);
sdi->status = SR_ST_INACTIVE;
}
static int hw_info_get(int info_id, const void **data,
const struct sr_dev_inst *sdi)
{
-
(void)sdi;
switch (info_id) {
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;
}
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
if (!(devc = sdi->priv)) {
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);
- if (serial_write(devc->serial->fd, "QM\r", 3) == -1) {
+ if (serial_write(devc->serial, "QM\r", 3) == -1) {
sr_err("Unable to send QM: %s.", strerror(errno));
return SR_ERR;
}
projects / libsigrok.git / blobdiff