projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update files that reference new paths
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 0d25c6d76d0eb50061a4938c4f5d9ed418a83524..ce1b8f7f14f7733a29722e6eedd62090733ed63f 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
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.util.*;
import java.util.*;
@@
-258,19
+258,33
@@
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;
}
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;
+ }
+
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
}
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
}
- static double easy_mini_voltage(int sensor, int serial) {
+ static double easy_mini_2_adc(int raw) {
+ return raw / 4095.0;
+ }
+
+ static double easy_mini_1_adc(int raw) {
+ return raw / 32767.0;
+ }
+
+ static double easy_mini_1_voltage(int sensor, int serial) {
double supply = 3.3;
double diode_offset = 0.0;
double supply = 3.3;
double diode_offset = 0.0;
@@
-284,7
+298,13
@@
public class AltosConvert {
if (serial < 1665)
diode_offset = 0.150;
if (serial < 1665)
diode_offset = 0.150;
- return sensor / 32767.0 * supply * 127/27 + diode_offset;
+ return easy_mini_1_adc(sensor) * supply * 127/27 + diode_offset;
+ }
+
+ static double easy_mini_2_voltage(int sensor) {
+ double supply = 3.3;
+
+ return easy_mini_2_adc(sensor) * supply * 127/27;
}
public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
}
public static double radio_to_frequency(int freq, int setting, int cal, int channel) {