projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
kernel
/
ao_convert_volt.c
diff --git
a/src/kernel/ao_convert_volt.c
b/src/kernel/ao_convert_volt.c
index 5afedfa5bcd5c72c98af9ec0a8e4ed67cdaaa3e6..c5dfd22d0d6bcf6da48744fdee3e1a19c7b4bc38 100644
(file)
--- a/
src/kernel/ao_convert_volt.c
+++ b/
src/kernel/ao_convert_volt.c
@@
-27,7
+27,7
@@
int16_t
ao_battery_decivolt(int16_t adc)
{
int16_t
ao_battery_decivolt(int16_t adc)
{
- return scale(adc, AO_BATTERY_DIV_PLUS, AO_BATTERY_DIV_MINUS);
+ return
(int16_t)
scale(adc, AO_BATTERY_DIV_PLUS, AO_BATTERY_DIV_MINUS);
}
#endif
}
#endif
@@
-35,6
+35,6
@@
ao_battery_decivolt(int16_t adc)
int16_t
ao_ignite_decivolt(int16_t adc)
{
int16_t
ao_ignite_decivolt(int16_t adc)
{
- return scale(adc, AO_IGNITE_DIV_PLUS, AO_IGNITE_DIV_MINUS);
+ return
(int16_t)
scale(adc, AO_IGNITE_DIV_PLUS, AO_IGNITE_DIV_MINUS);
}
#endif
}
#endif