X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=521616f96240bcfd58d77156d37a34b1dae540f9;hb=7532f61d1ba618e76628f6ea3db07f6dad7a751e;hp=a272cca29b8495e7dfc2af7b4ca3c4691faccda0;hpb=b0baddef5620c5783080d0e8811e668fbc2b38f5;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index a272cca2..521616f9 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -48,7 +48,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) GSList *l, *devices; const char *conn, *serialcomm; struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; struct sr_serial_dev_inst *serial; int dropped, ret; @@ -82,7 +81,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sr_info("Probing serial port %s.", conn); - drvc = di->context; devices = NULL; serial_flush(serial); @@ -130,15 +128,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; sdi->priv = devc; - sdi->driver = di; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); scan_cleanup: serial_close(serial); - return devices; + return std_scan_complete(di, devices); } static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, @@ -189,7 +185,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc = sdi->priv; sr_sw_limits_acquisition_start(&devc->limits); - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* Poll every 50ms, or whenever some data comes in. */ serial = sdi->conn; @@ -199,15 +195,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi) -{ - return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close, - sdi->conn, LOG_PREFIX); -} - #define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \ DELAY, REQUEST, VALID, PARSE, DETAILS) \ - &(struct dmm_info) { \ + &((struct dmm_info) { \ { \ .name = ID, \ .longname = VENDOR " " MODEL, \ @@ -222,14 +212,83 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) .dev_open = std_serial_dev_open, \ .dev_close = std_serial_dev_close, \ .dev_acquisition_start = dev_acquisition_start, \ - .dev_acquisition_stop = dev_acquisition_stop, \ + .dev_acquisition_stop = std_serial_dev_acquisition_stop, \ .context = NULL, \ }, \ VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \ REQUEST, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \ - } + }).di -SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { +SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, + /* + * The items are sorted by chipset first and then model name. + * + * This reflects the developer's perspective and is preferrable + * during maintenance, as a vendor/product based sort order does + * not work well for rebranded models, and from a support point + * of view it's more important to identify similarities between + * models and compatible devices. + * + * Fold marks {{{ }}} with matching braces were added, to further + * speed up navigation in the long list. + */ + /* bm25x based meters {{{ */ + DMM( + "brymen-bm25x", bm25x, + "Brymen", "BM25x", "9600/8n1/rts=1/dtr=1", + 9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL, + sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse, + NULL + ), + /* }}} */ + /* dtm0660 based meters {{{ */ + DMM( + "peaktech-3415", dtm0660, + "Peaktech", "3415", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), + DMM( + "velleman-dvm4100", dtm0660, + "Velleman", "DVM4100", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), + /* }}} */ + /* es519xx based meters {{{ */ + DMM( + "iso-tech-idm103n", es519xx, + "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", + 2400, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, + NULL + ), + DMM( + "tenma-72-7750-ser", es519xx, + /* Note: ES51986 baudrate is actually 19230! */ + "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, + NULL + ), + DMM( + /* Note: ES51986 baudrate is actually 19230! */ + "uni-t-ut60g-ser", es519xx, + "UNI-T", "UT60G (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, + NULL + ), + DMM( + "uni-t-ut61e-ser", es519xx, + /* Note: ES51922 baudrate is actually 19230! */ + "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_14B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, + NULL + ), + /* }}} */ + /* meters based on other chips (to get sorted) */ DMM( "bbcgm-2010", metex14, "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, @@ -441,14 +500,6 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_00_temp_c ), - DMM( - /* Note: ES51986 baudrate is actually 19230! */ - "uni-t-ut60g-ser", es519xx, - "UNI-T", "UT60G (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, - NULL - ), DMM( "uni-t-ut61b-ser", fs9922, "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", @@ -467,14 +518,6 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { 2400, FS9922_PACKET_SIZE, 0, 0, NULL, sr_fs9922_packet_valid, sr_fs9922_parse, NULL ), - DMM( - "uni-t-ut61e-ser", es519xx, - /* Note: ES51922 baudrate is actually 19230! */ - "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_14B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, - NULL - ), DMM( "uni-t-ut71a-ser", ut71x, "UNI-T", "UT71A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", @@ -505,13 +548,6 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), - DMM( - "iso-tech-idm103n", es519xx, - "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", - 2400, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, - NULL - ), DMM( "tenma-72-7730-ser", ut71x, "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", @@ -538,31 +574,10 @@ SR_PRIV const struct dmm_info *serial_dmm_drivers[] = { sr_fs9721_00_temp_c ), DMM( - "tenma-72-7750-ser", es519xx, - /* Note: ES51986 baudrate is actually 19230! */ - "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, - NULL - ), - DMM( - "brymen-bm25x", bm25x, - "Brymen", "BM25x", "9600/8n1/rts=1/dtr=1", - 9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL, - sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse, - NULL - ), - DMM( - "velleman-dvm4100", dtm0660, - "Velleman", "DVM4100", "2400/8n1/rts=0/dtr=1", - 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, - sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL - ), - DMM( - "peaktech-3415", dtm0660, - "Peaktech", "3415", "2400/8n1/rts=0/dtr=1", - 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, - sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + "peaktech-3330", fs9721, + "Peaktech", "3330", "2400/8n1/dtr=1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_01_10_temp_f_c ), - NULL -}; +);