X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fprotocol.h;h=2510d7360fd5cd940bfe246184d20221b6c5dcc1;hb=6402c379161ec138e451901c411817a55846a75b;hp=c018ed3372bccb2273ba5656662473bd6a4d2464;hpb=d822726dbffea1fabe47bcea3e434eadcfa29b31;p=libsigrok.git

diff --git a/src/hardware/agilent-dmm/protocol.h b/src/hardware/agilent-dmm/protocol.h
index c018ed33..2510d736 100644
--- a/src/hardware/agilent-dmm/protocol.h
+++ b/src/hardware/agilent-dmm/protocol.h
@@ -28,6 +28,16 @@
 /* Always USB-serial, 1ms is plenty. */
 #define SERIAL_WRITE_TIMEOUT_MS 1
 
+#define DEFAULT_DATA_SOURCE	DATA_SOURCE_LIVE
+
+enum {
+	DATA_SOURCE_LIVE,
+	DATA_SOURCE_LOG_HAND,
+	DATA_SOURCE_LOG_TRIG,
+	DATA_SOURCE_LOG_AUTO,
+	DATA_SOURCE_LOG_EXPO,
+};
+
 /* Supported models */
 enum {
 	AGILENT_U1231 = 1,
@@ -37,6 +47,9 @@ enum {
 	AGILENT_U1241,
 	AGILENT_U1242,
 
+	KEYSIGHT_U1241C,
+	KEYSIGHT_U1242C,
+
 	AGILENT_U1251,
 	AGILENT_U1252,
 	AGILENT_U1253,
@@ -50,7 +63,8 @@ struct agdmm_profile {
 	int model;
 	const char *modelname;
 	int nb_channels;
-	const struct agdmm_job *jobs;
+	const struct agdmm_job *jobs_live;
+	const struct agdmm_job *jobs_log;
 	const struct agdmm_recv *recvs;
 };
 
@@ -58,13 +72,20 @@ struct agdmm_profile {
 struct dev_context {
 	const struct agdmm_profile *profile;
 	struct sr_sw_limits limits;
+	int data_source;
 
 	/* Runtime. */
-	int64_t jobqueue[8];
+	const struct agdmm_job *jobs;
+	int current_job;
+	gboolean job_running;
+	gboolean job_again;
+	int64_t jobs_start[8];
 	unsigned char buf[AGDMM_BUFSIZE];
 	int buflen;
+	uint64_t cur_samplerate;
 	struct sr_channel *cur_channel;
 	struct sr_channel *cur_conf;
+	int cur_sample;
 	int cur_mq[MAX_CHANNELS];
 	int cur_unit[MAX_CHANNELS];
 	int cur_mqflags[MAX_CHANNELS];
@@ -74,9 +95,20 @@ struct dev_context {
 	int mode_tempaux;
 	int mode_continuity;
 	int mode_squarewave;
+	int mode_dbm_dbv;
+};
+
+enum job_type {
+	JOB_AGAIN = 1,
+	JOB_STOP,
+	JOB_CONF,
+	JOB_STAT,
+	JOB_FETC,
+	JOB_LOG,
 };
 
 struct agdmm_job {
+	enum job_type type;
 	int interval;
 	int (*send) (const struct sr_dev_inst *sdi);
 };