Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 28cf025bd0a4208c8d264d2e820cfaafefc07953
Merge: 8c361fb 6a0dcbd
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Thu Mar 7 18:30:23 2024 -0800

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

commit 8c361fb99d5d946d4023b45b510abb96159dc8c2
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Thu Mar 7 18:30:20 2024 -0800

    align with tag Y

commit 6a0dcbd4339c63d4415e2862fbaa03a6904db64c
Author: Aleah H <aleahjham@gmail.com>
Date:   Thu Mar 7 18:23:39 2024 -0800

    Set idle mode for hang motors

commit 0336e2e709bc18333058328311299502507e85f8
Author: Aleah H <aleahjham@gmail.com>
Date:   Thu Mar 7 18:10:24 2024 -0800

    Make hang two different hangs

commit c62d6323884ced69f9d4ac009d1209629123ce23
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Thu Mar 7 18:03:20 2024 -0800

    fix merge

commit 4cb1ba8bdb2c797975f28ed1e88378b87e94bc1a
Merge: c2f79f2 ffc0e98
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Thu Mar 7 17:55:25 2024 -0800

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

commit ffc0e98a847cdfce409037906fd2004b2e18fcb6
Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
Date:   Thu Mar 7 17:55:05 2024 -0800

    Squashed commit of the following:

    commit 95f6b9ea6112e5877f17699500d7159205dc0b61
    Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
    Date:   Mon Mar 4 16:09:53 2024 -0800

        Create ScoringAlign.java

    commit 82a7a93271d3a645366269f8c74099db4e9879d9
    Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
    Date:   Mon Mar 4 15:50:37 2024 -0800

        Squashed commit of the following:

        commit b0eb1a863cb49efad9148d84c5e121f7ce8d0725
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 23:01:12 2024 -0800

            Final changes from testing

        commit 1045c75026d9cff9924aee2cf28f979cfbdf77a1
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 17:26:50 2024 -0800

            score on speaker

        commit 6451012fc4a54784e733878ae07186ddf9bd74fd
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 16:53:20 2024 -0800

            AMP FIRE COOL YAY

        commit 6213d9a5fd5a205f26dba869349eaa4c2b01f905
        Merge: 81e837a 11ad339
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 15:42:47 2024 -0800

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

        commit 81e837a3cf7419b91ded7f7be3a1b7b7f7dd7043
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 15:40:56 2024 -0800

            First working shoot test

        commit 11ad3392ff3a8d4458dceeb6e2c32a7ab468b386
        Author: Aleah H <aleahjham@gmail.com>
        Date:   Sat Mar 2 14:06:43 2024 -0800

            Add dropInSpeaker command

        commit 3be4babf3c8ca0ffa82e831798562d8b1bfeafc7
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Sat Mar 2 13:58:40 2024 -0800

            DropInAmp auto

        commit 25de589d3528a8cc165c5c3eb61edea1a46822dc
        Merge: 04bdb5d 2940fc5
        Author: Aleah H <aleahjham@gmail.com>
        Date:   Sat Mar 2 13:44:47 2024 -0800

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

        commit 04bdb5d62a73bb8ff270d1c761ebd1782bc0b70b
        Author: Aleah H <aleahjham@gmail.com>
        Date:   Sat Mar 2 13:44:38 2024 -0800

            Move Arm Commands

        commit 2940fc5077729f70b5c42819b99b05a5421ee960
        Merge: 32fe9a2 0c289d3
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 13:38:18 2024 -0800

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

        commit 32fe9a241c2b585d666fe61c814724040182354c
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 13:37:50 2024 -0800

            update vision constants

        commit 0c289d3a31f2463fa33b429d6c507fe615afe56d
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Sat Mar 2 13:36:21 2024 -0800

            SpinIntakeFlywheel command

        commit 4e68f7740bf0be39cacb21db5e5c0c81863e7c6f
        Merge: 7a2f214 115e3d2
        Author: Aleah H <aleahjham@gmail.com>
        Date:   Sat Mar 2 12:35:22 2024 -0800

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

        commit 7a2f2148707089552ee6946c04e4cebaf469407d
        Author: Aleah H <aleahjham@gmail.com>
        Date:   Sat Mar 2 12:35:11 2024 -0800

            Add Smartdashboard printout for the hang limit switch

        commit 115e3d250d1f074036a69673ba44f159b7786643
        Merge: 58555f3 e8db7ca
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Sat Mar 2 12:32:47 2024 -0800

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

        commit 58555f3a0bd1020378c48ab77ccfe206703b45b0
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Sat Mar 2 12:32:39 2024 -0800

            Change Co-op light signal

        commit e8db7ca75f48e794a35172b494406658f84d6ee1
        Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
        Date:   Sat Mar 2 12:14:11 2024 -0800

            Hang Feature (#6)

            * Add Hang Subsystem and Commands

            * feature flag for hang

            * Name constants in proper constant naming format

            ---------

            Co-authored-by: Aleah H <aleahjham@gmail.com>

        commit c2af5accf7b3f6e57578e83318c99c4177cca4a4
        Merge: 36af1fa 12b950f
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 11:38:24 2024 -0800

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

        commit 36af1faebadae5c7cc3a4b1779eb938e1d7a7815
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 11:38:20 2024 -0800

            Quick odometry fix

        commit 12b950f0c31e49430a1893ca33e1626098c04581
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Sat Mar 2 11:00:42 2024 -0800

            Feature flag for intake shooter

        commit 66498d5c76d3e860a69e7badaf971da78507a53d
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 10:49:23 2024 -0800

            Add flywheel to robot container

        commit 62815f9baeeb2dde05725a33aa12252d2d440ad7
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 02:48:06 2024 -0800

            Fix small merge issue with drivetrain

        commit 821abe671ba787fa36a300fa3f2fc3a28cc079a8
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 02:46:04 2024 -0800

            Squashed commit of the following:

            commit db233b3276916172cf5cd0f3a49a414f9c6410c4
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Sat Mar 2 02:37:42 2024 -0800

                Pose with Vision, follow tag, vision subsystem changes. 2:37pm

            commit 960e7e10537142912244a6e2c68c1984463ca2ef
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Fri Mar 1 23:45:48 2024 -0800

                minor cleanup

            commit 55c74e2e925b4e7b6198e4ba0bfae883f95ec3ea
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 19:15:08 2024 -0800

                Auto position testing

            commit c50522269acab864b9e8546fcb17af6e52e0619f
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:50:35 2024 -0800

                fix controller and AutoDriveTo

            commit f25b50a3931f03cf91287a4a9719adacec8ad4d7
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:21:49 2024 -0800

                fix merge breaks

            commit 7f8908f09993a991729e08779b446fdc542926b9
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:20:06 2024 -0800

                Squashed commit of the following:

                commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:53 2024 -0800

                    remove unused variables

                commit 9b77e9492b73441f4f805735ed4eb6aff267d704
                Merge: 8be1aa7 7af525b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:08 2024 -0800

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

                commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:04 2024 -0800

                    Update shuffleboard and handle no joystick

                commit 7af525bd6d814aa6cae4f7715289d53741521926
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:41:21 2024 -0800

                    Change colors when button pressed

                commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:36:15 2024 -0800

                    Fix merge stuff

                commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
                Merge: bbb0787 e1694f7
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:35:05 2024 -0800

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

                commit bbb078706bafcebd320132f5182f019bc229813d
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:23:06 2024 -0800

                    Color constants

                commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:18:40 2024 -0800

                    Working LED color changes

                commit 4cf45032739463da3e6356e25ac687747b0977af
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 16:48:30 2024 -0800

                    Convert lightstrip stuff to PWM

                commit e1694f74bed809833cdfab066afd87d0316debc3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:37:42 2024 -0800

                    Switch to Arm base class over interface

                commit ea273196b675905e63c925895d2bf28726af427b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:36:44 2024 -0800

                    Squashed commit of the following:

                    commit cd61ef593ed60911513568107f2ac026b4edfd3c
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:36 2024 -0800

                        add missing files

                    commit 853a614b66e1f036b9962b256b2800ba932806d7
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:12 2024 -0800

                        Allow arm to be moved manully by operator

                commit 79f6d072cb321da1d7dd63f2c64033e15d423bf3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:32:07 2024 -0800

                    remove unused method from arm

                commit 6ec5e4702809d6addcd9edc5b213ca5fd1b14fa6
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:15:36 2024 -0800

                    add Control for IntakeShooter

                commit 27fd8cdfdbe8b4c133119439d9842a192e6d40d4
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 15:46:39 2024 -0800

                    Squashed commit of the following:

                    commit cdcf43840388fe8989e12506315f64dc5e42ec2b
                    Merge: 40ad7bb 326c5c5
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 15:36:39 2024 -0800

                        Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops

                    commit 40ad7bb8ee2f9f910a3725ee027f5ddbd63b60bc
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 1 17:58:17 2024 -0800

                        Rename IntakeShooter.Java to IntakeShooter.java

                    commit 8f683e0c09fec2d87e3568d3427a387e560de927
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:40:27 2024 -0800

                        Fix compile error
                        The compiler doesn't like if you capitalize .java

                    commit 192edcd1b24c6fb6270126e08df62f4c7cf92969
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:19:59 2024 -0800

                        Change to Talon controllers for flywheel

                    commit d0b206795c7d090d38a7e6b633adaf4cbc449a34
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:11:16 2024 -0800

                        Constructor allows speed change

                    commit 0ebe58a38b99f21eab31c1e2ddb15081529f9d4d
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:09:42 2024 -0800

                        Test shooter command

                    commit 2f051b8322d410b8d654f684c5276cd833f56783
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 16:46:49 2024 -0800

                        Skeleton of the skeleton for the intake shooter

                commit 326c5c5dcc497bed07ffee0f2674259ebb44707a
                Merge: 2ec3b75 3ffa7e8
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:20:19 2024 -0800

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

                commit 2ec3b752c18dfba6a155fb276059de574867bb6d
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:19:37 2024 -0800

                    Diagonal auto drive to and other changes

                commit 3ffa7e8f792cf107a28e8ede328bd7a2932f7390
                Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
                Date:   Wed Feb 28 18:28:44 2024 -0800

                    Create subsystem & test command for LED strip (#5)

                    * LED Subsys

                    * Add lightstrip color command & auto to test it

                    * Clarify meaning of number 60

                commit c2bc797de36c6d9670d181f2a53eabf20e1bf396
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 17:19:27 2024 -0800

                    fix minor bug with aim at tag after update

            commit 89c1634c155f8f291d9575d84fe2d6215286539c
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Wed Feb 28 18:39:19 2024 -0800

                fixes

            commit 3f9cac9dd2f69e752a5d97cfbf1b9691230b7fde
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:22:55 2024 -0800

                button

            commit 1dbcb6ba3a2fce3b33044c45bbca30307b204e6e
            Merge: b2d991f 967796b
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:15:34 2024 -0800

                Merge branch 'main' into autoposition

            commit b2d991f28afa4793514cbc104a60744ccc50d201
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:12:26 2024 -0800

                mostly done

            commit 7e1700fae958b07201bbcf3ca1e9d3212150655d
            Merge: 3ab70d3 44d9f6b
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 15:44:07 2024 -0800

                Merge branch 'main' into autoposition

            commit 3ab70d3da3907a554904846a5a0735a50a78c9bf
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Mon Feb 26 17:53:40 2024 -0800

                autoposition subsystems

        commit 4a7f107e34df5a49e98084bf9fe1efb624a61273
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 02:41:43 2024 -0800

            rename function to cleaner name

        commit 8e83d3a7628e54e2c16bdaf32cfe5a18fa5a8705
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Sat Mar 2 01:18:09 2024 -0800

            Squashed commit of the following:

            commit 040dc4c31b406c7e996c7d48648e5e0559eab72e
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Sat Mar 2 01:17:11 2024 -0800

                Squashed commit of the following:

                commit 1d6e7328f3e9668b541864dcdce68188b5cf8b54
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 20:36:31 2024 -0800

                    add cancel command

                commit ccf5a6f2a34466b3e94fd0d535c32d5e1ba0d8e2
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 20:22:03 2024 -0800

                    Squashed commit of the following:

                    commit 55c74e2e925b4e7b6198e4ba0bfae883f95ec3ea
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 19:15:08 2024 -0800

                        Auto position testing

                    commit c50522269acab864b9e8546fcb17af6e52e0619f
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 18:50:35 2024 -0800

                        fix controller and AutoDriveTo

                    commit f25b50a3931f03cf91287a4a9719adacec8ad4d7
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 18:21:49 2024 -0800

                        fix merge breaks

                    commit 7f8908f09993a991729e08779b446fdc542926b9
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 18:20:06 2024 -0800

                        Squashed commit of the following:

                        commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 17:58:53 2024 -0800

                            remove unused variables

                        commit 9b77e9492b73441f4f805735ed4eb6aff267d704
                        Merge: 8be1aa7 7af525b
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 17:58:08 2024 -0800

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

                        commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 17:58:04 2024 -0800

                            Update shuffleboard and handle no joystick

                        commit 7af525bd6d814aa6cae4f7715289d53741521926
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 17:41:21 2024 -0800

                            Change colors when button pressed

                        commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 17:36:15 2024 -0800

                            Fix merge stuff

                        commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
                        Merge: bbb0787 e1694f7
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 17:35:05 2024 -0800

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

                        commit bbb078706bafcebd320132f5182f019bc229813d
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 17:23:06 2024 -0800

                            Color constants

                        commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 17:18:40 2024 -0800

                            Working LED color changes

                        commit 4cf45032739463da3e6356e25ac687747b0977af
                        Author: Aceius E <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 29 16:48:30 2024 -0800

                            Convert lightstrip stuff to PWM

                        commit e1694f74bed809833cdfab066afd87d0316debc3
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 16:37:42 2024 -0800

                            Switch to Arm base class over interface

                        commit ea273196b675905e63c925895d2bf28726af427b
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 16:36:44 2024 -0800

                            Squashed commit of the following:

                            commit cd61ef593ed60911513568107f2ac026b4edfd3c
                            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                            Date:   Wed Feb 28 10:31:36 2024 -0800

                                add missing files

                            commit 853a614b66e1f036b9962b256b2800ba932806d7
                            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                            Date:   Wed Feb 28 10:31:12 2024 -0800

                                Allow arm to be moved manully by operator

                        commit 79f6d072cb321da1d7dd63f2c64033e15d423bf3
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 16:32:07 2024 -0800

                            remove unused method from arm

                        commit 6ec5e4702809d6addcd9edc5b213ca5fd1b14fa6
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 16:15:36 2024 -0800

                            add Control for IntakeShooter

                        commit 27fd8cdfdbe8b4c133119439d9842a192e6d40d4
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Thu Feb 29 15:46:39 2024 -0800

                            Squashed commit of the following:

                            commit cdcf43840388fe8989e12506315f64dc5e42ec2b
                            Merge: 40ad7bb 326c5c5
                            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                            Date:   Thu Feb 29 15:36:39 2024 -0800

                                Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops

                            commit 40ad7bb8ee2f9f910a3725ee027f5ddbd63b60bc
                            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                            Date:   Thu Feb 1 17:58:17 2024 -0800

                                Rename IntakeShooter.Java to IntakeShooter.java

                            commit 8f683e0c09fec2d87e3568d3427a387e560de927
                            Author: Aceius E. <aceiuselms@seattleacademy.org>
                            Date:   Thu Feb 1 17:40:27 2024 -0800

                                Fix compile error
                                The compiler doesn't like if you capitalize .java

                            commit 192edcd1b24c6fb6270126e08df62f4c7cf92969
                            Author: Aceius E. <aceiuselms@seattleacademy.org>
                            Date:   Thu Feb 1 17:19:59 2024 -0800

                                Change to Talon controllers for flywheel

                            commit d0b206795c7d090d38a7e6b633adaf4cbc449a34
                            Author: Aceius E. <aceiuselms@seattleacademy.org>
                            Date:   Thu Feb 1 17:11:16 2024 -0800

                                Constructor allows speed change

                            commit 0ebe58a38b99f21eab31c1e2ddb15081529f9d4d
                            Author: Aceius E. <aceiuselms@seattleacademy.org>
                            Date:   Thu Feb 1 17:09:42 2024 -0800

                                Test shooter command

                            commit 2f051b8322d410b8d654f684c5276cd833f56783
                            Author: Aceius E. <aceiuselms@seattleacademy.org>
                            Date:   Thu Feb 1 16:46:49 2024 -0800

                                Skeleton of the skeleton for the intake shooter

                        commit 326c5c5dcc497bed07ffee0f2674259ebb44707a
                        Merge: 2ec3b75 3ffa7e8
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Wed Feb 28 21:20:19 2024 -0800

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

                        commit 2ec3b752c18dfba6a155fb276059de574867bb6d
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Wed Feb 28 21:19:37 2024 -0800

                            Diagonal auto drive to and other changes

                        commit 3ffa7e8f792cf107a28e8ede328bd7a2932f7390
                        Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
                        Date:   Wed Feb 28 18:28:44 2024 -0800

                            Create subsystem & test command for LED strip (#5)

                            * LED Subsys

                            * Add lightstrip color command & auto to test it

                            * Clarify meaning of number 60

                        commit c2bc797de36c6d9670d181f2a53eabf20e1bf396
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Wed Feb 28 17:19:27 2024 -0800

                            fix minor bug with aim at tag after update

                    commit 89c1634c155f8f291d9575d84fe2d6215286539c
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 18:39:19 2024 -0800

                        fixes

                    commit 3f9cac9dd2f69e752a5d97cfbf1b9691230b7fde
                    Author: Linden <50274080+liulinden@users.noreply.github.com>
                    Date:   Wed Feb 28 17:22:55 2024 -0800

                        button

                    commit 1dbcb6ba3a2fce3b33044c45bbca30307b204e6e
                    Merge: b2d991f 967796b
                    Author: Linden <50274080+liulinden@users.noreply.github.com>
                    Date:   Wed Feb 28 17:15:34 2024 -0800

                        Merge branch 'main' into autoposition

                    commit b2d991f28afa4793514cbc104a60744ccc50d201
                    Author: Linden <50274080+liulinden@users.noreply.github.com>
                    Date:   Wed Feb 28 17:12:26 2024 -0800

                        mostly done

                    commit 7e1700fae958b07201bbcf3ca1e9d3212150655d
                    Merge: 3ab70d3 44d9f6b
                    Author: Linden <50274080+liulinden@users.noreply.github.com>
                    Date:   Wed Feb 28 15:44:07 2024 -0800

                        Merge branch 'main' into autoposition

                    commit 3ab70d3da3907a554904846a5a0735a50a78c9bf
                    Author: Linden <50274080+liulinden@users.noreply.github.com>
                    Date:   Mon Feb 26 17:53:40 2024 -0800

                        autoposition subsystems

                commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:53 2024 -0800

                    remove unused variables

                commit 9b77e9492b73441f4f805735ed4eb6aff267d704
                Merge: 8be1aa7 7af525b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:08 2024 -0800

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

                commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:04 2024 -0800

                    Update shuffleboard and handle no joystick

                commit 7af525bd6d814aa6cae4f7715289d53741521926
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:41:21 2024 -0800

                    Change colors when button pressed

                commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:36:15 2024 -0800

                    Fix merge stuff

                commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
                Merge: bbb0787 e1694f7
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:35:05 2024 -0800

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

                commit bbb078706bafcebd320132f5182f019bc229813d
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:23:06 2024 -0800

                    Color constants

                commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:18:40 2024 -0800

                    Working LED color changes

                commit 4cf45032739463da3e6356e25ac687747b0977af
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 16:48:30 2024 -0800

                    Convert lightstrip stuff to PWM

                commit e1694f74bed809833cdfab066afd87d0316debc3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:37:42 2024 -0800

                    Switch to Arm base class over interface

                commit ea273196b675905e63c925895d2bf28726af427b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:36:44 2024 -0800

                    Squashed commit of the following:

                    commit cd61ef593ed60911513568107f2ac026b4edfd3c
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:36 2024 -0800

                        add missing files

                    commit 853a614b66e1f036b9962b256b2800ba932806d7
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:12 2024 -0800

                        Allow arm to be moved manully by operator

                commit 79f6d072cb321da1d7dd63f2c64033e15d423bf3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:32:07 2024 -0800

                    remove unused method from arm

                commit 6ec5e4702809d6addcd9edc5b213ca5fd1b14fa6
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:15:36 2024 -0800

                    add Control for IntakeShooter

                commit 27fd8cdfdbe8b4c133119439d9842a192e6d40d4
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 15:46:39 2024 -0800

                    Squashed commit of the following:

                    commit cdcf43840388fe8989e12506315f64dc5e42ec2b
                    Merge: 40ad7bb 326c5c5
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 15:36:39 2024 -0800

                        Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops

                    commit 40ad7bb8ee2f9f910a3725ee027f5ddbd63b60bc
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 1 17:58:17 2024 -0800

                        Rename IntakeShooter.Java to IntakeShooter.java

                    commit 8f683e0c09fec2d87e3568d3427a387e560de927
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:40:27 2024 -0800

                        Fix compile error
                        The compiler doesn't like if you capitalize .java

                    commit 192edcd1b24c6fb6270126e08df62f4c7cf92969
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:19:59 2024 -0800

                        Change to Talon controllers for flywheel

                    commit d0b206795c7d090d38a7e6b633adaf4cbc449a34
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:11:16 2024 -0800

                        Constructor allows speed change

                    commit 0ebe58a38b99f21eab31c1e2ddb15081529f9d4d
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:09:42 2024 -0800

                        Test shooter command

                    commit 2f051b8322d410b8d654f684c5276cd833f56783
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 16:46:49 2024 -0800

                        Skeleton of the skeleton for the intake shooter

                commit 326c5c5dcc497bed07ffee0f2674259ebb44707a
                Merge: 2ec3b75 3ffa7e8
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:20:19 2024 -0800

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

                commit 2ec3b752c18dfba6a155fb276059de574867bb6d
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:19:37 2024 -0800

                    Diagonal auto drive to and other changes

            commit 3a17046f9c7941d757ad2754cbde5401be83ff40
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Sat Mar 2 01:16:21 2024 -0800

                Move DriveToPose and DriveTransform to depricated

        commit 1d6e7328f3e9668b541864dcdce68188b5cf8b54
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 20:36:31 2024 -0800

            add cancel command

        commit ccf5a6f2a34466b3e94fd0d535c32d5e1ba0d8e2
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 20:22:03 2024 -0800

            Squashed commit of the following:

            commit 55c74e2e925b4e7b6198e4ba0bfae883f95ec3ea
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 19:15:08 2024 -0800

                Auto position testing

            commit c50522269acab864b9e8546fcb17af6e52e0619f
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:50:35 2024 -0800

                fix controller and AutoDriveTo

            commit f25b50a3931f03cf91287a4a9719adacec8ad4d7
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:21:49 2024 -0800

                fix merge breaks

            commit 7f8908f09993a991729e08779b446fdc542926b9
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 18:20:06 2024 -0800

                Squashed commit of the following:

                commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:53 2024 -0800

                    remove unused variables

                commit 9b77e9492b73441f4f805735ed4eb6aff267d704
                Merge: 8be1aa7 7af525b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:08 2024 -0800

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

                commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 17:58:04 2024 -0800

                    Update shuffleboard and handle no joystick

                commit 7af525bd6d814aa6cae4f7715289d53741521926
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:41:21 2024 -0800

                    Change colors when button pressed

                commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:36:15 2024 -0800

                    Fix merge stuff

                commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
                Merge: bbb0787 e1694f7
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:35:05 2024 -0800

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

                commit bbb078706bafcebd320132f5182f019bc229813d
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:23:06 2024 -0800

                    Color constants

                commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 17:18:40 2024 -0800

                    Working LED color changes

                commit 4cf45032739463da3e6356e25ac687747b0977af
                Author: Aceius E <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 29 16:48:30 2024 -0800

                    Convert lightstrip stuff to PWM

                commit e1694f74bed809833cdfab066afd87d0316debc3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:37:42 2024 -0800

                    Switch to Arm base class over interface

                commit ea273196b675905e63c925895d2bf28726af427b
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:36:44 2024 -0800

                    Squashed commit of the following:

                    commit cd61ef593ed60911513568107f2ac026b4edfd3c
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:36 2024 -0800

                        add missing files

                    commit 853a614b66e1f036b9962b256b2800ba932806d7
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Wed Feb 28 10:31:12 2024 -0800

                        Allow arm to be moved manully by operator

                commit 79f6d072cb321da1d7dd63f2c64033e15d423bf3
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:32:07 2024 -0800

                    remove unused method from arm

                commit 6ec5e4702809d6addcd9edc5b213ca5fd1b14fa6
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 16:15:36 2024 -0800

                    add Control for IntakeShooter

                commit 27fd8cdfdbe8b4c133119439d9842a192e6d40d4
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 15:46:39 2024 -0800

                    Squashed commit of the following:

                    commit cdcf43840388fe8989e12506315f64dc5e42ec2b
                    Merge: 40ad7bb 326c5c5
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 15:36:39 2024 -0800

                        Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops

                    commit 40ad7bb8ee2f9f910a3725ee027f5ddbd63b60bc
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 1 17:58:17 2024 -0800

                        Rename IntakeShooter.Java to IntakeShooter.java

                    commit 8f683e0c09fec2d87e3568d3427a387e560de927
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:40:27 2024 -0800

                        Fix compile error
                        The compiler doesn't like if you capitalize .java

                    commit 192edcd1b24c6fb6270126e08df62f4c7cf92969
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:19:59 2024 -0800

                        Change to Talon controllers for flywheel

                    commit d0b206795c7d090d38a7e6b633adaf4cbc449a34
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:11:16 2024 -0800

                        Constructor allows speed change

                    commit 0ebe58a38b99f21eab31c1e2ddb15081529f9d4d
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 17:09:42 2024 -0800

                        Test shooter command

                    commit 2f051b8322d410b8d654f684c5276cd833f56783
                    Author: Aceius E. <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 1 16:46:49 2024 -0800

                        Skeleton of the skeleton for the intake shooter

                commit 326c5c5dcc497bed07ffee0f2674259ebb44707a
                Merge: 2ec3b75 3ffa7e8
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:20:19 2024 -0800

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

                commit 2ec3b752c18dfba6a155fb276059de574867bb6d
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 21:19:37 2024 -0800

                    Diagonal auto drive to and other changes

                commit 3ffa7e8f792cf107a28e8ede328bd7a2932f7390
                Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
                Date:   Wed Feb 28 18:28:44 2024 -0800

                    Create subsystem & test command for LED strip (#5)

                    * LED Subsys

                    * Add lightstrip color command & auto to test it

                    * Clarify meaning of number 60

                commit c2bc797de36c6d9670d181f2a53eabf20e1bf396
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 17:19:27 2024 -0800

                    fix minor bug with aim at tag after update

            commit 89c1634c155f8f291d9575d84fe2d6215286539c
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Wed Feb 28 18:39:19 2024 -0800

                fixes

            commit 3f9cac9dd2f69e752a5d97cfbf1b9691230b7fde
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:22:55 2024 -0800

                button

            commit 1dbcb6ba3a2fce3b33044c45bbca30307b204e6e
            Merge: b2d991f 967796b
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:15:34 2024 -0800

                Merge branch 'main' into autoposition

            commit b2d991f28afa4793514cbc104a60744ccc50d201
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 17:12:26 2024 -0800

                mostly done

            commit 7e1700fae958b07201bbcf3ca1e9d3212150655d
            Merge: 3ab70d3 44d9f6b
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Wed Feb 28 15:44:07 2024 -0800

                Merge branch 'main' into autoposition

            commit 3ab70d3da3907a554904846a5a0735a50a78c9bf
            Author: Linden <50274080+liulinden@users.noreply.github.com>
            Date:   Mon Feb 26 17:53:40 2024 -0800

                autoposition subsystems

        commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:53 2024 -0800

            remove unused variables

        commit 9b77e9492b73441f4f805735ed4eb6aff267d704
        Merge: 8be1aa7 7af525b
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:08 2024 -0800

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

        commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:04 2024 -0800

            Update shuffleboard and handle no joystick

        commit 7af525bd6d814aa6cae4f7715289d53741521926
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:41:21 2024 -0800

            Change colors when button pressed

        commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:36:15 2024 -0800

            Fix merge stuff

        commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
        Merge: bbb0787 e1694f7
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:35:05 2024 -0800

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

        commit bbb078706bafcebd320132f5182f019bc229813d
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:23:06 2024 -0800

            Color constants

        commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:18:40 2024 -0800

            Working LED color changes

        commit 4cf45032739463da3e6356e25ac687747b0977af
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 16:48:30 2024 -0800

            Convert lightstrip stuff to PWM

        commit e1694f74bed809833cdfab066afd87d0316debc3
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:37:42 2024 -0800

            Switch to Arm base class over interface

        commit ea273196b675905e63c925895d2bf28726af427b
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:36:44 2024 -0800

            Squashed commit of the following:

            commit cd61ef593ed60911513568107f2ac026b4edfd3c
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Wed Feb 28 10:31:36 2024 -0800

                add missing files

            commit 853a614b66e1f036b9962b256b2800ba932806d7
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Wed Feb 28 10:31:12 2024 -0800

                Allow arm to be moved manully by operator

        commit 79f6d072cb321da1d7dd63f2c64033e15d423bf3
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:32:07 2024 -0800

            remove unused method from arm

        commit 6ec5e4702809d6addcd9edc5b213ca5fd1b14fa6
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:15:36 2024 -0800

            add Control for IntakeShooter

        commit 27fd8cdfdbe8b4c133119439d9842a192e6d40d4
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 15:46:39 2024 -0800

            Squashed commit of the following:

            commit cdcf43840388fe8989e12506315f64dc5e42ec2b
            Merge: 40ad7bb 326c5c5
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 15:36:39 2024 -0800

                Merge branch 'main' into onTheSubjectOfRelocatingRubberHoops

            commit 40ad7bb8ee2f9f910a3725ee027f5ddbd63b60bc
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 1 17:58:17 2024 -0800

                Rename IntakeShooter.Java to IntakeShooter.java

            commit 8f683e0c09fec2d87e3568d3427a387e560de927
            Author: Aceius E. <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 1 17:40:27 2024 -0800

                Fix compile error
                The compiler doesn't like if you capitalize .java

            commit 192edcd1b24c6fb6270126e08df62f4c7cf92969
            Author: Aceius E. <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 1 17:19:59 2024 -0800

                Change to Talon controllers for flywheel

            commit d0b206795c7d090d38a7e6b633adaf4cbc449a34
            Author: Aceius E. <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 1 17:11:16 2024 -0800

                Constructor allows speed change

            commit 0ebe58a38b99f21eab31c1e2ddb15081529f9d4d
            Author: Aceius E. <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 1 17:09:42 2024 -0800

                Test shooter command

            commit 2f051b8322d410b8d654f684c5276cd833f56783
            Author: Aceius E. <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 1 16:46:49 2024 -0800

                Skeleton of the skeleton for the intake shooter

        commit 326c5c5dcc497bed07ffee0f2674259ebb44707a
        Merge: 2ec3b75 3ffa7e8
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 21:20:19 2024 -0800

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

        commit 2ec3b752c18dfba6a155fb276059de574867bb6d
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 21:19:37 2024 -0800

            Diagonal auto drive to and other changes

        commit 3ffa7e8f792cf107a28e8ede328bd7a2932f7390
        Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
        Date:   Wed Feb 28 18:28:44 2024 -0800

            Create subsystem & test command for LED strip (#5)

            * LED Subsys

            * Add lightstrip color command & auto to test it

            * Clarify meaning of number 60

        commit c2bc797de36c6d9670d181f2a53eabf20e1bf396
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 17:19:27 2024 -0800

            fix minor bug with aim at tag after update

    commit ad93c8219bd831c2b3fa0789445704b2de489afe
    Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
    Date:   Mon Mar 4 15:44:58 2024 -0800

        Add switch statement for coprocessor camera name

commit c2f79f21e8a4d1c329835ae51042e0483e633842
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Thu Mar 7 17:20:05 2024 -0800

    Add magnetic limit switch for intake

commit 3c7d35d6de2d18b09cc74cc0c45c431656b2eecf
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Wed Mar 6 14:03:14 2024 -0800

    Add vision toggle, add light strip default, add remove unused intake feature

commit b327b6ae915aeb3de1b62a603e96d5a489bd6926
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Mon Mar 4 21:57:33 2024 -0800

    fix error with build

commit 0107052972a6008db3c2147aceb48450f698e625
Merge: 05af81e 9923832
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Mon Mar 4 19:11:09 2024 -0800

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

commit 05af81e7e83fdb8e7add6e3bd3c2e8d3772ec45f
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Mon Mar 4 19:09:01 2024 -0800

    rename, rebind, and other stuff

commit 992383280859cab49f5fb9351c6c15c65097620b
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Mon Mar 4 17:56:41 2024 -0800

    Change amplify signal color

commit 9ae52417a753dfd44fbc4d57a432cf272e42d205
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Mon Mar 4 17:24:31 2024 -0800

    Detect simulations in feature flags

commit faf008f6e3cd41e32273fc0fd91759c7aaec2296
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Mon Mar 4 16:57:51 2024 -0800

    Update comments

commit fa3e40789f3574942c75a138d6527dd2f1f65cf9
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Mon Mar 4 16:54:55 2024 -0800

    Kill dead comments

commit e1c69c5bcf8440be72af5360d2ba9c71f26b56d3
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Mon Mar 4 16:11:53 2024 -0800

    Auto mode that shoots and then drives out

commit b0eb1a863cb49efad9148d84c5e121f7ce8d0725
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 23:01:12 2024 -0800

    Final changes from testing

commit 1045c75026d9cff9924aee2cf28f979cfbdf77a1
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 17:26:50 2024 -0800

    score on speaker

commit 6451012fc4a54784e733878ae07186ddf9bd74fd
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 16:53:20 2024 -0800

    AMP FIRE COOL YAY

commit 6213d9a5fd5a205f26dba869349eaa4c2b01f905
Merge: 81e837a 11ad339
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 15:42:47 2024 -0800

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

commit 81e837a3cf7419b91ded7f7be3a1b7b7f7dd7043
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 15:40:56 2024 -0800

    First working shoot test

commit 11ad3392ff3a8d4458dceeb6e2c32a7ab468b386
Author: Aleah H <aleahjham@gmail.com>
Date:   Sat Mar 2 14:06:43 2024 -0800

    Add dropInSpeaker command

commit 3be4babf3c8ca0ffa82e831798562d8b1bfeafc7
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Sat Mar 2 13:58:40 2024 -0800

    DropInAmp auto

commit 25de589d3528a8cc165c5c3eb61edea1a46822dc
Merge: 04bdb5d 2940fc5
Author: Aleah H <aleahjham@gmail.com>
Date:   Sat Mar 2 13:44:47 2024 -0800

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

commit 04bdb5d62a73bb8ff270d1c761ebd1782bc0b70b
Author: Aleah H <aleahjham@gmail.com>
Date:   Sat Mar 2 13:44:38 2024 -0800

    Move Arm Commands

commit 2940fc5077729f70b5c42819b99b05a5421ee960
Merge: 32fe9a2 0c289d3
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 13:38:18 2024 -0800

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

commit 32fe9a241c2b585d666fe61c814724040182354c
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 13:37:50 2024 -0800

    update vision constants

commit 0c289d3a31f2463fa33b429d6c507fe615afe56d
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Sat Mar 2 13:36:21 2024 -0800

    SpinIntakeFlywheel command

commit 4e68f7740bf0be39cacb21db5e5c0c81863e7c6f
Merge: 7a2f214 115e3d2
Author: Aleah H <aleahjham@gmail.com>
Date:   Sat Mar 2 12:35:22 2024 -0800

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

commit 7a2f2148707089552ee6946c04e4cebaf469407d
Author: Aleah H <aleahjham@gmail.com>
Date:   Sat Mar 2 12:35:11 2024 -0800

    Add Smartdashboard printout for the hang limit switch

commit 115e3d250d1f074036a69673ba44f159b7786643
Merge: 58555f3 e8db7ca
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Sat Mar 2 12:32:47 2024 -0800

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

commit 58555f3a0bd1020378c48ab77ccfe206703b45b0
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Sat Mar 2 12:32:39 2024 -0800

    Change Co-op light signal

commit e8db7ca75f48e794a35172b494406658f84d6ee1
Author: Aceius E <144858100+AceiusRedshift@users.noreply.github.com>
Date:   Sat Mar 2 12:14:11 2024 -0800

    Hang Feature (#6)

    * Add Hang Subsystem and Commands

    * feature flag for hang

    * Name constants in proper constant naming format

    ---------

    Co-authored-by: Aleah H <aleahjham@gmail.com>

commit c2af5accf7b3f6e57578e83318c99c4177cca4a4
Merge: 36af1fa 12b950f
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 11:38:24 2024 -0800

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

commit 36af1faebadae5c7cc3a4b1779eb938e1d7a7815
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 11:38:20 2024 -0800

    Quick odometry fix

commit 12b950f0c31e49430a1893ca33e1626098c04581
Author: Aceius E <aceiuselms@seattleacademy.org>
Date:   Sat Mar 2 11:00:42 2024 -0800

    Feature flag for intake shooter

commit 66498d5c76d3e860a69e7badaf971da78507a53d
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 10:49:23 2024 -0800

    Add flywheel to robot container

commit 62815f9baeeb2dde05725a33aa12252d2d440ad7
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 02:48:06 2024 -0800

    Fix small merge issue with drivetrain

commit 821abe671ba787fa36a300fa3f2fc3a28cc079a8
Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
Date:   Sat Mar 2 02:46:04 2024 -0800

    Squashed commit of the following:

    commit db233b3276916172cf5cd0f3a49a414f9c6410c4
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Sat Mar 2 02:37:42 2024 -0800

        Pose with Vision, follow tag, vision subsystem changes. 2:37pm

    commit 960e7e10537142912244a6e2c68c1984463ca2ef
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Fri Mar 1 23:45:48 2024 -0800

        minor cleanup

    commit 55c74e2e925b4e7b6198e4ba0bfae883f95ec3ea
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 19:15:08 2024 -0800

        Auto position testing

    commit c50522269acab864b9e8546fcb17af6e52e0619f
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 18:50:35 2024 -0800

        fix controller and AutoDriveTo

    commit f25b50a3931f03cf91287a4a9719adacec8ad4d7
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 18:21:49 2024 -0800

        fix merge breaks

    commit 7f8908f09993a991729e08779b446fdc542926b9
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 18:20:06 2024 -0800

        Squashed commit of the following:

        commit 6fdc46c73a7628a5e71cda8bb8e19684d0427894
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:53 2024 -0800

            remove unused variables

        commit 9b77e9492b73441f4f805735ed4eb6aff267d704
        Merge: 8be1aa7 7af525b
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:08 2024 -0800

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

        commit 8be1aa7a71f6b8d39656731a55c9485df35c6f6e
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 17:58:04 2024 -0800

            Update shuffleboard and handle no joystick

        commit 7af525bd6d814aa6cae4f7715289d53741521926
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:41:21 2024 -0800

            Change colors when button pressed

        commit 407c9eadf06efd9f1acf92bd0a92d28abcc20f8e
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:36:15 2024 -0800

            Fix merge stuff

        commit 955a05595bb2dc9d1c4eb7e993ad9fabd4990b57
        Merge: bbb0787 e1694f7
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:35:05 2024 -0800

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

        commit bbb078706bafcebd320132f5182f019bc229813d
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:23:06 2024 -0800

            Color constants

        commit a9fe75603dbccc48694aaf1c9d8c67afd7fdf1fe
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 17:18:40 2024 -0800

            Working LED color changes

        commit 4cf45032739463da3e6356e25ac687747b0977af
        Author: Aceius E <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 29 16:48:30 2024 -0800

            Convert lightstrip stuff to PWM

        commit e1694f74bed809833cdfab066afd87d0316debc3
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:37:42 2024 -0800

            Switch to Arm base class over interface

        commit ea273196b675905e63c925895d2bf28726af427b
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 16:36:44 2024 -0800

            Squashed commit of the following:

            commit cd61ef593ed60911513568107f2ac026b4edfd3c
            Author: michael-lesirge <100492377+michael-les…
  • Loading branch information
@MichaelLesirge
MichaelLesirge committed Mar 8, 2024
1 parent 0dddcf2 commit e740be9
Show file tree
Hide file tree
Showing 36 changed files with 1,501 additions and 483 deletions.
284 changes: 149 additions & 135 deletions shuffleboard.json
View file

Large diffs are not rendered by default.

22 changes: 16 additions & 6 deletions simgui-ds.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"Keyboard 0 Settings": {
"window": {
"visible": true
}
},
"keyboardJoysticks": [
{
"axisConfig": [
Expand All @@ -18,12 +23,17 @@
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonCount": 9,
"buttonKeys": [
90,
88,
67,
86
49,
50,
51,
52,
53,
54,
55,
56,
57
],
"povConfig": [
{
Expand All @@ -37,7 +47,7 @@
"key90": 326
}
],
"povCount": 1
"povCount": 0
},
{
"axisConfig": [
Expand Down
121 changes: 102 additions & 19 deletions src/main/java/frc/robot/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/
public final class Constants {
public static enum Bot {
WOOD_BOT, COMP_BOT
WOOD_BOT,
COMP_BOT,
SIM_BOT
}

public static final Bot currentBot;
Expand All @@ -36,6 +38,10 @@ public static enum Bot {
serialNumber = RobotBase.isReal() ? RobotController.getSerialNumber() : "simulation";

switch (serialNumber) {
case "simulation":
currentBot = Bot.SIM_BOT;
break;

case "03282B00": // Wood Bot Serial Number
currentBot = Bot.WOOD_BOT;
break;
Expand All @@ -47,6 +53,34 @@ public static enum Bot {
}
}

public static class HangConstants {
static {
switch (currentBot) {
case WOOD_BOT:
HAS_HANG = false;
break;

case COMP_BOT:
default:
HAS_HANG = false;
break;
}
}

public static final boolean HAS_HANG;

public static final int LEFT_MOTOR_ID = 0;
public static final int RIGHT_MOTOR_ID = 1;
public static final int LEFT_LIMIT_SWITCH_ID = 2;
public static final int RIGHT_LIMIT_SWITCH_ID = 3;

public static final boolean LEFT_MOTOR_IS_INVERTED = false;
public static final boolean RIGHT_MOTOR_IS_INVERTED = false;

public static final double speed = 0.2;

}

public static class DriverConstants {
public static final int DRIVER_JOYSTICK_PORT = 0;
public static final int OPERATOR_JOYSTICK_PORT = 1;
Expand Down Expand Up @@ -81,29 +115,61 @@ public static class ArmConstants {

public static final boolean HAS_ARM;

public static final double MAXIMUM_ARM_DEGREES = 1;
public static final double MINIMUM_ARM_DEGREES = 0;
// TODO: figure out positions
public static final double MAXIMUM_ARM_DEGREES = 50;
public static final double MINIMUM_ARM_DEGREES = -120;

public static final double ARM_AMP_SHOOTING_DEGREES = -20;
public static final double ARM_SPEAKER_SHOOTING_DEGREES = 45;
public static final double ARM_INTAKE_DEGREES = -40;
// Degrees
public static final double ARM_START_DEGREES = -38;
public static final double ARM_STOW_DEGREES = -83;
public static final double ARM_STOW_2_DEGREES = -100;
public static final double ARM_AMP_SHOOTING_DEGREES = -27.8;
public static final double ARM_SPEAKER_SHOOTING_DEGREES = -97.822;
public static final double ARM_INTAKE_DEGREES = -109;

public static final int LEFT_MOTOR_ID = 5;
public static final int RIGHT_MOTOR_ID = 19;
public static final int RIGHT_MOTOR_ID = 19;
public static final int RIGHT_ENCODER_ID = 6;

public static final boolean ARE_MOTORS_REVERSED = false;

public static final double DEGREES_PER_SECOND = 2.0;
public static final double DEGREES_PER_SECOND = 1;

public static final double ELEVATION_PID_P = 15;
public static final double ELEVATION_PID_P = 10;
public static final double ELEVATION_PID_I = 0;
public static final double ELEVATION_PID_D = 0;
}

public static class IntakeShooterConstants {
public static final boolean INTAKE_REVERSE = false;
public static final boolean FLYWHEEL_REVERSE = false;
static {
switch (currentBot) {
case WOOD_BOT:
HAS_INTAKE = false;
break;

case COMP_BOT:
default:
HAS_INTAKE = true;
break;
}
}

public static final boolean HAS_INTAKE;

public static final boolean INTAKE_REVERSE = false;

public static final int FLYWHEEL_MOTOR_1_ID = 13;
public static final int FLYWHEEL_MOTOR_2_ID = 7;

public static final int INTAKE_MOTOR_ID = 12;
public static final int INTAKE_LIMIT_SWITCH_ID = -1; // TODO get value

public static final double FLYWHEEL_SHOOTER_SPEED_AMP = 0.5;
public static final double FLYWHEEL_SHOOTER_SPEED_SPEAKER = 1;

public static final double INTAKE_GRABBER_SPEED_AMP = 1;
public static final double INTAKE_GRABBER_SPEED_SPEAKER = 1;
public static final double INTAKE_GRABBER_SPEED_INTAKE = -1;
}

public static class RobotMovementConstants {
Expand All @@ -114,10 +180,10 @@ public static class RobotMovementConstants {
public static final double ROTATION_PID_I = 0;
public static final double ROTATION_PID_D = 0;

public static final double TRANSLATION_PID_P = 1; //pids all temporarily set low
public static final double TRANSLATION_PID_I = 0;
public static final double TRANSLATION_PID_D = 0;
public static final double MAX_TRANSLATION_SPEED = 0.1;
public static final double TRANSLATION_PID_P = 100;
public static final double TRANSLATION_PID_I = 0.5;
public static final double TRANSLATION_PID_D = 15;
public static final double MAX_TRANSLATION_SPEED = 1;
}

public static class OperatorConstants {
Expand Down Expand Up @@ -255,14 +321,29 @@ public static class SwerveDrivetrainConstants {
}

public static class AutoConstants {
// preffered distance to tag, specifically for autopositioning the robot to in front of the tag
public static final double PREFERRED_TAG_DISTANCE=2;
// preffered distance to tag, specifically for autopositioning the robot to in
// front of the tag
public static final double PREFERRED_TAG_DISTANCE = 2;
}

public static class VisionConstants {
static {
switch (currentBot) {
case WOOD_BOT:
CAMERA_NAME = "Arducam_OV2311_USB_Camera";
break;
case COMP_BOT:
default:
CAMERA_NAME = "Arducam_OV9281_USB_Camera";
break;
}
}
public static final String CAMERA_NAME;

public static final Transform3d CAMERA_POSE = new Transform3d(0, 0, 0, new Rotation3d());
public static final String CAMERA_NAME = "Arducam_OV9281_USB_Camera";
public static final Transform3d CAMERA_POSE = new Transform3d(Units.inchesToMeters(13), 0,
Units.inchesToMeters(11), new Rotation3d(0, Units.degreesToRadians(-20), 0));
public static final Transform3d ROBOT_TO_FRONT = new Transform3d(Units.inchesToMeters(-13), 0, 0,
new Rotation3d());
}

public static class LightConstants {
Expand All @@ -277,5 +358,7 @@ public static class LightConstants {
public static final double LED_COLOR_PURPLE = 0.91;
public static final double LED_COLOR_WHITE = 0.93;
public static final double LED_COLOR_RAINBOW = -0.99;

public static final double LED_COLOR_DEFAULT = 0.99;
}
}
7 changes: 5 additions & 2 deletions src/main/java/frc/robot/Robot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

/**
* The VM is configured to automatically run this class,
* and to call the functions corresponding to each mode, as described in the TimedRobot documentation.
* If you change the name of this class or the package after creating this project, you must also update the build.gradle file in the project.
* and to call the functions corresponding to each mode, as described in the
* TimedRobot documentation.
* If you change the name of this class or the package after creating this
* project, you must also update the build.gradle file in the project.
*/
public class Robot extends TimedRobot {
private Command autonomousCommand;
Expand Down Expand Up @@ -88,6 +90,7 @@ public void teleopInit() {

robotContainer.setUpDriveController();
robotContainer.setUpOperatorController();
robotContainer.toDefaultPositions();
}

/** This function is called periodically during operator control. */
Expand Down
Loading

0 comments on commit e740be9

Please sign in to comment.