BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial-dmm/uni-t-dmm: Drop Tecpel DMM-8060. 

The Tecpel DMM-8060 was added since we assumed it would be a rebadged
Voltcraft VC-820 (since we know the Tecpel DMM-8061 is a rebadged VC-840).

However, according to the vendor webpage it doesn't have PC connectivity
at all, so drop it for now (until someone can confirm that it does or does
not actually have RS232/USB connectivity).
This commit is contained in:
Uwe Hermann 2013-07-17 22:17:17 +02:00
parent e84e0096db
commit 2b691be806
7 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hardware/serial-dmm/api.c
View File

@ -53,7 +53,6 @@ SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; 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_805_driver_info;
SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info;
SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_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_m3650d_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
@ -149,14 +148,6 @@ SR_PRIV struct dmm_info dmms[] = {
NULL, NULL,
&radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812, &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812,
}, },
{
"Tecpel", "DMM-8060 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL,
&tecpel_dmm_8060_ser_driver_info,
receive_data_TECPEL_DMM_8060_SER,
},
{ {
"Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", "Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, NULL, 2400, FS9721_PACKET_SIZE, NULL,
@ -538,7 +529,6 @@ 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") DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168")
DRV(radioshack_22_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-805") 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(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812")
DRV(tecpel_dmm_8060_ser, TECPEL_DMM_8060_SER, "tecpel-dmm-8060-ser", "Tecpel DMM-8060 (UT-D02 cable)")
DRV(tecpel_dmm_8061_ser, TECPEL_DMM_8061_SER, "tecpel-dmm-8061-ser", "Tecpel DMM-8061 (UT-D02 cable)") 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_m3650d, VOLTCRAFT_M3650D, "voltcraft-m3650d", "Voltcraft M-3650D")
DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)") DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)")

1
hardware/serial-dmm/protocol.c
View File

@ -170,7 +170,6 @@ RECEIVE_DATA(PCE_PCE_DM32, fs9721)
RECEIVE_DATA(RADIOSHACK_22_168, metex14) RECEIVE_DATA(RADIOSHACK_22_168, metex14)
RECEIVE_DATA(RADIOSHACK_22_805, metex14) RECEIVE_DATA(RADIOSHACK_22_805, metex14)
RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd) RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
RECEIVE_DATA(TECPEL_DMM_8060_SER, fs9721)
RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721) RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721)
RECEIVE_DATA(VOLTCRAFT_M3650D, metex14) RECEIVE_DATA(VOLTCRAFT_M3650D, metex14)
RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721) RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)

4
hardware/serial-dmm/protocol.h
View File

@ -43,7 +43,6 @@ enum {
RADIOSHACK_22_168, RADIOSHACK_22_168,
RADIOSHACK_22_805, RADIOSHACK_22_805,
RADIOSHACK_22_812, RADIOSHACK_22_812,
TECPEL_DMM_8060_SER,
TECPEL_DMM_8061_SER, TECPEL_DMM_8061_SER,
VOLTCRAFT_M3650D, VOLTCRAFT_M3650D,
VOLTCRAFT_VC820_SER, VOLTCRAFT_VC820_SER,
@ -55,7 +54,7 @@ enum {
UNI_T_UT61E_SER, UNI_T_UT61E_SER,
}; };
#define DMM_COUNT 22 #define DMM_COUNT 21
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -109,7 +108,6 @@ SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data); SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_RADIOSHACK_22_805(int fd, int revents, void *cb_data); SR_PRIV int receive_data_RADIOSHACK_22_805(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data); SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TECPEL_DMM_8060_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data); SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data);

9
hardware/uni-t-dmm/api.c
View File

