X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=b433c0630de468577f8a883571b76f53dc4ab2a1;hb=641d8f276ce52e84903a3d918187cf4d74c7dda4;hp=2eb1dc569bbb6b165fad656bc3e6cd007155b803;hpb=de737bfc11f37ecaf9e028ba17fceafe510fc68c;p=libsigrok.git diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index 2eb1dc56..b433c063 100644 --- a/hardware/serial-dmm/api.c +++ b/hardware/serial-dmm/api.c @@ -41,6 +41,7 @@ static const int32_t hwcaps[] = { SR_CONF_CONTINUOUS, }; +SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info; SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info; SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info; SR_PRIV struct sr_dev_driver metex_me31_driver_info; @@ -48,6 +49,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,25 +57,35 @@ 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; 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_ut61b_ser_driver_info; +SR_PRIV struct sr_dev_driver uni_t_ut61c_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, + "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, + BBCGM_M2110_PACKET_SIZE, NULL, + sr_m2110_packet_valid, sr_m2110_parse, + NULL, + &bbcgm_m2110_driver_info, receive_data_BBCGM_M2110, + }, + { + "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 +126,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 +183,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, @@ -209,6 +235,18 @@ SR_PRIV struct dmm_info dmms[] = { &uni_t_ut60e_ser_driver_info, receive_data_UNI_T_UT60E_SER, }, + { + "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL, + &uni_t_ut61b_ser_driver_info, receive_data_UNI_T_UT61B_SER, + }, + { + "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL, + &uni_t_ut61c_ser_driver_info, receive_data_UNI_T_UT61C_SER, + }, { "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", 2400, FS9922_PACKET_SIZE, NULL, @@ -218,15 +256,15 @@ SR_PRIV struct dmm_info dmms[] = { { /* Note: ES51922 baudrate is actually 19230! */ "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES51922_PACKET_SIZE, NULL, - sr_es51922_packet_valid, sr_es51922_parse, NULL, + 19200, ES519XX_14B_PACKET_SIZE, NULL, + sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, NULL, &uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER, }, { "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, + sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, NULL, + &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N, }, }; @@ -364,41 +402,18 @@ static GSList *dev_list(int dmm) return ((struct drv_context *)(dmms[dmm].di->priv))->instances; } -static int dev_open(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial; - - serial = sdi->conn; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) - return SR_ERR; - - sdi->status = SR_ST_ACTIVE; - - return SR_OK; -} - -static int dev_close(struct sr_dev_inst *sdi) -{ - struct sr_serial_dev_inst *serial; - - serial = sdi->conn; - if (serial && serial->fd != -1) { - serial_close(serial); - sdi->status = SR_ST_INACTIVE; - } - - return SR_OK; -} - 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 +440,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: @@ -475,7 +491,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, /* Poll every 50ms, or whenever some data comes in. */ serial = sdi->conn; - sr_source_add(serial->fd, G_IO_IN, 50, + serial_source_add(serial, G_IO_IN, 50, dmms[dmm].receive_data, (void *)sdi); return SR_OK; @@ -483,8 +499,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close, - sdi->conn, LOG_PREFIX); + return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, + sdi->conn, LOG_PREFIX); } /* Driver-specific API function wrappers */ @@ -522,13 +538,14 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ - .dev_open = dev_open, \ - .dev_close = dev_close, \ + .dev_open = std_serial_dev_open, \ + .dev_close = std_serial_dev_close, \ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ .dev_acquisition_stop = dev_acquisition_stop, \ .priv = NULL, \ }; +DRV(bbcgm_m2110, BBCGM_M2110, "bbcgm-m2110", "BBC Goertz Metrawatt M2110") DRV(digitek_dt4000zc, DIGITEK_DT4000ZC, "digitek-dt4000zc", "Digitek DT4000ZC") DRV(tekpower_tp4000zc, TEKPOWER_TP4000ZC, "tekpower-tp4000zc", "TekPower TP4000ZC") DRV(metex_me31, METEX_ME31, "metex-me31", "Metex ME-31") @@ -536,6 +553,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,11 +561,14 @@ 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)") DRV(uni_t_ut60a_ser, UNI_T_UT60A_SER, "uni-t-ut60a-ser", "UNI-T UT60A (UT-D02 cable)") DRV(uni_t_ut60e_ser, UNI_T_UT60E_SER, "uni-t-ut60e-ser", "UNI-T UT60E (UT-D02 cable)") +DRV(uni_t_ut61b_ser, UNI_T_UT61B_SER, "uni-t-ut61b-ser", "UNI-T UT61B (UT-D02 cable)") +DRV(uni_t_ut61c_ser, UNI_T_UT61C_SER, "uni-t-ut61c-ser", "UNI-T UT61C (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")