projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.9
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 3e1796b2c194bfbeb212a9adbe675a0917642201..ded4b36527cbfc92e6ba7beefbadcc9a31a3cbb1 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-270,6
+270,12
@@
public class AltosConvert {
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
}
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
}
+ static double tele_gps_3_voltage(int sensor) {
+ double supply = 3.3;
+
+ return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
+ }
+
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
@@
-311,6
+317,10
@@
public class AltosConvert {
return easy_mini_2_adc(sensor) * supply * 127/27;
}
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;
static double motor_pressure(double voltage) {
double base = 0.5;
double max = 4.5;