scpi-pps: Add enum pps_scpi_dialect and add to struct scpi_pps,

[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 e93658208831324953fdf3f3de61cd1b12e063e7..420d5345abf1d38aaca04bf3b5c499ff3eabaf7a 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -2,6 +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>
  *
  * 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
@@ -29,7 +30,7 @@
 #define LOG_PREFIX "scpi-pps"
 
 enum pps_scpi_cmds {
-       SCPI_CMD_REMOTE,
+       SCPI_CMD_REMOTE = 1,
        SCPI_CMD_LOCAL,
        SCPI_CMD_BEEPER,
        SCPI_CMD_BEEPER_ENABLE,
@@ -66,6 +67,14 @@ enum pps_scpi_cmds {
        SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
 };
 
+/* Defines the SCPI dialect */
+enum pps_scpi_dialect {
+       SCPI_DIALECT_UNKNOWN = 1,
+       SCPI_DIALECT_HP_COMP,
+       SCPI_DIALECT_HP_66XXB,
+       SCPI_DIALECT_PHILIPS,
+};
+
 /*
  * These are bit values denoting features a device can have either globally,
  * in scpi_pps.features, or on a per-channel-group basis in
@@ -83,6 +92,7 @@ enum pps_features {
 struct scpi_pps {
        const char *vendor;
        const char *model;
+       const enum pps_scpi_dialect dialect;
        uint64_t features;
        const uint32_t *devopts;
        unsigned int num_devopts;
@@ -105,6 +115,8 @@ struct channel_spec {
        double current[5];
        double power[5];
        double frequency[5];
+       double ovp[5];
+       double ocp[5];
 };
 
 struct channel_group_spec {
@@ -143,7 +155,8 @@ struct dev_context {
        struct channel_spec *channels;
        struct channel_group_spec *channel_groups;
 
-       struct sr_channel *cur_channel;
+       struct sr_channel *cur_acquisition_channel;
+       struct sr_sw_limits limits;
 };
 
 SR_PRIV extern unsigned int num_pps_profiles;