*/
#include <config.h>
+#include <math.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
struct channel_priv {
int ch_type;
int fd;
+ int digits;
float val;
struct channel_group_priv *probe;
};
uint8_t pwr_sw;
uint8_t serial[EEPROM_SERIAL_SIZE];
int8_t tag[EEPROM_TAG_SIZE];
-} __attribute__((packed));
+};
+
+#define EEPROM_SIZE (3 * sizeof(uint32_t) + 1 + EEPROM_SERIAL_SIZE + EEPROM_TAG_SIZE)
+
+#define EEPROM_OFF_TYPE 0
+#define EEPROM_OFF_REV sizeof(uint32_t)
+#define EEPROM_OFF_SHUNT (2 * sizeof(uint32_t))
+#define EEPROM_OFF_PWR_SW (3 * sizeof(uint32_t))
+#define EEPROM_OFF_SERIAL (3 * sizeof(uint32_t) + 1)
+#define EEPROM_OFF_TAG (EEPROM_OFF_SERIAL + EEPROM_SERIAL_SIZE)
static const uint8_t enrg_i2c_addrs[] = {
0x40, 0x41, 0x44, 0x45, 0x42, 0x43, 0x46, 0x47,
probe_name_path(addr, path);
status = g_file_get_contents(path->str, &buf, &size, &err);
if (!status) {
- sr_dbg("Name for probe %d can't be read: %s",
- prb_num, err->message);
+ /* Don't log "No such file or directory" messages. */
+ if (err->code != G_FILE_ERROR_NOENT)
+ sr_dbg("Name for probe %d can't be read (%d): %s",
+ prb_num, err->code, err->message);
g_string_free(path, TRUE);
+ g_error_free(err);
return ret;
}
if (!dir) {
sr_err("Error opening %s: %s", path->str, err->message);
g_string_free(path, TRUE);
+ g_error_free(err);
return -1;
}
static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
{
- static const ssize_t len = sizeof(struct probe_eeprom);
-
GString *path = g_string_sized_new(64);
+ char eeprom_buf[EEPROM_SIZE];
ssize_t rd;
int fd;
if (fd < 0)
return -1;
- rd = read(fd, eeprom, len);
- g_close(fd, NULL);
- if (rd != len)
+ rd = read(fd, eeprom_buf, EEPROM_SIZE);
+ close(fd);
+ if (rd != EEPROM_SIZE)
return -1;
- /*
- * All integer types are in network byte order. Convert them to
- * host order before proceeding.
- */
- eeprom->type = ntohl(eeprom->type);
- eeprom->rev = ntohl(eeprom->rev);
- eeprom->shunt = ntohl(eeprom->shunt);
+ eeprom->type = RB32(eeprom_buf + EEPROM_OFF_TYPE);
+ eeprom->rev = RB32(eeprom_buf + EEPROM_OFF_REV);
+ eeprom->shunt = RB32(eeprom_buf + EEPROM_OFF_SHUNT);
+ eeprom->pwr_sw = R8(eeprom_buf + EEPROM_OFF_PWR_SW);
+ /* Don't care about the serial number and tag for now. */
/* Check if we have some sensible values. */
if (eeprom->rev != 'B')
static int revB_addr_to_num(unsigned int addr)
{
switch (addr) {
- case 0x44: return 5;
- case 0x45: return 6;
- case 0x42: return 3;
- case 0x43: return 4;
- default: return addr - 0x3f;
+ case 0x44: return 5;
+ case 0x45: return 6;
+ case 0x42: return 3;
+ case 0x43: return 4;
+ default: return addr - 0x3f;
}
}
if (hwmon < 0)
return FALSE;
- cg = g_malloc0(sizeof(struct sr_channel_group));
cgp = g_malloc0(sizeof(struct channel_group_priv));
- cg->priv = cgp;
+ cg = sr_channel_group_new(sdi, NULL, cgp);
/*
* See if we can read the EEPROM contents. If not, assume it's
* a revision A probe.
*/
+ memset(&eeprom, 0, sizeof(struct probe_eeprom));
status = read_probe_eeprom(addr, &eeprom);
cgp->rev = status < 0 ? ACME_REV_A : ACME_REV_B;
sr_err("Invalid probe type: %d.", type);
}
- sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
-
return TRUE;
}
if (!status) {
sr_err("Error reading shunt resistance: %s", err->message);
ret = SR_ERR_IO;
+ g_error_free(err);
goto out;
}
}
/* We need to scale measurements down from the units used by the drivers. */
-static float adjust_data(int val, int type)
+static int type_digits(int type)
{
switch (type) {
case ENRG_PWR:
- return ((float)val) / 1000000.0;
+ return 6;
case ENRG_CURR: /* Fallthrough */
case ENRG_VOL: /* Fallthrough */
case TEMP_IN: /* Fallthrough */
case TEMP_OUT:
- return ((float)val) / 1000.0;
+ return 3;
default:
- return 0.0;
+ return 0;
}
}
return -1.0;
}
- return adjust_data(strtol(buf, NULL, 10), chp->ch_type);
+ chp->digits = type_digits(chp->ch_type);
+ return strtol(buf, NULL, 10) * powf(10, -chp->digits);
}
SR_PRIV int bl_acme_open_channel(struct sr_channel *ch)
{
struct channel_priv *chp;
- char path[64], *file;
+ char path[64];
+ const char *file;
int fd;
chp = ch->priv;
SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
{
- uint32_t cur_time, elapsed_time;
uint64_t nrexpiration;
- struct sr_datafeed_packet packet, framep;
+ 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_dev_inst *sdi;
struct sr_channel *ch;
struct channel_priv *chp;
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
if (read(devc->timer_fd, &nrexpiration, sizeof(nrexpiration)) < 0) {
sr_warn("Failed to read timer information");
* accuracy.
*/
for (i = 0; i < nrexpiration; i++) {
- framep.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &framep);
+ std_session_send_df_frame_begin(sdi);
/*
* Due to different units used in each channel we're sending
continue;
chonly.next = NULL;
chonly.data = ch;
- analog.channels = &chonly;
analog.num_samples = 1;
- analog.mq = channel_to_mq(chl->data);
- analog.unit = channel_to_unit(ch);
+ analog.meaning->channels = &chonly;
+ analog.meaning->mq = channel_to_mq(chl->data);
+ analog.meaning->unit = channel_to_unit(ch);
if (i < 1)
chp->val = read_sample(ch);
+ analog.encoding->digits = chp->digits;
+ analog.spec->spec_digits = chp->digits;
analog.data = &chp->val;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
- framep.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &framep);
+ std_session_send_df_frame_end(sdi);
}
- devc->samples_read++;
- if (devc->limit_samples > 0 &&
- devc->samples_read >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- devc->last_sample_fin = g_get_monotonic_time();
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+ if (sr_sw_limits_check(&devc->limits)) {
+ sr_dev_acquisition_stop(sdi);
return TRUE;
- } else if (devc->limit_msec > 0) {
- cur_time = g_get_monotonic_time();
- elapsed_time = cur_time - devc->start_time;
-
- if (elapsed_time >= devc->limit_msec) {
- sr_info("Sampling time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- devc->last_sample_fin = g_get_monotonic_time();
- return TRUE;
- }
}
- devc->last_sample_fin = g_get_monotonic_time();
return TRUE;
}
projects / libsigrok.git / blobdiff