From 7ffe89537450793a16f42069bfe0b443bdde3e1a Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Tue, 22 Sep 2015 15:33:24 +0300 Subject: [PATCH] grovevdiv: Function's return value is input for another function, so it should be the same type Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu --- src/grovevdiv/grovevdiv.cxx | 2 +- src/grovevdiv/grovevdiv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/grovevdiv/grovevdiv.cxx b/src/grovevdiv/grovevdiv.cxx index 83c8d479..722956ea 100644 --- a/src/grovevdiv/grovevdiv.cxx +++ b/src/grovevdiv/grovevdiv.cxx @@ -59,7 +59,7 @@ unsigned int GroveVDiv::value(unsigned int samples) return (sum / samples); } -float GroveVDiv::computedValue(uint8_t gain, uint16_t val, int vref, int res) +float GroveVDiv::computedValue(uint8_t gain, unsigned int val, int vref, int res) { return ((float(gain) * float(val) * float(vref) / float(res)) / 1000.0); diff --git a/src/grovevdiv/grovevdiv.h b/src/grovevdiv/grovevdiv.h index 5fa3bc34..9e93879d 100644 --- a/src/grovevdiv/grovevdiv.h +++ b/src/grovevdiv/grovevdiv.h @@ -89,7 +89,7 @@ namespace upm { * * @return Measured voltage */ - float computedValue(uint8_t gain, uint16_t val, int vref=GROVEVDIV_VREF, + float computedValue(uint8_t gain, unsigned int val, int vref=GROVEVDIV_VREF, int res=GROVEVDIV_ADC_RES); private: