Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Angle refactor + tests! by Bernstern · Pull Request #42 · Mineinjava/quail · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/linting.yml → .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,4 +15,15 @@ jobs:
distribution: 'zulu'
java-version: 17
- name: Run spotless linter
run: ./gradlew spotlessCheck
run: ./gradlew spotlessCheck

tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Run tests
run: ./gradlew test
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
package com.mineinjava.quail;

import com.mineinjava.quail.util.Util;
import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Vec2d;

public class SwerveModuleBase {
Expand DownExpand Up@@ -47,7 +47,7 @@ public SwerveModuleBase(
* @return the angle to set the steering motor to
*/
public double calculateNewAngleSetpoint(double angle) {
double shortestAngle = Util.deltaAngle(currentAngle, angle);
double shortestAngle = MathUtil.deltaAngle(currentAngle, angle);
return currentAngle = currentAngle + shortestAngle;
}

Expand All@@ -56,7 +56,7 @@ public double calculateNewAngleSetpoint(double angle) {
* opposite direction and rotate less than 90 degrees
*/
public double calculateOptimizedAngle(double angle) {
double deltaAngle = Util.deltaAngle(currentAngle, angle);
double deltaAngle = MathUtil.deltaAngle(currentAngle, angle);
if (Math.abs(deltaAngle) > Math.PI / 2) {
motorFlipper = -1;
return angle + Math.PI;
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
package com.mineinjava.quail.localization;

import com.mineinjava.quail.util.MathUtil;
import com.mineinjava.quail.util.geometry.Pose2d;
import com.mineinjava.quail.util.geometry.Vec2d;
import java.util.ArrayList;

public class KalmanFilterLocalizer implements Localizer {
private Vec2d poseEstimate = new Vec2d(0, 0);
private double looptime = 0;
private ArrayList<KalmanPose2d> velocities =
new ArrayList<KalmanPose2d>(); // / list of velocities, most recent last
public double heading = 0;

public KalmanFilterLocalizer(Vec2d initialPose, double looptime) {
poseEstimate = initialPose;
this.looptime = looptime;
}

/**
* Updates the pose estimate based on the current velocity and the time since the last vision
* update
*
* @param observedPose the current pose estimate (get this from vision usually)
* @param velocity the current velocity
* @param poseEstimateLatency the time since the last vision update
*/
public Vec2d update(Vec2d observedPose, Vec2d velocity, double poseEstimateLatency, double w) {
KalmanPose2d currentVelocity = new KalmanPose2d(velocity, System.currentTimeMillis());
velocities.add(currentVelocity); // add the current velocity to the list of velocities
// trim the list of velocities to only include the relevant ones.
while (velocities.size() > 0
&& velocities.get(0).timestamp < System.currentTimeMillis() - poseEstimateLatency) {
velocities.remove(0);
}
// distance traveled since the vision update
Vec2d deltaPosSinceVision = new Vec2d(0, 0);
for (KalmanPose2d vel : velocities) {
deltaPosSinceVision =
deltaPosSinceVision.add(
vel); // don't scale here, we'll do it later (distributive property)
}
deltaPosSinceVision =
deltaPosSinceVision.scale(looptime); // scale by the looptime: distance = velocity * time
// update the vision pose estimate with the delta from velocity
Vec2d visionPoseEstimate = observedPose.add(deltaPosSinceVision);
// update the last pose estimate with the velocity
Vec2d kinematicsPoseEstimate = this.poseEstimate.add(velocity.scale(this.looptime));
// update the pose estimate with a weighted average of the vision and kinematics pose estimates
w = MathUtil.clamp(w, 0, 1); // make sure w is between 0 and 1 (inclusive)
this.poseEstimate = ((visionPoseEstimate.scale(w)).add(kinematicsPoseEstimate.scale(1 - w)));
return this.poseEstimate;
}

public Pose2d getPose() {
return new Pose2d(poseEstimate.x, poseEstimate.y, this.heading);
}

public void setPose(Pose2d pose) {
this.poseEstimate = new Vec2d(pose.x, pose.y);
}

public void setHeading(double heading) {
this.heading = heading;
}
}

class KalmanPose2d extends Vec2d {
public double timestamp = 0;

public KalmanPose2d(double x, double y, double timestamp) {
super(x, y);
this.timestamp = timestamp;
}

public KalmanPose2d(Vec2d vec, double timestamp) {
super(vec.x, vec.y);
this.timestamp = timestamp;
}
}
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
package com.mineinjava.quail.pathing;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower. This can be either translational or angular velocity. If angular velocity, units are in
* radians.
*/
public class ConstraintsPair {

private double velocity;
private double acceleration;
private final double velocity;
private final double acceleration;

/**
* Represents a pair of constraints (max velocity and max acceleration) for use in the path
* follower Can be either translational or angular velocity. If angular velocity, units are in
* radians.
* Constructs a new ConstraintsPair with the specified max velocity and max acceleration.
*
* @param maxVelocity your units/s
* @param maxAcceleration your units/s^2
* @param maxVelocity the maximum velocity in units/s
* @param maxAcceleration the maximum acceleration in units/s^2
*/
public ConstraintsPair(double maxVelocity, double maxAcceleration) {
this.velocity = maxVelocity;
this.acceleration = maxAcceleration;
}

/**
* Returns the constraints' max velocity
* Returns the maximum velocity of the constraints.
*
* @return
* @return the maximum velocity in units/s
*/
public double getMaxVelocity() {
return velocity;
}

/**
* Returns the constraints' max acceleration
* Returns the maximum acceleration of the constraints.
*
* @return
* @return the maximum acceleration in units/s^2
*/
public double getMaxAcceleration() {
return acceleration;
Expand Down
Loading