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;
}
}
-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_meaning meaning;
struct sr_analog_spec spec;
- sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+ sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
analog.meaning->channels = g_slist_append(NULL, ch);
analog.num_samples = 1;
analog.data = &value;
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct sr_modbus_dev_inst *modbus;
- struct sr_datafeed_packet packet;
uint16_t registers[4];
(void)fd;
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(sdi, &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(sdi, &packet);
+ std_session_send_df_frame_end(sdi);
sr_sw_limits_update_samples_read(&devc->limits, 1);
}
if (sr_sw_limits_check(&devc->limits)) {
- sdi->driver->dev_acquisition_stop(sdi);
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}