projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Delay accel cal value adjustment until data all read
[fw/altos]
/
altoslib
/
AltosPressure.java
diff --git
a/altoslib/AltosPressure.java
b/altoslib/AltosPressure.java
index e199bb1db7b44ea2c3f6416b8a989192b3520f90..97fd5de9dc22d5911045db7bc200cde379529d3b 100644
(file)
--- a/
altoslib/AltosPressure.java
+++ b/
altoslib/AltosPressure.java
@@
-23,28
+23,28
@@
public class AltosPressure extends AltosUnits {
public double value(double v, boolean imperial_units) {
if (imperial_units)
return AltosConvert.pa_to_psi(v);
public double value(double v, boolean imperial_units) {
if (imperial_units)
return AltosConvert.pa_to_psi(v);
- return v;
+ return v
/ 1000.0
;
}
public double inverse(double v, boolean imperial_units) {
if (imperial_units)
return AltosConvert.psi_to_pa(v);
}
public double inverse(double v, boolean imperial_units) {
if (imperial_units)
return AltosConvert.psi_to_pa(v);
- return v;
+ return v
* 1000.0
;
}
public String show_units(boolean imperial_units) {
if (imperial_units)
return "psi";
}
public String show_units(boolean imperial_units) {
if (imperial_units)
return "psi";
- return "Pa";
+ return "
k
Pa";
}
public String say_units(boolean imperial_units) {
if (imperial_units)
return "p s i";
}
public String say_units(boolean imperial_units) {
if (imperial_units)
return "p s i";
- return "pascals";
+ return "
kilo
pascals";
}
public int show_fraction(int width, boolean imperial_units) {
}
public int show_fraction(int width, boolean imperial_units) {
- return width /
9
;
+ return width /
5
;
}
}
}
}