X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=b4336593cf3643d8d80944d738e5eac5b2bf4ef7;hb=49a468ed8bbd4d8f70cedc8fea205fba45e2e552;hp=d4425e725573cb0813267cc7f4be8ff02adea283;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index d4425e72..b4336593 100644
--- 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,
@@ -101,10 +102,12 @@ struct scpi_pps {
 struct channel_spec {
 	const char *name;
 	/* Min, max, programming resolution, spec digits, encoding digits. */
-	float voltage[5];
-	float current[5];
-	float power[5];
-	float frequency[5];
+	double voltage[5];
+	double current[5];
+	double power[5];
+	double frequency[5];
+	double ovp[5];
+	double ocp[5];
 };
 
 struct channel_group_spec {
@@ -143,7 +146,7 @@ struct dev_context {
 	struct channel_spec *channels;
 	struct channel_group_spec *channel_groups;
 
-	struct sr_channel *cur_channel;
+	struct sr_channel *cur_acquisition_channel;
 };
 
 SR_PRIV extern unsigned int num_pps_profiles;