summaryrefslogtreecommitdiff
path: root/altoslib/AltosConvert.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-08-31 23:11:39 -0500
committerKeith Packard <keithp@keithp.com>2013-08-31 23:11:39 -0500
commit77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea (patch)
treef2b92c6d3e92d4b807ec945285bf15d91585367a /altoslib/AltosConvert.java
parentc781469ff907a32bd43a5d781391b6859b14cd32 (diff)
altoslib/altosui: Further AltosState transition work
Parses most eeprom and telem records now; altosui updated to show from AltosState info. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConvert.java')
-rw-r--r--altoslib/AltosConvert.java22
1 files changed, 22 insertions, 0 deletions
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a1e2cdca..cf2bc59f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -196,6 +196,28 @@ public class AltosConvert {
return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
}
+ static double
+ thermometer_to_temperature(double thermo)
+ {
+ return (thermo - 19791.268) / 32728.0 * 1.25 / 0.00247;
+ }
+
+ static double mega_adc(int raw) {
+ return raw / 4095.0;
+ }
+
+ static public double mega_battery_voltage(int v_batt) {
+ if (v_batt != AltosRecord.MISSING)
+ return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+ return AltosRecord.MISSING;
+ }
+
+ static double mega_pyro_voltage(int raw) {
+ if (raw != AltosRecord.MISSING)
+ return 3.3 * mega_adc(raw) * (100.0 + 27.0) / 27.0;
+ return AltosRecord.MISSING;
+ }
+
public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
double f;