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

Subaru: combine platform panda flags #2115

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion board/safety/safety_subaru_preglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static safety_config subaru_preglobal_init(uint16_t param) {
{.msg = {{MSG_SUBARU_PG_CruiseControl, SUBARU_PG_MAIN_BUS, 8, .frequency = 20U}, { 0 }, { 0 }}},
};

const int SUBARU_PG_PARAM_REVERSED_DRIVER_TORQUE = 1;
const int SUBARU_PG_PARAM_REVERSED_DRIVER_TORQUE = 4;

subaru_pg_reversed_driver_torque = GET_FLAG(param, SUBARU_PG_PARAM_REVERSED_DRIVER_TORQUE);
return BUILD_SAFETY_CFG(subaru_preglobal_rx_checks, SUBARU_PG_TX_MSGS);
Expand Down
3 changes: 1 addition & 2 deletions python/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,7 @@ class Panda:

FLAG_SUBARU_GEN2 = 1
FLAG_SUBARU_LONG = 2

FLAG_SUBARU_PREGLOBAL_REVERSED_DRIVER_TORQUE = 1
FLAG_SUBARU_PREGLOBAL_REVERSED_DRIVER_TORQUE = 4

FLAG_NISSAN_ALT_EPS_BUS = 1

Expand Down
Loading