diff --git a/ArduPlane/AP_Arming.cpp b/ArduPlane/AP_Arming.cpp index 9e0f6e2b56..23a17378f8 100644 --- a/ArduPlane/AP_Arming.cpp +++ b/ArduPlane/AP_Arming.cpp @@ -23,18 +23,6 @@ enum HomeState AP_Arming_Plane::home_status() const return plane.home_is_set; } -bool AP_Arming_Plane::arm(uint8_t method) -{ - // start logging here so we can check success or failure in - // arm_checks - if (plane.g.log_bitmask != NONE && - !plane.DataFlash.logging_started()) { - plane.start_logging(); - } - - return AP_Arming::arm(method); -} - /* additional arming checks for plane diff --git a/ArduPlane/AP_Arming.h b/ArduPlane/AP_Arming.h index 1ca909a50e..bf694221c3 100644 --- a/ArduPlane/AP_Arming.h +++ b/ArduPlane/AP_Arming.h @@ -20,7 +20,6 @@ public: AP_Param::setup_object_defaults(this, var_info); } bool pre_arm_checks(bool report); - bool arm(uint8_t method) override; ArmingRudder rudder_arming() const { return (ArmingRudder)rudder_arming_value.get(); } diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp index 4e68dcb013..bf684a0486 100644 --- a/ArduPlane/Log.cpp +++ b/ArduPlane/Log.cpp @@ -558,12 +558,6 @@ void Plane::Log_Write_Vehicle_Startup_Messages() gps.Write_DataFlash_Log_Startup_messages(); } -// start a new log -void Plane::start_logging() -{ - DataFlash.StartUnstartedLogging(); -} - /* initialise logging subsystem */ @@ -611,7 +605,6 @@ void Plane::Log_Write_Home_And_Origin() {} void Plane::Log_Read(uint16_t log_num, int16_t start_page, int16_t end_page) {} #endif // CLI_ENABLED -void Plane::start_logging() {} void Plane::log_init(void) {} #endif // LOGGING_ENABLED diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index ad56427197..ad3da4b6b6 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -847,7 +847,6 @@ private: void Log_Write_Vehicle_Startup_Messages(); void Log_Write_AOA_SSA(); void Log_Read(uint16_t log_num, int16_t start_page, int16_t end_page); - void start_logging(); void load_parameters(void); void adjust_altitude_target(); diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp index 47f27ac9e0..29a70cba97 100644 --- a/ArduPlane/system.cpp +++ b/ArduPlane/system.cpp @@ -838,11 +838,7 @@ void Plane::print_comma(void) bool Plane::should_log(uint32_t mask) { #if LOGGING_ENABLED == ENABLED - if (!DataFlash.should_log(mask)) { - return false; - } - start_logging(); - return true; + return DataFlash.should_log(mask); #else return false; #endif