X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=cf0dbdd5aa227a2815269378fabb917b888d6513;hb=88e4daa9ff82f45f5966ac662d794c04625df176;hp=4956e5d4cb0ff8cfe9f116abecf0e548a65db2a1;hpb=562a34908e47cf3b698a822b2e8177dc26422358;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 4956e5d4..cf0dbdd5 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
@@ -22,13 +23,14 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #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,
@@ -92,7 +94,6 @@ struct scpi_pps {
 	const struct channel_group_spec *channel_groups;
 	unsigned int num_channel_groups;
 	const struct scpi_command *commands;
-	unsigned int num_commands;
 	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);
@@ -100,15 +101,13 @@ struct scpi_pps {
 
 struct channel_spec {
 	const char *name;
-	/* Min, max, programming resolution. */
-	float voltage[3];
-	float current[3];
-	float frequency[3];
-};
-
-struct scpi_command {
-	int command;
-	const char *string;
+	/* Min, max, programming resolution, spec digits, encoding digits. */
+	double voltage[5];
+	double current[5];
+	double power[5];
+	double frequency[5];
+	double ovp[5];
+	double ocp[5];
 };
 
 struct channel_group_spec {
@@ -118,13 +117,14 @@ struct channel_group_spec {
 };
 
 struct pps_channel {
-	int mq;
+	enum sr_mq mq;
 	unsigned int hw_output_idx;
 	const char *hwname;
+	int digits;
 };
 
 struct pps_channel_instance {
-	int mq;
+	enum sr_mq mq;
 	int command;
 	const char *prefix;
 };
@@ -139,34 +139,21 @@ enum acq_states {
 	STATE_STOP,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Model-specific information */
 	const struct scpi_pps *device;
 
-	/* Acquisition settings */
-	void *cb_data;
-
-	/* Operational state */
 	gboolean beeper_was_set;
 	struct channel_spec *channels;
 	struct channel_group_spec *channel_groups;
 
-	/* Temporary state across callbacks */
-	struct sr_channel *cur_channel;
+	struct sr_channel *cur_acquisition_channel;
+	struct sr_sw_limits limits;
 };
 
 SR_PRIV extern unsigned int num_pps_profiles;
 SR_PRIV extern const struct scpi_pps pps_profiles[];
 
-SR_PRIV const char *get_vendor(const char *raw_vendor);
-SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...);
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
-		const GVariantType *gvtype, int command, ...);
 SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch);
-SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
-		struct sr_channel *cur_channel);
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data);
 
 #endif