X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=62001a5b8f98e8d9edd4636bab2193d2c822e869;hb=21d464a7e53efc9ac9810d9301a12b6a56fdb061;hp=3b3082844cc4dad70cd20248f0c49da19f82a7b3;hpb=4c22355f046fefff812042ef9764199df17fb809;p=libsigrok.git diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index 3b308284..62001a5b 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -39,6 +39,7 @@ static const int32_t hwcaps[] = { SR_CONF_HOLD_MAX, SR_CONF_HOLD_MIN, SR_CONF_POWER_OFF, + SR_CONF_DATA_SOURCE, }; static const char *weight_freq[] = { @@ -58,6 +59,10 @@ static const uint64_t meas_ranges[][2] = { { 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; @@ -112,6 +117,8 @@ 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; @@ -137,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) @@ -236,6 +239,12 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi) 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; } @@ -313,6 +322,16 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) 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; } @@ -355,6 +374,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) } *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; }