diff --git a/libraries/DataFlash/DFMessageWriter.cpp b/libraries/DataFlash/DFMessageWriter.cpp index 2da44baf3a..307457c6bb 100644 --- a/libraries/DataFlash/DFMessageWriter.cpp +++ b/libraries/DataFlash/DFMessageWriter.cpp @@ -37,9 +37,6 @@ void DFMessageWriter_DFLogStart::process() if (!_dataflash_backend->Log_Write_Format(_dataflash_backend->structure(next_format_to_send))) { return; // call me again! } - // provide hook to avoid corrupting the APM1/APM2 - // dataflash by writing too fast: - _dataflash_backend->WroteStartupFormat(); next_format_to_send++; } _fmt_done = true; @@ -52,7 +49,6 @@ void DFMessageWriter_DFLogStart::process() return; } ap = AP_Param::next_scalar(&token, &type); - _dataflash_backend->WroteStartupParam(); } stage = ls_blockwriter_stage_sysinfo; diff --git a/libraries/DataFlash/DataFlash.cpp b/libraries/DataFlash/DataFlash.cpp index 3022ff022e..6c19adc198 100644 --- a/libraries/DataFlash/DataFlash.cpp +++ b/libraries/DataFlash/DataFlash.cpp @@ -111,13 +111,6 @@ uint16_t DataFlash_Class::get_num_logs(void) { } return backends[0]->get_num_logs(); } -void DataFlash_Class::Log_Fill_Format(const struct LogStructure *s, struct log_Format &pkt) { - if (_next_backend == 0) { - // how were we called?! - return; - } - backends[0]->Log_Fill_Format(s, pkt); -} void DataFlash_Class::LogReadProcess(uint16_t log_num, uint16_t start_page, uint16_t end_page, @@ -189,11 +182,6 @@ void DataFlash_Class::Log_Write_EntireMission(const AP_Mission &mission) FOR_EACH_BACKEND(Log_Write_EntireMission(mission)); } -void DataFlash_Class::Log_Write_Format(const struct LogStructure *s) -{ - FOR_EACH_BACKEND(Log_Write_Format(s)); -} - void DataFlash_Class::Log_Write_Message(const char *message) { FOR_EACH_BACKEND(Log_Write_Message(message)); diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h index 77c078e8c4..c22376fcda 100644 --- a/libraries/DataFlash/DataFlash.h +++ b/libraries/DataFlash/DataFlash.h @@ -88,7 +88,7 @@ public: void StartNewLog(void); void EnableWrites(bool enable); - void Log_Write_Format(const struct LogStructure *structure); + void Log_Write_Parameter(const char *name, float value); void Log_Write_GPS(const AP_GPS &gps, uint8_t instance, int32_t relative_alt); void Log_Write_RFND(const RangeFinder &rangefinder); @@ -149,11 +149,6 @@ public: void periodic_tasks(); // may want to split this into GCS/non-GCS duties - // this is out here for the trickle-startup-messages logging. - // Think before calling. - bool Log_Write_Parameter(const AP_Param *ap, const AP_Param::ParamToken &token, - enum ap_var_type type); - vehicle_startup_message_Log_Writer _vehicle_messages; // parameter support @@ -166,10 +161,6 @@ public: const struct LogStructure *structure(uint16_t num) const; protected: - void Log_Fill_Format(const struct LogStructure *structure, struct log_Format &pkt); - - void WroteStartupFormat(); - void WroteStartupParam(); const struct LogStructure *_structures; uint8_t _num_types; diff --git a/libraries/DataFlash/DataFlash_Backend.h b/libraries/DataFlash/DataFlash_Backend.h index 27313cbf11..b89a7b1751 100644 --- a/libraries/DataFlash/DataFlash_Backend.h +++ b/libraries/DataFlash/DataFlash_Backend.h @@ -55,9 +55,6 @@ public: void EnableWrites(bool enable) { _writes_enabled = enable; } bool logging_started(void) const { return log_write_started; } - // initialisation this really shouldn't take structure and - // num_types, however the CLI LogReadProcess function requires it. - // That function needs to be split. virtual void Init() { _writes_enabled = true; } @@ -86,9 +83,6 @@ public: uint8_t num_types() const; const struct LogStructure *structure(uint8_t structure) const; - virtual void WroteStartupFormat() { } - virtual void WroteStartupParam() { } - void Log_Write_EntireMission(const AP_Mission &mission); bool Log_Write_Format(const struct LogStructure *structure); bool Log_Write_MavCmd(uint16_t cmd_total, const mavlink_mission_item_t& mav_cmd);