From 1eced053590db99a16b0fb65a5ee876e92a6f645 Mon Sep 17 00:00:00 2001 From: mcsauder Date: Wed, 20 Feb 2019 10:01:51 -0700 Subject: [PATCH] Rename Simulator class private methods names to match snake case of other private class methods. --- src/modules/simulator/simulator.cpp | 8 ++++---- src/modules/simulator/simulator.h | 4 ++-- src/modules/simulator/simulator_mavlink.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/simulator/simulator.cpp b/src/modules/simulator/simulator.cpp index 638596329f..79eb44ba8d 100644 --- a/src/modules/simulator/simulator.cpp +++ b/src/modules/simulator/simulator.cpp @@ -160,18 +160,18 @@ int Simulator::start(int argc, char *argv[]) } if (argv[2][1] == 's') { - _instance->initializeSensorData(); + _instance->initialize_sensor_data(); #ifndef __PX4_QURT // Update sensor data - _instance->pollForMAVLinkMessages(false); + _instance->poll_for_MAVLink_messages(false); #endif } else if (argv[2][1] == 'p') { // Update sensor data - _instance->pollForMAVLinkMessages(true); + _instance->poll_for_MAVLink_messages(true); } else { - _instance->initializeSensorData(); + _instance->initialize_sensor_data(); _instance->_initialized = true; } diff --git a/src/modules/simulator/simulator.h b/src/modules/simulator/simulator.h index 4aae03b0f6..96cc2560f0 100644 --- a/src/modules/simulator/simulator.h +++ b/src/modules/simulator/simulator.h @@ -272,7 +272,7 @@ private: } // class methods - void initializeSensorData(); + void initialize_sensor_data(); int publish_sensor_topics(mavlink_hil_sensor_t *imu); int publish_flow_topic(mavlink_hil_optical_flow_t *flow); @@ -338,7 +338,7 @@ private: void parameters_update(bool force); void poll_topics(); - void pollForMAVLinkMessages(bool publish); + void poll_for_MAVLink_messages(bool publish); void request_hil_state_quaternion(); void send(); void send_controls(); diff --git a/src/modules/simulator/simulator_mavlink.cpp b/src/modules/simulator/simulator_mavlink.cpp index 99acf86e7c..4570dcd3ce 100644 --- a/src/modules/simulator/simulator_mavlink.cpp +++ b/src/modules/simulator/simulator_mavlink.cpp @@ -632,7 +632,7 @@ void Simulator::send_heartbeat() send_mavlink_message(message); } -void Simulator::initializeSensorData() +void Simulator::initialize_sensor_data() { // Write sensor data to memory so that drivers can copy data from there. RawMPUData mpu = {}; @@ -664,7 +664,7 @@ void Simulator::initializeSensorData() write_airspeed_data(&airspeed); } -void Simulator::pollForMAVLinkMessages(bool publish) +void Simulator::poll_for_MAVLink_messages(bool publish) { #ifdef __PX4_DARWIN pthread_setname_np("sim_rcv");