cem-dt-885x: Fix datalog on/off setting in max/min hold mode

[libsigrok.git] / hardware / cem-dt-885x / api.c

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 68e2f023ddfe3872f2a38b231df29731cabd6940..640559149254852c85d853590a2e850a7bf45fec 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include "protocol.h"
 
 #define SERIALCOMM "9600/8n1"
@@ -31,8 +32,22 @@ 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_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;
@@ -85,6 +100,8 @@ static GSList *scan(GSList *options)
                                sr_dbg("Device context malloc failed.");
                                return NULL;
                        }
+                       devc->cur_mqflags = 0;
+                       devc->recording = -1;
 
                        if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
                                return NULL;
@@ -92,7 +109,7 @@ static GSList *scan(GSList *options)
                        sdi->inst_type = SR_INST_SERIAL;
                        sdi->priv = devc;
                        sdi->driver = di;
-                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+                       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "SPL")))
                                return NULL;
                        sdi->probes = g_slist_append(sdi->probes, probe);
                        drvc->instances = g_slist_append(drvc->instances, sdi);
@@ -156,27 +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:
+               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;
@@ -193,6 +243,39 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
                devc->limit_samples = tmp_u64;
                ret = SR_OK;
                break;
+       case SR_CONF_DATALOG:
+               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;
        }
@@ -216,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;
        }
@@ -223,17 +312,31 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-                                   void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
-       (void)sdi;
-       (void)cb_data;
+       struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       /* TODO: configure hardware, reset acquisition state, set up
-        * callbacks and send header packet. */
+       if (!(devc = sdi->priv)) {
+               sr_err("sdi->priv was NULL.");
+               return SR_ERR_BUG;
+       }
+
+       devc->cb_data = cb_data;
+       devc->state = ST_INIT;
+       devc->num_samples = 0;
+       devc->buf_len = 0;
+
+       /* Send header packet to the session bus. */
+       std_session_send_df_header(cb_data, LOG_PREFIX);
+
+       /* Poll every 100ms, or whenever some data comes in. */
+       serial = sdi->conn;
+       sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data,
+                       (void *)sdi);
 
        return SR_OK;
 }
@@ -245,7 +348,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       /* TODO: stop acquisition. */
+       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+                       sdi->conn, LOG_PREFIX);
 
        return SR_OK;
 }