X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_convert_volt.c;h=5afedfa5bcd5c72c98af9ec0a8e4ed67cdaaa3e6;hb=HEAD;hp=f697e74892048955ba8ae1bfc1122c272cc04b07;hpb=2a3846df381a5eeac8ec3327c770af502aaf4e76;p=fw%2Faltos

diff --git a/src/kernel/ao_convert_volt.c b/src/kernel/ao_convert_volt.c
index f697e748..1f04df64 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
@@ -18,15 +19,15 @@
 #include "ao.h"
 
 #define MUL(p,m)	((int32_t) AO_ADC_REFERENCE_DV * ((p) + (m)))
-#define ADD(p,m)	(MUL(p,m)/2)
 #define DIV(p,m)	((int32_t) AO_ADC_MAX * (m))
+#define ADD(p,m)	(DIV(p,m) / 2)
 #define scale(v,p,m)	(((int32_t) (v) * MUL(p,m) + ADD(p,m)) / DIV(p,m))
 
 #if HAS_APRS || HAS_BATTERY_REPORT
 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
 
@@ -34,6 +35,6 @@ ao_battery_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