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

AP_Airspeed: Change from magic number 0 to definition name.

This commit is contained in:
murata 2017-02-18 13:26:58 +09:00 committed by Francisco Ferreira
parent 07ab04897d
commit af65be5aa4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Airspeed/AP_Airspeed_MS4525.cpp
View File

@ -56,7 +56,7 @@ bool AP_Airspeed_MS4525::init()
if (!_dev) { if (!_dev) {
continue; continue;
} }
if (!_dev->get_semaphore()->take(0)) { if (!_dev->get_semaphore()->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
continue; continue;
} }
@ -138,7 +138,7 @@ void AP_Airspeed_MS4525::_collect()
_voltage_correction(press, temp); _voltage_correction(press, temp);
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
_press_sum += press; _press_sum += press;
_temp_sum += temp; _temp_sum += temp;
_press_count++; _press_count++;
@ -192,7 +192,7 @@ bool AP_Airspeed_MS4525::get_differential_pressure(float &pressure)
if ((AP_HAL::millis() - _last_sample_time_ms) > 100) { if ((AP_HAL::millis() - _last_sample_time_ms) > 100) {
return false; return false;
} }
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
if (_press_count > 0) { if (_press_count > 0) {
_pressure = _press_sum / _press_count; _pressure = _press_sum / _press_count;
_press_count = 0; _press_count = 0;
@ -210,7 +210,7 @@ bool AP_Airspeed_MS4525::get_temperature(float &temperature)
if ((AP_HAL::millis() - _last_sample_time_ms) > 100) { if ((AP_HAL::millis() - _last_sample_time_ms) > 100) {
return false; return false;
} }
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
if (_temp_count > 0) { if (_temp_count > 0) {
_temperature = _temp_sum / _temp_count; _temperature = _temp_sum / _temp_count;
_temp_count = 0; _temp_count = 0;

8
libraries/AP_Airspeed/AP_Airspeed_MS5525.cpp
View File

@ -66,7 +66,7 @@ bool AP_Airspeed_MS5525::init()
if (!dev) { if (!dev) {
continue; continue;
} }
if (!dev->get_semaphore()->take(0)) { if (!dev->get_semaphore()->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
continue; continue;
} }
@ -213,7 +213,7 @@ void AP_Airspeed_MS5525::calculate(void)
} }
#endif #endif
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
pressure_sum += P_Pa; pressure_sum += P_Pa;
temperature_sum += Temp_C; temperature_sum += Temp_C;
press_count++; press_count++;
@ -258,7 +258,7 @@ bool AP_Airspeed_MS5525::get_differential_pressure(float &_pressure)
if ((AP_HAL::millis() - last_sample_time_ms) > 100) { if ((AP_HAL::millis() - last_sample_time_ms) > 100) {
return false; return false;
} }
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
if (press_count > 0) { if (press_count > 0) {
pressure = pressure_sum / press_count; pressure = pressure_sum / press_count;
press_count = 0; press_count = 0;
@ -276,7 +276,7 @@ bool AP_Airspeed_MS5525::get_temperature(float &_temperature)
if ((AP_HAL::millis() - last_sample_time_ms) > 100) { if ((AP_HAL::millis() - last_sample_time_ms) > 100) {
return false; return false;
} }
if (sem->take(0)) { if (sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
if (temp_count > 0) { if (temp_count > 0) {
temperature = temperature_sum / temp_count; temperature = temperature_sum / temp_count;
temp_count = 0; temp_count = 0;