X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=96138743e85e473c664afd7b800eafcbf8835930;hb=cfe01d0607a65bf4e17e3a8d15e4c0f2b20fb55c;hp=ea1ba90a8f1207a647212315424927646f6f7a7e;hpb=4104ef810e56cd68ccfd66919a24e9e8c572ef58;p=libsigrok.git diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c index ea1ba90a..96138743 100644 --- a/hardware/serial-dmm/api.c +++ b/hardware/serial-dmm/api.c @@ -57,8 +57,10 @@ SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; 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_m3650cr_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_me42_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; @@ -70,6 +72,8 @@ 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_driver_info; +SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info; +SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info; SR_PRIV struct dmm_info dmms[] = { { @@ -185,6 +189,13 @@ SR_PRIV struct dmm_info dmms[] = { &tecpel_dmm_8061_ser_driver_info, receive_data_TECPEL_DMM_8061_SER, }, + { + "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL, + &voltcraft_m3650cr_driver_info, receive_data_VOLTCRAFT_M3650CR, + }, { "Voltcraft", "M-3650D", "1200/7n2/rts=0/dtr=1", 1200, METEX14_PACKET_SIZE, sr_metex14_packet_request, @@ -199,6 +210,13 @@ SR_PRIV struct dmm_info dmms[] = { NULL, &voltcraft_m4650cr_driver_info, receive_data_VOLTCRAFT_M4650CR, }, + { + "Voltcraft", "ME-42", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL, + &voltcraft_me42_driver_info, receive_data_VOLTCRAFT_ME42, + }, { "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", 2400, FS9721_PACKET_SIZE, NULL, @@ -274,15 +292,32 @@ 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, ES519XX_14B_PACKET_SIZE, NULL, - sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, 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, + sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, + NULL, &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N, }, + { + "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c, + &tenma_72_7745_ser_driver_info, receive_data_TENMA_72_7745_SER, + }, + { + /* Note: ES51986 baudrate is actually 19230! */ + "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_11B_PACKET_SIZE, NULL, + sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, + NULL, + &tenma_72_7750_ser_driver_info, receive_data_TENMA_72_7750_SER, + }, }; static int dev_clear(int dmm) @@ -302,7 +337,7 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GSList *devices; int dropped, ret; @@ -370,9 +405,9 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) sdi->priv = devc; sdi->driver = dmms[dmm].di; - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) goto scan_cleanup; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); @@ -425,11 +460,11 @@ static int cleanup(int dmm) } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - (void)probe_group; + (void)cg; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -458,10 +493,10 @@ static int config_set(int id, 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) + const struct sr_channel_group *cg) { (void)sdi; - (void)probe_group; + (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -578,8 +613,10 @@ DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-16 DRV(radioshack_22_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-805") 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_m3650cr, VOLTCRAFT_M3650CR, "voltcraft-m3650cr", "Voltcraft M-3650CR") DRV(voltcraft_m3650d, VOLTCRAFT_M3650D, "voltcraft-m3650d", "Voltcraft M-3650D") DRV(voltcraft_m4650cr, VOLTCRAFT_M4650CR, "voltcraft-m4650cr", "Voltcraft M-4650CR") +DRV(voltcraft_me42, VOLTCRAFT_ME42, "voltcraft-me42", "Voltcraft ME-42") 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)") @@ -591,3 +628,5 @@ DRV(uni_t_ut61c_ser, UNI_T_UT61C_SER, "uni-t-ut61c-ser", "UNI-T UT61C (UT-D02 ca 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, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N") +DRV(tenma_72_7745_ser, TENMA_72_7745_SER, "tenma-72-7745-ser", "Tenma 72-7745 (UT-D02 cable)") +DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)")