X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=ef57f31822e3eaf97b090b332bdc5583d074ad5b;hb=1a323dd887e655ac76133af1f018e3eeabd174e2;hp=24e7069d71a7c5910fbe0f6816df067b20818b21;hpb=72e1672fc9267cd34fe9e6b174a80ec6aae420d8;p=libsigrok.git diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index 24e7069d..ef57f318 100644 --- a/hardware/serial-dmm/api.c +++ b/hardware/serial-dmm/api.c @@ -48,6 +48,7 @@ SR_PRIV struct sr_dev_driver peaktech_3410_driver_info; SR_PRIV struct sr_dev_driver mastech_mas345_driver_info; SR_PRIV struct sr_dev_driver va_va18b_driver_info; SR_PRIV struct sr_dev_driver metex_m3640d_driver_info; +SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info; SR_PRIV struct sr_dev_driver peaktech_4370_driver_info; SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; @@ -55,6 +56,7 @@ SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info; +SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info; @@ -62,18 +64,18 @@ SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info; -SR_PRIV struct sr_dev_driver iso_tech_idm103n_ser_driver_info; +SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info; SR_PRIV struct dmm_info dmms[] = { { - "Digitek", "DT4000ZC", "2400/8n1", 2400, + "Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_10_temp_c, &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC, }, { - "TekPower", "TP4000ZC", "2400/8n1", 2400, + "TekPower", "TP4000ZC", "2400/8n1/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_10_temp_c, @@ -114,6 +116,13 @@ SR_PRIV struct dmm_info dmms[] = { NULL, &metex_m3640d_driver_info, receive_data_METEX_M3640D, }, + { + "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL, + &metex_m4650cr_driver_info, receive_data_METEX_M4650CR, + }, { "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200, METEX14_PACKET_SIZE, sr_metex14_packet_request, @@ -164,6 +173,13 @@ SR_PRIV struct dmm_info dmms[] = { NULL, &voltcraft_m3650d_driver_info, receive_data_VOLTCRAFT_M3650D, }, + { + "Voltcraft", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL, + &voltcraft_m4650cr_driver_info, receive_data_VOLTCRAFT_M4650CR, + }, { "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, @@ -226,7 +242,7 @@ SR_PRIV struct dmm_info dmms[] = { "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", 2400, ES519XX_11B_PACKET_SIZE, NULL, sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, NULL, - &iso_tech_idm103n_ser_driver_info, receive_data_ISO_TECH_IDM103N_SER, + &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N, }, }; @@ -395,10 +411,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; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -425,10 +444,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: @@ -536,6 +556,7 @@ DRV(peaktech_3410, PEAKTECH_3410, "peaktech-3410", "PeakTech 3410") DRV(mastech_mas345, MASTECH_MAS345, "mastech-mas345", "MASTECH MAS345") DRV(va_va18b, VA_VA18B, "va-va18b", "V&A VA18B") DRV(metex_m3640d, METEX_M3640D, "metex-m3640d", "Metex M-3640D") +DRV(metex_m4650cr, METEX_M4650CR, "metex-m4650cr", "Metex M-4650CR") DRV(peaktech_4370, PEAKTECH_4370, "peaktech-4370", "PeakTech 4370") DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32") DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168") @@ -543,6 +564,7 @@ DRV(radioshack_22_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-80 DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812") DRV(tecpel_dmm_8061_ser, TECPEL_DMM_8061_SER, "tecpel-dmm-8061-ser", "Tecpel DMM-8061 (UT-D02 cable)") DRV(voltcraft_m3650d, VOLTCRAFT_M3650D, "voltcraft-m3650d", "Voltcraft M-3650D") +DRV(voltcraft_m4650cr, VOLTCRAFT_M4650CR, "voltcraft-m4650cr", "Voltcraft M-4650CR") DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)") DRV(voltcraft_vc830_ser, VOLTCRAFT_VC830_SER, "voltcraft-vc830-ser", "Voltcraft VC-830 (UT-D02 cable)") DRV(voltcraft_vc840_ser, VOLTCRAFT_VC840_SER, "voltcraft-vc840-ser", "Voltcraft VC-840 (UT-D02 cable)") @@ -550,4 +572,4 @@ DRV(uni_t_ut60a_ser, UNI_T_UT60A_SER, "uni-t-ut60a-ser", "UNI-T UT60A (UT-D02 ca DRV(uni_t_ut60e_ser, UNI_T_UT60E_SER, "uni-t-ut60e-ser", "UNI-T UT60E (UT-D02 cable)") DRV(uni_t_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)") DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)") -DRV(iso_tech_idm103n_ser, ISO_TECH_IDM103N_SER, "iso-tech-idm103n-ser", "ISO-TECH IDM103N") +DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N")