Skip to content

Workingjava #10

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.

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

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
16a8208
fixed file with all recent changes
IanCharboneau Mar 8, 2023
e912a91
fixed build errors and added some basic arm
IanCharboneau Mar 8, 2023
ff2bd72
Readded Paths
NikkiTallerThanYou Mar 8, 2023
6cad88a
added more kinematics to arm
IanCharboneau Mar 8, 2023
fe8925f
code so far
IanCharboneau Mar 9, 2023
9ee4f15
Working befor comp- arm
NikkiTallerThanYou Mar 9, 2023
5fc30d5
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
c891dae
Working arm controled by operator
NikkiTallerThanYou Mar 9, 2023
748fb2a
More auton changes
IanCharboneau Mar 9, 2023
16559b0
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
IanCharboneau Mar 9, 2023
93a5ec6
Comp branch testing
NikkiTallerThanYou Mar 9, 2023
1c00923
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
5c05b40
Added Auton selector (commands are WIP)
NikkiTallerThanYou Mar 9, 2023
ee4e78a
Update Arm curent limits and add suffleboard pid
IanCharboneau Mar 9, 2023
56506d6
More auton config (commands are WIP)
NikkiTallerThanYou Mar 9, 2023
919bd5a
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
7c20813
Added support for setting max speed and
IanCharboneau Mar 9, 2023
67001a1
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
IanCharboneau Mar 9, 2023
7f8e8fb
Possibly fixed Kinematics Functions, make sure
IanCharboneau Mar 9, 2023
92308cf
Skeleton Commands
NikkiTallerThanYou Mar 9, 2023
9719337
Fixed compile erros, Fixed some ki, fished safe
IanCharboneau Mar 9, 2023
766f04d
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
IanCharboneau Mar 9, 2023
dc80f9f
Add extra extent funtionality
IanCharboneau Mar 9, 2023
0fe57b5
Configs
NikkiTallerThanYou Mar 9, 2023
19e1e21
make it a slider
IanCharboneau Mar 9, 2023
c20145e
and corret typo in lable of geter
IanCharboneau Mar 9, 2023
981d0f7
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
bf55cb9
Add reset position command and put in robot arm
IanCharboneau Mar 9, 2023
146c655
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
d5a8b8b
Added fields for configuring max output power, adjust
IanCharboneau Mar 9, 2023
081f343
Fixed maxoupt seters to use values from 0-1
IanCharboneau Mar 9, 2023
87edad1
actually saved the code to fixe the max output, shout now
IanCharboneau Mar 9, 2023
99e27c8
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
cd673d1
Added funtionality to select and autoalighment
IanCharboneau Mar 9, 2023
ed3184b
Illegal State Exception (w/Autobalancing command) >:(
NikkiTallerThanYou Mar 9, 2023
19b11c0
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 9, 2023
4db2ddd
Arm initializing errors
NikkiTallerThanYou Mar 9, 2023
eb1c670
begin move to zero method
IanCharboneau Mar 9, 2023
b59e769
change shuffle smothing commad to numeric slider
IanCharboneau Mar 9, 2023
e838e49
Added more loggin and fixed namong conventions
IanCharboneau Mar 9, 2023
ade9244
add functionality to limit the extention length for rule
IanCharboneau Mar 9, 2023
a56cfe0
Add PPramsety back to drivetrain and another function
IanCharboneau Mar 9, 2023
80a1baa
Begin defining Target poses for each scoring
IanCharboneau Mar 9, 2023
a795dab
create posemap of grid targest and substation
IanCharboneau Mar 10, 2023
708238e
create posemap of grid targest and substation
IanCharboneau Mar 10, 2023
29ffb8a
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
IanCharboneau Mar 10, 2023
a5948ce
fix mirroring of grid poses
IanCharboneau Mar 10, 2023
c41f12a
add chargings station poses to target map
IanCharboneau Mar 10, 2023
29f45ab
reduce current limits on arm for testing and safty
IanCharboneau Mar 10, 2023
10937b1
set soft limits on arm and reduce arm max range, max
IanCharboneau Mar 10, 2023
d5833b6
create auto paths to leave commuity, and 2 more
IanCharboneau Mar 10, 2023
c361989
Not entirely finished extendPos
NikkiTallerThanYou Mar 10, 2023
f5d77cb
fine tune auto paths
IanCharboneau Mar 10, 2023
f1c2e63
Addetd two expirimental drive to selected target
IanCharboneau Mar 10, 2023
449787e
Bind more command for driveing other places,
IanCharboneau Mar 10, 2023
50627b3
sencond part on last comit
IanCharboneau Mar 10, 2023
b4efe8e
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 10, 2023
2fe1f01
Place target at high framework
NikkiTallerThanYou Mar 10, 2023
444f7a0
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 10, 2023
5c69d58
"fix" autoselector
IanCharboneau Mar 10, 2023
6a85151
nonworking auto
IanCharboneau Mar 10, 2023
8518fa4
AddDonothing Auto
IanCharboneau Mar 10, 2023
8472f9a
auto selector change to targeting tab
IanCharboneau Mar 10, 2023
c1b7deb
Merge changes
IanCharboneau Mar 10, 2023
565c116
fix oblog and remove arm softlimits test carefuly
IanCharboneau Mar 10, 2023
c8625d9
Begin new atuot command that will work without
IanCharboneau Mar 10, 2023
880f725
actualy implemt dumb drive auto
IanCharboneau Mar 10, 2023
3edfd57
nicoles additions
NikkiTallerThanYou Mar 15, 2023
16975e7
Merge branch 'workingjava' of https://github.com/oscarrobotics/FRC202…
NikkiTallerThanYou Mar 15, 2023
bd7d949
Tune Pid and fix angle readout
IanCharboneau Mar 18, 2023
499d9c9
Tune Pid and fix arm pose calculator
IanCharboneau Mar 18, 2023
0cf8a1e
at DE
IanCharboneau Mar 18, 2023
acc2bf3
Semi-tuned extend pid
NikkiTallerThanYou Mar 19, 2023
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
7 changes: 7 additions & 0 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"robotWidth": 0.76,
"robotLength": 0.9,
"holonomicMode": false,
"generateJSON": true,
"generateCSV": false
}
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ wpi.java.configureTestTasks(test)
// Configure string concat to always inline compile
tasks.withType(JavaCompile) {
options.compilerArgs.add '-XDstringConcat=inline'
options.compilerArgs.add '-parameters'
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/BasicAuto.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.8971430359922339,
"y": 3.295782989670245
},
"prevControl": null,
"nextControl": {
"x": 3.4617919262920473,
"y": 3.2849960506962317
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.918574694292246,
"y": 3.292390870496027
},
"prevControl": {
"x": 3.1698661501588417,
"y": 3.314778857045866
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"maxVelocity": null,
"maxAcceleration": null,
"isReversed": false,
"markers": []
}
102 changes: 102 additions & 0 deletions src/main/deploy/pathplanner/OneCargoAuto1.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.8771305963664562,
"y": 4.960295710065105
},
"prevControl": null,
"nextControl": {
"x": 2.8771305963664533,
"y": 4.960295710065105
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 4.23487917151273,
"y": 4.960295710065105
},
"prevControl": {
"x": 3.1900986919438368,
"y": 4.960295710065105
},
"nextControl": {
"x": 4.751770205294798,
"y": 4.960295710065105
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 5.839961855362307,
"y": 3.8086262137436555
},
"prevControl": {
"x": 6.552586078837914,
"y": 4.833470347828792
},
"nextControl": {
"x": 5.445207455710081,
"y": 3.2409192546470966
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.8993534127419136,
"y": 3.3824178174672146
},
"prevControl": {
"x": 4.996613326559983,
"y": 3.3733495537166522
},
"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": true,
"markers": []
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/OneCargoAuto2.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.7999927428426288,
"y": 3.8077216154432314
},
"prevControl": null,
"nextControl": {
"x": 2.7999927428426297,
"y": 3.8077216154432314
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.918574694292246,
"y": 3.4212235567328277
},
"prevControl": {
"x": 3.116949091041039,
"y": 3.4355382996480284
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"maxVelocity": null,
"maxAcceleration": null,
"isReversed": true,
"markers": []
}
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/OneCargoAuto3.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"waypoints": [
{
"anchorPoint": {
"x": 1.8952671238675813,
"y": 1.5959698586063844
},
"prevControl": null,
"nextControl": {
"x": 2.8927761364294655,
"y": 1.5959698586063844
},
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
},
{
"anchorPoint": {
"x": 3.8812168852407885,
"y": 2.1219291561390143
},
"prevControl": {
"x": 2.4302946851507743,
"y": 2.1219291561390143
},
"nextControl": null,
"holonomicAngle": 0,
"isReversal": false,
"velOverride": null,
"isLocked": false,
"isStopPoint": false,
"stopEvent": {
"names": [],
"executionBehavior": "parallel",
"waitBehavior": "none",
"waitTime": 0
}
}
],
"maxVelocity": 2.0,
"maxAcceleration": null,
"isReversed": true,
"markers": []
}
Loading