X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fprotocol.c;h=c87ea8a1f10b37b55491600b6414617d5e3ec0fc;hb=a9ed2eb06953eb34fb019ae9a80e213c75790fab;hp=d2b96e1f5c8c8ad58fbbf6ab9a81abfd2e55bbfd;hpb=9333691aaf1b08f597caa6a6490ebb56441f4a38;p=libsigrok.git
diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index d2b96e1f..c87ea8a1 100644
--- a/src/hardware/teleinfo/protocol.c
+++ b/src/hardware/teleinfo/protocol.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -55,35 +56,36 @@ static struct sr_channel *teleinfo_find_channel(struct sr_dev_inst *sdi,
}
static void teleinfo_send_value(struct sr_dev_inst *sdi, const char *channel_name,
- float value, int mq, int unit)
+ float value, enum sr_mq mq, enum sr_unit unit)
{
- struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_channel *ch;
- devc = sdi->priv;
ch = teleinfo_find_channel(sdi, channel_name);
if (!ch || !ch->enabled)
return;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
- analog.channels = g_slist_append(analog.channels, ch);
+ /* Note: digits/spec_digits is actually really 0 for this device! */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+ analog.meaning->channels = g_slist_append(analog.meaning->channels, ch);
analog.num_samples = 1;
- analog.mq = mq;
- analog.unit = unit;
+ analog.meaning->mq = mq;
+ analog.meaning->unit = unit;
analog.data = &value;
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- sr_session_send(devc->session_cb_data, &packet);
- g_slist_free(analog.channels);
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
}
-static void teleinfo_handle_mesurement(struct sr_dev_inst *sdi,
- const char *label, const char *data,
- char *optarif)
+static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
+ const char *label, const char *data, char *optarif)
{
struct dev_context *devc;
int v = atoi(data);
@@ -94,35 +96,34 @@ static void teleinfo_handle_mesurement(struct sr_dev_inst *sdi,
return;
}
- if (!strcmp(label, "ADCO")) {
- devc->num_samples++;
- } else if (!strcmp(label, "BASE")) {
+ 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);
- } 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,
@@ -135,7 +136,7 @@ static gboolean teleinfo_parse_group(struct sr_dev_inst *sdi,
return FALSE;
if (!teleinfo_control_check(label, data, control))
return FALSE;
- teleinfo_handle_mesurement(sdi, label, data, optarif);
+ teleinfo_handle_measurement(sdi, label, data, optarif);
return TRUE;
}
@@ -186,7 +187,6 @@ SR_PRIV int teleinfo_receive_data(int fd, int revents, void *cb_data)
struct sr_serial_dev_inst *serial;
const uint8_t *ptr, *next_ptr, *end_ptr;
int len;
- int64_t time;
(void)fd;
@@ -219,19 +219,8 @@ SR_PRIV int teleinfo_receive_data(int fd, int revents, void *cb_data)
return FALSE;
}
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data);
- return TRUE;
- }
+ if (sr_sw_limits_check(&devc->sw_limits))
+ sr_dev_acquisition_stop(sdi);
- if (devc->limit_msec) {
- time = (g_get_monotonic_time() - devc->start_time) / 1000;
- if (time > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data);
- return TRUE;
- }
- }
return TRUE;
}