Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 0bb8005477f95db82889ce7e07a8b17d57f44ab9
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Wed May 29 20:51:52 2024 -0400

    track drifting

commit 88352fdc2308c60f9c1161d93018e68bc70ea801
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Wed May 29 20:48:03 2024 -0400

    brake sensor outputs swapped. bspd working now

commit 3e60d1fb117334f371cc11624a32946113ecd9a7
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Wed May 29 19:20:46 2024 -0400

    adjusted pedal range

commit c4b35006395f2f15971596f8870b65d8202ef53c
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Wed May 29 13:05:47 2024 -0400

    adjustment for new brake sensor (tbc)

commit c083f8989aa781f0f25be1559db742527618fb10
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Tue May 28 21:06:36 2024 -0400

    merged branch, use main

commit 21dd996d6f60d82285a57ed481d679849ee25efc
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Mon May 27 14:39:49 2024 -0400

    Squashed commit of the following:

    commit a66e55b5f526563df1e444f86a694bb34b58d2e1
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 27 14:19:41 2024 -0400

        fixed test to make it pass

    commit ab92c8c74cd86904166622d8f377409afd638710
    Merge: ba91e2ee 56933097
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 27 14:13:49 2024 -0400

        Merge branch 'master' into feature/TCMux-relevant-status-tracking

    commit 569330973eb670944b8dcbb79b4b088bf7778305
    Author: Ben Hall <rcmast3r1@gmail.com>
    Date:   Sat May 25 15:51:49 2024 -0400

        CASE (#95)

        * adding stuff in

        * adding in current progress

        * Cooking on EthernetInterface

        * fixing merges

        * cooking on parameter server

        * working on getting protobuf messages handled

        * pb ethernet receiving docs

        * Initial UDPSocket template

        * removing BS

        * Updating ethernet interface

        * fixing ethernetinterface compile errors

        * Rewriting send() function in EthernetInterface

        * removed buffer size from EthernetInterface constructor

        * adding stuff in

        * Moving Ethernet UDP socket into main and Using NativeEthernet instead

        * she lives!

        * actually working in the test pog

        * cooking

        * CASE testing flahsed to car 5/4/24, works on jacks, havent tested on ground

        * fix test_CASE.h

        * updating readme with a proposed shift in generation of stuff

        * Updated load cell scaling

        * Update main.cpp

        * Update main.cpp

        * integrating the parameter interface

        * jankily fixing tests

        * working my magic

        * compiles!

        * adjusted can release

        * updated platform.ini

        * Flashed to car 5/8/24

        * push for benajmin

        * uh

        * last flashed 5/9/24 on car

        * Added TCS saturation limit for front and rear axles

        * Add CAN msg for TCS saturation limits

        * Added steer dependent torque delta constraint to TCS

        * lib branch merged, back to main

        * Integrating filter into steering system

        * compiles. to be tested

        * configuration for testing

        * debug notes but might be a good starting point to add back basic debug serial prints

        * Compiles and passed steering test

        * Reset calibrated steering offset and add serial monitor speed in .ini (not sure if it's doing anything helpful)

        * Temp changes

        * CASE updated with normal load based TCS gain scheduling

        * Wheel spun

        * Decoupled and NL scheduled slip targets for TCS

        * Added non zero filer alpha

        * Adjusted steering system test for iir filter

        * Minor adjustment

        * Recalibrated bottom sensor and wheel spun

        * Added comments to steering test for readability

        * Added Derate Factor code to AMS interface

        * added derate factor to case and loadcell

        * Revert "added derate factor to case and loadcell"

        This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

        * Revert "Added Derate Factor code to AMS interface"

        This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

        * read more values

        * finale

        * Squashed commit of the following:

        commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:10:02 2024 -0400

            more detailed steering report

        commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:26:14 2024 -0400

            not working when steered to right

        commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
        Merge: 8ac101b5 1416d3eb
        Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
        Date:   Mon May 20 22:54:56 2024 -0700

            Merge branch 'master' of https://github.com/hytech-racing/MCU

        commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
        Author: Ben Hall <rcmast3r1@gmail.com>
        Date:   Sat May 11 15:24:45 2024 -0400

            adding private member functions to doxygen docs

        commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
        Author: Ben Hall <rcmast3r1@gmail.com>
        Date:   Sat May 11 15:11:22 2024 -0400

            fixing repo library dep clone directives

        * Revert "Squashed commit of the following:"

        This reverts commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189.

        * Merge branch 'master' into CASE_testbranch

        * Update main.cpp

        * bad

        * Revert "bad"

        This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

        * Revert "Update main.cpp"

        This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

        * Revert "Merge branch 'master' into CASE_testbranch"

        This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

        * Reapply "Merge branch 'master' into CASE_testbranch"

        This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

        * Reapply "Update main.cpp"

        This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

        * Reapply "bad"

        This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

        * Squashed commit of the following:

        commit 07faefaba316f8a090ab1d0191dd06c95f139e82
        Merge: f149cdcc bb038370
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:29:16 2024 -0400

            Merge branch 'master' into CASE_testbranch

        commit f149cdcc7d914b543d060fb815c316e24461bb95
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:06:46 2024 -0400

            Reapply "bad"

            This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

        commit e8cbee792d0dbe17f318fcc82e0d5b3bef443b1d
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:06:35 2024 -0400

            Reapply "Update main.cpp"

            This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

        commit 3d1aab350837aa61484f96b4e33bf0752168c37b
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:06:23 2024 -0400

            Reapply "Merge branch 'master' into CASE_testbranch"

            This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

        commit e062970d4409bd761214e392f27842b7e6870ec2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:37:16 2024 -0400

            Revert "Merge branch 'master' into CASE_testbranch"

            This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

        commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:37:07 2024 -0400

            Revert "Update main.cpp"

            This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

        commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:36:55 2024 -0400

            Revert "bad"

            This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

        commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:36:42 2024 -0400

            bad

        commit dfa4f7a3cf177dcaee65c59cd3a406c253359288
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:24:22 2024 -0400

            Update main.cpp

        commit df74595acc64ee569cfd9377f0f344c784be3323
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:23:20 2024 -0400

            Merge branch 'master' into CASE_testbranch

        commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:10:02 2024 -0400

            more detailed steering report

        commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:26:14 2024 -0400

            not working when steered to right

        commit 40dd816373d34d825800ed9cf16a17fd0994ee7d
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Tue May 21 18:05:55 2024 -0400

            Revert "Added Derate Factor code to AMS interface"

            This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

        commit 760bd8f0acf3683092601822cb4682c4eb286568
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Tue May 21 18:04:56 2024 -0400

            Revert "added derate factor to case and loadcell"

            This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

        commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253
        Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
        Date:   Tue May 21 00:07:20 2024 -0700

            added derate factor to case and loadcell

        commit 5262fe863b9df002e12565476522d49171ff36b1
        Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
        Date:   Mon May 20 23:53:20 2024 -0700

            Added Derate Factor code to AMS interface

        commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
        Merge: 8ac101b5 1416d3eb
        Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
        Date:   Mon May 20 22:54:56 2024 -0700

            Merge branch 'master' of https://github.com/hytech-racing/MCU

        commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
        Author: Ben Hall <rcmast3r1@gmail.com>
        Date:   Sat May 11 15:24:45 2024 -0400

            adding private member functions to doxygen docs

        commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
        Author: Ben Hall <rcmast3r1@gmail.com>
        Date:   Sat May 11 15:11:22 2024 -0400

            fixing repo library dep clone directives

        * Squashed commit of the following:

        commit 0b688704841d2fa14da35a5fa5159061fa30a375
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:33:24 2024 -0400

            Squashed commit of the following:

            commit 07faefaba316f8a090ab1d0191dd06c95f139e82
            Merge: f149cdcc bb038370
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:29:16 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit f149cdcc7d914b543d060fb815c316e24461bb95
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:46 2024 -0400

                Reapply "bad"

                This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

            commit e8cbee792d0dbe17f318fcc82e0d5b3bef443b1d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:35 2024 -0400

                Reapply "Update main.cpp"

                This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

            commit 3d1aab350837aa61484f96b4e33bf0752168c37b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:23 2024 -0400

                Reapply "Merge branch 'master' into CASE_testbranch"

                This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

            commit e062970d4409bd761214e392f27842b7e6870ec2
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:16 2024 -0400

                Revert "Merge branch 'master' into CASE_testbranch"

                This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

            commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:07 2024 -0400

                Revert "Update main.cpp"

                This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

            commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:55 2024 -0400

                Revert "bad"

                This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

            commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:42 2024 -0400

                bad

            commit dfa4f7a3cf177dcaee65c59cd3a406c253359288
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:24:22 2024 -0400

                Update main.cpp

            commit df74595acc64ee569cfd9377f0f344c784be3323
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:23:20 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 40dd816373d34d825800ed9cf16a17fd0994ee7d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:05:55 2024 -0400

                Revert "Added Derate Factor code to AMS interface"

                This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

            commit 760bd8f0acf3683092601822cb4682c4eb286568
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:04:56 2024 -0400

                Revert "added derate factor to case and loadcell"

                This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

            commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Tue May 21 00:07:20 2024 -0700

                added derate factor to case and loadcell

            commit 5262fe863b9df002e12565476522d49171ff36b1
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 23:53:20 2024 -0700

                Added Derate Factor code to AMS interface

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit 28d5e7226319c65f8976b519d1162793991da576
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:17:14 2024 -0400

            Revert "Squashed commit of the following:"

            This reverts commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189.

        commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:15:59 2024 -0400

            Squashed commit of the following:

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit f4e69efce5c21a20d632c5b64b0400da11872775
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 01:16:52 2024 -0400

            Added comments to steering test for readability

        commit c1710c297db5fda3bb99a6213de3eb25367f658d
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sat May 18 22:01:15 2024 -0400

            Recalibrated bottom sensor and wheel spun

        commit 04524b778b34709dba2cb7e79f0b80f0fcfb5360
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sat May 18 19:02:42 2024 -0400

            Minor adjustment

        commit 455aab32aeba2e99e75fc6087c9c6bb9375be00e
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sat May 18 18:45:53 2024 -0400

            Adjusted steering system test for iir filter

        commit 0c6639ff352665cde326ecfea17d33c34b1de844
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sat May 18 14:38:51 2024 -0400

            Added non zero filer alpha

        commit 7ab723e7da6eb52058e14655fb37757a9f8a879f
        Merge: e7dceb74 04ad455f
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Fri May 17 23:49:31 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit e7dceb740d831226a64781a118fe671c93b078b7
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sun May 12 22:06:24 2024 -0400

            configuration for testing

        commit c76391e9a03d42b181fa2c0a006a281fdad7edf9
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sun May 12 20:02:55 2024 -0400

            compiles. to be tested

        commit 6df7c595af71eb39512a781410067e2887d03e46
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Sun May 12 00:52:58 2024 -0400

            Integrating filter into steering system

        * Update steering_system_test.h

        * adding back in the tc mux checks for mode change

        ---------

        Co-authored-by: walkermburns <walkermburns@gmail.com>
        Co-authored-by: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Co-authored-by: Eric Galluzzi <ericbgalluzzi@gmail.com>
        Co-authored-by: CL16gtgh <ryang359@gatech.edu>
        Co-authored-by: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
        Co-authored-by: CL16gtgh <113149455+CL16gtgh@users.noreply.github.com>

    commit ba91e2ee0b48ec4e8fe255e42b2d072cddbb248c
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sat May 25 15:49:03 2024 -0400

        Test cases passed

    commit 97da4f12ef6672d7c98af75968f8d2bd445c4161
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sat May 25 15:03:40 2024 -0400

        Test env compiles

    commit ddb1f02aa49ea983d714fbd251c9570918efcae3
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sat May 25 03:39:35 2024 -0400

        Update steering_system_test.h

    commit b0124a88b5f4899ff05488d6cd2d766ada6a17ae
    Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
    Date:   Fri May 24 20:48:12 2024 -0700

        Added TCSVelThreshold back in

    commit 6bd7ba44c7be5b74955c8c6164732531eec9a3f1
    Merge: 2beeda82 18152729
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Fri May 24 21:35:01 2024 -0400

        Merge branch 'master' into feature/TCMux-relevant-status-tracking

    commit 2beeda82da902a27599f6a2109848db0283daa60
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 18:55:23 2024 -0400

        Trying to get rid of self limiting features

    commit 65f9ba00df78313c1c7a56c8ef8faea73a36322c
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 17:36:43 2024 -0400

        Squashed commit of the following:

        commit 0b688704841d2fa14da35a5fa5159061fa30a375
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:33:24 2024 -0400

            Squashed commit of the following:

            commit 07faefaba316f8a090ab1d0191dd06c95f139e82
            Merge: f149cdcc bb038370
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:29:16 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit f149cdcc7d914b543d060fb815c316e24461bb95
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:46 2024 -0400

                Reapply "bad"

                This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

            commit e8cbee792d0dbe17f318fcc82e0d5b3bef443b1d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:35 2024 -0400

                Reapply "Update main.cpp"

                This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

            commit 3d1aab350837aa61484f96b4e33bf0752168c37b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:23 2024 -0400

                Reapply "Merge branch 'master' into CASE_testbranch"

                This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

            commit e062970d4409bd761214e392f27842b7e6870ec2
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:16 2024 -0400

                Revert "Merge branch 'master' into CASE_testbranch"

                This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

            commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:07 2024 -0400

                Revert "Update main.cpp"

                This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

            commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:55 2024 -0400

                Revert "bad"

                This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

            commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:42 2024 -0400

                bad

            commit dfa4f7a3cf177dcaee65c59cd3a406c253359288
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:24:22 2024 -0400

                Update main.cpp

            commit df74595acc64ee569cfd9377f0f344c784be3323
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:23:20 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 40dd816373d34d825800ed9cf16a17fd0994ee7d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:05:55 2024 -0400

                Revert "Added Derate Factor code to AMS interface"

                This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

            commit 760bd8f0acf3683092601822cb4682c4eb286568
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:04:56 2024 -0400

                Revert "added derate factor to case and loadcell"

                This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

            commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Tue May 21 00:07:20 2024 -0700

                added derate factor to case and loadcell

            commit 5262fe863b9df002e12565476522d49171ff36b1
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 23:53:20 2024 -0700

                Added Derate Factor code to AMS interface

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit 28d5e7226319c65f8976b519d1162793991da576
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:17:14 2024 -0400

            Revert "Squashed commit of the following:"

            This reverts commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189.

        commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:15:59 2024 -0400

            Squashed commit of the following:

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit afda31e97927c150a94b44c0c8617ebd34a851a6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 16:00:49 2024 -0400

        Squashed commit of the following:

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit b73616916b859496200d85c5c513a4e5390b70ea
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 15:52:14 2024 -0400

        Fix skill issue

    commit 9facf9ebb1ccbab60920bd45ba3f6566d1b14bfc
    Merge: 3daa65bc f4e69efc
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 01:19:17 2024 -0400

        Merge branch 'feature/filter-steering-reading' into feature/TCMux-relevant-status-tracking

    commit 3daa65bcdb64796f2ae48b1196cf0cc25fb5171a
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 00:11:51 2024 -0400

        a lil bit of ocd

    commit 1e5326a37c199fba7a919d5c55c3b2b6745e579f
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 23:20:57 2024 -0400

        Added implementation in TelemetryInterface and updated .ini file

    commit 3a1f493e97938ab68cec98103d8e9df7e637a6ee
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 18:40:13 2024 -0400

        Added steering status report

    commit 1284ebc4bd482d4f5976c2c0220309b87e7ebcd6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 16:02:14 2024 -0400

        Idea outline for reporting TCMux status

commit 7d18695cf09b86607cbd2482ffb084b45235edf8
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Sun May 26 14:48:10 2024 -0400

    swapped CAN message assignment for pots

commit 082dd462bc60851d0888ef295cafafa57c7d7df7
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Sat May 25 18:36:23 2024 -0400

    extended init wait time

commit e38f99862e34b1adc6aefbc9138e13b470c08fd4
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Sat May 25 00:21:42 2024 -0400

    Squashed commit of the following:

    commit b0124a88b5f4899ff05488d6cd2d766ada6a17ae
    Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
    Date:   Fri May 24 20:48:12 2024 -0700

        Added TCSVelThreshold back in

    commit 6bd7ba44c7be5b74955c8c6164732531eec9a3f1
    Merge: 2beeda82 18152729
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Fri May 24 21:35:01 2024 -0400

        Merge branch 'master' into feature/TCMux-relevant-status-tracking

    commit 2beeda82da902a27599f6a2109848db0283daa60
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 18:55:23 2024 -0400

        Trying to get rid of self limiting features

    commit 65f9ba00df78313c1c7a56c8ef8faea73a36322c
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 17:36:43 2024 -0400

        Squashed commit of the following:

        commit 0b688704841d2fa14da35a5fa5159061fa30a375
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:33:24 2024 -0400

            Squashed commit of the following:

            commit 07faefaba316f8a090ab1d0191dd06c95f139e82
            Merge: f149cdcc bb038370
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:29:16 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit f149cdcc7d914b543d060fb815c316e24461bb95
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:46 2024 -0400

                Reapply "bad"

                This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

            commit e8cbee792d0dbe17f318fcc82e0d5b3bef443b1d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:35 2024 -0400

                Reapply "Update main.cpp"

                This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

            commit 3d1aab350837aa61484f96b4e33bf0752168c37b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:23 2024 -0400

                Reapply "Merge branch 'master' into CASE_testbranch"

                This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

            commit e062970d4409bd761214e392f27842b7e6870ec2
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:16 2024 -0400

                Revert "Merge branch 'master' into CASE_testbranch"

                This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

            commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:07 2024 -0400

                Revert "Update main.cpp"

                This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

            commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:55 2024 -0400

                Revert "bad"

                This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

            commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:42 2024 -0400

                bad

            commit dfa4f7a3cf177dcaee65c59cd3a406c253359288
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:24:22 2024 -0400

                Update main.cpp

            commit df74595acc64ee569cfd9377f0f344c784be3323
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:23:20 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 40dd816373d34d825800ed9cf16a17fd0994ee7d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:05:55 2024 -0400

                Revert "Added Derate Factor code to AMS interface"

                This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

            commit 760bd8f0acf3683092601822cb4682c4eb286568
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:04:56 2024 -0400

                Revert "added derate factor to case and loadcell"

                This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

            commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Tue May 21 00:07:20 2024 -0700

                added derate factor to case and loadcell

            commit 5262fe863b9df002e12565476522d49171ff36b1
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 23:53:20 2024 -0700

                Added Derate Factor code to AMS interface

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit 28d5e7226319c65f8976b519d1162793991da576
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:17:14 2024 -0400

            Revert "Squashed commit of the following:"

            This reverts commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189.

        commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:15:59 2024 -0400

            Squashed commit of the following:

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit afda31e97927c150a94b44c0c8617ebd34a851a6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 16:00:49 2024 -0400

        Squashed commit of the following:

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit b73616916b859496200d85c5c513a4e5390b70ea
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 15:52:14 2024 -0400

        Fix skill issue

    commit 9facf9ebb1ccbab60920bd45ba3f6566d1b14bfc
    Merge: 3daa65bc f4e69efc
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 01:19:17 2024 -0400

        Merge branch 'feature/filter-steering-reading' into feature/TCMux-relevant-status-tracking

    commit 3daa65bcdb64796f2ae48b1196cf0cc25fb5171a
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 00:11:51 2024 -0400

        a lil bit of ocd

    commit 1e5326a37c199fba7a919d5c55c3b2b6745e579f
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 23:20:57 2024 -0400

        Added implementation in TelemetryInterface and updated .ini file

    commit 3a1f493e97938ab68cec98103d8e9df7e637a6ee
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 18:40:13 2024 -0400

        Added steering status report

    commit 1284ebc4bd482d4f5976c2c0220309b87e7ebcd6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 16:02:14 2024 -0400

        Idea outline for reporting TCMux status

commit e33f672619bf51bdf583499614d1ff745d41c6b7
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Sat May 25 00:19:54 2024 -0400

    Cherry picked coulomb counting

commit 38f08570a1da3db2ee84c7876a4f33d0ca36e19e
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Fri May 24 23:17:14 2024 -0400

    stash

commit ee32c25039817b679921702d756947c023920b83
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Fri May 24 23:03:52 2024 -0400

    Squashed commit of the following:

    commit 6bd7ba44c7be5b74955c8c6164732531eec9a3f1
    Merge: 2beeda82 18152729
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Fri May 24 21:35:01 2024 -0400

        Merge branch 'master' into feature/TCMux-relevant-status-tracking

    commit 2beeda82da902a27599f6a2109848db0283daa60
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 18:55:23 2024 -0400

        Trying to get rid of self limiting features

    commit 65f9ba00df78313c1c7a56c8ef8faea73a36322c
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 17:36:43 2024 -0400

        Squashed commit of the following:

        commit 0b688704841d2fa14da35a5fa5159061fa30a375
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 17:33:24 2024 -0400

            Squashed commit of the following:

            commit 07faefaba316f8a090ab1d0191dd06c95f139e82
            Merge: f149cdcc bb038370
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:29:16 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit f149cdcc7d914b543d060fb815c316e24461bb95
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:46 2024 -0400

                Reapply "bad"

                This reverts commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d.

            commit e8cbee792d0dbe17f318fcc82e0d5b3bef443b1d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:35 2024 -0400

                Reapply "Update main.cpp"

                This reverts commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503.

            commit 3d1aab350837aa61484f96b4e33bf0752168c37b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 17:06:23 2024 -0400

                Reapply "Merge branch 'master' into CASE_testbranch"

                This reverts commit e062970d4409bd761214e392f27842b7e6870ec2.

            commit e062970d4409bd761214e392f27842b7e6870ec2
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:16 2024 -0400

                Revert "Merge branch 'master' into CASE_testbranch"

                This reverts commit df74595acc64ee569cfd9377f0f344c784be3323.

            commit 50de74cb8fdf54dfb73dd047d41d2618a97a3503
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:37:07 2024 -0400

                Revert "Update main.cpp"

                This reverts commit dfa4f7a3cf177dcaee65c59cd3a406c253359288.

            commit 2a253cde26abbe9648e8cf12feb2ffedcb2c630d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:55 2024 -0400

                Revert "bad"

                This reverts commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b.

            commit 95c4618988317737ebc4a31afa6c6d5ee3a2e27b
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:36:42 2024 -0400

                bad

            commit dfa4f7a3cf177dcaee65c59cd3a406c253359288
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:24:22 2024 -0400

                Update main.cpp

            commit df74595acc64ee569cfd9377f0f344c784be3323
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 16:23:20 2024 -0400

                Merge branch 'master' into CASE_testbranch

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 40dd816373d34d825800ed9cf16a17fd0994ee7d
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:05:55 2024 -0400

                Revert "Added Derate Factor code to AMS interface"

                This reverts commit 5262fe863b9df002e12565476522d49171ff36b1.

            commit 760bd8f0acf3683092601822cb4682c4eb286568
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Tue May 21 18:04:56 2024 -0400

                Revert "added derate factor to case and loadcell"

                This reverts commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253.

            commit 5d9761b97bdf00b7dc1c1b5c5e89d01f0a533253
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Tue May 21 00:07:20 2024 -0700

                added derate factor to case and loadcell

            commit 5262fe863b9df002e12565476522d49171ff36b1
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 23:53:20 2024 -0700

                Added Derate Factor code to AMS interface

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit 28d5e7226319c65f8976b519d1162793991da576
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:17:14 2024 -0400

            Revert "Squashed commit of the following:"

            This reverts commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189.

        commit 25136c7f3b5790c11e6ad2022c372ac16ea1a189
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 16:15:59 2024 -0400

            Squashed commit of the following:

            commit bb038370a0f0c13cd0e1e4bcb25e634b6ee7feed
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 15:10:02 2024 -0400

                more detailed steering report

            commit 2b5642365faf8db118b26bba7cd2324b8d8ffa7f
            Author: CL16gtgh <ryang359@gatech.edu>
            Date:   Wed May 22 14:26:14 2024 -0400

                not working when steered to right

            commit 23be5cd4e88243c9d4273c0ad2025a7270980f4c
            Merge: 8ac101b5 1416d3eb
            Author: shaynoorani <113149316+shaynoorani@users.noreply.github.com>
            Date:   Mon May 20 22:54:56 2024 -0700

                Merge branch 'master' of https://github.com/hytech-racing/MCU

            commit 1416d3eb16d117c7cb9bd9fb9273aa1d3a93779c
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:24:45 2024 -0400

                adding private member functions to doxygen docs

            commit 408193b6b7111dbdc48f6af84ce1b50195d7a855
            Author: Ben Hall <rcmast3r1@gmail.com>
            Date:   Sat May 11 15:11:22 2024 -0400

                fixing repo library dep clone directives

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit afda31e97927c150a94b44c0c8617ebd34a851a6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 16:00:49 2024 -0400

        Squashed commit of the following:

        commit ccd205a147946ce2619be9fbd60d3a7be67dfcd3
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 15:50:25 2024 -0400

            finale

        commit d0c523e211f2316917893533fb185f0d1f8f3ee2
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Wed May 22 14:57:58 2024 -0400

            read more values

        commit b528dfc3c72147cf90c0177a1c478504a2fd2db8
        Merge: f4e69efc 207b2991
        Author: CL16gtgh <ryang359@gatech.edu>
        Date:   Mon May 20 21:26:55 2024 -0400

            Merge branch 'CASE_testbranch' into feature/filter-steering-reading

        commit 207b29915f61fa55f6a80a9fe54bd92001e9207a
        Author: Luke Chen <43226681+Luke-kC@users.noreply.github.com>
        Date:   Sat May 18 00:59:13 2024 -0700

            Decoupled and NL scheduled slip targets for TCS

    commit b73616916b859496200d85c5c513a4e5390b70ea
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Wed May 22 15:52:14 2024 -0400

        Fix skill issue

    commit 9facf9ebb1ccbab60920bd45ba3f6566d1b14bfc
    Merge: 3daa65bc f4e69efc
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 01:19:17 2024 -0400

        Merge branch 'feature/filter-steering-reading' into feature/TCMux-relevant-status-tracking

    commit 3daa65bcdb64796f2ae48b1196cf0cc25fb5171a
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Mon May 20 00:11:51 2024 -0400

        a lil bit of ocd

    commit 1e5326a37c199fba7a919d5c55c3b2b6745e579f
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 23:20:57 2024 -0400

        Added implementation in TelemetryInterface and updated .ini file

    commit 3a1f493e97938ab68cec98103d8e9df7e637a6ee
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 18:40:13 2024 -0400

        Added steering status report

    commit 1284ebc4bd482d4f5976c2c0220309b87e7ebcd6
    Author: CL16gtgh <ryang359@gatech.edu>
    Date:   Sun May 19 16:02:14 2024 -0400

        Idea outline for reporting TCMux status

commit 2dadde962b064d4e18be3bd29cc38918a76dd3d5
Merge: 7971ee6a 18152729
Author: CL16gtgh <ryang359@gatech.edu>
Date:   Fri May 24 22:48:47 2024 -0400

    Merge branch 'master' into v1.2_candidate

commit 181527290241c0bcebfe62e5d100dbbf6084ce13
Merge: bb038370 bc4e3114
Author: CL16gtgh <113149455+CL16gtgh@users.noreply.github.com>
Date:   Fri May 24 21:31:50 2024 -0400

    Merge pull request #93 from hytech-racing/CASE_testbranch

    Case testbranch

commit 7971ee6a9e3fc8eb5a1ddaaba3ffcafce6097f18
Merge: 4d9b9822 07faefab
Author: CL16gtgh <113149455+CL16gtgh@users.noreply.github.com>
Date:   Fri May 24 21:01:08 2024 -0400

    Merge pull request #87 from hytech-racing/CASE_testbranch

    Case testbranch
  • Loading branch information
CL16gtgh committed May 30, 2024
1 parent 7724e3d commit 494f6ef
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
12 changes: 6 additions & 6 deletions include/MCU_rev15_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ const unsigned long TELEM_CAN_BAUDRATE = 500000;
// All of these values are the PEDAL min/max
// the sensor min/max that trip implaus are calculated
// in the PedalsSystem constructor
const int ACCEL1_PEDAL_MAX = 3330;
const int ACCEL2_PEDAL_MAX = 388;
const int ACCEL1_PEDAL_MAX = 3240; // 3330
const int ACCEL2_PEDAL_MAX = 440; // 388

const int ACCEL1_PEDAL_MIN = 2124;
const int ACCEL2_PEDAL_MIN = 1517;

const int BRAKE1_PEDAL_MAX = 2200;
const int BRAKE2_PEDAL_MAX = 2200;
const int BRAKE1_PEDAL_MAX = 1745; // 2200;
const int BRAKE2_PEDAL_MAX = 1935; // 2200;

const int BRAKE1_PEDAL_MIN = 785;
const int BRAKE2_PEDAL_MIN = 785;
const int BRAKE1_PEDAL_MIN = 1235; // 785; // 1230 to 1750
const int BRAKE2_PEDAL_MIN = 2445; // 785; // 2450 to 1930

const int ACCEL1_PEDAL_OOR_MIN = 90;
const int ACCEL2_PEDAL_OOR_MIN = 90;
Expand Down
17 changes: 16 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,20 @@ void loop()
Serial.print("Sensor divergence: ");
Serial.println(steering1.convert().angle - a1.get().conversions[MCU15_STEERING_CHANNEL].conversion);
Serial.println();
Serial.println("Pedal outputs:");
Serial.print("Accel 1 raw: ");
Serial.println(a1.get().conversions[MCU15_ACCEL1_CHANNEL].raw);
Serial.print("Accel 2 raw: ");
Serial.println(a1.get().conversions[MCU15_ACCEL2_CHANNEL].raw);
Serial.print("Accel percent: ");
Serial.println(pedals_system.getPedalsSystemDataCopy().accelPercent);
Serial.print("Brake 1 raw: ");
Serial.println(a1.get().conversions[MCU15_BRAKE1_CHANNEL].raw);
Serial.print("Brake 2 raw: ");
Serial.println(a1.get().conversions[MCU15_BRAKE2_CHANNEL].raw);
Serial.print("Brake percent: ");
Serial.println(pedals_system.getPedalsSystemDataCopy().brakePercent);
Serial.println();

Serial.println();
}
Expand Down Expand Up @@ -506,7 +520,8 @@ void tick_all_systems(const SysTick_s &current_system_tick)
current_system_tick,
a1.get().conversions[MCU15_ACCEL1_CHANNEL],
a1.get().conversions[MCU15_ACCEL2_CHANNEL],
a1.get().conversions[MCU15_BRAKE1_CHANNEL]);
a1.get().conversions[MCU15_BRAKE1_CHANNEL],
a1.get().conversions[MCU15_BRAKE2_CHANNEL]);

// tick steering system
steering_system.tick(
Expand Down

0 comments on commit 494f6ef

Please sign in to comment.