scpi-pps: Add support for Owon P4000 series.

[libsigrok.git] / src / hardware / scpi-pps / api.c

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 2ea124a12926e5ca022d854f6b2c7895649ad7a2..ed9fbd9db20661a0c7b472e2741c39a89f17f560 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -153,7 +153,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
                                        ch = l->data;
                                        pch = ch->priv;
                                        /* Add mqflags from channel_group_spec only to voltage
-                                        * and current channels
+                                        * and current channels.
                                         */
                                        if (pch->mq == SR_MQ_VOLTAGE || pch->mq == SR_MQ_CURRENT)
                                                pch->mqflags = cgs->mqflags;
@@ -173,7 +173,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
        sr_scpi_hw_info_free(hw_info);
        hw_info = NULL;
 
-       /* Don't send SCPI_CMD_LOCAL for HP 66xxB devices using SCPI over GPIB */
+       /* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
        if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
                        scpi->transport == SCPI_TRANSPORT_LIBGPIB))
                sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
@@ -269,7 +269,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       /* Don't send SCPI_CMD_REMOTE for HP 66xxB devices using SCPI over GPIB */
+       /* Don't send SCPI_CMD_REMOTE for HP 66xxB using SCPI over GPIB. */
        if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
                        scpi->transport == SCPI_TRANSPORT_LIBGPIB))
                sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE);
@@ -303,7 +303,7 @@ static int dev_close(struct sr_dev_inst *sdi)
                sr_scpi_cmd(sdi, devc->device->commands,
                        0, NULL, SCPI_CMD_BEEPER_ENABLE);
 
-       /* Don't send SCPI_CMD_LOCAL for HP 66xxB devices using SCPI over GPIB */
+       /* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
        if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
                        scpi->transport == SCPI_TRANSPORT_LIBGPIB))
                sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
@@ -333,6 +333,7 @@ static int config_get(uint32_t key, GVariant **data,
        int cmd, ret;
        const char *s;
        int reg;
+       gboolean is_hmp_sqii;
 
        if (!sdi)
                return SR_ERR_ARG;
@@ -391,6 +392,11 @@ static int config_get(uint32_t key, GVariant **data,
                cmd = SCPI_CMD_GET_CURRENT_LIMIT;
                break;
        case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
+               if (devc->device->dialect == SCPI_DIALECT_HMP) {
+                       /* OVP is always enabled. */
+                       *data = g_variant_new_boolean(TRUE);
+                       return 0;
+               }
                gvtype = G_VARIANT_TYPE_BOOLEAN;
                cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED;
                break;
@@ -423,12 +429,18 @@ static int config_get(uint32_t key, GVariant **data,
                cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD;
                break;
        case SR_CONF_OVER_TEMPERATURE_PROTECTION:
+               if (devc->device->dialect == SCPI_DIALECT_HMP) {
+                       /* OTP is always enabled. */
+                       *data = g_variant_new_boolean(TRUE);
+                       return 0;
+               }
                gvtype = G_VARIANT_TYPE_BOOLEAN;
                cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION;
                break;
        case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
-                       devc->device->dialect == SCPI_DIALECT_HP_COMP)
+                       devc->device->dialect == SCPI_DIALECT_HP_COMP ||
+                       devc->device->dialect == SCPI_DIALECT_HMP)
                        gvtype = G_VARIANT_TYPE_STRING;
                else
                        gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -451,8 +463,22 @@ static int config_get(uint32_t key, GVariant **data,
                channel_group_name = g_strdup(cg->name);
        }
 
-       ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
-               channel_group_cmd, channel_group_name, data, gvtype, cmd);
+       is_hmp_sqii = FALSE;
+       is_hmp_sqii |= cmd == SCPI_CMD_GET_OUTPUT_REGULATION;
+       is_hmp_sqii |= cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE;
+       is_hmp_sqii &= devc->device->dialect == SCPI_DIALECT_HMP;
+       if (is_hmp_sqii) {
+               if (!cg) {
+                       /* STAT:QUES:INST:ISUMx query requires channel spec. */
+                       sr_err("Need a channel group for regulation or OTP-active query.");
+                       return SR_ERR_NA;
+               }
+               ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+                       0, NULL, data, gvtype, cmd, channel_group_name);
+       } else {
+               ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+                       channel_group_cmd, channel_group_name, data, gvtype, cmd);
+       }
        g_free(channel_group_name);
 
        /*
@@ -504,6 +530,18 @@ static int config_get(uint32_t key, GVariant **data,
                        else
                                *data = g_variant_new_string("UR");
                }
+               if (devc->device->dialect == SCPI_DIALECT_HMP) {
+                       /* Evaluate Condition Status Register from a HMP series device. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       if (reg & (1 << 0))
+                               *data = g_variant_new_string("CC");
+                       else if (reg & (1 << 1))
+                               *data = g_variant_new_string("CV");
+                       else
+                               *data = g_variant_new_string("UR");
+               }
 
                s = g_variant_get_string(*data, NULL);
                if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") && g_strcmp0(s, "CC-") &&
@@ -556,7 +594,8 @@ static int config_get(uint32_t key, GVariant **data,
                        g_variant_unref(*data);
                        *data = g_variant_new_boolean(reg & (1 << 4));
                }
-               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+                   devc->device->dialect == SCPI_DIALECT_HMP) {
                        /* Evaluate Questionable Status Register bit 4 from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
                        sr_atoi(s, &reg);
@@ -674,6 +713,7 @@ static int config_list(uint32_t key, GVariant **data,
 {
        struct dev_context *devc;
        struct sr_channel *ch;
+       struct pps_channel *pch;
        const struct channel_spec *ch_spec;
        int i;
        const char *s[16];
@@ -721,9 +761,10 @@ static int config_list(uint32_t key, GVariant **data,
                 * specification for use in series or parallel mode.
                 */
                ch = cg->channels->data;
+               pch = ch->priv;
                if (!devc || !devc->device)
                        return SR_ERR_ARG;
-               ch_spec = &(devc->device->channels[ch->index]);
+               ch_spec = &(devc->device->channels[pch->hw_output_idx]);
 
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS: