X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fprotocol.h;h=9dcc19cacdfd192c19a8f7aac4442a428df0c5cb;hb=d32120c4c30650c30720d04eaf88dcf7b76a1e9f;hp=5df3fce60c35ab6725a9f9aef3f8619b8feb2d5c;hpb=2c5bdf1bbdf8d68b8ff9b352c790f50f23d90a23;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 5df3fce6..9dcc19ca 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -2,6 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2015 Hannu Vuolasaho <vuokkosetae@gmail.com>
+ * Copyright (C) 2018-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
@@ -17,12 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * @file
- * Korad KAxxxxP power supply driver
- * @internal
- */
-
 #ifndef LIBSIGROK_HARDWARE_KORAD_KAXXXXP_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_KORAD_KAXXXXP_PROTOCOL_H
 
@@ -36,29 +31,32 @@
 
 #define KAXXXXP_POLL_INTERVAL_MS 80
 
-enum {
-	VELLEMAN_LABPS_3005D,
-	KORAD_KA3005D,
-	/* Support for future devices with this protocol. */
+enum korad_quirks_flag {
+	KORAD_QUIRK_NONE = 0,
+	KORAD_QUIRK_LABPS_OVP_EN = 1UL << 0,
+	KORAD_QUIRK_ID_NO_VENDOR = 1UL << 1,
+	KORAD_QUIRK_ID_TRAILING = 1UL << 2,
+	KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
+	KORAD_QUIRK_ALL = (1UL << 4) - 1,
 };
 
 /* Information on single model */
 struct korad_kaxxxxp_model {
-	int model_id; /**< Model info */
 	const char *vendor; /**< Vendor name */
 	const char *name; /**< Model name */
 	const char *id; /**< Model ID, as delivered by interface */
 	int channels; /**< Number of channels */
-	double voltage[3]; /**< Min, max, step */
-	double current[3]; /**< Min, max, step */
+	const double *voltage; /**< References: Min, max, step */
+	const double *current; /**< References: Min, max, step */
+	enum korad_quirks_flag quirks;
 };
 
 /* Reply targets */
 enum {
 	KAXXXXP_CURRENT,
-	KAXXXXP_CURRENT_MAX,
+	KAXXXXP_CURRENT_LIMIT,
 	KAXXXXP_VOLTAGE,
-	KAXXXXP_VOLTAGE_MAX,
+	KAXXXXP_VOLTAGE_TARGET,
 	KAXXXXP_STATUS,
 	KAXXXXP_OUTPUT,
 	KAXXXXP_BEEP,
@@ -68,26 +66,17 @@ enum {
 	KAXXXXP_RECALL,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Model-specific information */
 	const struct korad_kaxxxxp_model *model; /**< Model information. */
 
-	/* Acquisition settings */
-	uint64_t limit_samples;
-	uint64_t limit_msec;
-	uint64_t num_samples;
-	int64_t starttime;
+	struct sr_sw_limits limits;
 	int64_t req_sent_at;
-	gboolean reply_pending;
+	GMutex rw_mutex;
 
-	void *cb_data;
-
-	/* Operational state */
 	float current;          /**< Last current value [A] read from device. */
-	float current_max;      /**< Output current set. */
+	float current_limit;    /**< Output current set. */
 	float voltage;          /**< Last voltage value [V] read from device. */
-	float voltage_max;      /**< Output voltage set. */
+	float voltage_target;   /**< Output voltage set. */
 	gboolean cc_mode[2];    /**< Device is in CC mode (otherwise CV). */
 
 	gboolean output_enabled; /**< Is the output enabled? */
@@ -95,22 +84,31 @@ struct dev_context {
 	gboolean ocp_enabled;    /**< Output current protection enabled. */
 	gboolean ovp_enabled;    /**< Output voltage protection enabled. */
 
-	/* Temporary state across callbacks */
-	int target;              /**< What reply to expect. */
+	gboolean cc_mode_1_changed;      /**< CC mode of channel 1 has changed. */
+	gboolean cc_mode_2_changed;      /**< CC mode of channel 2 has changed. */
+	gboolean output_enabled_changed; /**< Output enabled state has changed. */
+	gboolean ocp_enabled_changed;    /**< OCP enabled state has changed. */
+	gboolean ovp_enabled_changed;    /**< OVP enabled state has changed. */
+
+	int acquisition_target;  /**< What reply to expect. */
 	int program;             /**< Program to store or recall. */
-	char reply[6];
+
+	float set_current_limit;     /**< New output current to set. */
+	float set_voltage_target;    /**< New output voltage to set. */
+	gboolean set_output_enabled; /**< New output enabled to set. */
+	gboolean set_beep_enabled;   /**< New enable beeper to set. */
+	gboolean set_ocp_enabled;    /**< New OCP enabled to set. */
+	gboolean set_ovp_enabled;    /**< New OVP enabled to set. */
 };
 
 SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
 					const char *cmd);
 SR_PRIV int korad_kaxxxxp_read_chars(struct sr_serial_dev_inst *serial,
-					int count, char *buf);
+					size_t count, char *buf);
 SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
-					struct dev_context *devc);
-SR_PRIV int korad_kaxxxxp_query_value(struct sr_serial_dev_inst *serial,
-					struct dev_context *devc);
-SR_PRIV int korad_kaxxxxp_get_reply(struct sr_serial_dev_inst *serial,
-					struct dev_context *devc);
+					int target, struct dev_context *devc);
+SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial,
+					int target, struct dev_context *devc);
 SR_PRIV int korad_kaxxxxp_get_all_values(struct sr_serial_dev_inst *serial,
 					struct dev_context *devc);
 SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data);