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.

Sign up for GitHub

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

Jump to bottom

Copter: remove pointless wrapper around proximity init #19636

Merged
merged 1 commit into from Jan 4, 2022
Merged

Copter: remove pointless wrapper around proximity init #19636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion ArduCopter/Copter.h
View file
Open in desktop
Expand Up @@ -864,7 +864,6 @@ class Copter : public AP_Vehicle {
void rpm_update();
void update_optical_flow(void);
void compass_cal_update(void);
void init_proximity();

// RC_Channel.cpp
void save_trim();
Expand Down
9 changes: 0 additions & 9 deletions ArduCopter/sensors.cpp
View file
Open in desktop
Expand Up @@ -159,12 +159,3 @@ void Copter::rpm_update(void)
}
#endif
}


// initialise proximity sensor
void Copter::init_proximity(void)
{
#if HAL_PROXIMITY_ENABLED
g2.proximity.init();
#endif
}
4 changes: 3 additions & 1 deletion ArduCopter/system.cpp
View file
Open in desktop
Expand Up @@ -149,8 +149,10 @@ void Copter::init_ardupilot()
// initialise rangefinder
init_rangefinder();

#if HAL_PROXIMITY_ENABLED
// init proximity sensor
init_proximity();
g2.proximity.init();
#endif

#if BEACON_ENABLED == ENABLED
// init beacons used for non-gps position estimation
Expand Down