From: Uwe Hermann <redacted>
Date: Sat, 22 Jun 2013 14:53:13 +0000 (+0200)
Subject: uni-t-dmm: Add support for the Voltcraft VC-830.
X-Git-Tag: libsigrok-0.2.1~42
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c134574938ef5746775ac62e10025da34d83ae47;p=libsigrok.git

uni-t-dmm: Add support for the Voltcraft VC-830.
---

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index f553b3ac..8968d876 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -42,6 +42,7 @@ SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 
 SR_PRIV struct dmm_info udmms[] = {
@@ -80,6 +81,13 @@ SR_PRIV struct dmm_info udmms[] = {
 		NULL,
 		&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
 	},
+	{
+		"Voltcraft", "VC-830", 2400,
+		FS9922_PACKET_SIZE, NULL,
+		sr_fs9922_packet_valid, sr_fs9922_parse,
+		NULL,
+		&voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
+	},
 	{
 		"Voltcraft", "VC-840", 2400,
 		FS9721_PACKET_SIZE, NULL,
@@ -340,4 +348,5 @@ DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
 DRV(uni_t_ut61d, UNI_T_UT61D, "uni-t-ut61d", "UNI-T UT61D")
 DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E")
 DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
+DRV(voltcraft_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830")
 DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")
diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index ec05822b..1344948c 100644
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -65,6 +65,7 @@
  *  - UNI-T UT61E: Cyrustek ES51922
  *  - UNI-T UT70B: ?
  *  - Voltcraft VC-820: Fortune Semiconductor FS9721_LP3
+ *  - Voltcraft VC-830: Fortune Semiconductor FS9922-DMM4
  *  - Voltcraft VC-840: Fortune Semiconductor FS9721_LP3
  *  - ...
  */
@@ -307,4 +308,5 @@ RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
 RECEIVE_DATA(UNI_T_UT61D, fs9922)
 RECEIVE_DATA(UNI_T_UT61E, es51922)
 RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)
diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index 62759673..709ca20e 100644
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -43,10 +43,11 @@ enum {
 	UNI_T_UT61D,
 	UNI_T_UT61E,
 	VOLTCRAFT_VC820,
+	VOLTCRAFT_VC830,
 	VOLTCRAFT_VC840,
 };
 
-#define DMM_COUNT 6
+#define DMM_COUNT 7
 
 struct dmm_info {
 	char *vendor;
@@ -96,6 +97,7 @@ SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC830(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
 
 #endif
diff --git a/hwdriver.c b/hwdriver.c
index 22e94e66..3ef19a2e 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -193,6 +193,7 @@ extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 #endif
 /** @endcond */
@@ -290,6 +291,7 @@ static struct sr_dev_driver *drivers_list[] = {
 	&uni_t_ut61d_driver_info,
 	&uni_t_ut61e_driver_info,
 	&voltcraft_vc820_driver_info,
+	&voltcraft_vc830_driver_info,
 	&voltcraft_vc840_driver_info,
 #endif
 	NULL,