Remove some unneeded double-spaces.

[libsigrok.git] / src / hardware / rigol-ds / protocol.c

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 0ce3a11cbae6ea19c12f938ca48f0e6bd3151fcf..77af43e94d3d3af4f7bdc93a693dd9f781d03c61 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -221,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
                return SR_OK;
 
        if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-                         ch->index + 1) != SR_OK)
+                       ch->index + 1) != SR_OK)
                return SR_ERR;
        /* Check that the number of samples will be accepted */
        if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
@@ -432,7 +432,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
                break;
        case PROTOCOL_V3:
                if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-                                 ch->index + 1) != SR_OK)
+                               ch->index + 1) != SR_OK)
                        return SR_ERR;
                if (devc->data_source != DATA_SOURCE_LIVE) {
                        if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
@@ -672,7 +672,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                else
                        for (i = 0; i < len; i++)
                                devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
-               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+               float vdivlog = log10f(vdiv);
+               int digits = -(int)vdivlog + (vdivlog < 0.0);
+               sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
                analog.meaning->channels = g_slist_append(NULL, ch);
                analog.num_samples = len;
                analog.data = devc->data;
@@ -769,6 +771,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_channel *ch;
        char *cmd;
        unsigned int i;
        int res;
@@ -782,6 +785,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                g_free(cmd);
                if (res != SR_OK)
                        return SR_ERR;
+               ch = g_slist_nth_data(sdi->channels, i);
+               ch->enabled = devc->analog_channels[i];
        }
        sr_dbg("Current analog channel state:");
        for (i = 0; i < devc->model->analog_channels; i++)
@@ -804,6 +809,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                        g_free(cmd);
                        if (res != SR_OK)
                                return SR_ERR;
+                       ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels);
+                       ch->enabled = devc->digital_channels[i];
                        sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
                }
        }
@@ -813,29 +820,21 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                return SR_ERR;
        sr_dbg("Current timebase %g", devc->timebase);
 
-       /* Vertical gain. */
+       /* Probe attenuation. */
        for (i = 0; i < devc->model->analog_channels; i++) {
-               cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
-               res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
+               cmd = g_strdup_printf(":CHAN%d:PROB?", i + 1);
+               res = sr_scpi_get_float(sdi->conn, cmd, &devc->attenuation[i]);
                g_free(cmd);
                if (res != SR_OK)
                        return SR_ERR;
        }
-       sr_dbg("Current vertical gain:");
+       sr_dbg("Current probe attenuation:");
        for (i = 0; i < devc->model->analog_channels; i++)
-               sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+               sr_dbg("CH%d %g", i + 1, devc->attenuation[i]);
 
-       /* Vertical offset. */
-       for (i = 0; i < devc->model->analog_channels; i++) {
-               cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
-               res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
-               g_free(cmd);
-               if (res != SR_OK)
-                       return SR_ERR;
-       }
-       sr_dbg("Current vertical offset:");
-       for (i = 0; i < devc->model->analog_channels; i++)
-               sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+       /* Vertical gain and offset. */
+       if (rigol_ds_get_dev_cfg_vertical(sdi) != SR_OK)
+               return SR_ERR;
 
        /* Coupling. */
        for (i = 0; i < devc->model->analog_channels; i++) {
@@ -864,5 +863,46 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                return SR_ERR;
        sr_dbg("Current trigger slope %s", devc->trigger_slope);
 
+       /* Trigger level. */
+       if (sr_scpi_get_float(sdi->conn, ":TRIG:EDGE:LEV?", &devc->trigger_level) != SR_OK)
+               return SR_ERR;
+       sr_dbg("Current trigger level %g", devc->trigger_level);
+
+       return SR_OK;
+}
+
+SR_PRIV int rigol_ds_get_dev_cfg_vertical(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc;
+       char *cmd;
+       unsigned int i;
+       int res;
+
+       devc = sdi->priv;
+
+       /* Vertical gain. */
+       for (i = 0; i < devc->model->analog_channels; i++) {
+               cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
+               res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
+               g_free(cmd);
+               if (res != SR_OK)
+                       return SR_ERR;
+       }
+       sr_dbg("Current vertical gain:");
+       for (i = 0; i < devc->model->analog_channels; i++)
+               sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+
+       /* Vertical offset. */
+       for (i = 0; i < devc->model->analog_channels; i++) {
+               cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
+               res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
+               g_free(cmd);
+               if (res != SR_OK)
+                       return SR_ERR;
+       }
+       sr_dbg("Current vertical offset:");
+       for (i = 0; i < devc->model->analog_channels; i++)
+               sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+
        return SR_OK;
 }