Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Beacon: minor formatting fixes for marvelmind

This commit is contained in:
Randy Mackay 2017-05-16 14:58:38 +09:00
parent 4daba8e98a
commit 945a7bfaed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Beacon/AP_Beacon_Marvelmind.cpp
View File

@ -338,7 +338,7 @@ void AP_Beacon_Marvelmind::create_marvelmind_hedge()
hedge->_last_values_count = 0; hedge->_last_values_count = 0;
hedge->_last_values_next = 0; hedge->_last_values_next = 0;
hedge->_have_new_values = false; hedge->_have_new_values = false;
hedge->terminationRequired = false; hedge->termination_required = false;
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -351,7 +351,7 @@ void AP_Beacon_Marvelmind::start_marvelmind_hedge()
if (hedge->verbose) { if (hedge->verbose) {
hal.console->printf("MarvelMind: Not enough memory"); hal.console->printf("MarvelMind: Not enough memory");
} }
hedge->terminationRequired = true; hedge->termination_required = true;
return; return;
} }
for (uint8_t i = 0; i < hedge->max_buffered_positions; i++) { for (uint8_t i = 0; i < hedge->max_buffered_positions; i++) {
@ -401,7 +401,7 @@ void AP_Beacon_Marvelmind::set_stationary_beacons_positions_and_distances()
void AP_Beacon_Marvelmind::order_stationary_beacons() void AP_Beacon_Marvelmind::order_stationary_beacons()
{ {
if(hedge->positions_beacons.updated) { if (hedge->positions_beacons.updated) {
bool swapped = false; bool swapped = false;
uint8_t j = hedge->positions_beacons.num_beacons; uint8_t j = hedge->positions_beacons.num_beacons;
do do
@ -409,7 +409,7 @@ void AP_Beacon_Marvelmind::order_stationary_beacons()
swapped = false; swapped = false;
StationaryBeaconPosition beacon_to_swap; StationaryBeaconPosition beacon_to_swap;
for(uint8_t i = 1; i < j; i++) { for(uint8_t i = 1; i < j; i++) {
if(hedge->positions_beacons.beacons[i-1].address > hedge->positions_beacons.beacons[i].address) { if (hedge->positions_beacons.beacons[i-1].address > hedge->positions_beacons.beacons[i].address) {
beacon_to_swap = hedge->positions_beacons.beacons[i]; beacon_to_swap = hedge->positions_beacons.beacons[i];
hedge->positions_beacons.beacons[i] = hedge->positions_beacons.beacons[i-1]; hedge->positions_beacons.beacons[i] = hedge->positions_beacons.beacons[i-1];
hedge->positions_beacons.beacons[i-1] = beacon_to_swap; hedge->positions_beacons.beacons[i-1] = beacon_to_swap;

2
libraries/AP_Beacon/AP_Beacon_Marvelmind.h
View File

@ -77,7 +77,7 @@ private:
StationaryBeaconsPositions positions_beacons; StationaryBeaconsPositions positions_beacons;
bool verbose; // verbose flag which activate console output, default: False bool verbose; // verbose flag which activate console output, default: False
bool pause; // pause flag. If True, class would not read serial data bool pause; // pause flag. If True, class would not read serial data
bool terminationRequired; // If True, thread would exit from main loop and stop bool termination_required; // If True, thread would exit from main loop and stop
void (*receive_data_callback)(PositionValue position); // receive_data_callback is callback function to receive data void (*receive_data_callback)(PositionValue position); // receive_data_callback is callback function to receive data
uint8_t _last_values_count; uint8_t _last_values_count;