X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fprotocol.c;h=3a4c2d4631473ce4692e774232257dcdb37a8107;hb=7fe1f91f7550d63ea4a09c0f0e1ce5b88c59c6fb;hp=5ef16ac730284da67562252df6ff85fa0930cc24;hpb=ffb580cf732f060f167cbb3b910299395dd67aaa;p=libsigrok.git
diff --git a/src/hardware/maynuo-m97/protocol.c b/src/hardware/maynuo-m97/protocol.c
index 5ef16ac7..3a4c2d46 100644
--- a/src/hardware/maynuo-m97/protocol.c
+++ b/src/hardware/maynuo-m97/protocol.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
SR_PRIV int maynuo_m97_get_bit(struct sr_modbus_dev_inst *modbus,
@@ -94,15 +95,15 @@ SR_PRIV int maynuo_m97_get_model_version(struct sr_modbus_dev_inst *modbus,
uint16_t registers[2];
int ret;
ret = sr_modbus_read_holding_registers(modbus, MODEL, 2, registers);
- *model = RB16(registers+0);
- *version = RB16(registers+1);
+ *model = RB16(registers + 0);
+ *version = RB16(registers + 1);
return ret;
}
SR_PRIV const char *maynuo_m97_mode_to_str(enum maynuo_m97_mode mode)
{
- switch(mode) {
+ switch (mode) {
case CC: return "CC";
case CV: return "CV";
case CW: return "CP";
@@ -124,22 +125,26 @@ SR_PRIV const char *maynuo_m97_mode_to_str(enum maynuo_m97_mode mode)
}
-static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, float value, enum sr_mq mq, enum sr_unit unit)
+static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, float value, enum sr_mq mq, enum sr_unit unit, int digits)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
- analog.channels = g_slist_append(NULL, ch);
+ sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+ analog.meaning->channels = g_slist_append(NULL, ch);
analog.num_samples = 1;
analog.data = &value;
- analog.mq = mq;
- analog.unit = unit;
- analog.mqflags = SR_MQFLAG_DC;
+ analog.meaning->mq = mq;
+ analog.meaning->unit = unit;
+ analog.meaning->mqflags = SR_MQFLAG_DC;
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
sr_session_send(sdi, &packet);
- g_slist_free(analog.channels);
+ g_slist_free(analog.meaning->channels);
}
SR_PRIV int maynuo_m97_capture_start(const struct sr_dev_inst *sdi)
@@ -161,9 +166,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct sr_modbus_dev_inst *modbus;
- struct sr_datafeed_packet packet;
uint16_t registers[4];
- int64_t t;
(void)fd;
(void)revents;
@@ -176,36 +179,24 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
devc->expecting_registers = 0;
if (sr_modbus_read_holding_registers(modbus, -1, 4, registers) == SR_OK) {
- packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &packet);
+ std_session_send_df_frame_begin(sdi);
maynuo_m97_session_send_value(sdi, sdi->channels->data,
RBFL(registers + 0),
- SR_MQ_VOLTAGE, SR_UNIT_VOLT);
+ SR_MQ_VOLTAGE, SR_UNIT_VOLT, 3);
maynuo_m97_session_send_value(sdi, sdi->channels->next->data,
RBFL(registers + 2),
- SR_MQ_CURRENT, SR_UNIT_AMPERE);
+ SR_MQ_CURRENT, SR_UNIT_AMPERE, 4);
- packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- devc->num_samples++;
+ std_session_send_df_frame_end(sdi);
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
- if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ if (sr_sw_limits_check(&devc->limits)) {
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}
- if (devc->limit_msec) {
- t = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (t > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
-
maynuo_m97_capture_start(sdi);
return TRUE;
}