Skip to content

Commit 69aaa9b

Browse files
acfloriaJaeyoung-Lim
authored andcommitted
Fix getting the aoa and slip hall id
1 parent 538b8d9 commit 69aaa9b

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/modules/sensors/sensors.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,6 @@ Sensors::~Sensors()
338338
sub.unregisterCallback();
339339
}
340340

341-
for (auto &sub : _sensor_hall_subs) {
342-
sub.unregisterCallback();
343-
}
344-
345341
_vehicle_acceleration.Stop();
346342
_vehicle_angular_velocity.Stop();
347343

@@ -658,9 +654,7 @@ void Sensors::hall_poll()
658654
// messages and that would mess with the updated flags of the subscribers
659655

660656
// find the AoA hall sensor index if not set yet
661-
if ((_parameters.CAL_AV_AOA_ID >= 0) && (_parameters.CAL_AV_AOA_ID < MAX_SENSOR_COUNT) &&
662-
((_av_aoa_hall_sub_index < 0) || (_av_aoa_hall_sub_index >= MAX_SENSOR_COUNT))) {
663-
657+
if (_parameters.CAL_AV_AOA_ID >= 0 && _av_aoa_hall_sub_index < 0) {
664658
_av_aoa_hall_sub_index = getHallSubIndex(_parameters.CAL_AV_AOA_ID);
665659

666660
if (_av_aoa_hall_sub_index >= 0) {
@@ -669,9 +663,7 @@ void Sensors::hall_poll()
669663
}
670664

671665
// find the Slip hall sensor index if not set yet
672-
if ((_parameters.CAL_AV_SLIP_ID >= 0) && (_parameters.CAL_AV_SLIP_ID < MAX_SENSOR_COUNT) &&
673-
((_av_slip_hall_sub_index < 0) || (_av_slip_hall_sub_index >= MAX_SENSOR_COUNT))) {
674-
666+
if (_parameters.CAL_AV_SLIP_ID >= 0&& _av_slip_hall_sub_index < 0) {
675667
_av_slip_hall_sub_index = getHallSubIndex(_parameters.CAL_AV_SLIP_ID);
676668

677669
if (_av_slip_hall_sub_index >= 0) {

0 commit comments

Comments
 (0)