X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=83299632a3d3e5f38b094d3a8b18c9f264793e8f;hb=1fa1ba86f6e6e4ff469f0680cdbc39bc806474a4;hp=89f36a6c4a373f66a90dc2612ae6e39e66d92506;hpb=4435843fc8eb06751dbb1ba00fb2856563963e5e;p=fw%2Faltos diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 89f36a6c..83299632 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -19,7 +19,7 @@ /* * Sensor data conversion functions */ -package org.altusmetrum.altoslib_13; +package org.altusmetrum.altoslib_14; import java.util.*; @@ -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; }