serial-dmm: Implemented support for Voltcraft ME-42 (driver voltcraft-me42).

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index aee0c004df2f4742816d01e7f45577d535940a8d..ebb8f02ceb014fcbc1acddd74e4868335c2cc1be 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -59,6 +59,7 @@ 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_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;
@@ -201,6 +202,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,
@@ -599,6 +607,7 @@ DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-81
 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_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)")

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index c38c1422aef6a37a9ec97523cc9417b9fad9bccc..6e91aec9a4ced6da20c46655820bd5ae4672e2ff 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -178,6 +178,7 @@ RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
 RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721)
 RECEIVE_DATA(VOLTCRAFT_M3650D, metex14)
 RECEIVE_DATA(VOLTCRAFT_M4650CR, metex14)
+RECEIVE_DATA(VOLTCRAFT_ME42, metex14)
 RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
 RECEIVE_DATA(VOLTCRAFT_VC830_SER, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 8e065642addbfce7c785bb8618565b5450366bbc..8db0e6355ed5bd797b3f34d2d87b7f9c55c88773 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -41,6 +41,7 @@ enum {
        TECPEL_DMM_8061_SER,
        VOLTCRAFT_M3650D,
        VOLTCRAFT_M4650CR,
+       VOLTCRAFT_ME42,
        VOLTCRAFT_VC820_SER,
        VOLTCRAFT_VC830_SER,
        VOLTCRAFT_VC840_SER,
@@ -125,6 +126,7 @@ SR_PRIV int receive_data_RADIOSHACK_22_812(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_M4650CR(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_ME42(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_VC830_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);

diff --git a/hwdriver.c b/hwdriver.c
index b62fdd41c643aee802656409a86fc9e459c2cd17..dff0732e01da8fa7876f7d42e52748060de2fe30 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -248,6 +248,7 @@ extern SR_PRIV struct sr_dev_driver radioshack_22_812_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_m4650cr_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_me42_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
@@ -404,6 +405,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &tecpel_dmm_8061_ser_driver_info,
        &voltcraft_m3650d_driver_info,
        &voltcraft_m4650cr_driver_info,
+       &voltcraft_me42_driver_info,
        &voltcraft_vc820_ser_driver_info,
        &voltcraft_vc830_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,