Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-07 08:23:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: rename Log_Arm_Disarm to Log_Write_Arm_Disarm

Browse Source
This commit is contained in:
Randy Mackay 2018-06-11 20:08:01 +09:00
parent 2454f865f7
commit 4499049a30
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
APMrover2/Log.cpp
View File

@ -166,7 +166,8 @@ struct PACKED log_Arm_Disarm {
uint16_t arm_checks; uint16_t arm_checks;
}; };
void Rover::Log_Arm_Disarm() { void Rover::Log_Write_Arm_Disarm()
{
struct log_Arm_Disarm pkt = { struct log_Arm_Disarm pkt = {
LOG_PACKET_HEADER_INIT(LOG_ARM_DISARM_MSG), LOG_PACKET_HEADER_INIT(LOG_ARM_DISARM_MSG),
time_us : AP_HAL::micros64(), time_us : AP_HAL::micros64(),
@ -322,7 +323,7 @@ void Rover::Log_Write_Rangefinder() {}
void Rover::Log_Write_Attitude() {} void Rover::Log_Write_Attitude() {}
void Rover::Log_Write_RC(void) {} void Rover::Log_Write_RC(void) {}
void Rover::Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target) {} void Rover::Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target) {}
void Rover::Log_Arm_Disarm() {} void Rover::Log_Write_Arm_Disarm() {}
void Rover::Log_Write_Error(uint8_t sub_system, uint8_t error_code) {} void Rover::Log_Write_Error(uint8_t sub_system, uint8_t error_code) {}
void Rover::Log_Write_Steering() {} void Rover::Log_Write_Steering() {}
void Rover::Log_Write_WheelEncoder() {} void Rover::Log_Write_WheelEncoder() {}

2
APMrover2/Rover.h
View File

@ -481,7 +481,7 @@ private:
void Log_Write_Nav_Tuning(); void Log_Write_Nav_Tuning();
void Log_Write_Attitude(); void Log_Write_Attitude();
void Log_Write_Rangefinder(); void Log_Write_Rangefinder();
void Log_Arm_Disarm(); void Log_Write_Arm_Disarm();
void Log_Write_RC(void); void Log_Write_RC(void);
void Log_Write_Error(uint8_t sub_system, uint8_t error_code); void Log_Write_Error(uint8_t sub_system, uint8_t error_code);
void Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target); void Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target);

2
APMrover2/system.cpp
View File

@ -337,7 +337,7 @@ bool Rover::should_log(uint32_t mask)
*/ */
void Rover::change_arm_state(void) void Rover::change_arm_state(void)
{ {
Log_Arm_Disarm(); Log_Write_Arm_Disarm();
update_soft_armed(); update_soft_armed();
} }