summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
69b0005)
Use the scale and offset support for analog measurement values which is
part of the existing sr_analog_encoding API. Rename the routine which
configures MQ and unit before submission of analog data.
This drops local redundant scaling support. And brings feed queue on par
with the binary helpers implementation.
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
GSList *channels;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
GSList *channels;
};
SR_API struct feed_queue_analog *feed_queue_analog_alloc(
};
SR_API struct feed_queue_analog *feed_queue_analog_alloc(
-SR_API int feed_queue_analog_params(struct feed_queue_analog *q,
- float scale_factor,
+SR_API int feed_queue_analog_mq_unit(struct feed_queue_analog *q,
enum sr_mq mq, enum sr_mqflag mq_flag, enum sr_unit unit)
{
int ret;
enum sr_mq mq, enum sr_mqflag mq_flag, enum sr_unit unit)
{
int ret;
if (ret != SR_OK)
return ret;
if (ret != SR_OK)
return ret;
- q->scale_factor = scale_factor;
- if (q->scale_factor == 1.0)
- q->scale_factor = 0.0;
-
q->meaning.mq = mq;
q->meaning.mqflags = mq_flag;
q->meaning.unit = unit;
q->meaning.mq = mq;
q->meaning.mqflags = mq_flag;
q->meaning.unit = unit;
+SR_API int feed_queue_analog_scale_offset(struct feed_queue_analog *q,
+ const struct sr_rational *scale, const struct sr_rational *offset)
+{
+ int ret;
+
+ if (!q)
+ return SR_ERR_ARG;
+
+ ret = feed_queue_analog_flush(q);
+ if (ret != SR_OK)
+ return ret;
+
+ if (scale)
+ q->encoding.scale = *scale;
+ if (offset)
+ q->encoding.offset = *offset;
+
+ return SR_OK;
+}
+
SR_API int feed_queue_analog_submit(struct feed_queue_analog *q,
float data, size_t count)
{
int ret;
SR_API int feed_queue_analog_submit(struct feed_queue_analog *q,
float data, size_t count)
{
int ret;
- if (q->scale_factor)
- data *= q->scale_factor;
while (count--) {
q->data_values[q->fill_count++] = data;
if (q->fill_count == q->alloc_count) {
while (count--) {
q->data_values[q->fill_count++] = data;
if (q->fill_count == q->alloc_count) {
SR_API struct feed_queue_analog *feed_queue_analog_alloc(
const struct sr_dev_inst *sdi,
size_t sample_count, int digits, struct sr_channel *ch);
SR_API struct feed_queue_analog *feed_queue_analog_alloc(
const struct sr_dev_inst *sdi,
size_t sample_count, int digits, struct sr_channel *ch);
-SR_API int feed_queue_analog_params(struct feed_queue_analog *q,
- float scale_factor,
+SR_API int feed_queue_analog_mq_unit(struct feed_queue_analog *q,
enum sr_mq mq, enum sr_mqflag mq_flag, enum sr_unit unit);
enum sr_mq mq, enum sr_mqflag mq_flag, enum sr_unit unit);
+SR_API int feed_queue_analog_scale_offset(struct feed_queue_analog *q,
+ const struct sr_rational *scale, const struct sr_rational *offset);
SR_API int feed_queue_analog_submit(struct feed_queue_analog *q,
float data, size_t count);
SR_API int feed_queue_analog_flush(struct feed_queue_analog *q);
SR_API int feed_queue_analog_submit(struct feed_queue_analog *q,
float data, size_t count);
SR_API int feed_queue_analog_flush(struct feed_queue_analog *q);