X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=6628d93d421d62c8a0e17cbf3a76ece6feb8fa2c;hb=66a435766721dd6ecdbce7b31a2f43c2e0752a12;hp=f2329c38c229de7ca33ce1fc56114bf742155a35;hpb=a90e480cdc808d0c91eecc6b5078e745a751882b;p=libsigrok.git diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index f2329c38..6628d93d 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -32,11 +32,14 @@ static const int32_t hwcaps[] = { SR_CONF_SOUNDLEVELMETER, SR_CONF_LIMIT_SAMPLES, SR_CONF_CONTINUOUS, - SR_CONF_DATALOG, SR_CONF_SPL_WEIGHT_FREQ, SR_CONF_SPL_WEIGHT_TIME, + SR_CONF_SPL_MEASUREMENT_RANGE, + SR_CONF_DATALOG, SR_CONF_HOLD_MAX, SR_CONF_HOLD_MIN, + SR_CONF_POWER_OFF, + SR_CONF_DATA_SOURCE, }; static const char *weight_freq[] = { @@ -49,6 +52,17 @@ static const char *weight_time[] = { "S", }; +static const uint64_t meas_ranges[][2] = { + { 30, 130 }, + { 30, 80 }, + { 50, 100 }, + { 80, 130 }, +}; + +static const char *data_sources[] = { + "Live", + "Memory", +}; SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info; static struct sr_dev_driver *di = &cem_dt_885x_driver_info; @@ -102,6 +116,9 @@ static GSList *scan(GSList *options) } devc->cur_mqflags = 0; devc->recording = -1; + devc->cur_meas_range = 0; + devc->cur_data_source = DATA_SOURCE_LIVE; + devc->enable_data_source_memory = FALSE; if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM))) return NULL; @@ -127,11 +144,7 @@ static GSList *scan(GSList *options) static GSList *dev_list(void) { - struct drv_context *drvc; - - drvc = di->priv; - - return drvc->instances; + return ((struct drv_context *)(di->priv))->instances; } static int dev_clear(void) @@ -170,11 +183,16 @@ static int cleanup(void) return dev_clear(); } -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; + GVariant *range[2]; + uint64_t low, high; int tmp, ret; + (void)probe_group; + if (!sdi) return SR_ERR_ARG; @@ -185,7 +203,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) *data = g_variant_new_uint64(devc->limit_samples); break; case SR_CONF_DATALOG: - *data = g_variant_new_boolean(cem_dt_885x_recording_get(sdi)); + if ((ret = cem_dt_885x_recording_get(sdi, &tmp)) == SR_OK) + *data = g_variant_new_boolean(tmp); break; case SR_CONF_SPL_WEIGHT_FREQ: tmp = cem_dt_885x_weight_freq_get(sdi); @@ -213,6 +232,22 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK) *data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN); break; + case SR_CONF_SPL_MEASUREMENT_RANGE: + if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) { + range[0] = g_variant_new_uint64(low); + range[1] = g_variant_new_uint64(high); + *data = g_variant_new_tuple(range, 2); + } + break; + case SR_CONF_POWER_OFF: + *data = g_variant_new_boolean(FALSE); + break; + case SR_CONF_DATA_SOURCE: + if (devc->cur_data_source == DATA_SOURCE_LIVE) + *data = g_variant_new_string("Live"); + else + *data = g_variant_new_string("Memory"); + break; default: return SR_ERR_NA; } @@ -220,13 +255,17 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) return ret; } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) +static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { struct dev_context *devc; - uint64_t tmp_u64; + uint64_t tmp_u64, low, high; + unsigned int i; int tmp, ret; const char *tmp_str; + (void)probe_group; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -243,13 +282,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) ret = SR_OK; break; case SR_CONF_DATALOG: - if (g_variant_get_boolean(data)) { - /* Start logging. */ - ret = cem_dt_885x_recording_set(sdi, TRUE); - } else { - /* Stop logging. */ - ret = cem_dt_885x_recording_set(sdi, FALSE); - } + ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data)); break; case SR_CONF_SPL_WEIGHT_FREQ: tmp_str = g_variant_get_string(data, NULL); @@ -281,6 +314,30 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0; ret = cem_dt_885x_holdmode_set(sdi, tmp); break; + case SR_CONF_SPL_MEASUREMENT_RANGE: + g_variant_get(data, "(tt)", &low, &high); + ret = SR_ERR_ARG; + for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) { + if (meas_ranges[i][0] == low && meas_ranges[i][1] == high) { + ret = cem_dt_885x_meas_range_set(sdi, low, high); + break; + } + } + break; + case SR_CONF_POWER_OFF: + if (g_variant_get_boolean(data)) + ret = cem_dt_885x_power_off(sdi); + break; + case SR_CONF_DATA_SOURCE: + tmp_str = g_variant_get_string(data, NULL); + if (!strcmp(tmp_str, "Live")) + devc->cur_data_source = DATA_SOURCE_LIVE; + else if (!strcmp(tmp_str, "Memory")) + devc->cur_data_source = DATA_SOURCE_MEMORY; + else + return SR_ERR; + devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY; + break; default: ret = SR_ERR_NA; } @@ -288,11 +345,16 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) return ret; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group) { + GVariant *tuple, *range[2]; + GVariantBuilder gvb; + unsigned int i; int ret; (void)sdi; + (void)probe_group; ret = SR_OK; switch (key) { @@ -310,6 +372,19 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) case SR_CONF_SPL_WEIGHT_TIME: *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time)); break; + case SR_CONF_SPL_MEASUREMENT_RANGE: + g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); + for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) { + range[0] = g_variant_new_uint64(meas_ranges[i][0]); + range[1] = g_variant_new_uint64(meas_ranges[i][1]); + tuple = g_variant_new_tuple(range, 2); + g_variant_builder_add_value(&gvb, tuple); + } + *data = g_variant_builder_end(&gvb); + break; + case SR_CONF_DATA_SOURCE: + *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources)); + break; default: return SR_ERR_NA; }