Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 1d52dcb
Author: Aleah H <[email protected]>
Date:   Sat Feb 24 11:00:12 2024 -0800

    Make rotateTo variables less ambiguous

commit 2c5f12c
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 24 10:45:27 2024 -0800

    delete unused code

commit 8985324
Author: michael-lesirge <[email protected]>
Date:   Fri Feb 23 17:07:40 2024 -0800

    Remove unused imports

commit 858b800
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 15:41:38 2024 -0800

    Im sorry micheal, the fancy code broke it, i just hardcoded it

commit 9aadee6
Merge: 2c97fad 709282d
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 15:16:55 2024 -0800

    Merge branch 'origin/arm-subsystem-scaffolding'

commit 709282d
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 15:15:21 2024 -0800

    Rewrite arm commands

commit 6ba1163
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 15:04:36 2024 -0800

    Arm Code Working

commit df93862
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 14:56:58 2024 -0800

    Add somewhat working arm code

commit 2c97fad
Author: Aleah H <[email protected]>
Date:   Mon Feb 19 13:10:19 2024 -0800

    Add New Swerve Offsets (Comp Bot)

commit 1411991
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 17 17:28:22 2024 -0800

    small cleanup after testing (unused constants/imports, etc)

commit f9f16d2
Author: Aleah H <[email protected]>
Date:   Sat Feb 17 15:01:36 2024 -0800

    Test rotateTo Command

commit 3b7bbc2
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 17 10:09:51 2024 -0800

    make auto rotate work robot relative

commit f594505
Author: michael-lesirge <[email protected]>
Date:   Fri Feb 16 08:29:42 2024 -0800

    cleanup minor code logic

commit b3343f4
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 15 20:06:35 2024 -0800

    reenable vision subsystem

commit 131a059
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 15 17:42:22 2024 -0800

    Add auto rotate relative to start

commit 93e6fe7
Author: judeconnolly <[email protected]>
Date:   Thu Feb 15 17:31:15 2024 -0800

    arm button remapping

commit 48a1c46
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 15 17:25:59 2024 -0800

    Get auto rotate to working within 1 degree

commit 1ee510e
Author: judeconnolly <[email protected]>
Date:   Thu Feb 15 16:44:15 2024 -0800

    main merge cleanup

commit 747a6bc
Merge: 95e1e18 b58e567
Author: judeconnolly <[email protected]>
Date:   Thu Feb 15 16:32:11 2024 -0800

    Merge branch 'main' into origin/arm-subsystem-scaffolding

commit 95e1e18
Author: judeconnolly <[email protected]>
Date:   Thu Feb 15 15:43:02 2024 -0800

    separate arm container + PID constants for arm

commit b58e567
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 15 15:28:15 2024 -0800

    Get ready for testing today and improve control setting readability

commit 3a2fcd8
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 21:44:24 2024 -0800

    change template comments to be more helpful

commit 5f332a2
Merge: b024178 f8b3245
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 17:10:18 2024 -0800

    Merge branch 'main' of https://github.com/redshiftrobotics/crescendo-2024

commit b024178
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 17:10:15 2024 -0800

    Remove newline

commit f8b3245
Merge: b519362 02c76ab
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 17:06:44 2024 -0800

    Merge pull request #2 from redshiftrobotics/shuffleboard

    LGTM 👍 👍 👍 👍 👍 👍

commit 02c76ab
Author: Aceius E <[email protected]>
Date:   Wed Feb 14 17:02:54 2024 -0800

    Update icon

commit 274ebaf
Author: Aceius E <[email protected]>
Date:   Wed Feb 14 16:53:56 2024 -0800

    This was a bad idea

    This reverts commit 4322034.

commit b519362
Merge: 9a0aae2 2777294
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 16:48:51 2024 -0800

    Merge branch 'main' of https://github.com/redshiftrobotics/crescendo-2024

commit 9a0aae2
Author: michael-lesirge <[email protected]>
Date:   Wed Feb 14 16:48:03 2024 -0800

    Fix future in follow tag

commit 2777294
Author: DigitalFork <[email protected]>
Date:   Wed Feb 14 16:47:33 2024 -0800

    Rename camera to vision in FollowTag (disambiguity)

