fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-14 04:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update msgs fields from camelCase to snake_case so rosidl_generate_interfaces() is able to generate code for ROS IDL files

Browse Source
This commit is contained in:
TSC21
2018-07-29 21:28:59 +01:00
committed by Lorenz Meier
parent 553d68b80f
commit ca42483794
14 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/PreflightCheck.cpp
+1 -1
View File
@@ -507,7 +507,7 @@ static bool powerCheck(orb_advert_t *mavlink_log_pub, vehicle_status_s &status,
if (hrt_elapsed_time(&system_power.timestamp) < 200000) {
/* copy avionics voltage */
float avionics_power_rail_voltage = system_power.voltage5V_v;
float avionics_power_rail_voltage = system_power.voltage5v_v;
// avionics rail
// Check avionics rail voltages
src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
+11 -11
View File
@@ -1956,21 +1956,21 @@ FixedwingPositionControl::tecs_update_pitch_throttle(float alt_sp, float airspee
break;
}
t.altitudeSp = _tecs.hgt_setpoint_adj();
t.altitude_sp = _tecs.hgt_setpoint_adj();
t.altitude_filtered = _tecs.vert_pos_state();
t.airspeedSp = _tecs.TAS_setpoint_adj();
t.airspeed_filtered = _tecs.tas_state();
t.airspeed_sp = _tecs.TAS_setpoint_adj();
t.airspeed_filtered = _tecs.tas_state();
t.flightPathAngleSp = _tecs.hgt_rate_setpoint();
t.flightPathAngle = _tecs.vert_vel_state();
t.flight_path_angle_sp = _tecs.hgt_rate_setpoint();
t.flight_path_angle = _tecs.vert_vel_state();
t.airspeedDerivativeSp = _tecs.TAS_rate_setpoint();
t.airspeedDerivative = _tecs.speed_derivative();
t.airspeed_derivative_sp = _tecs.TAS_rate_setpoint();
t.airspeed_derivative = _tecs.speed_derivative();
t.totalEnergyError = _tecs.STE_error();
t.totalEnergyRateError = _tecs.STE_rate_error();
t.energyDistributionError = _tecs.SEB_error();
t.energyDistributionRateError = _tecs.SEB_rate_error();
t.total_energy_error = _tecs.STE_error();
t.total_energy_rate_error = _tecs.STE_rate_error();
t.energy_distribution_error = _tecs.SEB_error();
t.energy_distribution_rate_error = _tecs.SEB_rate_error();
t.throttle_integ = _tecs.throttle_integ_state();
t.pitch_integ = _tecs.pitch_integ_state();
src/modules/mavlink/mavlink_high_latency2.cpp
+2 -2
View File
@@ -362,7 +362,7 @@ bool MavlinkStreamHighLatency2::write_tecs_status(mavlink_high_latency2_t *msg)
if (_tecs_time > 0) {
int16_t target_altitude;
convert_limit_safe(tecs_status.altitudeSp, target_altitude);
convert_limit_safe(tecs_status.altitude_sp, target_altitude);
msg->target_altitude = target_altitude;
}
@@ -502,7 +502,7 @@ void MavlinkStreamHighLatency2::update_tecs_status()
tecs_status_s tecs_status;
if (_tecs_status_sub->update(&tecs_status)) {
_airspeed_sp.add_value(tecs_status.airspeedSp, _update_rate_filtered);
_airspeed_sp.add_value(tecs_status.airspeed_sp, _update_rate_filtered);
}
}
src/modules/mavlink/mavlink_messages.cpp
+3 -3
View File
@@ -1378,7 +1378,7 @@ protected:
if (!(pos.flags & transponder_report_s::PX4_ADSB_FLAGS_RETRANSLATE)) { continue; }
msg.ICAO_address = pos.ICAO_address;
msg.ICAO_address = pos.icao_address;
msg.lat = pos.lat * 1e7;
msg.lon = pos.lon * 1e7;
msg.altitude_type = pos.altitude_type;
@@ -3517,8 +3517,8 @@ protected:
msg.target_bearing = (int16_t)math::degrees(_fw_pos_ctrl_status.target_bearing);
msg.wp_dist = (uint16_t)_fw_pos_ctrl_status.wp_dist;
msg.xtrack_error = _fw_pos_ctrl_status.xtrack_error;
msg.alt_error = _tecs_status.altitude_filtered - _tecs_status.altitudeSp;
msg.aspd_error = _tecs_status.airspeed_filtered - _tecs_status.airspeedSp;
msg.alt_error = _tecs_status.altitude_filtered - _tecs_status.altitude_sp;
msg.aspd_error = _tecs_status.airspeed_filtered - _tecs_status.airspeed_sp;
mavlink_msg_nav_controller_output_send_struct(_mavlink->get_channel(), &msg);
src/modules/mavlink/mavlink_receiver.cpp
+1 -1
View File
@@ -2167,7 +2167,7 @@ void MavlinkReceiver::handle_message_adsb_vehicle(mavlink_message_t *msg)
t.timestamp = hrt_absolute_time();
t.ICAO_address = adsb.ICAO_address;
t.icao_address = adsb.ICAO_address;
t.lat = adsb.lat * 1e-7;
t.lon = adsb.lon * 1e-7;
t.altitude_type = adsb.altitude_type;
src/modules/navigator/navigator_main.cpp
+1 -1
View File
@@ -967,7 +967,7 @@ void Navigator::fake_traffic(const char *callsign, float distance, float directi
transponder_report_s tr = {};
tr.timestamp = hrt_absolute_time();
tr.ICAO_address = 1234;
tr.icao_address = 1234;
tr.lat = lat; // Latitude, expressed as degrees
tr.lon = lon; // Longitude, expressed as degrees
tr.altitude_type = 0;
src/modules/vtol_att_control/vtol_type.cpp
+3 -3
View File
@@ -210,11 +210,11 @@ void VtolType::check_quadchute_condition()
// We use tecs for tracking in FW and local_pos_sp during transitions
if (_tecs_running) {
// 1 second rolling average
_ra_hrate = (49 * _ra_hrate + _tecs_status->flightPathAngle) / 50;
_ra_hrate_sp = (49 * _ra_hrate_sp + _tecs_status->flightPathAngleSp) / 50;
_ra_hrate = (49 * _ra_hrate + _tecs_status->flight_path_angle) / 50;
_ra_hrate_sp = (49 * _ra_hrate_sp + _tecs_status->flight_path_angle_sp) / 50;
// are we dropping while requesting significant ascend?
if (((_tecs_status->altitudeSp - _tecs_status->altitude_filtered) > _params->fw_alt_err) &&
if (((_tecs_status->altitude_sp - _tecs_status->altitude_filtered) > _params->fw_alt_err) &&
(_ra_hrate < -1.0f) &&
(_ra_hrate_sp > 1.0f)) {