X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=bcff1913f5ee4d1e6db73e80acca88169dad6f75;hb=388aa0fb6bf70557115d1f301aae1560e8c643bb;hp=88e3b88aef6b8974208a473313b558d8cc5b53e5;hpb=48e2992f8684ece7200fc9aabc2bf45625be8ef0;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 88e3b88a..bcff1913 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -138,8 +138,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		dmm->channel_count = 4;
 	for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
 		size_t ch_num;
+		const char *fmt;
+		fmt = "P%zu";
+		if (dmm->channel_formats && dmm->channel_formats[ch_idx])
+			fmt = dmm->channel_formats[ch_idx];
 		ch_num = ch_idx + 1;
-		snprintf(ch_name, sizeof(ch_name), "P%zu", ch_num);
+		snprintf(ch_name, sizeof(ch_name), fmt, ch_num);
 		sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name);
 	}
 	devices = g_slist_append(devices, sdi);
@@ -207,7 +211,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 			.context = NULL, \
 		}, \
 		VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
-		REQUEST, 1, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
+		REQUEST, 1, NULL, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
 	}).di
 
 SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
@@ -410,6 +414,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		2400, FS9922_PACKET_SIZE, 0, 0, NULL,
 		sr_fs9922_packet_valid, sr_fs9922_parse, NULL
 	),
+	DMM(
+		"victor-dmm-ser", fs9922,
+		"Victor", "Victor DMMs (Mini-USB cable)", "2400/8n1",
+		2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+		sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+	),
 	DMM(
 		/*
 		 * Note: The VC830 doesn't set the 'volt' and 'diode' bits of