X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Funi-t-ut181a%2Fapi.c;h=53fdf18cf9d59300e688641325b3a6d1a4116488;hb=b503d24cdf56abf8c0d66d438ccac28969f01670;hp=0beb2245cf405bc4a53534125e80825d90209452;hpb=ebc51109899008694c50977cb2574050b1bc0c89;p=libsigrok.git diff --git a/src/hardware/uni-t-ut181a/api.c b/src/hardware/uni-t-ut181a/api.c index 0beb2245..53fdf18c 100644 --- a/src/hardware/uni-t-ut181a/api.c +++ b/src/hardware/uni-t-ut181a/api.c @@ -37,7 +37,8 @@ static const uint32_t devopts[] = { SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_DATALOG | SR_CONF_GET, + SR_CONF_DATALOG | SR_CONF_GET | SR_CONF_SET, + /* TODO SR_CONF_DATALOG is bool only, how to setup interval/duration? */ SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; @@ -202,7 +203,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) serial = sr_serial_dev_inst_new(conn, serialcomm); ret = serial_open(serial, SERIAL_RDWR); snprintf(conn_id, sizeof(conn_id), "%s", serial->port); - serial_flush(serial); /* * We cannot identify the device at this point in time. * Successful open shall suffice for now. More activity @@ -335,6 +335,7 @@ static int config_set(uint32_t key, GVariant *data, { struct dev_context *devc; ssize_t idx; + gboolean on; GVariant *tuple_child; enum sr_mq mq; enum sr_mqflag mqflags; @@ -377,6 +378,22 @@ static int config_set(uint32_t key, GVariant *data, return SR_ERR_ARG; devc->data_source = DATA_SOURCE_REC_FIRST + rec_no - 1; break; + case SR_CONF_DATALOG: + if (!devc) + return SR_ERR_ARG; + on = g_variant_get_boolean(data); + sr_err("DIAG: record start/stop %d, currently ENOIMPL", on); + return SR_ERR_NA; + /* + * TODO Send command 0x0a (start) or 0x0b (stop). Though + * start needs a name (ymd timestamp?) and interval and + * duration (arbitrary choice? 1s for 1d?). Or shall this + * SET request control "save" items instead? Take one + * sample each for every 'datalog=on' request? Combine + * limit_samples and limit_msec with datalog to configure + * a recording's parameters? + */ + break; case SR_CONF_MEASURED_QUANTITY: if (!devc) return SR_ERR_ARG; @@ -514,6 +531,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->info.rec_data.samples_total = devc->wait_state.data_value; devc->info.rec_data.samples_curr = 0; ret = ut181a_send_cmd_get_rec_samples(serial, rec_idx, 0); + } else { + sr_err("Unhandled data source %d, programming error?", + (int)devc->data_source); + ret = SR_ERR_BUG; } if (ret < 0) return ret;