Add support for the Voltcraft M-4650CR.

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 38fb053ff1cc9ce40c9aefa113342350f4d4d25b..1362d3b7ab5fac2105182f95092e0483315ed7dc 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -55,6 +55,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;
@@ -164,6 +165,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,
@@ -543,6 +551,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)")

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index bbe572f5b5ecddacdcba7f3dc7da1ea045446d99..838403de849926c7b02791e435fce39eeb4f88f9 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -172,6 +172,7 @@ RECEIVE_DATA(RADIOSHACK_22_805, metex14)
 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_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 ca27f8421b353025571f205ac1412db424c30a47..7b170e66869d2ca2f121a2f79b1357287148db04 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -45,6 +45,7 @@ enum {
        RADIOSHACK_22_812,
        TECPEL_DMM_8061_SER,
        VOLTCRAFT_M3650D,
+       VOLTCRAFT_M4650CR,
        VOLTCRAFT_VC820_SER,
        VOLTCRAFT_VC830_SER,
        VOLTCRAFT_VC840_SER,
@@ -55,7 +56,7 @@ enum {
        ISO_TECH_IDM103N,
 };
 
-#define DMM_COUNT 22
+#define DMM_COUNT 23
 
 struct dmm_info {
        char *vendor;
@@ -111,6 +112,7 @@ 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_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_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 48b91ac9b6cd9700f84ed7fc7d826321c0228d0f..a6bd90cd82d5f47f4075758164cc46e1faec2502 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -205,6 +205,7 @@ 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 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_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;
@@ -325,6 +326,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &radioshack_22_812_driver_info,
        &tecpel_dmm_8061_ser_driver_info,
        &voltcraft_m3650d_driver_info,
+       &voltcraft_m4650cr_driver_info,
        &voltcraft_vc820_ser_driver_info,
        &voltcraft_vc830_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,