aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DataFlash: remove check for max BARO instances

Browse Source 
For all supported boards we allow more than 1 baro instance.
This commit is contained in:
Lucas De Marchi 2015-10-14 12:53:14 -03:00 committed by Andrew Tridgell
parent 4d3229daa2
commit d83609b24c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/DataFlash/LogFile.cpp
View File

@ -831,7 +831,7 @@ void DataFlash_Class::Log_Write_Baro(AP_Baro &baro)
climbrate : baro.get_climb_rate() climbrate : baro.get_climb_rate()
}; };
WriteBlock(&pkt, sizeof(pkt)); WriteBlock(&pkt, sizeof(pkt));
#if BARO_MAX_INSTANCES > 1
if (baro.num_instances() > 1 && baro.healthy(1)) { if (baro.num_instances() > 1 && baro.healthy(1)) {
struct log_BARO pkt2 = { struct log_BARO pkt2 = {
LOG_PACKET_HEADER_INIT(LOG_BAR2_MSG), LOG_PACKET_HEADER_INIT(LOG_BAR2_MSG),
@ -843,8 +843,7 @@ void DataFlash_Class::Log_Write_Baro(AP_Baro &baro)
}; };
WriteBlock(&pkt2, sizeof(pkt2)); WriteBlock(&pkt2, sizeof(pkt2));
} }
#endif
#if BARO_MAX_INSTANCES > 2
if (baro.num_instances() > 2 && baro.healthy(2)) { if (baro.num_instances() > 2 && baro.healthy(2)) {
struct log_BARO pkt3 = { struct log_BARO pkt3 = {
LOG_PACKET_HEADER_INIT(LOG_BAR3_MSG), LOG_PACKET_HEADER_INIT(LOG_BAR3_MSG),
@ -856,7 +855,6 @@ void DataFlash_Class::Log_Write_Baro(AP_Baro &baro)
}; };
WriteBlock(&pkt3, sizeof(pkt3)); WriteBlock(&pkt3, sizeof(pkt3));
} }
#endif
} }
// Write an raw accel/gyro data packet // Write an raw accel/gyro data packet