commit 49d2c13
Author: judeconnolly <[email protected]>
Date:   Wed Feb 14 16:40:36 2024 -0800

    Arm Driver Control updating to new format

commit e88a986
Author: Aceius E <[email protected]>
Date:   Wed Feb 14 16:18:47 2024 -0800

    Fix innacurate docs & other comment cleanup

commit 5b168bc
Author: Aceius E <[email protected]>
Date:   Wed Feb 14 16:00:36 2024 -0800

    Fix out of date comment

commit 36669f6
Author: Aceius E <[email protected]>
Date:   Wed Feb 14 15:54:48 2024 -0800

    Update SwerveDrivetrain.java

commit 763ce69
Merge: 7f1bd24 6af518d
Author: michael-lesirge <[email protected]>
Date:   Mon Feb 12 17:44:45 2024 -0800

    Merge branch 'main' of https://github.com/redshiftrobotics/crescendo-2024

commit 7f1bd24
Author: michael-lesirge <[email protected]>
Date:   Mon Feb 12 17:44:23 2024 -0800

    new pid values

commit 6af518d
Author: Aceius E <[email protected]>
Date:   Mon Feb 12 17:40:00 2024 -0800

    Update javadocs on some commands

commit 4322034
Author: Aceius E <[email protected]>
Date:   Mon Feb 12 17:29:21 2024 -0800

    Switch to shuffleboard API in DriverControl command

commit bb476a2
Author: judeconnolly <[email protected]>
Date:   Mon Feb 12 16:01:54 2024 -0800

    Arm Xbox control creation and attribution of buttons

    teehee my commit names make me feel smart

commit b8316e7
Author: michael-lesirge <[email protected]>
Date:   Mon Feb 12 14:05:50 2024 -0800

    update how drivetrain gets to position to account for vision

commit fb3cbe1
Author: michael-lesirge <[email protected]>
Date:   Sun Feb 11 11:28:00 2024 -0800

    clean up ChassisDriveInputs

commit 54f7580
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 15:42:24 2024 -0800

    start using vision subsystem

commit f108150
Merge: 943a30c 4278680
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 15:21:30 2024 -0800

    Merge branch 'main' of https://github.com/redshiftrobotics/crescendo-2024

commit 943a30c
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 15:17:46 2024 -0800

    switch x and y to fix it

commit 4278680
Author: DigitalFork <[email protected]>
Date:   Sat Feb 10 13:47:30 2024 -0800

    Squashed commit of the following:

    commit e8f5872
    Merge: 9d2afd0 9b3b533
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 10 11:53:01 2024 -0800

        Merge branch 'main' into vision

    commit 9d2afd0
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 10 11:42:59 2024 -0800

        Re-add commented lines (for merge)

    commit eb7c2c1
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 10 11:34:40 2024 -0800

        Add camera name constant and port forwarder for USB port on RoboRIO
        https://docs.photonvision.org/en/latest/docs/installation/networking.html#port-forwarding

    commit 91d13c3
    Author: DigitalFork <[email protected]>
    Date:   Wed Feb 7 21:00:11 2024 -0800

        Update PhotonLib version
        Fix SmartDashboard put statement
        Add camera offset transform constant

    commit bce9f62
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 3 21:57:36 2024 -0800

        Add new post statements for testing
        Need to get 3D AprilTags working

    commit 00ddc23
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 3 14:11:35 2024 -0800

        VISION PIPELINE WORKS!
        Update photonlib vendordep
        Vision cameraName is Arducam name

    commit 9996b90
    Author: DigitalFork <[email protected]>
    Date:   Sat Feb 3 10:27:24 2024 -0800

        Add Initial Full Vision Pipeline Test
        Add getDist methods for tag detection in bot.
        Add ShuffleBoard field for posting tag numbers. (Not working, need to test)

    commit 2e38015
    Author: DigitalFork <[email protected]>
    Date:   Wed Jan 24 15:50:17 2024 -0800

        Add initial files for vision

commit f7ab8a4
Merge: 37ca977 9b3b533
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 10:53:14 2024 -0800

    Merge branch 'main' into origin/arm-subsystem-scaffolding

