projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Remove debug printf from AltosIMU.java
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index e1930430add0de07f49812808e053edfa5b0e38e..89f36a6c4a373f66a90dc2612ae6e39e66d92506 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-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;
@@
-467,7
+473,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);