Skip to content

Commit

Permalink
Changes for / from Champs (#184)
Browse files Browse the repository at this point in the history
* Add swerve X mode while planted

* Add stall detection to 2 wire, strafe correct direction, extend back away path and add vel override for back away

* Add comment to align then score

* rezero wrist encoder

* change key for arm positions

* Reset motion profile in auton init

* Tune field values and fix wrist off center offset

* Restructure field constants file

* double score delta for high tip out

* Adjust 3 piece auton

* re outtake in 2 piece wire

* tune 2 piece wire on practice field

* only stall if acquiring

* Add red blue x distance alignment, convert y to double arrays

* Amend the two-degree-of-freedom holonomic module target angles for the x-mode configuration method for the base class subsystem for the eight-degree-of-freedom holonomic control drivetrain mechanism by incrementing the value of each two-degree-of-freedom holonomic module target angle by one quarter of a full unit of rotation, also known as ninety degrees.

* Name ppfield images, add overlaid image

* make 2 piece path further away from grid

* remove an inch frmo the stddev's

* update 3 piece auton, make it go into grid more

* Lower teleop velocity feedback wrist cutoff

* Lower teleop vision stdevs

* Tune 3 piece low path

* Tune cone alignment grid distances

* Remove arm requirement from score cubes command

* upload 3 piece paths and add red and blue versions

* tune the mid cone scopre position to be higher

* increase the feedback cutoff for the arm

* decrement the odometry impl again

* decrease camera resolution

* Make red three w low the default auton

* Update three piece red side to avoid barrier & intake piece better

* Update 3 piece blue to avoid barrier

* excuse me it's a free country

* Retune swerve modules

* Adjust three piece auto ot not hit the bloody barrier

* Update swerve module offset date

---------

Co-authored-by: Prog694 <prog692@gmail.com>
  • Loading branch information
BenG49 and Prog694 authored May 15, 2023
1 parent 48d5abc commit 29b751c
Show file tree
Hide file tree
Showing 29 changed files with 1,376 additions and 205 deletions.
File renamed without changes
Binary file added images/ppfieldcursed.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ppfieldred.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 32 additions & 32 deletions src/main/deploy/pathplanner/2 Piece Wire.path
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
},
{
"anchorPoint": {
"x": 4.025,
"x": 3.93,
"y": 0.6
},
"prevControl": {
"x": 3.9394171953824344,
"x": 3.844417195382434,
"y": 0.6
},
"nextControl": {
"x": 4.091564403591444,
"x": 3.9965644035914436,
"y": 0.6
},
"holonomicAngle": 0,
Expand Down Expand Up @@ -74,20 +74,20 @@
},
{
"anchorPoint": {
"x": 7.5,
"y": 0.8500000000000001
"x": 4.630000000000001,
"y": 0.7204483269726036
},
"prevControl": {
"x": 7.525347858738666,
"y": 0.8534978594569578
"x": 4.737558305754327,
"y": 0.71660695890995
},
"nextControl": {
"x": 6.301852034309053,
"y": 0.6846624369405326
"x": 4.487939766512445,
"y": 0.7255219067400154
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"velOverride": 0.6,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
Expand All @@ -99,22 +99,22 @@
},
{
"anchorPoint": {
"x": 4.733971442626428,
"y": 0.7204483269726036
"x": 2.15,
"y": 1.26
},
"prevControl": {
"x": 4.841529748380754,
"y": 0.71660695890995
"x": 3.8167809668952675,
"y": 0.33250922108681824
},
"nextControl": {
"x": 4.591911209138873,
"y": 0.7255219067400154
"x": 3.8167809668952675,
"y": 0.33250922108681824
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": 0.6,
"isReversal": true,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"isStopPoint": true,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
Expand All @@ -124,22 +124,22 @@
},
{
"anchorPoint": {
"x": 2.15,
"y": 1.35
"x": 3.9107899324922086,
"y": 0.7170175342139599
},
"prevControl": {
"x": 3.2377422608937754,
"y": 0.9963188456626031
"x": 3.658418782263801,
"y": 0.7467082577702426
},
"nextControl": {
"x": 3.2377422608937754,
"y": 0.9963188456626031
"x": 4.154575894124955,
"y": 0.6883368328454019
},
"holonomicAngle": 0,
"isReversal": true,
"velOverride": null,
"isReversal": false,
"velOverride": 0.6,
"isLocked": false,
"isStopPoint": true,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
Expand All @@ -149,12 +149,12 @@
},
{
"anchorPoint": {
"x": 3.79,
"y": 1.05
"x": 6.104863587186924,
"y": 0.7600385862667981
},
"prevControl": {
"x": 3.3677068898441593,
"y": 0.905669066274842
"x": 5.682570477031083,
"y": 0.6157076525416401
},
"nextControl": null,
"holonomicAngle": 0,
Expand Down
202 changes: 202 additions & 0 deletions src/main/deploy/pathplanner/3 Piece W Low - Blue.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.8,
"y": 4.6
},
"prevControl": null,
"nextControl": {
"x": 3.1835287054512387,
"y": 4.6
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 6.340000000000001,
"y": 4.44
},
"prevControl": {
"x": 5.587270042913402,
"y": 4.44
},
"nextControl": {
"x": 6.549202411287385,
"y": 4.44
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": 1.0,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 6.7700000000000005,
"y": 4.44
},
"prevControl": {
"x": 6.651547629778109,
"y": 4.471296466187375
},
"nextControl": {
"x": 6.651547629778109,
"y": 4.471296466187375
},
"holonomicAngle": 0,
"isReversal": true,
"velOverride": null,
"isLocked": false,
"isStopPoint": true,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 2.1599999999999997,
"y": 4.4
},
"prevControl": {
"x": 4.086804808642588,
"y": 4.568573577583465
},
"nextControl": {
"x": 4.086804808642588,
"y": 4.568573577583465
},
"holonomicAngle": 6.54,
"isReversal": true,
"velOverride": null,
"isLocked": false,
"isStopPoint": true,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 6.58,
"y": 3.53
},
"prevControl": {
"x": 5.370212645435206,
"y": 4.73978735456479
},
"nextControl": {
"x": 6.712618407320928,
"y": 3.3973815926790722
},
"holonomicAngle": -30.0,
"isReversal": false,
"velOverride": 1.0,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 6.9,
"y": 3.25
},
"prevControl": {
"x": 6.842860523327884,
"y": 3.3115587598696563
},
"nextControl": {
"x": 6.842860523327884,
"y": 3.3115587598696563
},
"holonomicAngle": -30.0,
"isReversal": true,
"velOverride": null,
"isLocked": false,
"isStopPoint": true,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 1.7,
"y": 4.4
},
"prevControl": {
"x": 6.23764461204136,
"y": 4.853146458429669
},
"nextControl": {
"x": 6.23764461204136,
"y": 4.853146458429669
},
"holonomicAngle": 10.0,
"isReversal": true,
"velOverride": null,
"isLocked": false,
"isStopPoint": true,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 7.60794478853915,
"y": 4.990176476079449
},
"prevControl": {
"x": 6.851165372882417,
"y": 4.737916670860539
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"maxVelocity": 3.0,
"maxAcceleration": 4.0,
"isReversed": null,
"markers": []
}
Loading

0 comments on commit 29b751c

Please sign in to comment.