BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

teleinfo: Fix measured quantity (energy, not power).

This commit is contained in:
Frank Stettner 2020-07-27 19:55:27 +02:00 committed by Gerhard Sittig
parent 98b7b08956
commit f5247d953f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hardware/teleinfo/protocol.c
View File

@ -99,27 +99,27 @@ static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
if (!strcmp(label, "ADCO"))
sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
else if (!strcmp(label, "BASE"))
teleinfo_send_value(sdi, "BASE", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "BASE", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "HCHP"))
teleinfo_send_value(sdi, "HP" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HP" , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "HCHC"))
teleinfo_send_value(sdi, "HC" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HC" , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "EJPHN"))
teleinfo_send_value(sdi, "HN" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HN" , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "EJPHPM"))
teleinfo_send_value(sdi, "HPM" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HPM" , v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHPJB"))
teleinfo_send_value(sdi, "HPJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HPJB", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHPJW"))
teleinfo_send_value(sdi, "HPJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HPJW", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHPJR"))
teleinfo_send_value(sdi, "HPJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HPJR", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHCJB"))
teleinfo_send_value(sdi, "HCJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HCJB", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHCJW"))
teleinfo_send_value(sdi, "HCJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HCJW", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "BBRHCJR"))
teleinfo_send_value(sdi, "HCJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR);
teleinfo_send_value(sdi, "HCJR", v, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR);
else if (!strcmp(label, "IINST"))
teleinfo_send_value(sdi, "IINST", v, SR_MQ_CURRENT, SR_UNIT_AMPERE);
else if (!strcmp(label, "PAPP"))