X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fprotocol.h;h=233ef8603876d103e0c403cd23daca8ed3e06303;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=49fe55d3aab3111f1dca469de749a12a39da93ec;hpb=a90e480cdc808d0c91eecc6b5078e745a751882b;p=libsigrok.git

diff --git a/hardware/cem-dt-885x/protocol.h b/hardware/cem-dt-885x/protocol.h
index 49fe55d3..233ef860 100644
--- a/hardware/cem-dt-885x/protocol.h
+++ b/hardware/cem-dt-885x/protocol.h
@@ -25,16 +25,15 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "cem-dt-885x: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
-
-#define BUF_SIZE 32
+#define LOG_PREFIX "cem-dt-885x"
+
+/* When retrieving samples from device memory, group this many
+ * together into a sigrok packet. */
+#define SAMPLES_PER_PACKET 50
+
+/* Various temporary storage, at least 8 bytes. */
+#define BUF_SIZE SAMPLES_PER_PACKET * 2
+
 /* When in hold mode, force the last measurement out at this interval.
  * We're using 50ms, which duplicates the non-hold 20Hz update rate. */
 #define HOLD_REPEAT_INTERVAL 50 * 1000
@@ -71,6 +70,21 @@ enum {
 	CMD_TOGGLE_WEIGHT_FREQ = 0x99,
 	CMD_TOGGLE_WEIGHT_TIME = 0x77,
 	CMD_TOGGLE_HOLD_MAX_MIN = 0x11,
+	CMD_TOGGLE_MEAS_RANGE = 0x88,
+	CMD_TOGGLE_POWER_OFF = 0x33,
+	CMD_TRANSFER_MEMORY = 0xac,
+};
+
+enum {
+	RECORD_DBA = 0xaa,
+	RECORD_DBC = 0xcc,
+	RECORD_DATA = 0xac,
+	RECORD_END = 0xdd,
+};
+
+enum {
+	DATA_SOURCE_LIVE,
+	DATA_SOURCE_MEMORY,
 };
 
 /** Private, per-device-instance driver context. */
@@ -78,6 +92,8 @@ struct dev_context {
 	/* Device state */
 	uint64_t cur_mqflags;
 	int recording;
+	int cur_meas_range;
+	int cur_data_source;
 
 	/* Acquisition settings */
 	uint64_t limit_samples;
@@ -85,6 +101,7 @@ struct dev_context {
 	/* Operational state */
 	int state;
 	uint64_t num_samples;
+	gboolean enable_data_source_memory;
 
 	/* Temporary state across callbacks */
 	void *cb_data;
@@ -101,12 +118,15 @@ enum {
 	ST_INIT,
 	ST_GET_TOKEN,
 	ST_GET_DATA,
-	ST_GET_LOG,
+	ST_GET_LOG_HEADER,
+	ST_GET_LOG_RECORD_META,
+	ST_GET_LOG_RECORD_DATA,
 };
 
 SR_PRIV int cem_dt_885x_receive_data(int fd, int revents, void *cb_data);
 SR_PRIV int cem_dt_885x_recording_set(const struct sr_dev_inst *sdi, gboolean start);
-SR_PRIV gboolean cem_dt_885x_recording_get(const struct sr_dev_inst *sdi);
+SR_PRIV gboolean cem_dt_885x_recording_get(const struct sr_dev_inst *sdi,
+		int *state);
 SR_PRIV int cem_dt_885x_weight_freq_get(const struct sr_dev_inst *sdi);
 SR_PRIV int cem_dt_885x_weight_freq_set(const struct sr_dev_inst *sdi, int freqw);
 SR_PRIV int cem_dt_885x_weight_time_get(const struct sr_dev_inst *sdi);
@@ -114,5 +134,10 @@ SR_PRIV int cem_dt_885x_weight_time_set(const struct sr_dev_inst *sdi, int timew
 SR_PRIV int cem_dt_885x_holdmode_get(const struct sr_dev_inst *sdi,
 		gboolean *holdmode);
 SR_PRIV int cem_dt_885x_holdmode_set(const struct sr_dev_inst *sdi, int holdmode);
+SR_PRIV int cem_dt_885x_meas_range_get(const struct sr_dev_inst *sdi,
+		uint64_t *low, uint64_t *high);
+SR_PRIV int cem_dt_885x_meas_range_set(const struct sr_dev_inst *sdi,
+		uint64_t low, uint64_t high);
+SR_PRIV int cem_dt_885x_power_off(const struct sr_dev_inst *sdi);
 
 #endif