rdtech-dps: Handle different current/voltage digits for the various models.

[libsigrok.git] / src / hardware / rdtech-dps / protocol.c

diff --git a/src/hardware/rdtech-dps/protocol.c b/src/hardware/rdtech-dps/protocol.c
index fe34b25700184fef2bb0428838a9c76e83eee235..6f1d48670b62b87288e601e5c99b5dab4b0cdc44 100644 (file)
--- a/src/hardware/rdtech-dps/protocol.c
+++ b/src/hardware/rdtech-dps/protocol.c
@@ -146,14 +146,16 @@ SR_PRIV int rdtech_dps_receive_data(int fd, int revents, void *cb_data)
                sr_session_send(sdi, &packet);
 
                send_value(sdi, sdi->channels->data,
-                       RB16(registers + 0) / 100.0f,
-                       SR_MQ_VOLTAGE, SR_MQFLAG_DC, SR_UNIT_VOLT, 3);
+                       RB16(registers + 0) / devc->voltage_multiplier,
+                       SR_MQ_VOLTAGE, SR_MQFLAG_DC, SR_UNIT_VOLT,
+                       devc->model->voltage_digits);
                send_value(sdi, sdi->channels->next->data,
-                       RB16(registers + 1) / 1000.0f,
-                       SR_MQ_CURRENT, SR_MQFLAG_DC, SR_UNIT_AMPERE, 4);
+                       RB16(registers + 1) / devc->current_multiplier,
+                       SR_MQ_CURRENT, SR_MQFLAG_DC, SR_UNIT_AMPERE,
+                       devc->model->current_digits);
                send_value(sdi, sdi->channels->next->next->data,
                        RB16(registers + 2) / 100.0f,
-                       SR_MQ_POWER, 0, SR_UNIT_WATT, 3);
+                       SR_MQ_POWER, 0, SR_UNIT_WATT, 2);
 
                packet.type = SR_DF_FRAME_END;
                sr_session_send(sdi, &packet);