projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Add tilt angle to pad and flight tabs
[fw/altos]
/
altosdroid
/
app
/
src
/
main
/
java
/
org
/
altusmetrum
/
AltosDroid
/
TabPad.java
diff --git
a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
index f526857f00ccedb3a67011dc9b606309dc2394f1..4a8b3f862b9bbeed9077133fc6e8a5b1b1f84f69 100644
(file)
--- a/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
+++ b/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
@@
-62,6
+62,8
@@
public class TabPad extends AltosDroidTab {
private TextView[] ignite_voltage_label = new TextView[4];
private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
private TextView[] ignite_voltage_label = new TextView[4];
private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
+ private View tilt_view;
+ private TextView tilt_value;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@
-107,6
+109,9
@@
public class TabPad extends AltosDroidTab {
(ImageView) v.findViewById(R.id.gps_ready_greenled),
getResources());
(ImageView) v.findViewById(R.id.gps_ready_greenled),
getResources());
+ tilt_view = (View) v.findViewById(R.id.tilt_view);
+ tilt_value = (TextView) v.findViewById(R.id.tilt_value);
+
for (int i = 0; i < 4; i++) {
int row_id, view_id, label_id, lights_id;
int red_id, green_id;
for (int i = 0; i < 4; i++) {
int row_id, view_id, label_id, lights_id;
int red_id, green_id;
@@
-213,8
+218,18
@@
public class TabPad extends AltosDroidTab {
} else
gps_locked_lights.set(false, true);
gps_ready_lights.set(state.gps_ready, state.gps == null);
} else
gps_locked_lights.set(false, true);
gps_ready_lights.set(state.gps_ready, state.gps == null);
+
+ double orient = state.orient();
+
+ if (orient == AltosLib.MISSING) {
+ tilt_view.setVisibility(View.GONE);
+ } else {
+ tilt_value.setText(AltosDroid.number("%1.0f°", orient));
+ tilt_view.setVisibility(View.VISIBLE);
+ }
}
}
+
if (telem_state != null) {
if (telem_state.receiver_battery == AltosLib.MISSING) {
receiver_row.setVisibility(View.GONE);
if (telem_state != null) {
if (telem_state.receiver_battery == AltosLib.MISSING) {
receiver_row.setVisibility(View.GONE);