Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 95f6b9e
Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
Date:   Mon Mar 4 16:09:53 2024 -0800

    Create ScoringAlign.java

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

    Squashed commit of the following:

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

        Final changes from testing

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

        score on speaker

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

        AMP FIRE COOL YAY

    commit 6213d9a
    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 81e837a
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Sat Mar 2 15:40:56 2024 -0800

        First working shoot test

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

        Add dropInSpeaker command

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

        DropInAmp auto

    commit 25de589
    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 04bdb5d
    Author: Aleah H <aleahjham@gmail.com>
    Date:   Sat Mar 2 13:44:38 2024 -0800

        Move Arm Commands

    commit 2940fc5
    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 32fe9a2
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Sat Mar 2 13:37:50 2024 -0800

        update vision constants

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

        SpinIntakeFlywheel command

    commit 4e68f77
    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 7a2f214
    Author: Aleah H <aleahjham@gmail.com>
    Date:   Sat Mar 2 12:35:11 2024 -0800

        Add Smartdashboard printout for the hang limit switch

    commit 115e3d2
    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 58555f3
    Author: Aceius E <aceiuselms@seattleacademy.org>
    Date:   Sat Mar 2 12:32:39 2024 -0800

        Change Co-op light signal

    commit e8db7ca
    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 c2af5ac
    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 36af1fa
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Sat Mar 2 11:38:20 2024 -0800

        Quick odometry fix

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

        Feature flag for intake shooter

    commit 66498d5
    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 62815f9
    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 821abe6
    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 db233b3
        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 960e7e1
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Fri Mar 1 23:45:48 2024 -0800

            minor cleanup

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

            Auto position testing

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

            fix controller and AutoDriveTo

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

            fix merge breaks

        commit 7f8908f
        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 6fdc46c
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 17:58:53 2024 -0800

                remove unused variables

            commit 9b77e94
            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 8be1aa7
            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 7af525b
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:41:21 2024 -0800

                Change colors when button pressed

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

                Fix merge stuff

            commit 955a055
            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 bbb0787
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:23:06 2024 -0800

                Color constants

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

                Working LED color changes

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

                Convert lightstrip stuff to PWM

            commit e1694f7
            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 ea27319
            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 cd61ef5
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 10:31:36 2024 -0800

                    add missing files

                commit 853a614
                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 79f6d07
            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 6ec5e47
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 16:15:36 2024 -0800

                add Control for IntakeShooter

            commit 27fd8cd
            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 cdcf438
                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 40ad7bb
                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 8f683e0
                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 192edcd
                Author: Aceius E. <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 1 17:19:59 2024 -0800

                    Change to Talon controllers for flywheel

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

                    Constructor allows speed change

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

                    Test shooter command

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

                    Skeleton of the skeleton for the intake shooter

            commit 326c5c5
            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 2ec3b75
            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 3ffa7e8
            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 c2bc797
            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 89c1634
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 18:39:19 2024 -0800

            fixes

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

            button

        commit 1dbcb6b
        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 b2d991f
        Author: Linden <50274080+liulinden@users.noreply.github.com>
        Date:   Wed Feb 28 17:12:26 2024 -0800

            mostly done

        commit 7e1700f
        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 3ab70d3
        Author: Linden <50274080+liulinden@users.noreply.github.com>
        Date:   Mon Feb 26 17:53:40 2024 -0800

            autoposition subsystems

    commit 4a7f107
    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 8e83d3a
    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 1d6e732
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 20:36:31 2024 -0800

                add cancel command

            commit ccf5a6f
            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 55c74e2
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Thu Feb 29 19:15:08 2024 -0800

                    Auto position testing

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

                    fix controller and AutoDriveTo

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

                    fix merge breaks

                commit 7f8908f
                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 6fdc46c
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 17:58:53 2024 -0800

                        remove unused variables

                    commit 9b77e94
                    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 8be1aa7
                    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 7af525b
                    Author: Aceius E <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 29 17:41:21 2024 -0800

                        Change colors when button pressed

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

                        Fix merge stuff

                    commit 955a055
                    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 bbb0787
                    Author: Aceius E <aceiuselms@seattleacademy.org>
                    Date:   Thu Feb 29 17:23:06 2024 -0800

                        Color constants

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

                        Working LED color changes

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

                        Convert lightstrip stuff to PWM

                    commit e1694f7
                    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 ea27319
                    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 cd61ef5
                        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                        Date:   Wed Feb 28 10:31:36 2024 -0800

                            add missing files

                        commit 853a614
                        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 79f6d07
                    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 6ec5e47
                    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                    Date:   Thu Feb 29 16:15:36 2024 -0800

                        add Control for IntakeShooter

                    commit 27fd8cd
                    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 cdcf438
                        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 40ad7bb
                        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 8f683e0
                        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 192edcd
                        Author: Aceius E. <aceiuselms@seattleacademy.org>
                        Date:   Thu Feb 1 17:19:59 2024 -0800

                            Change to Talon controllers for flywheel

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

                            Constructor allows speed change

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

                            Test shooter command

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

                            Skeleton of the skeleton for the intake shooter

                    commit 326c5c5
                    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 2ec3b75
                    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 3ffa7e8
                    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 c2bc797
                    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 89c1634
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 18:39:19 2024 -0800

                    fixes

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

                    button

                commit 1dbcb6b
                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 b2d991f
                Author: Linden <50274080+liulinden@users.noreply.github.com>
                Date:   Wed Feb 28 17:12:26 2024 -0800

                    mostly done

                commit 7e1700f
                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 3ab70d3
                Author: Linden <50274080+liulinden@users.noreply.github.com>
                Date:   Mon Feb 26 17:53:40 2024 -0800

                    autoposition subsystems

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

                remove unused variables

            commit 9b77e94
            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 8be1aa7
            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 7af525b
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:41:21 2024 -0800

                Change colors when button pressed

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

                Fix merge stuff

            commit 955a055
            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 bbb0787
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:23:06 2024 -0800

                Color constants

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

                Working LED color changes

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

                Convert lightstrip stuff to PWM

            commit e1694f7
            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 ea27319
            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 cd61ef5
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 10:31:36 2024 -0800

                    add missing files

                commit 853a614
                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 79f6d07
            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 6ec5e47
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 16:15:36 2024 -0800

                add Control for IntakeShooter

            commit 27fd8cd
            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 cdcf438
                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 40ad7bb
                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 8f683e0
                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 192edcd
                Author: Aceius E. <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 1 17:19:59 2024 -0800

                    Change to Talon controllers for flywheel

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

                    Constructor allows speed change

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

                    Test shooter command

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

                    Skeleton of the skeleton for the intake shooter

            commit 326c5c5
            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 2ec3b75
            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 1d6e732
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 20:36:31 2024 -0800

        add cancel command

    commit ccf5a6f
    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 55c74e2
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Thu Feb 29 19:15:08 2024 -0800

            Auto position testing

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

            fix controller and AutoDriveTo

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

            fix merge breaks

        commit 7f8908f
        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 6fdc46c
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 17:58:53 2024 -0800

                remove unused variables

            commit 9b77e94
            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 8be1aa7
            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 7af525b
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:41:21 2024 -0800

                Change colors when button pressed

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

                Fix merge stuff

            commit 955a055
            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 bbb0787
            Author: Aceius E <aceiuselms@seattleacademy.org>
            Date:   Thu Feb 29 17:23:06 2024 -0800

                Color constants

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

                Working LED color changes

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

                Convert lightstrip stuff to PWM

            commit e1694f7
            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 ea27319
            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 cd61ef5
                Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
                Date:   Wed Feb 28 10:31:36 2024 -0800

                    add missing files

                commit 853a614
                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 79f6d07
            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 6ec5e47
            Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
            Date:   Thu Feb 29 16:15:36 2024 -0800

                add Control for IntakeShooter

            commit 27fd8cd
            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 cdcf438
                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 40ad7bb
                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 8f683e0
                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 192edcd
                Author: Aceius E. <aceiuselms@seattleacademy.org>
                Date:   Thu Feb 1 17:19:59 2024 -0800

                    Change to Talon controllers for flywheel

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

                    Constructor allows speed change

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

                    Test shooter command

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

                    Skeleton of the skeleton for the intake shooter

            commit 326c5c5
            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 2ec3b75
            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 3ffa7e8
            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 c2bc797
            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 89c1634
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 18:39:19 2024 -0800

            fixes

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

            button

        commit 1dbcb6b
        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 b2d991f
        Author: Linden <50274080+liulinden@users.noreply.github.com>
        Date:   Wed Feb 28 17:12:26 2024 -0800

            mostly done

        commit 7e1700f
        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 3ab70d3
        Author: Linden <50274080+liulinden@users.noreply.github.com>
        Date:   Mon Feb 26 17:53:40 2024 -0800

            autoposition subsystems

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

        remove unused variables

    commit 9b77e94
    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 8be1aa7
    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 7af525b
    Author: Aceius E <aceiuselms@seattleacademy.org>
    Date:   Thu Feb 29 17:41:21 2024 -0800

        Change colors when button pressed

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

        Fix merge stuff

    commit 955a055
    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 bbb0787
    Author: Aceius E <aceiuselms@seattleacademy.org>
    Date:   Thu Feb 29 17:23:06 2024 -0800

        Color constants

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

        Working LED color changes

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

        Convert lightstrip stuff to PWM

    commit e1694f7
    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 ea27319
    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 cd61ef5
        Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
        Date:   Wed Feb 28 10:31:36 2024 -0800

            add missing files

        commit 853a614
        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 79f6d07
    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 6ec5e47
    Author: michael-lesirge <100492377+michael-lesirge@users.noreply.github.com>
    Date:   Thu Feb 29 16:15:36 2024 -0800

        add Control for IntakeShooter

    commit 27fd8cd
    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 cdcf438
        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 40ad7bb
        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 8f683e0
        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 192edcd
        Author: Aceius E. <aceiuselms@seattleacademy.org>
        Date:   Thu Feb 1 17:19:59 2024 -0800

            Change to Talon controllers for flywheel

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

            Constructor allows speed change

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

            Test shooter command

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

            Skeleton of the skeleton for the intake shooter

    commit 326c5c5
    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 2ec3b75
    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 3ffa7e8
    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 c2bc797
    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 ad93c82
