Copter: remove pointless wrapper around proximity init

ArduPilot · Jan 4, 2022 · 6bfcf2f · 6bfcf2f
1 parent f443353
commit 6bfcf2f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h
@@ -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();

diff --git a/ArduCopter/sensors.cpp b/ArduCopter/sensors.cpp
@@ -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
-}
diff --git a/ArduCopter/system.cpp b/ArduCopter/system.cpp
@@ -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