scpi-pps: don't break SCPI devices when scanning for HP-IB devices

[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 8fa49b66a2b409211f34975eb8645f23d6eaebcf..aa5b945a3349cee0573491709d304efa424ccdc7 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -254,6 +254,17 @@ static GSList *scan_scpi_pps(struct sr_dev_driver *di, GSList *options)
 
 static GSList *scan_hpib_pps(struct sr_dev_driver *di, GSList *options)
 {
+       const char *conn;
+
+       /*
+        * Only scan for HP-IB devices when conn= was specified, to not
+        * break SCPI devices' operation.
+        */
+       conn = NULL;
+       (void)sr_serial_extract_options(options, &conn, NULL);
+       if (!conn)
+               return NULL;
+
        return sr_scpi_scan(di->context, options, probe_hpib_pps_device);
 }
 
@@ -333,6 +344,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 +403,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 +440,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 +474,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 +541,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 +605,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);