X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fprotocol.c;h=9cb9ca82f717f94806db7d4b6b3ee9e070a2496f;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=96ca0200312fd12a46ecf6b618dd99241fd0fd5a;hpb=f3f19d1131025b68d29a11273b627c83d748e7ea;p=libsigrok.git
diff --git a/src/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c
index 96ca0200..9cb9ca82 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
@@ -57,27 +58,25 @@ 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)
{
- struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
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));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
analog.channels = g_slist_append(analog.channels, ch);
analog.num_samples = 1;
analog.mq = mq;
analog.unit = unit;
analog.data = &value;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(devc->session_cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_slist_free(analog.channels);
}
@@ -94,7 +93,7 @@ static void teleinfo_handle_measurement(struct sr_dev_inst *sdi,
}
if (!strcmp(label, "ADCO")) {
- devc->num_samples++;
+ 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")) {
@@ -185,7 +184,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;
@@ -218,19 +216,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))
+ sdi->driver->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;
}