Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
d86d29c
made changes
Jan 11, 2023
fd27f87
added angle offsets
Jan 13, 2023
10ed98c
shuffleboard
Jan 13, 2023
3845204
cleaned up and removed a ton of stuff
Jan 15, 2023
05e0033
everything in the universe
Jan 16, 2023
c2fa0f5
cleaned up even more
Jan 19, 2023
129bd64
cleaned up even more
Jan 19, 2023
d303563
stuff
Jan 23, 2023
e21b766
pid correction system in place, just needs tuning
Jan 25, 2023
d2dc209
jf
Feb 6, 2023
2c73577
progress as of 2/14/2023
Feb 15, 2023
0b5697e
Merge branch 'tempt'
Feb 15, 2023
7ab74c3
hjlfds
Feb 16, 2023
8aa7c08
upgraded to 2023 code. 2022 version of this repo is saved in the swer…
Rvistix Feb 19, 2023
a6dc678
builds
NottheIRS Feb 20, 2023
4fa0700
doesn't crash on new robot
NottheIRS Feb 21, 2023
6f6a869
still has module pid issues
NottheIRS Feb 21, 2023
5e12b52
Added a shuffleboard box that changes the preferences for alignment
Rvistix Feb 22, 2023
d6061d6
truncated analog input
Rvistix Feb 22, 2023
e0078bd
minor PID Changes
Rvistix Feb 22, 2023
e4e5226
aligns and moves without vibrating too much
Feb 26, 2023
5c9d415
drives, for the first time
Feb 27, 2023
674687c
fixed the alignment system
Mar 1, 2023
9d6ecdd
added subsystems code still fails to link
Mar 5, 2023
54cfd96
Update README.md
Rvistix Mar 5, 2023
9db4e88
fixed linker errors and setup subsystem triggers. I also bound the dp…
Mar 5, 2023
aee1133
vision input is done...
Rvistix Mar 5, 2023
48e540b
added cosine-based dynamic PID
Mar 5, 2023
bd362ea
does not build
Rvistix Mar 5, 2023
99bd321
fixed the alignment system
Mar 1, 2023
8d792c0
started inverse kinematics
Mar 5, 2023
e56ef55
calculating robot angles and distance to node
Mar 5, 2023
f8c794f
documentation and next step suggestions
Mar 5, 2023
f041136
started node picker
Mar 5, 2023
3e2430a
merged from cloud
Mar 5, 2023
6886899
merged from cloud
Mar 5, 2023
0e27d3d
merged from master
Mar 5, 2023
ff910f6
added telescope code
Mar 5, 2023
80369d7
added auton
Rvistix Mar 5, 2023
abffcb4
fixed build errors
Mar 5, 2023
7eee9c0
now master builds and links
Mar 5, 2023
5d36e78
gets robot relative to node position given robot relative to april tag
Mar 6, 2023
7149341
added PID for tele
Mar 6, 2023
b57da01
added functions for setting arm and tele pos for conveince
Mar 6, 2023
03d7441
most kinematics theoretically handled, just need to handle inputs and…
Mar 6, 2023
44a6543
a little extra telemetry I realized we needed
AdithyaLaakso Mar 6, 2023
d204c91
merged from master
Mar 7, 2023
56207fe
merged more changes from master
Mar 7, 2023
1dea290
changed can IDs (actually works now)
Mar 8, 2023
0df0877
Merge branch 'master' into auton
Mar 8, 2023
b8c6fce
added telemetry to identify the fact that taxi does not work
Mar 8, 2023
dc36883
tried something with auton
Mar 9, 2023
f8123bc
jsdlkfjd
Mar 10, 2023
a740411
changed encoder handling
Mar 10, 2023
5228486
increased power limit
Mar 10, 2023
482552f
Merge branch 'Auton' into SubsystemsandAuton
Mar 10, 2023
31c3ca0
merged
Mar 10, 2023
a4193a6
New auton mode ig
Rvistix Mar 10, 2023
b126b56
Added auton mode described by ryan
Rvistix Mar 11, 2023
9d8cf42
g
Mar 11, 2023
886d3b1
made it easier to tune with dashboard
Rvistix Mar 11, 2023
ab7cf54
Builds now haven't tested on robot
Rvistix Mar 11, 2023
9dce7f6
vision kinematic integration 3/10
Rvistix Mar 12, 2023
00f39d3
Auton is in the standard format and crap, reason for broke is somethi…
Rvistix Mar 12, 2023
8d2bd1b
bug fixes in vision
Mar 13, 2023
99049b8
added setnumber method in kinematicmodel
Rvistix Mar 13, 2023
fd241a6
Merge branch 'allignment' of https://github.com/FRC830/Robot-2023 int…
Rvistix Mar 13, 2023
e02be00
Merge remote-tracking branch 'origin/vision' into auton2
Rvistix Mar 13, 2023
1c49472
Merge branch 'auton2' into allignment
Rvistix Mar 14, 2023
04962a6
Merge remote-tracking branch 'origin/auton1' into allignment
Rvistix Mar 14, 2023
857da82
Builds now... still have to work on the deprycated
Rvistix Mar 14, 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
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,15 @@ gradle-app.setting
.settings/
bin/

