X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=18878c026dd01115501e87f8880a9bcb613feea6;hb=HEAD;hp=88ee1ad159772d9e613d4ed484375fa0a50c2d2c;hpb=1ab3cdedb83296a3296aeaaf1e0fa6a11800e331;p=fw%2Faltos diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 88ee1ad1..84f7e23d 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -317,6 +317,10 @@ public class AltosConvert { return easy_mini_2_adc(sensor) * supply * 127/27; } + static double easy_mini_3_voltage(int sensor) { + return easy_mini_1_voltage(sensor, 10000); + } + static double motor_pressure(double voltage) { double base = 0.5; double max = 4.5; @@ -555,7 +559,7 @@ public class AltosConvert { public static int beep_freq_to_value(double freq) { if (freq == 0) - return 94; + return 0; return (int) Math.floor (1.0/2.0 * (24.0e6/32.0) / freq + 0.5); }