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.

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

Vision #109

Closed
wants to merge 62 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
82d02f9
Fixed readme
Superbro525Alt Jan 30, 2024
2669a4b
Swerve fix (#106)
goanna247 Jan 23, 2024
d9683c7
Shooter - Implements Networking tables (#99)
totallysomeoneyoudontknow Jan 23, 2024
7bc0ecc
Intake (#100)
kill-shots Jan 23, 2024
e5a9d4d
Arm (#103)
JoystickMaster-race Jan 24, 2024
0029f49
fix some formatting
spacey-sooty Jan 24, 2024
3940bd2
fix more stuff
spacey-sooty Jan 24, 2024
57d11c0
Shooter pid (#117)
totallysomeoneyoudontknow Jan 30, 2024
c30477a
Intake - Manual/Auto fixes (#114)
prawny-boy Jan 30, 2024
c83ac05
[robot/vision] Started work on limelight vision
Superbro525Alt Jan 25, 2024
1b6d504
[robot/vision] Finished vision (needs testing)
Superbro525Alt Jan 25, 2024
c89d969
[wpiformat] Run wpiformat
Superbro525Alt Jan 25, 2024
df64818
[robot/vision] Finish vision
Superbro525Alt Jan 25, 2024
0242f4a
Updated vision
Superbro525Alt Jan 28, 2024
35104bf
More math stuff
Superbro525Alt Jan 29, 2024
cbf0e37
Finish vision maths
Superbro525Alt Jan 29, 2024
ae1a0fc
[wpiformat + add ctre_sim to gitignore]
Superbro525Alt Jan 29, 2024
c096260
Finished vision (hopefully)
Superbro525Alt Jan 29, 2024
2615ea8
More vision
Superbro525Alt Jan 29, 2024
6f3fb2f
Merge with swerve stuff
Superbro525Alt Jan 30, 2024
befb502
More vision
Superbro525Alt Jan 30, 2024
57e941a
[wpiformat]
Superbro525Alt Jan 30, 2024
2adee21
Finished turning to note
Superbro525Alt Jan 30, 2024
04692db
[wpiformat]
Superbro525Alt Jan 30, 2024
bf9b1b4
Merged with swerve
Superbro525Alt Jan 30, 2024
87c92ed
Did more vision stuff
Superbro525Alt Jan 30, 2024
29614ca
begin merge
Superbro525Alt Feb 12, 2024
f161f5f
[docs] remove unnecessary split in readme (#120)
spacey-sooty Feb 3, 2024
b6a6d07
[docs] make quick commands clearer (#121)
spacey-sooty Feb 3, 2024
18d76b0
[build] update gradle to 8.6 (#123)
spacey-sooty Feb 3, 2024
5e9957b
[wombat/utils] fix pid handling of negative numbers (#122)
spacey-sooty Feb 4, 2024
ad36f91
[wombat/drivetrain] add DrivetrainPoseBehaviour (#125)
spacey-sooty Feb 7, 2024
8df8414
Pid testing (#132)
goanna247 Feb 10, 2024
4e8f5b1
formatted (#133)
spacey-sooty Feb 11, 2024
a3d1491
Swerve fix (#106)
goanna247 Jan 23, 2024
c48b0b5
Shooter - Implements Networking tables (#99)
totallysomeoneyoudontknow Jan 23, 2024
1e38cbc
Intake (#100)
kill-shots Jan 23, 2024
8297dcc
Arm (#103)
JoystickMaster-race Jan 24, 2024
1dc1c24
fix some formatting
spacey-sooty Jan 24, 2024
650da17
fix more stuff
spacey-sooty Jan 24, 2024
7a95046
Shooter pid (#117)
totallysomeoneyoudontknow Jan 30, 2024
d5872bf
Intake - Manual/Auto fixes (#114)
prawny-boy Jan 30, 2024
c87ac5f
[robot/vision] Started work on limelight vision
Superbro525Alt Jan 25, 2024
d1aec64
[robot/vision] Finished vision (needs testing)
Superbro525Alt Jan 25, 2024
a2df62c
[wpiformat] Run wpiformat
Superbro525Alt Jan 25, 2024
ba3fc0e
[robot/vision] Finish vision
Superbro525Alt Jan 25, 2024
255c063
Updated vision
Superbro525Alt Jan 28, 2024
6250586
More math stuff
Superbro525Alt Jan 29, 2024
33a0cbc
Finish vision maths
Superbro525Alt Jan 29, 2024
9be89e7
[wpiformat + add ctre_sim to gitignore]
Superbro525Alt Jan 29, 2024
83b8d96
Finished vision (hopefully)
Superbro525Alt Jan 29, 2024
542b408
More vision
Superbro525Alt Jan 29, 2024
de137b3
Merge with swerve stuff
Superbro525Alt Jan 30, 2024
ed25bec
More vision
Superbro525Alt Jan 30, 2024
65bc79b
[wpiformat]
Superbro525Alt Jan 30, 2024
07e7ddd
Finished turning to note
Superbro525Alt Jan 30, 2024
984b9c1
[wpiformat]
Superbro525Alt Jan 30, 2024
a9125e9
Merged with swerve
Superbro525Alt Jan 30, 2024
c182ca3
Did more vision stuff
Superbro525Alt Jan 30, 2024
53a32c5
begin merge
Superbro525Alt Feb 12, 2024
1bca9f3
Merge remote-tracking branch 'refs/remotes/origin/vision' into vision
Superbro525Alt Feb 12, 2024
9837926
Merged
Superbro525Alt Feb 12, 2024
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 .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* text=auto
*.sh text eol=lf
*.bat text eol=crlf
*.gradle text eol=lf
*.java text eol=lf
*.json text eol=lf
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# This gitignore has been specially created by the WPILib team.
# If you remove items from this file, intellisense might break.

### Sim ###

ctre_sim

### C++ ###
# Prerequisites
*.d
Expand Down
1 change: 0 additions & 1 deletion .styleguide
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

cppHeaderFileInclude {
\.h$
\.hpp$
Expand Down
21 changes: 4 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,24 @@ Our code for the 2024 FRC game, CRESCENDO, using GradleRIO, Wombat, and probably

Setup
===

First install WPILib and if running Windows the FRC game tools. Instructions can be found [here](https://docs.wpilib.org/en/stable/docs/zero-to-robot/step-2/index.html).

Linux
---
Fork this repository then open up a terminal and run :
```bash
git clone https://github.com/*yourusernamehere*/2024-Crescendo.git
cd 2024-Crescendo
```
Now look in [CONTRIBUTING.md](./CONTRIBUTING.md) before continuing!

Windows
---
Fork this repository then open up a terminal and run :
```powershell
git clone https:\\github.com\*yourusernamehere*\2024-Crescendo.git
cd 2024-Crescendo
```
Now look in [CONTRIBUTING.md](./CONTRIBUTING.md) before continuing!

Quick Commands
===
These commands can be used in a variety of combinations, feel free to experiment!

Build
---
`./gradlew build`
Build will compile and get the code ready without deploying it. It will also run all automated tests, which is great for testing your code before it ever gets run on a robot (which also means you can build whenever).
Build will compile your code without deploying it. It will also run all automated tests, which is great for testing code before it runs on a robot.

`./gradlew :Wombat:build`
`./gradlew :wombat:build`
Will compile and build the Wombat library. Also runs all of Wombat's inbuilt tests.

Deploy
Expand All @@ -50,11 +37,11 @@ Cleaning removes caches of your compiled code. If you do not understand an error
Simulation
----------
**Release**
`./gradlew :nativeSimulation`
`./gradlew :simulateNative`
Runs a simulation of your code at highest optimisation.

**Debug**
`./gradlew :nativeSimulationDebug`
`./gradlew :simulateNativeDebug`
Runs a debug simulation of your code, including a variety of debugging tools similar to glass but at lower optimisation.

Documentation
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@ subprojects {
}

wrapper {
gradleVersion = '8.5'
gradleVersion = '8.6'
distributionType = Wrapper.DistributionType.BIN
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added ctre_sim/Pigeon 2 - 020 - 0 - ext.dat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
184 changes: 92 additions & 92 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,92 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
1 change: 1 addition & 0 deletions networktables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
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
}
]
}
26 changes: 26 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo"
}
},
"NetworkTables": {
"transitory": {
"drivetrain": {
"open": true,
"pid": {
"open": true
}
},
"vision": {
"open": true
}
}
},
"NetworkTables Info": {
"Clients": {
"open": true
},
"visible": true
}
}
Loading