Author: DigitalFork <113265535+DigitalFork@users.noreply.github.com>
Date:   Mon Mar 4 15:44:58 2024 -0800

    Add switch statement for coprocessor camera name
  • Loading branch information
@bforcum
bforcum committed Mar 8, 2024
1 parent 3c7d35d commit ffc0e98
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 12 deletions.
7 changes: 6 additions & 1 deletion simgui-ds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@
],
"robotJoysticks": [
{
"guid": "Keyboard0"
"guid": "78696e70757401000000000000000000",
"useGamepad": true
},
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
}
]
}
15 changes: 12 additions & 3 deletions src/main/java/frc/robot/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,13 +325,22 @@ public static class AutoConstants {
}

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(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 final String CAMERA_NAME = "Arducam_OV2311_USB_Camera";
// public static final String CAMERA_NAME = "Arducam_OV9281_USB_Camera";
}

public static class LightConstants {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/frc/robot/RobotContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.kauailabs.navx.frc.AHRS;

import edu.wpi.first.wpilibj.GenericHID;
import edu.wpi.first.wpilibj.TimedRobot;
import edu.wpi.first.wpilibj.GenericHID.HIDType;
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
Expand Down Expand Up @@ -174,7 +175,7 @@ public void setUpDriveController() {

final CommandJoystick joystick = new CommandJoystick(genericHID.getPort());

inputs = new ChassisDriveInputs(
ChassisDriveInputs inputs = new ChassisDriveInputs(
joystick::getX, -1,
joystick::getY, -1,
joystick::getTwist, -1,
Expand All @@ -195,7 +196,7 @@ public void setUpDriveController() {

final CommandXboxController xbox = new CommandXboxController(genericHID.getPort());

inputs = new ChassisDriveInputs(
ChassisDriveInputs inputs = new ChassisDriveInputs(
xbox::getLeftX, -1,
xbox::getLeftY, -1,
xbox::getRightX, -1,
Expand Down
32 changes: 32 additions & 0 deletions src/main/java/frc/robot/commands/SpinIntakeFlywheels.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package frc.robot.commands;

import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.intake.IntakeShooter;

public class SpinIntakeFlywheels extends Command {
private IntakeShooter intakeShooter;
private double speed;

public SpinIntakeFlywheels(IntakeShooter intake, double speed) {
intakeShooter = intake;
this.speed = speed;
}

@Override
public void initialize() {
intakeShooter.setFlyWheelSpeed(speed);
}

// @Override
// public void execute() { }

@Override
public boolean isFinished() {
return true;
}

@Override
public void end(boolean interrupted) {
// end
}
}
32 changes: 32 additions & 0 deletions src/main/java/frc/robot/commands/SpinIntakeWheels.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package frc.robot.commands;

import edu.wpi.first.wpilibj2.command.Command;
import frc.robot.subsystems.intake.IntakeShooter;

public class SpinIntakeWheels extends Command {
private IntakeShooter intakeShooter;
private double speed;

public SpinIntakeWheels(IntakeShooter intake, double speed) {
intakeShooter = intake;
this.speed = speed;
}

@Override
public void initialize() {
intakeShooter.setIntakeSpeed(speed);
}

// @Override
// public void execute() { }

@Override
public boolean isFinished() {
return true;
}

@Override
public void end(boolean interrupted) {
// end
}
}
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/Vision.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/** Vision subsystem */
public class Vision extends SubsystemBase {

private final static boolean DEBUG_INFO = false;
private final static boolean DEBUG_INFO = true;

private boolean visionEnabled = true;

Expand Down
10 changes: 5 additions & 5 deletions vendordeps/photonlib.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "photonlib.json",
"name": "photonlib",
"version": "v2024.2.4",
"version": "v2024.2.8",
"uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -14,7 +14,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-cpp",
"version": "v2024.2.4",
"version": "v2024.2.8",
"libName": "photonlib",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -29,7 +29,7 @@
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-cpp",
"version": "v2024.2.4",
"version": "v2024.2.8",
"libName": "photontargeting",
"headerClassifier": "headers",
"sharedLibrary": true,
Expand All @@ -46,12 +46,12 @@
{
"groupId": "org.photonvision",
"artifactId": "photonlib-java",
"version": "v2024.2.4"
"version": "v2024.2.8"
},
{
"groupId": "org.photonvision",
"artifactId": "photontargeting-java",
"version": "v2024.2.4"
"version": "v2024.2.8"
}
]
}

0 comments on commit ffc0e98

Please sign in to comment.