summaryrefslogtreecommitdiff
path: root/altoslib/AltosConvert.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-02-19 17:36:04 -0800
committerKeith Packard <keithp@keithp.com>2017-02-20 11:16:53 -0800
commit1029a6e4a61b20698e00e29fc0c8c3877f1e7b0f (patch)
tree68afb87e3cb0a2f75a5a1c8c61899e54a9281be3 /altoslib/AltosConvert.java
parent5c272d8e50d0b23f31a6a9ebdad81fc514936222 (diff)
altoslib: Add TeleMini v3 support
eeprom, telemetry and monitor idle. This is just like TeleMini v2, except the ADC ranges are all difference as the voltage dividers are different and the ADC itself has a different range. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConvert.java')
-rw-r--r--altoslib/AltosConvert.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 288f43ce..0b413287 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -219,7 +219,23 @@ public class AltosConvert {
return AltosLib.MISSING;
}
- static double tele_mini_voltage(int sensor) {
+ static double tele_mini_3_adc(int raw) {
+ return raw / 4095.0;
+ }
+
+ static public double tele_mini_3_battery_voltage(int v_batt) {
+ if (v_batt != AltosLib.MISSING)
+ return 3.3 * tele_mini_3_adc(v_batt) * (5.6 + 10.0) / 10.0;
+ return AltosLib.MISSING;
+ }
+
+ static double tele_mini_3_pyro_voltage(int raw) {
+ if (raw != AltosLib.MISSING)
+ return 3.3 * tele_mini_3_adc(raw) * (100.0 + 27.0) / 27.0;
+ return AltosLib.MISSING;
+ }
+
+ static double tele_mini_2_voltage(int sensor) {
double supply = 3.3;
return sensor / 32767.0 * supply * 127/27;