]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
adc: Use board-dependent function for LSB-to-Volts conversion
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 25 Apr 2016 15:19:27 +0000 (17:19 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 25 Apr 2016 15:19:27 +0000 (17:19 +0200)
Fixes #1605

rpp-test-sw/commands/cmd_adc.c

index 9cdd168203efc1aed7c227e59be1afc69156a5f8..1f56f47684d6e07daec20cab9a62b4651f9dc58c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Czech Technical University in Prague
+ * Copyright (C) 2012-2016 Czech Technical University in Prague
  *
  * Created on: 28.2.2013
  *
 #include <stdio.h>
 #include "drv/port.h"
 
-static double lsb2volts(unsigned lsb)
-{
-       return ((double)lsb + 0.0)*2.5/4095*2;
-}
-
-
 /**
  * @brief Read values from ADC port
  *
@@ -58,7 +52,7 @@ int cmd_do_read_adc1_values(cmd_io_t *cmd_io, const struct cmd_des *des, char *p
        }
        for (i = min; i <= max; i++) {
                unsigned d = rpp_adc_get(i+1);
-               double v = lsb2volts(d);
+               double v = port_adc_lsb2volts(d);
                rpp_sci_printf("ADC%-2d %4d lsb ~ %5.2f V\n", i, d, v);
        }
        return 0;
@@ -90,7 +84,7 @@ int cmd_do_adc_watch(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
                        rpp_sci_printf("%5d ", rpp_adc_get(i+1));
                rpp_sci_printf("lsb\n");
                for (i = 0; i < PORT_ADC_CHANNELS; i++)
-                       rpp_sci_printf("%5.2f ", lsb2volts(rpp_adc_get(i+1)));
+                       rpp_sci_printf("%5.2f ", port_adc_lsb2volts(rpp_adc_get(i+1)));
                rpp_sci_printf("V\r\033[A"); /* Cursor up */