output/csv: use intermediate time_t var, silence compiler warning

[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..116a5d467c5bde9b182f69f71e5adca181e88e8d 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -145,8 +145,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
 
        for (i = 0; i < num_channel_groups; i++) {
                cgs = &channel_groups[i];
-               cg = g_malloc0(sizeof(struct sr_channel_group));
-               cg->name = g_strdup(cgs->name);
+               cg = sr_channel_group_new(sdi, cgs->name, NULL);
                for (j = 0, mask = 1; j < 64; j++, mask <<= 1) {
                        if (cgs->channel_index_mask & mask) {
                                for (l = sdi->channels; l; l = l->next) {
@@ -167,7 +166,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
                pcg = g_malloc0(sizeof(struct pps_channel_group));
                pcg->features = cgs->features;
                cg->priv = pcg;
-               sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
        }
 
        sr_scpi_hw_info_free(hw_info);
@@ -254,6 +252,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 +342,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 +401,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;
@@ -422,13 +437,23 @@ static int config_get(uint32_t key, GVariant **data,
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD;
                break;
+       case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+               gvtype = G_VARIANT_TYPE_DOUBLE;
+               cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_DELAY;
+               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 +476,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 +543,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 +607,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);
@@ -650,6 +702,12 @@ static int config_set(uint32_t key, GVariant *data,
                                channel_group_cmd, channel_group_name,
                                SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d);
                break;
+       case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+               d = g_variant_get_double(data);
+               ret = sr_scpi_cmd(sdi, devc->device->commands,
+                               channel_group_cmd, channel_group_name,
+                               SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DELAY, d);
+               break;
        case SR_CONF_OVER_TEMPERATURE_PROTECTION:
                if (g_variant_get_boolean(data))
                        ret = sr_scpi_cmd(sdi, devc->device->commands,
@@ -746,6 +804,9 @@ static int config_list(uint32_t key, GVariant **data,
                case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
                        *data = std_gvar_min_max_step_array(ch_spec->ocp);
                        break;
+               case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+                       *data = std_gvar_min_max_step_array(ch_spec->ocp_delay);
+                       break;
                default:
                        return SR_ERR_NA;
                }