X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=88e3b88aef6b8974208a473313b558d8cc5b53e5;hb=48e2992f8684ece7200fc9aabc2bf45625be8ef0;hp=f23e96caf7d19fae8a19d85ad25aa32afe0947d8;hpb=9456d63610dfda13f928358ec94c9f6995a47338;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index f23e96ca..88e3b88a 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -137,7 +137,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (dmm->packet_parse == sr_metex14_4packets_parse) dmm->channel_count = 4; for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) { - snprintf(ch_name, sizeof(ch_name), "P%zu", ch_idx); + size_t ch_num; + ch_num = ch_idx + 1; + snprintf(ch_name, sizeof(ch_name), "P%zu", ch_num); sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name); } devices = g_slist_append(devices, sdi); @@ -579,13 +581,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), - DMM( - "voltcraft-vc96", vc96, - "Voltcraft", "VC96", "1200/8n2", 1200, - VC96_PACKET_SIZE, 0, 0, NULL, - sr_vc96_packet_valid, sr_vc96_parse, - NULL - ), DMM( "uni-t-ut71c-ser", ut71x, "UNI-T", "UT71C (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", @@ -631,6 +626,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_vc870_packet_valid, sr_vc870_parse, NULL ), /* }}} */ + /* vc96 based meters {{{ */ + DMM( + "voltcraft-vc96", vc96, + "Voltcraft", "VC-96", "1200/8n2", 1200, + VC96_PACKET_SIZE, 0, 0, NULL, + sr_vc96_packet_valid, sr_vc96_parse, + NULL + ), + /* }}} */ /* * The list is sorted. Add new items in the respective chip's group. */