aboutsummaryrefslogtreecommitdiff
path: root/libarmep/sample.c
diff options
context:
space:
mode:
Diffstat (limited to 'libarmep/sample.c')
-rw-r--r--libarmep/sample.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libarmep/sample.c b/libarmep/sample.c
index 9c9bb3d..d28b038 100644
--- a/libarmep/sample.c
+++ b/libarmep/sample.c
@@ -50,7 +50,7 @@ static void track_limits_convert_to_current(struct aep_channel *ch,
}
}
- *v2 = correct(ch->aep->aep_context->no_correction, *v1, *v2, ch->map_table->map, ch->map_table->len) / ch->rshunt;
+ *v2 = correct(ch->aep->aep_context->no_correction, *v1, *v2, ch->map_table) / ch->rshunt;
pwr = *v1 * *v2;
if (*v1 > ch->max[0])
@@ -138,8 +138,7 @@ unripe:
ADC_COUNTS_PER_VOLT_CH2) + vo1;
if ((!(ch->samples & 0x1ff)) && aep->aep_context->show_raw)
fprintf(stderr, "%fmV raw shunt; corr=%fmV\n", v2,
- correct(aep->aep_context->no_correction, v1, v2, ch->map_table->map,
- ch->map_table->len));
+ correct(aep->aep_context->no_correction, v1, v2, ch->map_table));
track_limits_convert_to_current(ch, &v1, &v2);
@@ -212,7 +211,7 @@ unripe:
if ((!(ch->samples & 0x1ff)) && aep->aep_context->show_raw)
fprintf(stderr, "%fmV raw shunt; corr=%fmV\n", v2,
- correct(aep->aep_context->no_correction, v1, v2, ch->map_table->map, ch->map_table->len));
+ correct(aep->aep_context->no_correction, v1, v2, ch->map_table));
track_limits_convert_to_current(ch, &v1, &v2);
@@ -1078,6 +1077,8 @@ post_start:
if (fd_with_rx < 0)
goto service;
+ gettimeofday(&tv, NULL);
+
/* somebody had something for us */
for (m = 0; m <= aep_context->highest; m++) {