scpi-pps: Implement init_acquisition() and update_status() for HP 66xxB power supplies.

[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 22c79740ed1fada6f042e2b644ebe6b16dd40e86..8fff5748d44208a49234b7c7b9362a19d5787f8e 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -2,7 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
- * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2017,2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -313,7 +313,7 @@ static int config_get(uint32_t key, GVariant **data,
        char *channel_group_name;
        int cmd, ret;
        const char *s;
-       int oper_cond;
+       int reg;
 
        if (!sdi)
                return SR_ERR_ARG;
@@ -376,7 +376,10 @@ 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:
-               gvtype = G_VARIANT_TYPE_BOOLEAN;
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB)
+                       gvtype = G_VARIANT_TYPE_STRING;
+               else
+                       gvtype = G_VARIANT_TYPE_BOOLEAN;
                cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE;
                break;
        case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
@@ -388,7 +391,10 @@ 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:
-               gvtype = G_VARIANT_TYPE_BOOLEAN;
+               if (devc->device->dialect == SCPI_DIALECT_HP_66XXB)
+                       gvtype = G_VARIANT_TYPE_STRING;
+               else
+                       gvtype = G_VARIANT_TYPE_BOOLEAN;
                cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE;
                break;
        case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
@@ -399,6 +405,13 @@ static int config_get(uint32_t key, GVariant **data,
                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)
+                       gvtype = G_VARIANT_TYPE_STRING;
+               else
+                       gvtype = G_VARIANT_TYPE_BOOLEAN;
+               cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE;
+               break;
        case SR_CONF_REGULATION:
                gvtype = G_VARIANT_TYPE_STRING;
                cmd = SCPI_CMD_GET_OUTPUT_REGULATION;
@@ -442,13 +455,13 @@ static int config_get(uint32_t key, GVariant **data,
                if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
                        /* Evaluate Operational Status Register from a HP 66xxB. */
                        s = g_variant_get_string(*data, NULL);
-                       sr_atoi(s, &oper_cond);
+                       sr_atoi(s, &reg);
                        g_variant_unref(*data);
-                       if (oper_cond & (1 << 8))
+                       if (reg & (1 << 8))
                                *data = g_variant_new_string("CV");
-                       else if (oper_cond & (1 << 10))
+                       else if (reg & (1 << 10))
                                *data = g_variant_new_string("CC");
-                       else if (oper_cond & (1 << 11))
+                       else if (reg & (1 << 11))
                                *data = g_variant_new_string("CC-");
                        else
                                *data = g_variant_new_string("UR");
@@ -463,6 +476,36 @@ 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_66XXB) {
+                       /* Evaluate Questionable Status Register bit 0 from a HP 66xxB. */
+                       s = g_variant_get_string(*data, NULL);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 0));
+               }
+       }
+
+       if (cmd == SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE) {
+               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);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 1));
+               }
+       }
+
+       if (cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE) {
+               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);
+                       sr_atoi(s, &reg);
+                       g_variant_unref(*data);
+                       *data = g_variant_new_boolean(reg & (1 << 4));
+               }
+       }
+
        return ret;
 }
 
@@ -662,6 +705,10 @@ 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);
+
        if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
                        scpi_pps_receive_data, (void *)sdi)) != SR_OK)
                return ret;