projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee2216a
)
altoslib: TeleMega uses 5.6k/10k divider for v_batt
author
Keith Packard
<keithp@keithp.com>
Sun, 8 Jun 2014 05:24:08 +0000
(22:24 -0700)
committer
Keith Packard
<keithp@keithp.com>
Sun, 8 Jun 2014 05:30:26 +0000
(22:30 -0700)
I suspect the 15 and 27 values are a 'close approximation' for integer
work on the cc1111 devices
Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosConvert.java
patch
|
blob
|
history
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index a65669dabde9d2f3007536318f52737de1a86f7a..8bcb9c9693618df5ce4dcd382fd37648dfe8d64d 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-208,7
+208,7
@@
public class AltosConvert {
static public double mega_battery_voltage(int v_batt) {
if (v_batt != AltosLib.MISSING)
- return 3.3 * mega_adc(v_batt) * (
15.0 + 27.0) / 27
.0;
+ return 3.3 * mega_adc(v_batt) * (
5.6 + 10.0) / 10
.0;
return AltosLib.MISSING;
}