X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=640559149254852c85d853590a2e850a7bf45fec;hb=8417ebad122cfade0f9ae6db6cbd8e7249156753;hp=e19ecc4f20e8e0d121411a3c0c040713224db253;hpb=e1af0e85b9b48b309f3552bceeed81d356735a33;p=libsigrok.git
diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index e19ecc4f..64055914 100644
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
#define SERIALCOMM "9600/8n1"
@@ -32,8 +33,21 @@ static const int32_t hwcaps[] = {
SR_CONF_LIMIT_SAMPLES,
SR_CONF_CONTINUOUS,
SR_CONF_DATALOG,
+ SR_CONF_SPL_WEIGHT_FREQ,
+ SR_CONF_SPL_WEIGHT_TIME,
+ SR_CONF_HOLD_MAX,
+ SR_CONF_HOLD_MIN,
};
+static const char *weight_freq[] = {
+ "A",
+ "C",
+};
+
+static const char *weight_time[] = {
+ "F",
+ "S",
+};
SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
@@ -159,30 +173,60 @@ static int cleanup(void)
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ int tmp, ret;
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
+ ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_SAMPLES:
*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);
+ if (tmp == SR_MQFLAG_SPL_FREQ_WEIGHT_A)
+ *data = g_variant_new_string("A");
+ else if (tmp == SR_MQFLAG_SPL_FREQ_WEIGHT_C)
+ *data = g_variant_new_string("C");
+ else
+ return SR_ERR;
+ break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ tmp = cem_dt_885x_weight_time_get(sdi);
+ if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_F)
+ *data = g_variant_new_string("F");
+ else if (tmp == SR_MQFLAG_SPL_TIME_WEIGHT_S)
+ *data = g_variant_new_string("S");
+ else
+ return SR_ERR;
+ break;
+ case SR_CONF_HOLD_MAX:
+ if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+ *data = g_variant_new_boolean(tmp == SR_MQFLAG_MAX);
+ break;
+ case SR_CONF_HOLD_MIN:
+ if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+ *data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
break;
default:
return SR_ERR_NA;
}
- return SR_OK;
+ return ret;
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
uint64_t tmp_u64;
- int ret;
+ int tmp, ret;
+ const char *tmp_str;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -200,13 +244,37 @@ 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);
+ if (!strcmp(tmp_str, "A"))
+ ret = cem_dt_885x_weight_freq_set(sdi,
+ SR_MQFLAG_SPL_FREQ_WEIGHT_A);
+ else if (!strcmp(tmp_str, "C"))
+ ret = cem_dt_885x_weight_freq_set(sdi,
+ SR_MQFLAG_SPL_FREQ_WEIGHT_C);
+ else
+ return SR_ERR_ARG;
+ break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ tmp_str = g_variant_get_string(data, NULL);
+ if (!strcmp(tmp_str, "F"))
+ ret = cem_dt_885x_weight_time_set(sdi,
+ SR_MQFLAG_SPL_TIME_WEIGHT_F);
+ else if (!strcmp(tmp_str, "S"))
+ ret = cem_dt_885x_weight_time_set(sdi,
+ SR_MQFLAG_SPL_TIME_WEIGHT_S);
+ else
+ return SR_ERR_ARG;
+ break;
+ case SR_CONF_HOLD_MAX:
+ tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0;
+ ret = cem_dt_885x_holdmode_set(sdi, tmp);
+ break;
+ case SR_CONF_HOLD_MIN:
+ tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0;
+ ret = cem_dt_885x_holdmode_set(sdi, tmp);
break;
default:
ret = SR_ERR_NA;
@@ -231,6 +299,12 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break;
+ case SR_CONF_SPL_WEIGHT_FREQ:
+ *data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
+ break;
+ case SR_CONF_SPL_WEIGHT_TIME:
+ *data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+ break;
default:
return SR_ERR_NA;
}