From 8b32af98adc0f61cbc2ab715a628b84236eb009c Mon Sep 17 00:00:00 2001 From: Rocco Marco Date: Mon, 13 Apr 2015 21:24:47 +0200 Subject: Lib are now totally independent from PLAY --- os/various/devices_lib/l3gd20.c | 5 ----- os/various/devices_lib/l3gd20.h | 5 ----- os/various/devices_lib/lis3mdl.c | 5 ----- os/various/devices_lib/lis3mdl.h | 10 +++------- os/various/devices_lib/lsm303dlhc.c | 4 ---- os/various/devices_lib/lsm303dlhc.h | 5 ----- os/various/devices_lib/lsm6ds0.c | 4 ---- os/various/devices_lib/lsm6ds0.h | 2 -- os/various/devices_lib/max7219.c | 3 --- os/various/devices_lib/max7219.h | 2 -- os/various/devices_lib/nrf24l01.c | 3 --- os/various/devices_lib/nrf24l01.h | 4 ---- 12 files changed, 3 insertions(+), 49 deletions(-) (limited to 'os/various/devices_lib') diff --git a/os/various/devices_lib/l3gd20.c b/os/various/devices_lib/l3gd20.c index 13238e5..1cc52c9 100644 --- a/os/various/devices_lib/l3gd20.c +++ b/os/various/devices_lib/l3gd20.c @@ -37,10 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "l3gd20.h" -#if (GYRO_USE_L3GD20) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -122,7 +120,4 @@ void l3gd20WriteRegister(SPIDriver *spip, uint8_t reg, uint8_t value) { spiUnselect(spip); } } - -#endif /* (GYRO_USE_L3GD20) */ - /** @} */ diff --git a/os/various/devices_lib/l3gd20.h b/os/various/devices_lib/l3gd20.h index f36fee1..ff67b21 100644 --- a/os/various/devices_lib/l3gd20.h +++ b/os/various/devices_lib/l3gd20.h @@ -36,7 +36,6 @@ #ifndef _L3GD20_H_ #define _L3GD20_H_ -#if (GYRO_USE_L3GD20) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -240,11 +239,7 @@ extern "C" { } #endif -#endif /* GYRO_USE_L3GD20 */ #endif /* _L3GD20_H_ */ /** @} */ -/* - * TODO PLAY--> add i2c support, and Multiple reg read. - */ diff --git a/os/various/devices_lib/lis3mdl.c b/os/various/devices_lib/lis3mdl.c index 12aba53..99b71e4 100644 --- a/os/various/devices_lib/lis3mdl.c +++ b/os/various/devices_lib/lis3mdl.c @@ -37,11 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "lis3mdl.h" -#if (COMP_USE_LIS3MDL) || defined(__DOXYGEN__) - /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -151,6 +148,4 @@ void lis3mdlWriteRegister(I2CDriver *i2cp, uint8_t sad, uint8_t sub, break; } } - -#endif /* COMP_USE_LIS3MDL */ /** @} */ diff --git a/os/various/devices_lib/lis3mdl.h b/os/various/devices_lib/lis3mdl.h index 458e5b7..e55978e 100644 --- a/os/various/devices_lib/lis3mdl.h +++ b/os/various/devices_lib/lis3mdl.h @@ -36,17 +36,14 @@ #ifndef _LIS3MDL_H_ #define _LIS3MDL_H_ -#if (COMP_USE_LIS3MDL) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ -#if (PLAY_USE_FLOAT) || defined(__DOXYGEN__) #define LIS3MDL_COMP_SENS_4GA ((float)6842.0f) /*!< compass sensitivity with 4 GA full scale [LSB / Ga] */ -#define LIS3MDL_COMP_SENS_8GA ((float)3421.0f) /*!< compass sensitivity with 8 GA full scale [LSB / Ga] */ -#define LIS3MDL_COMP_SENS_12GA ((float)2281.0f) /*!< compass sensitivity with 12 GA full scale [LSB / Ga] */ -#define LIS3MDL_COMP_SENS_16GA ((float)1711.0f) /*!< compass sensitivity with 16 GA full scale [LSB / Ga] */ -#endif /* PLAY_USE_FLOAT */ +#define LIS3MDL_COMP_SENS_8GA ((float)3421.0f) /*!< compass sensitivity with 8 GA full scale [LSB / Ga] */ +#define LIS3MDL_COMP_SENS_12GA ((float)2281.0f) /*!< compass sensitivity with 12 GA full scale [LSB / Ga] */ +#define LIS3MDL_COMP_SENS_16GA ((float)1711.0f) /*!< compass sensitivity with 16 GA full scale [LSB / Ga] */ /** * @name LIS3MDL register names * @{ @@ -256,7 +253,6 @@ extern "C" { } #endif -#endif /* COMP_USE_LIS3MDL */ #endif /* _LIS3MDL_H_ */ /** @} */ diff --git a/os/various/devices_lib/lsm303dlhc.c b/os/various/devices_lib/lsm303dlhc.c index 59faa16..070c49c 100644 --- a/os/various/devices_lib/lsm303dlhc.c +++ b/os/various/devices_lib/lsm303dlhc.c @@ -37,11 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "lsm303dlhc.h" -#if (ACCEL_USE_LSM303DLHC) || (COMP_USE_LSM303DLHC) || defined(__DOXYGEN__) - /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -205,5 +202,4 @@ void lsm303dlhcWriteRegister(I2CDriver *i2cp,uint8_t sad, uint8_t sub, } } } -#endif /* (ACCEL_USE_LSM303DLHC) || (COMP_USE_LSM303DLHC) */ /** @} */ diff --git a/os/various/devices_lib/lsm303dlhc.h b/os/various/devices_lib/lsm303dlhc.h index f96a890..ed52e68 100644 --- a/os/various/devices_lib/lsm303dlhc.h +++ b/os/various/devices_lib/lsm303dlhc.h @@ -37,7 +37,6 @@ #ifndef _LSM303DLHC_H_ #define _LSM303DLHC_H_ -#if (ACCEL_USE_LSM303DLHC) || (COMP_USE_LSM303DLHC) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -350,10 +349,6 @@ extern "C" { #ifdef __cplusplus } #endif -#endif /* (ACCEL_USE_LSM303DLHC) || (COMP_USE_LSM303DLHC) */ #endif /* _LSM303DLHC_H_ */ /** @} */ -/* - * TODO PLAY--> add spi support, and Multiple reg read. - */ diff --git a/os/various/devices_lib/lsm6ds0.c b/os/various/devices_lib/lsm6ds0.c index 6d0c3ae..da67f12 100644 --- a/os/various/devices_lib/lsm6ds0.c +++ b/os/various/devices_lib/lsm6ds0.c @@ -37,11 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "lsm6ds0.h" -#if (ACCEL_USE_LSM6DS0) || (GYRO_USE_LSM6DS0) || defined(__DOXYGEN__) - /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -184,5 +181,4 @@ void lsm6ds0WriteRegister(I2CDriver *i2cp, uint8_t sad, uint8_t sub, } } -#endif /* (ACCEL_USE_LSM6DS0) || (GYRO_USE_LSM6DS0) */ /** @} */ diff --git a/os/various/devices_lib/lsm6ds0.h b/os/various/devices_lib/lsm6ds0.h index c32dfcb..3631493 100644 --- a/os/various/devices_lib/lsm6ds0.h +++ b/os/various/devices_lib/lsm6ds0.h @@ -36,7 +36,6 @@ #ifndef _LSM6DS0_H_ #define _LSM6DS0_H_ -#if (ACCEL_USE_LSM6DS0) || (GYRO_USE_LSM6DS0) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -481,7 +480,6 @@ extern "C" { } #endif -#endif /* (ACCEL_USE_LSM6DS0) || (GYRO_USE_LSM6DS0) */ #endif /* _LSM6DS0_H_ */ /** @} */ diff --git a/os/various/devices_lib/max7219.c b/os/various/devices_lib/max7219.c index 527176e..0e51167 100644 --- a/os/various/devices_lib/max7219.c +++ b/os/various/devices_lib/max7219.c @@ -37,10 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "max7219.h" -#if (PLAY_USE_MAX7219) || defined (__DOXYGEN__) /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -93,5 +91,4 @@ void max7219WriteRegister(SPIDriver *spip, uint16_t adr, uint8_t data) { spiUnselect(spip); } } -#endif /* PLAY_USE_MAX7219 */ /** @} */ diff --git a/os/various/devices_lib/max7219.h b/os/various/devices_lib/max7219.h index 8b90260..f2bbbdf 100644 --- a/os/various/devices_lib/max7219.h +++ b/os/various/devices_lib/max7219.h @@ -36,7 +36,6 @@ #ifndef _MAX7219_H_ #define _MAX7219_H_ -#if (PLAY_USE_MAX7219) || defined (__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -182,7 +181,6 @@ extern "C" { #ifdef __cplusplus } #endif -#endif /* PLAY_USE_MAX7219 */ #endif /* _MAX7219_H_ */ /** @} */ diff --git a/os/various/devices_lib/nrf24l01.c b/os/various/devices_lib/nrf24l01.c index 31e4513..f526fbe 100644 --- a/os/various/devices_lib/nrf24l01.c +++ b/os/various/devices_lib/nrf24l01.c @@ -37,10 +37,8 @@ #include "ch.h" #include "hal.h" -#include "play.h" #include "nrf24l01.h" -#if (RF_USE_NRF24L01) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -438,6 +436,5 @@ NRF24L01_status_t nrf24l01WriteTxPlNoAck(SPIDriver *spip, uint8_t paylen, return status; } #endif /* NRF24L01_USE_FEATURE */ -#endif /* RF_USE_NRF24L01 */ /** @} */ diff --git a/os/various/devices_lib/nrf24l01.h b/os/various/devices_lib/nrf24l01.h index c56c66f..86ba127 100644 --- a/os/various/devices_lib/nrf24l01.h +++ b/os/various/devices_lib/nrf24l01.h @@ -36,9 +36,6 @@ #ifndef _NRF24L01_H_ #define _NRF24L01_H_ -#include "playconf.h" - -#if (RF_USE_NRF24L01) || defined(__DOXYGEN__) /*===========================================================================*/ /* Driver constants. */ /*===========================================================================*/ @@ -573,7 +570,6 @@ NRF24L01_status_t nrf24l01WriteTxPlNoAck(SPIDriver *spip, uint8_t paylen, } #endif -#endif /* RF_USE_NRF24L01 */ #endif /* _NRF24L01_H_ */ /** @} */ -- cgit v1.2.3