* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <config.h>
#include "protocol.h"
+#define NUM_CHANNELS 4
+
struct center_info {
- float temp[4];
+ float temp[NUM_CHANNELS];
gboolean rec, std, max, min, maxmin, t1t2, rel, hold, lowbat, celsius;
gboolean memfull, autooff;
gboolean mode_std, mode_rel, mode_max, mode_min, mode_maxmin;
{
int ret;
- if ((ret = serial_write(serial, cmd, strlen(cmd))) < 0) {
+ if ((ret = serial_write_blocking(serial, cmd, strlen(cmd),
+ serial_timeout(serial, strlen(cmd)))) < 0) {
sr_err("Error sending '%s' command: %d.", cmd, ret);
return SR_ERR;
}
info->autooff = (buf[2] & (1 << 7)) != 0;
/* Byte 7+8/9+10/11+12/13+14: channel T1/T2/T3/T4 temperature. */
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < NUM_CHANNELS; i++) {
temp_u16 = buf[8 + (i * 2)];
temp_u16 |= ((uint16_t)buf[7 + (i * 2)] << 8);
info->temp[i] = (float)temp_u16;
}
/* Byte 43: Specifies whether we need to divide the value(s) by 10. */
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < NUM_CHANNELS; i++) {
/* Bit = 0: Divide by 10. Bit = 1: Don't divide by 10. */
if ((buf[43] & (1 << i)) == 0)
info->temp[i] /= 10;
}
/* Bytes 39-42: Overflow/overlimit bits, depending on mode. */
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < NUM_CHANNELS; i++) {
if (info->mode_std && ((buf[39] & (1 << i)) != 0))
info->temp[i] = INFINITY;
/* TODO: Rel. Not available on all models. */
static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
struct dev_context *devc;
struct center_info info;
GSList *l;
devc = sdi->priv;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
memset(&info, 0, sizeof(struct center_info));
ret = packet_parse(buf, idx, &info);
}
/* Common values for all 4 channels. */
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
analog.mq = SR_MQ_TEMPERATURE;
analog.unit = (info.celsius) ? SR_UNIT_CELSIUS : SR_UNIT_FAHRENHEIT;
analog.num_samples = 1;
/* Send the values for T1 - T4. */
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < NUM_CHANNELS; i++) {
l = NULL;
l = g_slist_append(l, g_slist_nth_data(sdi->channels, i));
analog.channels = l;
analog.data = &(info.temp[i]);
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_slist_free(l);
}
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
return SR_OK;
}
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- int64_t t;
static gboolean request_new_packet = TRUE;
struct sr_serial_dev_inst *serial;
}
}
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- t = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (t > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->sw_limits))
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}