X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_convert_volt.c;h=c5dfd22d0d6bcf6da48744fdee3e1a19c7b4bc38;hb=86bd5f53ba4b13df502ec1bc70512f30cac94010;hp=7afc34bfab2bf45ebc9efa3b5a446eff9f82b92c;hpb=0d367fc24bfd0377db6f3b00a888a18245616767;p=fw%2Faltos

diff --git a/src/kernel/ao_convert_volt.c b/src/kernel/ao_convert_volt.c
index 7afc34bf..c5dfd22d 100644
--- a/src/kernel/ao_convert_volt.c
+++ b/src/kernel/ao_convert_volt.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,14 +27,14 @@
 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
 
-#if HAS_APRS
+#if HAS_APRS && defined(AO_IGNITE_DIV_PLUS)
 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