# IntelliJ
*.iml
*.ipr
*.iws
.idea/
out/

# Fleet
.fleet

# Simulation GUI and other tools window save file
*-window.json
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"desktop": false,
}
]
}
}
29 changes: 16 additions & 13 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,22 @@
"**/*~": true
},
"C_Cpp.default.configurationProvider": "vscode-wpilib",
"wpilib.autoStartRioLog": false,
"files.associations": {
"tuple": "cpp",
"*.inc": "cpp",
"array": "cpp",
"atomic": "cpp",
"hash_map": "cpp",
"hash_set": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
Expand All @@ -42,26 +43,26 @@
"cwctype": "cpp",
"deque": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"filesystem": "cpp",
"functional": "cpp",
"iterator": "cpp",
"map": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"set": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
Expand All @@ -74,16 +75,18 @@
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"semaphore": "cpp",
"span": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"variant": "cpp",
"*.inc": "cpp"
},
"wpilib.skipTests": true,
"wpilib.autoSaveOnDeploy": true
"variant": "cpp"
}
}
4 changes: 2 additions & 2 deletions .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": true,
"currentLanguage": "cpp",
"projectYear": "2022",
"teamNumber": 7443
"projectYear": "2023",
"teamNumber": 830
}
Binary file added FRC_20230311_141202.wpilog
Binary file not shown.
Binary file added FRC_20230311_141313.wpilog
Binary file not shown.
Binary file added FRC_20230311_141521.wpilog
Binary file not shown.
Binary file added FRC_20230311_141546.wpilog
Binary file not shown.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ Please see (and/or use) [shuffleboard.json](https://github.com/Jagwires7443/Swer
![alt text](https://github.com/Jagwires7443/Swerve/blob/master/TestMode1.PNG?raw=true)

![alt text](https://github.com/Jagwires7443/Swerve/blob/master/TestMode2.PNG?raw=true)



##Vision ig
To update vision setting in terms of pipeline tuning data. Click export settings and wait for the download of the .zip file. Disconnect from the radio. connect to the radio conncted the new pi we want the setting to be on. Than click import setting and all that stuff
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2022.4.1"
id "edu.wpi.first.GradleRIO" version "2023.4.2"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down Expand Up @@ -36,7 +36,7 @@ deploy {
def deployArtifact = deploy.targets.roborio.artifacts.frcCpp

// Set this to true to enable desktop support.
def includeDesktopSupport = false
def includeDesktopSupport = true

// Set to true to run simulation in debug mode
wpi.cpp.debugSimulation = false
Expand All @@ -61,6 +61,7 @@ model {
}
exportedHeaders {
srcDir 'src/main/include'
include "**/*.h"
}
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
16 changes: 11 additions & 5 deletions gradlew
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions networktables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[
{
"name": "/Preferences/FrontLeftAlignmentOffset",
"type": "double",
"value": 316.0,
"properties": {
"persistent": true
}
},
{
"name": "/Preferences/FrontRightAlignmentOffset",
"type": "double",
"value": 157.0,
"properties": {
"persistent": true
}
},
{
"name": "/Preferences/RearLeftAlignmentOffset",
"type": "double",
"value": 60.0,
"properties": {
"persistent": true
}
},
{
"name": "/Preferences/RearRightAlignmentOffset",
"type": "double",
"value": 287.0,
"properties": {
"persistent": true
}
}
]
1 change: 1 addition & 0 deletions networktables.json.bck
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
String frcYear = '2022'
String frcYear = '2023'
File frcHome
if (OperatingSystem.current().isWindows()) {
String publicFolder = System.getenv('PUBLIC')
Expand Down
92 changes: 92 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
"decKey": 87,
"incKey": 83
},
{
"decKey": 69,
"decayRate": 0.0,
"incKey": 82,
"keyRate": 0.009999999776482582
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
],
"povCount": 1
},
{
"axisConfig": [
{
"decKey": 74,
"incKey": 76
},
{
"decKey": 73,
"incKey": 75
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonKeys": [
77,
44,
46,
47
],
"povCount": 0
},
{
"axisConfig": [
{
"decKey": 263,
"incKey": 262
},
{
"decKey": 265,
"incKey": 264
}
],
"axisCount": 2,
"buttonCount": 6,
"buttonKeys": [
260,
268,
266,
261,
269,
267
],
"povCount": 0
},
{
"axisCount": 0,
"buttonCount": 0,
"povCount": 0
}
]
}
Loading