From: Keith Packard Date: Tue, 3 Mar 2015 06:23:22 +0000 (-0800) Subject: altosui/telegps: Change from variable-units snuck into master X-Git-Tag: 1.6.0.3~108 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d446c90dab0aca7e501a0228f24c210758d84a1d altosui/telegps: Change from variable-units snuck into master show_units_name(double) only exists on the variable-units branch... Signed-off-by: Keith Packard --- diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index b072ede7..67decaa4 100644 --- a/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigUI.java @@ -981,7 +981,7 @@ public class AltosConfigUI } String get_main_deploy_label() { - return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units_name(AltosLib.MISSING)); + return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units()); } String[] main_deploy_values() { @@ -1245,7 +1245,7 @@ public class AltosConfigUI } String get_tracker_motion_label() { - return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units_name(AltosLib.MISSING)); + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); } void set_tracker_tool_tip() { diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java index 0189a809..97ab34b4 100644 --- a/telegps/TeleGPSConfigUI.java +++ b/telegps/TeleGPSConfigUI.java @@ -862,7 +862,7 @@ public class TeleGPSConfigUI } String get_tracker_motion_label() { - return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units_name(AltosLib.MISSING)); + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); } void set_tracker_tool_tip() {