Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/teleop stutter #76

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bugfix/teleop stutter #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2aea290
Updated code to use new core lib. Gradle file cleanup. Removed all re…
Mar 17, 2017
b4a9740
Code cleanup. Fixes to remove warnings thrown by android lint.
Mar 17, 2017
b3e45e2
Removed unused code. Continued work to reduce errors and deprecated c…
Mar 17, 2017
2d81053
Changes to teleop command sending that eliminate stutter in teleop wh…
Mar 18, 2017
23f1991
Trying to debug library issues. Commit before merge from master.
Jul 2, 2017
9b99224
Merge remote-tracking branch 'remotes/origin/master' into bugfix/tele…
Jul 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ repositories {

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
buildToolsVersion "25.0.2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this line got duplicated for no reason.

playAccountConfigs {
release {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
android:name="com.mapbox.AccessToken"
android:value="" />

<service android:name="com.mapbox.mapboxsdk.telemetry.TelemetryService" />

</application>

</manifest>
5 changes: 2 additions & 3 deletions app/src/main/java/com/platypus/android/tablet/Boat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,11 @@ public void receivedPose(UtmPose upwcs)

}


// Removed null from here but this method needs fixing/implementation -ckt
public double getRotation()
{
return (Double) null;
return 0.0;
}

public double getThrust()
{
return tw.dx() / .010;
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/platypus/android/tablet/ConnectScreen.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import java.net.InetSocketAddress;

//import com.google.android.gms.maps.MapFragment;

public class ConnectScreen extends Activity implements OnClickListener {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/platypus/android/tablet/Joystick/JoystickView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
}

private int measure(int measureSpec) {
int result = 0;
int result;
// Decode the measurement specifications.
int specMode = MeasureSpec.getMode(measureSpec);
int specSize = MeasureSpec.getSize(measureSpec);
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/platypus/android/tablet/Path/Path.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public boolean isEmpty()

public void outputPointsToOctave()
{
String output = "";
System.out.print("x=[");
for (LatLng a : points)
{
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/platypus/android/tablet/PolyArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ public ArrayList<ArrayList<LatLng>> createSmallerPolygonsFlat(ArrayList<LatLng>

ArrayList<ArrayList<LatLng>> spirals = new ArrayList<ArrayList<LatLng>>();
spirals.add(vertices);
int i = 0;

//ArrayList<LatLng> pointToCenter = new ArrayList<LatLng>();
//normalized vectors from vertex to center
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/platypus/android/tablet/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.util.Map;


/*
* Only things that should be automatically saved from the teleop panel activity when its closed:
* IP Address
Expand Down
Loading