X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=84a288b9c9d6207a479746794360d580223592d9;hb=8f996b89481670219c7576e2c68b128a0a2ce026;hp=05c1c47e4e0204c2b53ec9f4d771a3eaaacb37fa;hpb=4d7ddff75b8c23fc8d5355c480df029b130cec0c;p=libsigrok.git diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c index 05c1c47e..84a288b9 100644 --- a/hardware/uni-t-dmm/api.c +++ b/hardware/uni-t-dmm/api.c @@ -99,10 +99,15 @@ SR_PRIV struct dmm_info udmms[] = { &voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820, }, { + /* + * Note: The VC830 doesn't set the 'volt' and 'diode' bits of + * the FS9922 protocol. Instead, it only sets the user-defined + * bit "z1" to indicate "diode mode" and "voltage". + */ "Voltcraft", "VC-830", 2400, FS9922_PACKET_SIZE, NULL, sr_fs9922_packet_valid, sr_fs9922_parse, - NULL, + &sr_fs9922_z1_diode, &voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830, }, { @@ -149,7 +154,7 @@ static GSList *scan(GSList *options, int dmm) } } if (!conn) - conn = UNI_T_UT_D04_NEW; + return NULL; devices = NULL; if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) { @@ -224,10 +229,13 @@ static int cleanup(int dmm) return dev_clear(dmm); } -static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; + (void)probe_group; + devc = sdi->priv; switch (id) { @@ -256,9 +264,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) return SR_OK; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { (void)sdi; + (void)probe_group; switch (key) { case SR_CONF_SCAN_OPTIONS: