From 24be1e05d5f1cbe84c69b0bd27d422ad4b13cd77 Mon Sep 17 00:00:00 2001 From: Frank Stettner Date: Sun, 22 Aug 2021 12:05:42 +0200 Subject: [PATCH] itech-it8500: Remove SR_MQFLAG_DC from power values. --- src/hardware/itech-it8500/protocol.c | 10 +++++----- src/hardware/itech-it8500/protocol.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hardware/itech-it8500/protocol.c b/src/hardware/itech-it8500/protocol.c index 4e3da049..69052736 100644 --- a/src/hardware/itech-it8500/protocol.c +++ b/src/hardware/itech-it8500/protocol.c @@ -341,7 +341,7 @@ SR_PRIV int itech_it8500_get_int(const struct sr_dev_inst *sdi, SR_PRIV void itech_it8500_channel_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, double value, enum sr_mq mq, - enum sr_unit unit, int digits) + enum sr_mqflag mqflags, enum sr_unit unit, int digits) { struct sr_datafeed_packet packet; struct sr_datafeed_analog analog; @@ -359,7 +359,7 @@ SR_PRIV void itech_it8500_channel_send_value(const struct sr_dev_inst *sdi, analog.encoding->is_float = TRUE; analog.meaning->mq = mq; analog.meaning->unit = unit; - analog.meaning->mqflags = SR_MQFLAG_DC; + analog.meaning->mqflags = mqflags; packet.type = SR_DF_ANALOG; packet.payload = &analog; @@ -389,15 +389,15 @@ SR_PRIV int itech_it8500_receive_data(int fd, int revents, void *cb_data) l = g_slist_nth(sdi->channels, 0); itech_it8500_channel_send_value(sdi, l->data, devc->voltage, - SR_MQ_VOLTAGE, SR_UNIT_VOLT, 5); + SR_MQ_VOLTAGE, SR_MQFLAG_DC, SR_UNIT_VOLT, 5); l = g_slist_nth(sdi->channels, 1); itech_it8500_channel_send_value(sdi, l->data, devc->current, - SR_MQ_CURRENT, SR_UNIT_AMPERE, 5); + SR_MQ_CURRENT, SR_MQFLAG_DC, SR_UNIT_AMPERE, 5); l = g_slist_nth(sdi->channels, 2); itech_it8500_channel_send_value(sdi, l->data, devc->power, - SR_MQ_POWER, SR_UNIT_WATT, 5); + SR_MQ_POWER, 0, SR_UNIT_WATT, 5); std_session_send_df_frame_end(sdi); diff --git a/src/hardware/itech-it8500/protocol.h b/src/hardware/itech-it8500/protocol.h index 71b126b3..6396fc6b 100644 --- a/src/hardware/itech-it8500/protocol.h +++ b/src/hardware/itech-it8500/protocol.h @@ -208,7 +208,7 @@ SR_PRIV int itech_it8500_get_int(const struct sr_dev_inst *sdi, enum itech_it8500_command command, int *result); SR_PRIV void itech_it8500_channel_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, double value, enum sr_mq mq, - enum sr_unit unit, int digits); + enum sr_mqflag mqflags, enum sr_unit unit, int digits); SR_PRIV int itech_it8500_receive_data(int fd, int revents, void *cb_data); #endif -- 2.30.2