X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fprotocol.c;h=c87ea8a1f10b37b55491600b6414617d5e3ec0fc;hb=e5137b9343563b27c8ba791360aa408264482153;hp=d42da22b5621466418e3ae66f4f3df0e58757bfd;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c index d42da22b..c87ea8a1 100644 --- a/src/hardware/teleinfo/protocol.c +++ b/src/hardware/teleinfo/protocol.c @@ -96,35 +96,34 @@ static void teleinfo_handle_measurement(struct sr_dev_inst *sdi, return; } - if (!strcmp(label, "ADCO")) { + if (!strcmp(label, "ADCO")) sr_sw_limits_update_samples_read(&devc->sw_limits, 1); - } else if (!strcmp(label, "BASE")) { + else if (!strcmp(label, "BASE")) teleinfo_send_value(sdi, "BASE", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "HCHP")) { + else if (!strcmp(label, "HCHP")) teleinfo_send_value(sdi, "HP" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "HCHC")) { + else if (!strcmp(label, "HCHC")) teleinfo_send_value(sdi, "HC" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "EJPHN")) { + else if (!strcmp(label, "EJPHN")) teleinfo_send_value(sdi, "HN" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "EJPHPM")) { + else if (!strcmp(label, "EJPHPM")) teleinfo_send_value(sdi, "HPM" , v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHPJB")) { + else if (!strcmp(label, "BBRHPJB")) teleinfo_send_value(sdi, "HPJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHPJW")) { + else if (!strcmp(label, "BBRHPJW")) teleinfo_send_value(sdi, "HPJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHPJR")) { + else if (!strcmp(label, "BBRHPJR")) teleinfo_send_value(sdi, "HPJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHCJB")) { + else if (!strcmp(label, "BBRHCJB")) teleinfo_send_value(sdi, "HCJB", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHCJW")) { + else if (!strcmp(label, "BBRHCJW")) teleinfo_send_value(sdi, "HCJW", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "BBRHCJR")) { + else if (!strcmp(label, "BBRHCJR")) teleinfo_send_value(sdi, "HCJR", v, SR_MQ_POWER, SR_UNIT_WATT_HOUR); - } else if (!strcmp(label, "IINST")) { + else if (!strcmp(label, "IINST")) teleinfo_send_value(sdi, "IINST", v, SR_MQ_CURRENT, SR_UNIT_AMPERE); - } else if (!strcmp(label, "PAPP")) { + else if (!strcmp(label, "PAPP")) teleinfo_send_value(sdi, "PAPP", v, SR_MQ_POWER, SR_UNIT_VOLT_AMPERE); - } } static gboolean teleinfo_parse_group(struct sr_dev_inst *sdi,