Browse Source

AP_HAL_SITL: style fixes

master
Pierre Kancir 8 years ago committed by Francisco Ferreira
parent
commit
8ade9d1fe8
  1. 2
      libraries/AP_HAL_SITL/AP_HAL_SITL.h
  2. 2
      libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
  3. 32
      libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
  4. 2
      libraries/AP_HAL_SITL/HAL_SITL_Class.h
  5. 4
      libraries/AP_HAL_SITL/Semaphores.cpp
  6. 2
      libraries/AP_HAL_SITL/Semaphores.h

2
libraries/AP_HAL_SITL/AP_HAL_SITL.h

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

2
libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h

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

32
libraries/AP_HAL_SITL/HAL_SITL_Class.cpp

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

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

4
libraries/AP_HAL_SITL/Semaphores.cpp

@ -27,7 +27,7 @@ bool Semaphore::take(uint32_t timeout_ms) @@ -27,7 +27,7 @@ bool Semaphore::take(uint32_t timeout_ms)
if (take_nonblocking()) {
return true;
}
} while ((AP_HAL::micros64() - start) < timeout_ms*1000);
} while ((AP_HAL::micros64() - start) < timeout_ms * 1000);
return false;
}
@ -36,4 +36,4 @@ bool Semaphore::take_nonblocking() @@ -36,4 +36,4 @@ bool Semaphore::take_nonblocking()
return pthread_mutex_trylock(&_lock) == 0;
}
#endif // CONFIG_HAL_BOARD
#endif // CONFIG_HAL_BOARD

2
libraries/AP_HAL_SITL/Semaphores.h

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

Loading…
Cancel
Save