rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

AndroidGCS: Suppress some warnings related to not implementing the STRING uavfield type properly.

Browse Source
This commit is contained in:
James Cotton 2012-08-26 22:26:34 -05:00
parent f01edc5d72
commit 120f9298b4
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
androidgcs/src/org/openpilot/androidgcs/ObjectEditView.java
View File

@ -93,6 +93,14 @@ public class ObjectEditView extends GridLayout {
((Spinner) fieldValue).setAdapter(adapter); ((Spinner) fieldValue).setAdapter(adapter);
((Spinner) fieldValue).setSelection((int) field.getDouble(idx)); ((Spinner) fieldValue).setSelection((int) field.getDouble(idx));
break; break;
case BITFIELD:
fieldValue = new EditText(context);
((EditText)fieldValue).setText(field.getValue(idx).toString());
((EditText)fieldValue).setInputType(InputType.TYPE_CLASS_NUMBER);
break;
case STRING:
fieldValue = new EditText(context);
((EditText)fieldValue).setText(field.getValue(idx).toString());
} }
addView(fieldValue, new GridLayout.LayoutParams(spec(row), spec(1))); addView(fieldValue, new GridLayout.LayoutParams(spec(row), spec(1)));

25
androidgcs/src/org/openpilot/uavtalk/UAVObjectField.java
View File

@ -578,6 +578,12 @@ public class UAVObjectField {
((ArrayList<Byte>) data).add((byte) 0); ((ArrayList<Byte>) data).add((byte) 0);
} }
break; break;
case STRING:
((ArrayList<Byte>) data).clear();
for(int index = 0; index < numElements; ++index) {
((ArrayList<Byte>) data).add((byte) 0);
}
break;
} }
} }
@ -633,7 +639,7 @@ public class UAVObjectField {
numBytesPerElement = 1; numBytesPerElement = 1;
break; break;
case STRING: case STRING:
data = new ArrayList<String>(this.numElements); data = new ArrayList<Byte>(this.numElements);
numBytesPerElement = 1; numBytesPerElement = 1;
break; break;
default: default:
@ -650,15 +656,9 @@ public class UAVObjectField {
*/ */
protected Long bound (Object val) { protected Long bound (Object val) {
switch(type) { long num = 0;
case ENUM: if (isNumeric())
case STRING: num = ((Number) val).longValue();
return 0L;
case FLOAT32:
return ((Number) val).longValue();
}
long num = ((Number) val).longValue();
switch(type) { switch(type) {
case INT8: case INT8:
@ -703,6 +703,11 @@ public class UAVObjectField {
if(num > 255) if(num > 255)
return (long) 255; return (long) 255;
return num; return num;
case FLOAT32:
return ((Number) val).longValue();
case ENUM:
case STRING:
return 0L;
} }
return num; return num;