From 2781c187d58955bbac5c9fcf498c3b46a84a13d5 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 9 Jun 2020 11:45:53 -0700 Subject: [PATCH] altoslib: Fix easytimer voltage conversions Battery and pyros all use the same circuit (100k/27k). Signed-off-by: Keith Packard --- altoslib/AltosConvert.java | 4 ++++ altoslib/AltosSensorEasyTimer1.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 63cdfa60..83299632 100644 --- 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 6af0cc14..dcf76928 100644 --- 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) { -- 2.30.2