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

AP_HAL_SITL: style fixes

This commit is contained in:
Pierre Kancir 2017-01-09 13:23:23 +01:00 committed by Francisco Ferreira
parent 5b2b4430b3
commit 8ade9d1fe8
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_SITL/AP_HAL_SITL.h
View File

@ -6,4 +6,4 @@
#include "HAL_SITL_Class.h" #include "HAL_SITL_Class.h"
#endif // CONFIG_HAL_BOARD #endif // CONFIG_HAL_BOARD

2
libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
View File

@ -14,4 +14,4 @@ class Util;
class Semaphore; class Semaphore;
class GPIO; class GPIO;
class DigitalSource; class DigitalSource;
} } // namespace HALSITL

32
libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
View File

@ -46,22 +46,22 @@ static Util utilInstance(&sitlState);
HAL_SITL::HAL_SITL() : HAL_SITL::HAL_SITL() :
AP_HAL::HAL( AP_HAL::HAL(
&sitlUart0Driver, /* uartA */ &sitlUart0Driver, /* uartA */
&sitlUart1Driver, /* uartB */ &sitlUart1Driver, /* uartB */
&sitlUart2Driver, /* uartC */ &sitlUart2Driver, /* uartC */
&sitlUart3Driver, /* uartD */ &sitlUart3Driver, /* uartD */
&sitlUart4Driver, /* uartE */ &sitlUart4Driver, /* uartE */
&sitlUart5Driver, /* uartF */ &sitlUart5Driver, /* uartF */
&i2c_mgr_instance, &i2c_mgr_instance,
&emptySPI, /* spi */ &emptySPI, /* spi */
&sitlAnalogIn, /* analogin */ &sitlAnalogIn, /* analogin */
&sitlEEPROMStorage, /* storage */ &sitlEEPROMStorage, /* storage */
&sitlUart0Driver, /* console */ &sitlUart0Driver, /* console */
&sitlGPIO, /* gpio */ &sitlGPIO, /* gpio */
&sitlRCInput, /* rcinput */ &sitlRCInput, /* rcinput */
&sitlRCOutput, /* rcoutput */ &sitlRCOutput, /* rcoutput */
&sitlScheduler, /* scheduler */ &sitlScheduler, /* scheduler */
&utilInstance, /* util */ &utilInstance, /* util */
&emptyOpticalFlow), /* onboard optical flow */ &emptyOpticalFlow), /* onboard optical flow */
_sitl_state(&sitlState) _sitl_state(&sitlState)
{} {}
@ -77,7 +77,7 @@ void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
rcin->init(); rcin->init();
rcout->init(); rcout->init();
//spi->init(); // spi->init();
analogin->init(); analogin->init();
callbacks->setup(); callbacks->setup();
@ -93,4 +93,4 @@ const AP_HAL::HAL& AP_HAL::get_HAL() {
return hal; return hal;
} }
#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL #endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL

2
libraries/AP_HAL_SITL/HAL_SITL_Class.h
View File

@ -17,4 +17,4 @@ private:
HALSITL::SITL_State *_sitl_state; HALSITL::SITL_State *_sitl_state;
}; };
#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL #endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL

10
libraries/AP_HAL_SITL/Semaphores.cpp
View File

@ -8,12 +8,12 @@ extern const AP_HAL::HAL& hal;
using namespace HALSITL; using namespace HALSITL;
bool Semaphore::give() bool Semaphore::give()
{ {
return pthread_mutex_unlock(&_lock) == 0; return pthread_mutex_unlock(&_lock) == 0;
} }
bool Semaphore::take(uint32_t timeout_ms) bool Semaphore::take(uint32_t timeout_ms)
{ {
if (timeout_ms == 0) { if (timeout_ms == 0) {
return pthread_mutex_lock(&_lock) == 0; return pthread_mutex_lock(&_lock) == 0;
@ -27,13 +27,13 @@ bool Semaphore::take(uint32_t timeout_ms)
if (take_nonblocking()) { if (take_nonblocking()) {
return true; return true;
} }
} while ((AP_HAL::micros64() - start) < timeout_ms*1000); } while ((AP_HAL::micros64() - start) < timeout_ms * 1000);
return false; return false;
} }
bool Semaphore::take_nonblocking() bool Semaphore::take_nonblocking()
{ {
return pthread_mutex_trylock(&_lock) == 0; return pthread_mutex_trylock(&_lock) == 0;
} }
#endif // CONFIG_HAL_BOARD #endif // CONFIG_HAL_BOARD

2
libraries/AP_HAL_SITL/Semaphores.h
View File

@ -17,5 +17,5 @@ public:
private: private:
pthread_mutex_t _lock; pthread_mutex_t _lock;
}; };
#endif // CONFIG_HAL_BOARD #endif // CONFIG_HAL_BOARD