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

Hongqi HS5 #882

Draft
wants to merge 32 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
317b2da
FAW: Barebones vehicle port
jyoung8607 Mar 21, 2022
415a3d8
GC old comment
jyoung8607 Mar 21, 2022
9b831f4
GC old comment
jyoung8607 Mar 21, 2022
2c795f3
MISRA letting me off easy today
jyoung8607 Mar 21, 2022
e57d1bc
blind test
jyoung8607 Mar 23, 2022
8916693
Merge branch 'master' into faw-hongqi-hs5
jyoung8607 Aug 6, 2022
e171095
follow refactoring
jyoung8607 Aug 6, 2022
4b79257
clean up commonized tests
jyoung8607 Aug 6, 2022
20cf44b
more commonized tests, GET_BIT usage
jyoung8607 Aug 6, 2022
0484fce
MISRA
jyoung8607 Aug 6, 2022
349a20d
bump opendbc ref
jyoung8607 Aug 6, 2022
188be5a
living my best submodule life
jyoung8607 Aug 6, 2022
0d78410
detail oriented
jyoung8607 Aug 6, 2022
7b66219
different MISRA
jyoung8607 Aug 6, 2022
cd67ef2
allow magic torque value for steering disabled
jyoung8607 Aug 8, 2022
db3d9a6
signal and counter refactor
jyoung8607 Aug 8, 2022
2b8ccf4
check all engaged states
jyoung8607 Aug 9, 2022
5f9fb77
adjust ramp-rates and driver torque allowance
jyoung8607 Aug 9, 2022
ce659c3
Merge branch 'master' into faw-hongqi-hs5
jyoung8607 Aug 23, 2022
f6a02bb
faw -> hongqi
jyoung8607 Aug 24, 2022
7c633b0
more renaming
jyoung8607 Aug 24, 2022
7ff1f31
follow torque rate control refactor
jyoung8607 Aug 26, 2022
c9592d8
Merge branch 'master' into faw-hongqi-hs5
jyoung8607 Oct 16, 2022
3b535a3
Merge branch 'master' of https://github.com/commaai/panda into faw-ho…
jyoung8607 Oct 22, 2022
aaa6806
follow pcm_cruise_check refactor
jyoung8607 Oct 22, 2022
de5559a
temp hack out other safeties to build on H7
jyoung8607 Oct 22, 2022
804cae5
more temp hack outs
jyoung8607 Oct 22, 2022
6aa9c78
Revert "more temp hack outs"
jyoung8607 Oct 31, 2022
b626af2
Revert "temp hack out other safeties to build on H7"
jyoung8607 Oct 31, 2022
13aedb9
Merge branch 'master' of https://github.com/commaai/panda into faw-ho…
jyoung8607 Oct 31, 2022
3625167
bump Docker refs
jyoung8607 Oct 31, 2022
6e7edcf
Merge branch 'master' into faw-hongqi-hs5
jyoung8607 Jan 14, 2023
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
adjust ramp-rates and driver torque allowance
  • Loading branch information
jyoung8607 committed Aug 9, 2022
commit 5f9fb7777939b0faab041cdf2d0c33b7fd69573f
8 changes: 4 additions & 4 deletions board/safety/safety_faw.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const int FAW_MAX_STEER = 300; // As-yet unknown fault boundary, guessing 300 / 3.0Nm for now
const int FAW_MAX_RT_DELTA = 56; // 3 max rate up * 50Hz send rate * 250000 RT interval / 1000000 = 37.5 ; 50 * 1.5 for safety pad = 56.25
const int FAW_MAX_RT_DELTA = 113; // 6 max rate up * 50Hz send rate * 250000 RT interval / 1000000 = 75 ; 50 * 1.5 for safety pad = 113
const uint32_t FAW_RT_INTERVAL = 250000; // 250ms between real time checks
const int FAW_MAX_RATE_UP = 3; // 3 unit/sec observed from factory LKAS, fault boundary unknown
const int FAW_MAX_RATE_DOWN = 3; // 3 unit/sec observed from factory LKAS, fault boundary unknown
const int FAW_DRIVER_TORQUE_ALLOWANCE = 25;
const int FAW_MAX_RATE_UP = 6; // 10 unit/sec observed from factory LKAS, fault boundary unknown
const int FAW_MAX_RATE_DOWN = 10; // 10 unit/sec observed from factory LKAS, fault boundary unknown
const int FAW_DRIVER_TORQUE_ALLOWANCE = 50;
const int FAW_DRIVER_TORQUE_FACTOR = 3;

#define MSG_ECM_1 0x92 // RX from ABS, for brake pressures
Expand Down
8 changes: 4 additions & 4 deletions tests/safety/test_faw.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ class TestFawSafety(common.PandaSafetyTest, common.DriverTorqueSteeringSafetyTes
RELAY_MALFUNCTION_ADDR = MSG_LKAS
RELAY_MALFUNCTION_BUS = 0

MAX_RATE_UP = 3
MAX_RATE_DOWN = 3
MAX_RATE_UP = 6
MAX_RATE_DOWN = 10
MAX_TORQUE = 300
MAX_RT_DELTA = 56
MAX_RT_DELTA = 113
RT_INTERVAL = 250000

DRIVER_TORQUE_ALLOWANCE = 25
DRIVER_TORQUE_ALLOWANCE = 50
DRIVER_TORQUE_FACTOR = 3

@classmethod
Expand Down