ricky/ioiotruck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added counter to count the number of time that a location is reported to

Browse Source 
be at the dest.

If this counter reaches 5, the robot will stop
This commit is contained in:
Ricky Barrette
2012-01-26 12:52:12 -05:00
parent 9f34ed410b
commit c539f7cad1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java
View File

@@ -63,6 +63,7 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
private TextView mLastUpdateTextView; private TextView mLastUpdateTextView;
private long mLast; private long mLast;
private WakeLock mWakeLock; private WakeLock mWakeLock;
private int mCount;
/** /**
* This thread will be used to update all the informational displays * This thread will be used to update all the informational displays
@@ -181,6 +182,7 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
@Override @Override
public void run(){ public void run(){
if(isRun){ if(isRun){
mCount = 0;
mGoButton.setText(R.string.go); mGoButton.setText(R.string.go);
isRunning = false; isRunning = false;
updateLog(R.string.stop); updateLog(R.string.stop);
@@ -264,12 +266,18 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
*/ */
if(mPoint != null) if(mPoint != null)
if(GeoUtils.isIntersecting(point, (float) (accuracy / 1E3), mPoint, Debug.RADIUS, Debug.FUDGE_FACTOR)) { if(GeoUtils.isIntersecting(point, (float) (accuracy / 1E3), mPoint, Debug.RADIUS, Debug.FUDGE_FACTOR)) {
Log.v(TAG, "Dest Reached, Stopping");
mIOIOManager.setDriveValue(IOIOTruckValues.DRIVE_STOP); mCount++;
updateGoButton(true);
updateLog(R.string.dest_reached); if(mCount > 5){
Log.v(TAG, "Dest Reached, Stopping");
mIOIOManager.setDriveValue(IOIOTruckValues.DRIVE_STOP);
updateGoButton(true);
updateLog(R.string.dest_reached);
}
} else { } else {
Log.v(TAG, "Driving Forward"); Log.v(TAG, "Driving Forward");
mCount = 0;
mIOIOManager.setDriveValue(IOIOTruckValues.DRIVE_FORWARD); mIOIOManager.setDriveValue(IOIOTruckValues.DRIVE_FORWARD);
} }
else{ else{