commit 9b3b533
Merge: cd22023 d9c1068
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 10:40:45 2024 -0800

    Merge branch 'main' of https://github.com/redshiftrobotics/crescendo-2024

commit cd22023
Author: michael-lesirge <[email protected]>
Date:   Sat Feb 10 10:38:14 2024 -0800

    fix some minor bugs and cleanup comments

commit 4cefc39
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 8 21:45:32 2024 -0800

    minor cleanup / comment fix

commit 37ca977
Author: judeconnolly <[email protected]>
Date:   Thu Feb 8 17:46:56 2024 -0800

    Arm Movement remake

commit d9c1068
Author: Aceius E <[email protected]>
Date:   Thu Feb 8 17:35:46 2024 -0800

    New shuffleboard Layout

    Co-Authored-By: MAIDGRENADE <[email protected]>

commit ef04238
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 8 16:00:51 2024 -0800

    clean up some comments

commit cd84514
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 8 08:20:27 2024 -0800

    add x mode breaking

commit d301203
Author: michael-lesirge <[email protected]>
Date:   Thu Feb 8 08:20:11 2024 -0800

    remember to call super

commit 218b311
Author: judeconnolly <[email protected]>
Date:   Wed Feb 7 17:55:12 2024 -0800

    ArmJoystickControl arm movment button controll :)

commit 2e3300e
Author: judeconnolly <[email protected]>
Date:   Wed Feb 7 15:36:38 2024 -0800

    Arm Subsystem Progression

commit ad0bf02
Author: judeconnolly <[email protected]>
Date:   Thu Feb 1 17:13:55 2024 -0800

    Set Arm To Intake/Amp/Speaker Pos

    changed everything from radians to degrees

commit 81e71cf
Author: judeconnolly <[email protected]>
Date:   Thu Feb 1 15:53:14 2024 -0800

    Previous setArmAngleRadians commit completion

    forgot to save before committing on my last commit

commit 64a1853
Author: judeconnolly <[email protected]>
Date:   Wed Jan 31 17:50:48 2024 -0800

    setArmAngleRadians

commit b4f399e
Author: judeconnolly <[email protected]>
Date:   Thu Jan 25 16:54:41 2024 -0800

    Arm Skeleton
  • Loading branch information
