Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mavlink: remove implicit cast from int to bool

Browse Source 
It confused me that we used an int result and casted it into a boolean.

This doesn't change the logic but makes handling the return value explicit.
This commit is contained in:
Julian Oes
2019-11-27 11:15:52 +01:00
committed by Daniel Agar
parent c5b9ccdc85
commit d27694728b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_mission.cpp
+7 -7
View File
@@ -305,19 +305,19 @@ void
MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t seq) MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t seq)
{ {
mission_item_s mission_item = {}; mission_item_s mission_item = {};
bool read_success = false; int read_result = 0;
switch (_mission_type) { switch (_mission_type) {
case MAV_MISSION_TYPE_MISSION: { case MAV_MISSION_TYPE_MISSION: {
read_success = dm_read(_dataman_id, seq, &mission_item, sizeof(mission_item_s)) == sizeof(mission_item_s); read_result = dm_read(_dataman_id, seq, &mission_item, sizeof(mission_item_s)) == sizeof(mission_item_s);
} }
break; break;
case MAV_MISSION_TYPE_FENCE: { // Read a geofence point case MAV_MISSION_TYPE_FENCE: { // Read a geofence point
mission_fence_point_s mission_fence_point; mission_fence_point_s mission_fence_point;
read_success = dm_read(DM_KEY_FENCE_POINTS, seq + 1, &mission_fence_point, sizeof(mission_fence_point_s)) == read_result = dm_read(DM_KEY_FENCE_POINTS, seq + 1, &mission_fence_point, sizeof(mission_fence_point_s)) ==
sizeof(mission_fence_point_s); sizeof(mission_fence_point_s);
mission_item.nav_cmd = mission_fence_point.nav_cmd; mission_item.nav_cmd = mission_fence_point.nav_cmd;
mission_item.frame = mission_fence_point.frame; mission_item.frame = mission_fence_point.frame;
@@ -337,8 +337,8 @@ MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t
case MAV_MISSION_TYPE_RALLY: { // Read a safe point / rally point case MAV_MISSION_TYPE_RALLY: { // Read a safe point / rally point
mission_safe_point_s mission_safe_point; mission_safe_point_s mission_safe_point;
read_success = dm_read(DM_KEY_SAFE_POINTS, seq + 1, &mission_safe_point, sizeof(mission_safe_point_s)) == read_result = dm_read(DM_KEY_SAFE_POINTS, seq + 1, &mission_safe_point, sizeof(mission_safe_point_s)) ==
sizeof(mission_safe_point_s); sizeof(mission_safe_point_s);
mission_item.nav_cmd = MAV_CMD_NAV_RALLY_POINT; mission_item.nav_cmd = MAV_CMD_NAV_RALLY_POINT;
mission_item.frame = mission_safe_point.frame; mission_item.frame = mission_safe_point.frame;
@@ -353,7 +353,7 @@ MavlinkMissionManager::send_mission_item(uint8_t sysid, uint8_t compid, uint16_t
break; break;
} }
if (read_success) { if (read_result > 0) {
_time_last_sent = hrt_absolute_time(); _time_last_sent = hrt_absolute_time();
if (_int_mode) { if (_int_mode) {