scpi-pps: Fix "aquisition" typo everywhere.

[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 104a020d84e06859f716b0603963a8f81f32fd89..2ea124a12926e5ca022d854f6b2c7895649ad7a2 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -173,7 +173,10 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
        sr_scpi_hw_info_free(hw_info);
        hw_info = NULL;
 
-       sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
+       /* Don't send SCPI_CMD_LOCAL for HP 66xxB devices 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);
 
        return sdi;
 }
@@ -265,7 +268,12 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
 
        devc = sdi->priv;
-       sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE);
+
+       /* Don't send SCPI_CMD_REMOTE for HP 66xxB devices 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);
+
        devc->beeper_was_set = FALSE;
        if (sr_scpi_cmd_resp(sdi, devc->device->commands, 0, NULL,
                        &beeper, G_VARIANT_TYPE_BOOLEAN, SCPI_CMD_BEEPER) == SR_OK) {
@@ -294,7 +302,11 @@ static int dev_close(struct sr_dev_inst *sdi)
        if (devc->beeper_was_set)
                sr_scpi_cmd(sdi, devc->device->commands,
                        0, NULL, SCPI_CMD_BEEPER_ENABLE);
-       sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
+
+       /* Don't send SCPI_CMD_LOCAL for HP 66xxB devices 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);
 
        return sr_scpi_close(scpi);
 }
@@ -383,7 +395,8 @@ static int config_get(uint32_t key, GVariant **data,
                cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED;
                break;
        case SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE:
-               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB)
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+                       devc->device->dialect == SCPI_DIALECT_HP_COMP)
                        gvtype = G_VARIANT_TYPE_STRING;
                else
                        gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -398,7 +411,8 @@ static int config_get(uint32_t key, GVariant **data,
                cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED;
                break;
        case SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE:
-               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB)
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+                       devc->device->dialect == SCPI_DIALECT_HP_COMP)
                        gvtype = G_VARIANT_TYPE_STRING;
                else
                        gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -413,7 +427,8 @@ static int config_get(uint32_t key, GVariant **data,
                cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION;
                break;
        case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
-               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB)
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+                       devc->device->dialect == SCPI_DIALECT_HP_COMP)
                        gvtype = G_VARIANT_TYPE_STRING;
                else
                        gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -459,6 +474,22 @@ static int config_get(uint32_t key, GVariant **data,
                                *data = g_variant_new_string("CC");
                        }
                }
+               if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+                       /* Evaluate Status Register from a HP 66xx in COMP mode. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       if (reg & (1 << 0))
+                               *data = g_variant_new_string("CV");
+                       else if (reg & (1 << 1))
+                               *data = g_variant_new_string("CC");
+                       else if (reg & (1 << 2))
+                               *data = g_variant_new_string("UR");
+                       else if (reg & (1 << 9))
+                               *data = g_variant_new_string("CC-");
+                       else
+                               *data = g_variant_new_string("");
+               }
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
                        /* Evaluate Operational Status Register from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
@@ -475,8 +506,8 @@ static int config_get(uint32_t key, GVariant **data,
                }
 
                s = g_variant_get_string(*data, NULL);
-               if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") &&
-                       g_strcmp0(s, "CC-") && g_strcmp0(s, "UR")) {
+               if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") && g_strcmp0(s, "CC-") &&
+                       g_strcmp0(s, "UR") && g_strcmp0(s, "")) {
 
                        sr_err("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
                        ret = SR_ERR_DATA;
@@ -484,6 +515,13 @@ static int config_get(uint32_t key, GVariant **data,
        }
 
        if (cmd == SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE) {
+               if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+                       /* Evaluate Status Register from a HP 66xx in COMP mode. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 3));
+               }
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
                        /* Evaluate Questionable Status Register bit 0 from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
@@ -494,6 +532,13 @@ static int config_get(uint32_t key, GVariant **data,
        }
 
        if (cmd == SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE) {
+               if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+                       /* Evaluate Status Register from a HP 66xx in COMP mode. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 6));
+               }
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
                        /* Evaluate Questionable Status Register bit 1 from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
@@ -504,6 +549,13 @@ static int config_get(uint32_t key, GVariant **data,
        }
 
        if (cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE) {
+               if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+                       /* Evaluate Status Register from a HP 66xx in COMP mode. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 4));
+               }
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
                        /* Evaluate Questionable Status Register bit 4 from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
@@ -712,9 +764,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        /* Prime the pipe with the first channel. */
        devc->cur_acquisition_channel = sr_next_enabled_channel(sdi, NULL);
 
-       /* Device specific initialization before aquisition starts. */
-       if (devc->device->init_aquisition)
-               devc->device->init_aquisition(sdi);
+       /* Device specific initialization before acquisition starts. */
+       if (devc->device->init_acquisition)
+               devc->device->init_acquisition(sdi);
 
        if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
                        scpi_pps_receive_data, (void *)sdi)) != SR_OK)