itech-it8500: Remove SR_MQFLAG_DC from power values.
authorFrank Stettner <frank-stettner@gmx.net>
Sun, 22 Aug 2021 10:05:42 +0000 (12:05 +0200)
committerFrank Stettner <frank-stettner@gmx.net>
Sun, 22 Aug 2021 10:05:42 +0000 (12:05 +0200)
src/hardware/itech-it8500/protocol.c
src/hardware/itech-it8500/protocol.h

index 4e3da049f1b07c25d52ab4f1d35468d7769b5e08..6905273614ced22c1ce1a8f1366f928774f3a5aa 100644 (file)
@@ -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);
 
index 71b126b3b14e990fcbb9ab67195bed169a35567a..6396fc6bd5677439cd88d427c5b0d5d8bb421693 100644 (file)
@@ -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