@ -37,7 +37,6 @@ static const int32_t hwcaps[] = {
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
}; };
SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info; SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
@ -48,13 +47,6 @@ SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = { SR_PRIV struct dmm_info udmms[] = {
{
"Tecpel", "DMM-8060", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL,
&tecpel_dmm_8060_driver_info, receive_data_TECPEL_DMM_8060,
},
{ {
"Tecpel", "DMM-8061", 2400, "Tecpel", "DMM-8061", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE, NULL,
@ -359,7 +351,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.priv = NULL, \ .priv = NULL, \
}; };
DRV(tecpel_dmm_8060, TECPEL_DMM_8060, "tecpel-dmm-8060", "Tecpel DMM-8060")
DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061") DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
DRV(uni_t_ut60a, UNI_T_UT60A, "uni-t-ut60a", "UNI-T UT60A") DRV(uni_t_ut60a, UNI_T_UT60A, "uni-t-ut60a", "UNI-T UT60A")
DRV(uni_t_ut60e, UNI_T_UT60E, "uni-t-ut60e", "UNI-T UT60E") DRV(uni_t_ut60e, UNI_T_UT60E, "uni-t-ut60e", "UNI-T UT60E")

2
hardware/uni-t-dmm/protocol.c
View File

@ -51,7 +51,6 @@
* f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1) * f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1)
* *
* Chips and serial settings used in UNI-T DMMs (and rebranded ones): * Chips and serial settings used in UNI-T DMMs (and rebranded ones):
* - Tecpel DMM-8060: ? (very likely Fortune Semiconductor FS9721_LP3)
* - Tecpel DMM-8061: ? (very likely Fortune Semiconductor FS9721_LP3) * - Tecpel DMM-8061: ? (very likely Fortune Semiconductor FS9721_LP3)
* - UNI-T UT108: ? * - UNI-T UT108: ?
* - UNI-T UT109: ? * - UNI-T UT109: ?
@ -304,7 +303,6 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
return receive_data(fd, revents, ID_UPPER, &info, cb_data); } return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
/* Driver-specific receive_data() wrappers */ /* Driver-specific receive_data() wrappers */
RECEIVE_DATA(TECPEL_DMM_8060, fs9721)
RECEIVE_DATA(TECPEL_DMM_8061, fs9721) RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
RECEIVE_DATA(UNI_T_UT60A, fs9721) RECEIVE_DATA(UNI_T_UT60A, fs9721)
RECEIVE_DATA(UNI_T_UT60E, fs9721) RECEIVE_DATA(UNI_T_UT60E, fs9721)

4
hardware/uni-t-dmm/protocol.h
View File

@ -38,7 +38,6 @@
/* Note: When adding entries here, don't forget to update DMM_COUNT. */ /* Note: When adding entries here, don't forget to update DMM_COUNT. */
enum { enum {
TECPEL_DMM_8060,
TECPEL_DMM_8061, TECPEL_DMM_8061,
UNI_T_UT60A, UNI_T_UT60A,
UNI_T_UT60E, UNI_T_UT60E,
@ -49,7 +48,7 @@ enum {
VOLTCRAFT_VC840, VOLTCRAFT_VC840,
}; };
#define DMM_COUNT 9 #define DMM_COUNT 8
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -94,7 +93,6 @@ struct dev_context {
uint8_t buflen; uint8_t buflen;
}; };
SR_PRIV int receive_data_TECPEL_DMM_8060(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data); SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT60A(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT60A(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT60E(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT60E(int fd, int revents, void *cb_data);

4
hwdriver.c
View File

@ -184,7 +184,6 @@ extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info;
extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info;
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info; extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
@ -196,7 +195,6 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info; extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
@ -292,7 +290,6 @@ static struct sr_dev_driver *drivers_list[] = {
&radioshack_22_168_driver_info, &radioshack_22_168_driver_info,
&radioshack_22_805_driver_info, &radioshack_22_805_driver_info,
&radioshack_22_812_driver_info, &radioshack_22_812_driver_info,
&tecpel_dmm_8060_ser_driver_info,
&tecpel_dmm_8061_ser_driver_info, &tecpel_dmm_8061_ser_driver_info,
&voltcraft_m3650d_driver_info, &voltcraft_m3650d_driver_info,
&voltcraft_vc820_ser_driver_info, &voltcraft_vc820_ser_driver_info,
@ -304,7 +301,6 @@ static struct sr_dev_driver *drivers_list[] = {
&uni_t_ut61e_ser_driver_info, &uni_t_ut61e_ser_driver_info,
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM
&tecpel_dmm_8060_driver_info,
&tecpel_dmm_8061_driver_info, &tecpel_dmm_8061_driver_info,
&uni_t_ut60a_driver_info, &uni_t_ut60a_driver_info,
&uni_t_ut60e_driver_info, &uni_t_ut60e_driver_info,