altoslib: Fix easytimer voltage conversions

Battery and pyros all use the same circuit (100k/27k).

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 63cdfa6092db2e30b2f70bb00491cde2c4ff47b5..83299632a3d3e5f38b094d3a8b18c9f264793e8f 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -276,6 +276,10 @@ public class AltosConvert {
                return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
        }
 
+       static double easy_timer_voltage(int sensor) {
+               return 3.3 * mega_adc(sensor) * (100.0 + 27.0) / 27.0;
+       }
+
        static double easy_mini_2_adc(int raw) {
                return raw / 4095.0;
        }

diff --git a/altoslib/AltosSensorEasyTimer1.java b/altoslib/AltosSensorEasyTimer1.java
index 6af0cc14c232ef673cff2f4875c03ef5c5ae31ad..dcf76928696088e861c814440c3d939ff246598b 100644 (file)
--- a/altoslib/AltosSensorEasyTimer1.java
+++ b/altoslib/AltosSensorEasyTimer1.java
@@ -63,11 +63,11 @@ class AltosSensorEasyTimer1 {
                try {
                        AltosSensorEasyTimer1   sensor_easytimer1 = new AltosSensorEasyTimer1(link);
 
-                       listener.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_easytimer1.v_batt));
+                       listener.set_battery_voltage(AltosConvert.easy_timer_voltage(sensor_easytimer1.v_batt));
 
                        double[]        igniter_voltage = new double[2];
                        for (int i = 0; i < 2; i++)
-                               igniter_voltage[i] = AltosConvert.mega_pyro_voltage(sensor_easytimer1.sense[i]);
+                               igniter_voltage[i] = AltosConvert.easy_timer_voltage(sensor_easytimer1.sense[i]);
                        listener.set_igniter_voltage(igniter_voltage);
 
                } catch (TimeoutException te) {