Skip to content

Commit 58d9b36

Browse files
committed
updated max dtheta velocity threshold based on data
1 parent 181dfe2 commit 58d9b36

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

include/VCF_Constants.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ namespace VCFInterfaceConstants {
6363
constexpr float PEDAL_REF_2V5_SCALE = 1.0;
6464
constexpr float PEDAL_REF_2V5_OFFSET = 0;
6565

66-
constexpr float STEERING_1_SCALE = 1.0; // TODO: Figure out what these mean
66+
constexpr float STEERING_1_SCALE = 1.0;
6767
constexpr float STEERING_1_OFFSET = 0;
68-
constexpr float STEERING_2_SCALE = 1.0; // TODO: Figure out if steering 2 = steering 1
68+
constexpr float STEERING_2_SCALE = 1.0;
6969
constexpr float STEERING_2_OFFSET = 0;
7070
// Scale for steering sensor = 0.02197265 . Offset has to be mechanically determined
7171

72-
constexpr float ACCEL_1_SCALE = 1.0; // TODO: Figure out what these should be
72+
constexpr float ACCEL_1_SCALE = 1.0;
7373
constexpr float ACCEL_1_OFFSET = 0;
7474
constexpr float ACCEL_2_SCALE = 1.0;
7575
constexpr float ACCEL_2_OFFSET = 0;
@@ -155,8 +155,7 @@ namespace VCFSystemConstants {
155155
constexpr float ERROR_BETWEEN_SENSORS_TOLERANCE = 5.0f;
156156

157157
// rate of angle change
158-
constexpr float MAX_DTHETA_THRESHOLD = 50.0f; //maximum change in angle since last reading to consider the reading valid
159-
// TODO: find best value for this threshold
158+
constexpr float MAX_DTHETA_THRESHOLD = 150.0f; //maximum change in angle since last reading to consider the reading valid, based on actual data
160159

161160
// degrees per bit
162161
constexpr float DEG_PER_COUNT_DIGITAL = 360.0f / 16384.0f; // based on datasheet

lib/systems/src/SteeringSystem.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ void SteeringSystem::recalibrate_steering_digital() {
3030
_steeringParams.digital_tol_deg = digital_tol_counts * _steeringParams.deg_per_count_digital;
3131
_steeringParams.digital_midpoint = (_steeringParams.max_steering_signal_digital + _steeringParams.min_steering_signal_digital) / 2;
3232
_steeringParams.analog_midpoint = (_steeringParams.max_steering_signal_analog + _steeringParams.min_steering_signal_analog) / 2;
33-
_steeringParams.analog_min_with_margins = static_cast<int32_t>(_steeringParams.min_steering_signal_analog - analog_tol_counts);
34-
_steeringParams.analog_max_with_margins = static_cast<int32_t>(_steeringParams.max_steering_signal_analog + analog_tol_counts);
35-
_steeringParams.digital_min_with_margins = static_cast<int32_t>(_steeringParams.min_steering_signal_digital - digital_tol_counts);
36-
_steeringParams.digital_max_with_margins = static_cast<int32_t>(_steeringParams.max_steering_signal_digital + digital_tol_counts);
33+
_steeringParams.analog_min_with_margins = static_cast<int32_t>(_steeringParams.min_steering_signal_analog - analog_tol_counts); // NOLINT we wont see numbers out of range
34+
_steeringParams.analog_max_with_margins = static_cast<int32_t>(_steeringParams.max_steering_signal_analog + analog_tol_counts); // NOLINT we wont see numbers out of range
35+
_steeringParams.digital_min_with_margins = static_cast<int32_t>(_steeringParams.min_steering_signal_digital - digital_tol_counts); // NOLINT we wont see numbers out of range
36+
_steeringParams.digital_max_with_margins = static_cast<int32_t>(_steeringParams.max_steering_signal_digital + digital_tol_counts); // NOLINT we wont see numbers out of range
3737

3838
if (max_observed_analog > min_observed_analog && _steeringParams.span_signal_analog > 2500) // NOLINT with 360 deg analog sensor, typical span is about 2000
3939
{

0 commit comments

Comments
 (0)