X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fprotocol.c;h=1938664d03c26dbf962ecda6a7034db6a6bca68b;hb=63f46e3e6f1b3b0a20a1da45ad10a1cd0a8937ab;hp=c87ea8a1f10b37b55491600b6414617d5e3ec0fc;hpb=8ebad343709aad6ef4d5aa83a2633690ef313de5;p=libsigrok.git

diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index c87ea8a1..1938664d 100644
--- a/src/hardware/teleinfo/protocol.c
+++ b/src/hardware/teleinfo/protocol.c
@@ -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"))