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

[libsigrok.git] / src / hardware / scpi-pps / protocol.h

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index e9da0d6dd6e82fe6022cbb12ec6faa97370251d2..b75feb2ec2a1d0fcc75abe445ac5671aa60985f9 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -66,6 +66,8 @@ enum pps_scpi_cmds {
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
+       SCPI_CMD_GET_OVER_CURRENT_PROTECTION_DELAY,
+       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DELAY,
 };
 
 /* Defines the SCPI dialect */
@@ -74,6 +76,7 @@ enum pps_scpi_dialect {
        SCPI_DIALECT_HP_COMP,
        SCPI_DIALECT_HP_66XXB,
        SCPI_DIALECT_PHILIPS,
+       SCPI_DIALECT_HMP,
 };
 
 /*
@@ -107,7 +110,7 @@ struct scpi_pps {
        int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
                struct channel_spec **channels, unsigned int *num_channels,
                struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
-       int (*init_aquisition) (const struct sr_dev_inst *sdi);
+       int (*init_acquisition) (const struct sr_dev_inst *sdi);
        int (*update_status) (const struct sr_dev_inst *sdi);
 };
 
@@ -120,16 +123,20 @@ struct channel_spec {
        double frequency[5];
        double ovp[5];
        double ocp[5];
+       double ocp_delay[5];
 };
 
 struct channel_group_spec {
        const char *name;
        uint64_t channel_index_mask;
        uint64_t features;
+       /* The mqflags will only be applied to voltage and current channels! */
+       enum sr_mqflag mqflags;
 };
 
 struct pps_channel {
        enum sr_mq mq;
+       enum sr_mqflag mqflags;
        unsigned int hw_output_idx;
        const char *hwname;
        int digits;