Use GET_REPORT request for device to host transfer.

[libsigrok.git] / hardware / uni-t-dmm / protocol.c

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index a18c2e6c7c94fdaa8f54898f675fe7086fb5bb95..1344948c5aa28ab0f712644fadcca373d866dbe7 100644 (file)
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -51,6 +51,8 @@
  *  f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1)
  *
  * Chips and serial settings used in UNI-T DMMs (and rebranded ones):
+ *  - Tecpel DMM-8060: ? (very likely Fortune Semiconductor FS9721_LP3)
+ *  - Tecpel DMM-8061: ? (very likely Fortune Semiconductor FS9721_LP3)
  *  - UNI-T UT108: ?
  *  - UNI-T UT109: ?
  *  - UNI-T UT30A: ?
@@ -63,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
  *  - ...
  */
@@ -265,6 +268,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
        int ret;
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       int64_t time_ms;
 
        (void)fd;
        (void)revents;
@@ -281,6 +285,15 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
        }
 
+       if (devc->limit_msec) {
+               time_ms = (g_get_monotonic_time() - devc->starttime) / 1000;
+               if (time_ms > (int64_t)devc->limit_msec) {
+                       sr_info("Requested time limit reached.");
+                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       return TRUE;
+               }
+       }
+
        return TRUE;
 }
 
@@ -290,5 +303,10 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
        return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
 
 /* Driver-specific receive_data() wrappers */
+RECEIVE_DATA(TECPEL_DMM_8060, fs9721)
+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)