summaryrefslogtreecommitdiff
path: root/altoslib/AltosSpeed.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-01-10 21:48:12 -0800
committerKeith Packard <keithp@keithp.com>2013-01-10 21:48:12 -0800
commit1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e (patch)
tree10adf6f3c6b6c1ed2bf7540a9972fe72253cfa81 /altoslib/AltosSpeed.java
parentacff2f466031fd1a8533fc315411c3734a8bacc6 (diff)
parentd409417ff8e9ed9d406bf1c04542a4ecb574768b (diff)
Merge remote-tracking branch 'origin/micropeak-logging'
Diffstat (limited to 'altoslib/AltosSpeed.java')
-rw-r--r--altoslib/AltosSpeed.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index af63ed17..4e2daf5a 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -21,19 +21,19 @@ public class AltosSpeed extends AltosUnits {
public double value(double v) {
if (AltosConvert.imperial_units)
- return AltosConvert.meters_to_feet(v);
+ return AltosConvert.meters_to_mph(v);
return v;
}
public String show_units() {
if (AltosConvert.imperial_units)
- return "ft/s";
+ return "mph";
return "m/s";
}
public String say_units() {
if (AltosConvert.imperial_units)
- return "feet per second";
+ return "miles per hour";
return "meters per second";
}