serial-dmm: Add support for the Voltcraft VC-830.

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 8a0f4619c0d68c25c0d4577b77d80d84e4d76d39..1c5272d4670606e49cc9cc5225a0c7573e13dece 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -57,6 +57,7 @@ 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 voltcraft_m3650d_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_ut61d_ser_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
@@ -177,6 +178,14 @@ SR_PRIV struct dmm_info dmms[] = {
                &voltcraft_vc820_ser_driver_info,
                receive_data_VOLTCRAFT_VC820_SER,
        },
+       {
+               "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL,
+               &voltcraft_vc830_ser_driver_info,
+               receive_data_VOLTCRAFT_VC830_SER,
+       },
        {
                "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
                2400, FS9721_PACKET_SIZE, NULL,
@@ -515,6 +524,7 @@ DRV(tecpel_dmm_8060_ser, TECPEL_DMM_8060_SER, "tecpel-dmm-8060-ser", "Tecpel DMM
 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_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_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)")

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 18e9cf6f23b6c745305d226d6a940df80ff2e090..3f18027037c1fe01410067f58b39bfa779ae484f 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -174,6 +174,7 @@ RECEIVE_DATA(TECPEL_DMM_8060_SER, fs9721)
 RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721)
 RECEIVE_DATA(VOLTCRAFT_M3650D, metex14)
 RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC830_SER, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61E_SER, es51922)

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index e608c85c14897e0b56d2e49740a307879015e4a3..51cdc0435d04bb30cb46787ec4d0059e5ba1dcc7 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -47,12 +47,13 @@ enum {
        TECPEL_DMM_8061_SER,
        VOLTCRAFT_M3650D,
        VOLTCRAFT_VC820_SER,
+       VOLTCRAFT_VC830_SER,
        VOLTCRAFT_VC840_SER,
        UNI_T_UT61D_SER,
        UNI_T_UT61E_SER,
 };
 
-#define DMM_COUNT 19
+#define DMM_COUNT 20
 
 struct dmm_info {
        char *vendor;
@@ -110,6 +111,7 @@ 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_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_VC830_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);

diff --git a/hwdriver.c b/hwdriver.c
index d9a0273cdc44350978b8105578b3ac5353708c8b..22e94e668ccef5387dbeca8e093bf2f7f9e49e05 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -182,6 +182,7 @@ 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 voltcraft_m3650d_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;
 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;
@@ -278,6 +279,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &tecpel_dmm_8061_ser_driver_info,
        &voltcraft_m3650d_driver_info,
        &voltcraft_vc820_ser_driver_info,
+       &voltcraft_vc830_ser_driver_info,
        &voltcraft_vc840_ser_driver_info,
        &uni_t_ut61d_ser_driver_info,
        &uni_t_ut61e_ser_driver_info,