rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

Make the UAVTalk object process one byte per call so it can be embedded in

Browse Source 
another loop.  Also clean up some warnings.
This commit is contained in:
James Cotton 2011-03-17 13:57:18 -05:00
parent 74ea0e5ac2
commit 38213de9aa
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
View File

@ -1,7 +1,5 @@
package org.openpilot.uavtalk;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -30,7 +28,10 @@ public class UAVTalk extends Observable {
inputProcessingThread = new Thread() {
public void run() {
processInputStream();
while(true) {
if( !processInputStream() )
break;
}
}
};
return inputProcessingThread;
@ -173,37 +174,36 @@ public class UAVTalk extends Observable {
}
/**
* Called each time there are data in the input buffer
* Process any data in the queue
*/
public void processInputStream() {
public boolean processInputStream() {
int val;
while (true) {
try {
// inStream.wait();
val = inStream.read();
} /*
* catch (InterruptedException e) { // TODO Auto-generated catch
* block System.out.println("Connection was aborted\n");
* e.printStackTrace(); break; }
*/catch (IOException e) {
// TODO Auto-generated catch block
System.out.println("Error reading from stream\n");
e.printStackTrace();
break;
}
if (val == -1) {
System.out
.println("End of stream, terminating processInputStream thread");
break;
}
try {
// inStream.wait();
val = inStream.read();
} /*
* catch (InterruptedException e) { // TODO Auto-generated catch
* block System.out.println("Connection was aborted\n");
* e.printStackTrace(); break; }
*/catch (IOException e) {
// TODO Auto-generated catch block
System.out.println("Error reading from stream\n");
e.printStackTrace();
return false;
}
if (val == -1) {
System.out.println("End of stream, terminating processInputStream thread");
return false;
}
// System.out.println("Received byte " + val + " in state + " +
// rxState);
processInputByte(val);
}
// System.out.println("Received byte " + val + " in state + " +
// rxState);
processInputByte(val);
return true;
}
/**
* Request an update for the specified object, on success the object data
* would have been updated by the GCS. \param[in] obj Object to update
@ -665,9 +665,6 @@ public class UAVTalk extends Observable {
public synchronized boolean transmitSingleObject(UAVObject obj, int type,
boolean allInstances) {
int length;
int dataOffset;
int objId;
int instId;
int allInstId = ALL_INSTANCES;
assert (objMngr != null && outStream != null);