projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/micropeak-v2.0: Functionally complete.
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index e1930430add0de07f49812808e053edfa5b0e38e..83299632a3d3e5f38b094d3a8b18c9f264793e8f 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-19,7
+19,7
@@
/*
* Sensor data conversion functions
*/
/*
* Sensor data conversion functions
*/
-package org.altusmetrum.altoslib_1
3
;
+package org.altusmetrum.altoslib_1
4
;
import java.util.*;
import java.util.*;
@@
-258,7
+258,13
@@
public class AltosConvert {
return sensor / 32767.0 * supply * 127/27;
}
return sensor / 32767.0 * supply * 127/27;
}
- static double tele_gps_voltage(int sensor) {
+ static double tele_gps_1_voltage(int sensor) {
+ double supply = 3.3;
+
+ return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
+ }
+
+ static double tele_gps_2_voltage(int sensor) {
double supply = 3.3;
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
double supply = 3.3;
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
@@
-270,6
+276,10
@@
public class AltosConvert {
return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
}
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;
}
static double easy_mini_2_adc(int raw) {
return raw / 4095.0;
}
@@
-467,7
+477,7
@@
public class AltosConvert {
public static AltosPyroName pyro_name = new AltosPyroName();
public static AltosPyroName pyro_name = new AltosPyroName();
- public static AltosUnits magnetic_field = n
ull
;
+ public static AltosUnits magnetic_field = n
ew AltosGauss()
;
public static String show_gs(String format, double a) {
a = meters_to_g(a);
public static String show_gs(String format, double a) {
a = meters_to_g(a);