/*
* This file is part of the libsigrok project.
*
- * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2012-2013 Uwe Hermann <uwe@hermann-uwe.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
SR_CONF_CONTINUOUS,
};
+SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = {
{
- "UNI-T", "UT61D", 19230 /* TODO */,
+ "Tecpel", "DMM-8061", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ sr_fs9721_00_temp_c,
+ &tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
+ },
+ {
+ "UNI-T", "UT61D", 2400,
FS9922_PACKET_SIZE, NULL,
sr_fs9922_packet_valid, sr_fs9922_parse,
NULL,
&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
},
{
- "Voltcraft VC-820", "VC-820", 19200 /* TODO */,
+ "UNI-T", "UT61E", 19230,
+ ES51922_PACKET_SIZE, NULL,
+ sr_es51922_packet_valid, sr_es51922_parse,
+ NULL,
+ &uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
+ },
+ {
+ "Voltcraft", "VC-820", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL,
&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
},
+ {
+ "Voltcraft", "VC-840", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ sr_fs9721_00_temp_c,
+ &voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
+ },
};
static int clear_instances(int dmm)
{
sr_dbg("Selected '%s' subdriver.", udmms[dmm].di->name);
- return std_hw_init(sr_ctx, uddms[dmm].di, DRIVER_LOG_DOMAIN);
+ return std_hw_init(sr_ctx, udmms[dmm].di, DRIVER_LOG_DOMAIN);
}
static GSList *hw_scan(GSList *options, int dmm)
struct sr_probe *probe;
const char *conn;
- (void)options;
-
drvc = udmms[dmm].di->priv;
- /* USB scan is always authoritative. */
- clear_instances(dmm);
-
conn = NULL;
for (l = options; l; l = l->next) {
src = l->data;
return NULL;
}
+ devc->first_run = TRUE;
+
if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
udmms[dmm].vendor, udmms[dmm].device, NULL))) {
sr_err("sr_dev_inst_new returned NULL.");
return NULL;
sdi->probes = g_slist_append(sdi->probes, probe);
- devc->usb = usb;
+ sdi->inst_type = SR_INST_USB;
+ sdi->conn = usb;
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
static GSList *hw_dev_list(int dmm)
{
- return ((struct drv_context *)(udmms[dmm]->priv))->instances;
+ return ((struct drv_context *)(udmms[dmm].di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
{
struct drv_context *drvc;
- struct dev_context *devc;
- int ret;
+ struct sr_usb_dev_inst *usb;
+ int ret;
drvc = udmms[dmm].di->priv;
- devc = sdi->priv;
+ usb = sdi->conn;
- if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb)) == SR_OK)
- sdi->status = SR_ST_ACTIVE;
+ if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
+ sdi->status = SR_ST_ACTIVE;
- return ret;
+ return ret;
}
static int hw_dev_close(struct sr_dev_inst *sdi)
/* TODO */
- sdi->status = SR_ST_INACTIVE;
+ sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
-
(void)sdi;
switch (key) {
.priv = NULL, \
};
+DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
DRV(uni_t_ut61d, UNI_T_UT61D, "uni-t-ut61d", "UNI-T UT61D")
+DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E")
DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
+DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")