Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented power mode frame and ROS callbacks send data to CAN #428

Merged
merged 48 commits into from
Sep 28, 2024
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
0537543
trying to fix desired heading
lross03 Jun 8, 2024
b7c265a
finished rudder data frame and modified tests for old can frames
lross03 Jun 15, 2024
d72fe08
trying to fix desired heading
lross03 Jun 8, 2024
380a4d5
finished rudder data frame and modified tests for old can frames
lross03 Jun 15, 2024
2c6361f
Finished tests for new frames except power mode
lross03 Jun 29, 2024
2459e0f
Finished tests for new frames except power mode
lross03 Jun 29, 2024
608e94b
Merge branch 'user/lross03/can_frame_parser' of https://github.com/UB…
lross03 Jun 29, 2024
6633930
Minor change in test
lross03 Jun 29, 2024
be1c3ca
Power mode and tests complete
lross03 Jun 29, 2024
55b5a03
Removed TODO comment
lross03 Jun 29, 2024
b32ba23
rebasing with main
lross03 Jun 8, 2024
45b48a3
finished rudder data frame and modified tests for old can frames
lross03 Jun 15, 2024
79f21a1
rebasing to main
lross03 Jun 29, 2024
f0f54a9
Finished tests for new frames except power mode
lross03 Jun 29, 2024
e62caaf
rebasing with main
lross03 Jun 8, 2024
1a16790
rebasing with main
lross03 Jun 15, 2024
7cc341d
Minor change in test
lross03 Jun 29, 2024
2c93fa9
fixing merge conflicts again
lross03 Jul 13, 2024
d833c17
replaced old CAN frame names in ros interface with new names
lross03 Jul 13, 2024
ed4d1b6
Power mode can frame parsing and ros interface functionality implemented
lross03 Jul 13, 2024
af4ad32
Added power mode condition where it will only return to normal mode o…
lross03 Jul 13, 2024
679e7d8
Addresed PR comments
lross03 Jul 20, 2024
cb582fb
Minor changes
lross03 Jul 20, 2024
2e61987
Merge branch 'main' into user/lross03/can_frame_parser
lross03 Jul 20, 2024
54ae95f
trying to fix desired heading
lross03 Jun 8, 2024
4b4809c
finished rudder data frame and modified tests for old can frames
lross03 Jun 15, 2024
e263ac6
Finished tests for new frames except power mode
lross03 Jun 29, 2024
af21eaa
Finished tests for new frames except power mode
lross03 Jun 29, 2024
74a3c3d
trying to fix desired heading
lross03 Jun 8, 2024
cd6a7d3
finished rudder data frame and modified tests for old can frames
lross03 Jun 15, 2024
62057a8
Minor change in test
lross03 Jun 29, 2024
a4d5cc4
Power mode and tests complete
lross03 Jun 29, 2024
6ebfec3
Removed TODO comment
lross03 Jun 29, 2024
66dbab1
Power mode can frame parsing and ros interface functionality implemented
lross03 Jul 13, 2024
6dfd83c
Added power mode condition where it will only return to normal mode o…
lross03 Jul 13, 2024
691c9f0
trying to rebase main
lross03 Jul 27, 2024
10f0846
fixing merge conflicts
lross03 Jul 27, 2024
638a597
removed duplicate test
lross03 Jul 27, 2024
8813a8e
Merge branch 'main' into user/lross03/can_frame_parser
lross03 Jul 27, 2024
ae9d79c
Implemented sending to CAN for sail commands and desired heading
lross03 Jul 27, 2024
d9c49e1
added tests for callbacks
lross03 Jul 27, 2024
087b552
merging power mode changes
lross03 Jul 27, 2024
4d83cfc
Fixed merge issues
lross03 Jul 27, 2024
14d1a1b
Merge branch 'main' into user/lross03/can_transceiver_ros
lross03 Aug 10, 2024
8c44d53
Merged with main
lross03 Aug 10, 2024
cd5c134
Removed duplicate line
lross03 Aug 29, 2024
992c329
merge from main
samdai01 Sep 28, 2024
67c979d
Merge branch 'main' into user/lross03/can_transceiver_ros
samdai01 Sep 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor change in test
lross03 committed Jul 27, 2024

Verified

This commit was signed with the committer’s verified signature.
dschach David Schach
commit 62057a899b73983db96d09c66916ae6a6d5b6efe
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ TEST_F(TestCanFrameParser, TestRudderDataInvalid)
EXPECT_THROW(CAN_FP::RudderData tmp(helper_msg, valid_id), std::out_of_range);
};

cf.can_id = static_cast<canid_t>(CAN_FP::CanId::MAIN_HEADING);
cf.can_id = static_cast<canid_t>(CAN_FP::CanId::RUDDER_DATA_FRAME);
std::copy(std::begin(GARBAGE_DATA), std::end(GARBAGE_DATA), cf.data);

EXPECT_THROW(CAN_FP::RudderData tmp(cf), std::out_of_range);