@RamiRedShift
RamiRedShift committed Feb 24, 2024
1 parent c9ee3f8 commit c9d731d
Show file tree
Hide file tree
Showing 26 changed files with 1,145 additions and 604 deletions.
75 changes: 36 additions & 39 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,37 @@
{
"java.configuration.updateBuildConfiguration": "automatic",
"java.server.launchMode": "Standard",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"bin/": true,
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true,
"**/*~": true
},
"java.test.config": [
{
"name": "WPIlibUnitTests",
"workingDirectory": "${workspaceFolder}/build/jni/release",
"vmargs": [
"-Djava.library.path=${workspaceFolder}/build/jni/release"
],
"env": {
"LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release",
"DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release"
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests",
// Style guide - most of this came from clicking buttons and then copying from my user settings.json
// General editor stuff
"editor.formatOnSave": true, // So you cant forget
"editor.tabSize": 4, // 4 char width indentation
"editor.detectIndentation": false, // Prevent above from being overridden
"editor.insertSpaces": false, // use tab character instead of spaces
"java.cleanup.actionsOnSave": [
"addOverride",
]
}
"java.configuration.updateBuildConfiguration": "automatic",
"java.server.launchMode": "Standard",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"bin/": true,
"**/.classpath": true,
"**/.project": true,
"**/.settings": true,
"**/.factorypath": true,
"**/*~": true
},
"java.test.config": [
{
"name": "WPIlibUnitTests",
"workingDirectory": "${workspaceFolder}/build/jni/release",
"vmargs": [ "-Djava.library.path=${workspaceFolder}/build/jni/release" ],
"env": {
"LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release" ,
"DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release"
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests",
"cSpell.words": [
"AHRS",
"Deadzone",
"Odometry",
"setpoint",
"velociticities"
]
}

94 changes: 74 additions & 20 deletions shuffleboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"vgap": 16.0,
"titleType": 0,
"tiles": {
"0,0": {
"4,2": {
"size": [
1,
1
Expand Down Expand Up @@ -46,7 +46,7 @@
],
"content": {
"_type": "Gyro",
"_source0": "network_table:///SmartDashboard/Heading Degrees",
"_source0": "network_table:///SmartDashboard/ Degrees",
"_title": "Heading Degrees",
"_glyph": 139,
"_showGlyph": true,
Expand All @@ -56,7 +56,7 @@
"Visuals/Counter clockwise": false
}
},
"9,1": {
"9,5": {
"size": [
1,
1
Expand All @@ -69,7 +69,7 @@
"_showGlyph": false
}
},
"3,0": {
"4,0": {
"size": [
1,
2
Expand All @@ -88,7 +88,7 @@
"Visuals/Orientation": "VERTICAL"
}
},
"9,0": {
"0,0": {
"size": [
1,
1
Expand All @@ -97,13 +97,13 @@
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/ControlActive",
"_title": "ControlActive",
"_glyph": 148,
"_showGlyph": false,
"_glyph": 392,
"_showGlyph": true,
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"7,1": {
"1,2": {
"size": [
2,
1
Expand All @@ -116,7 +116,7 @@
"_showGlyph": true
}
},
"1,3": {
"7,1": {
"size": [
1,
1
Expand All @@ -129,7 +129,7 @@
"_showGlyph": true
}
},
"0,3": {
"6,1": {
"size": [
1,
1
Expand All @@ -142,7 +142,7 @@
"_showGlyph": true
}
},
"2,3": {
"8,1": {
"size": [
1,
1
Expand All @@ -155,20 +155,20 @@
"_showGlyph": true
}
},
"7,0": {
"6,2": {
"size": [
2,
1
],
"content": {
"_type": "ComboBox Chooser",
"_type": "Split Button Chooser",
"_source0": "network_table:///SmartDashboard/Auto Chooser",
"_title": "Auto Chooser",
"_glyph": 167,
"_showGlyph": true
}
},
"5,3": {
"7,0": {
"size": [
1,
1
Expand All @@ -187,7 +187,7 @@
"Visuals/Orientation": "HORIZONTAL"
}
},
"4,3": {
"6,0": {
"size": [
1,
1
Expand All @@ -206,15 +206,15 @@
"Visuals/Orientation": "HORIZONTAL"
}
},
"6,3": {
"8,0": {
"size": [
1,
1
],
"content": {
"_type": "Number Bar",
"_source0": "network_table:///SmartDashboard/Speed",
"_title": "Speed",
"_source0": "network_table:///SmartDashboard/Spin",
"_title": "Spin",
"_glyph": 419,
"_showGlyph": true,
"Range/Min": -1.0,
Expand All @@ -224,6 +224,60 @@
"Visuals/Show text": true,
"Visuals/Orientation": "HORIZONTAL"
}
},
"7,3": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/tPoseX",
"_title": "tPoseX",
"_glyph": 110,
"_showGlyph": true
}
},
"6,3": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/tPoseY",
"_title": "tPoseY",
"_glyph": 111,
"_showGlyph": true
}
},
"8,3": {
"size": [
1,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/tPoseDegrees",
"_title": "tPoseDegrees",
"_glyph": 419,
"_showGlyph": true
}
},
"8,2": {
"size": [
1,
1
],
"content": {
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/tPoseActive",
"_title": "tPoseActive",
"_glyph": 288,
"_showGlyph": true,
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
}
}
}
Expand All @@ -245,7 +299,7 @@
"windowGeometry": {
"x": -7.199999809265137,
"y": -7.199999809265137,
"width": 1550.4000244140625,
"height": 830.4000244140625
"width": 1551.199951171875,
"height": 831.2000122070312
}
}
8 changes: 8 additions & 0 deletions simgui.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"/SmartDashboard/SendableChooser[0]": "String Chooser"
}
},
"NetworkTables": {
"Transitory Values": {
"open": false
}
},
"NetworkTables Info": {
"Connections": {
"open": true
Expand All @@ -14,5 +19,8 @@
"open": true
},
"visible": true
},
"NetworkTables View": {
"visible": false
}
}
Loading

0 comments on commit c9d731d

Please sign in to comment.