X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=ffafcd085efa6eb1c3176a4a99b4b0198a77713e;hp=a21663fca5f1d3f0f5f7f71a0bd3b7f90ba3460d;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7 diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c index a21663fc..ffafcd08 100644 --- a/src/hardware/uni-t-dmm/api.c +++ b/src/hardware/uni-t-dmm/api.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include @@ -198,10 +199,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->starttime = g_get_monotonic_time(); - /* Send header packet to the session bus. */ std_session_send_df_header(sdi, LOG_PREFIX); - sr_session_source_add(sdi->session, 0, 0, 10 /* poll_timeout */, + sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */, uni_t_dmm_receive_data, (void *)sdi); return SR_OK; @@ -209,18 +209,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) { - struct sr_datafeed_packet packet; - (void)cb_data; sr_dbg("Stopping acquisition."); - - /* Send end packet to the session bus. */ - sr_dbg("Sending SR_DF_END."); - packet.type = SR_DF_END; - sr_session_send(sdi, &packet); - - sr_session_source_remove(sdi->session, 0); + std_session_send_df_end(sdi, LOG_PREFIX); + sr_session_source_remove(sdi->session, -1); return SR_OK; } @@ -387,6 +380,24 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = { "Voltcraft", "VC-960", 2400, UT71X_PACKET_SIZE, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), + DMM( + "tenma-72-7730", ut71x, + "Tenma", "72-7730", 2400, + UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-7732", ut71x, + "Tenma", "72-7732", 2400, + UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-9380a", ut71x, + "Tenma", "72-9380A", 2400, + UT71X_PACKET_SIZE, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), DMM( "tenma-72-7745", es519xx, "Tenma", "72-7745", 2400,