From a67bba56af1bfc5f8c24c03ef6c9c411518e802e Mon Sep 17 00:00:00 2001 From: Rocco Marco Date: Fri, 17 Apr 2015 00:44:32 +0200 Subject: [PATCH] Reorganized devices_lib folder Removed some others pre-processor directives --- os/various/devices_lib/{ => mems}/l3gd20.c | 0 os/various/devices_lib/{ => mems}/l3gd20.h | 2 -- os/various/devices_lib/{ => mems}/lis3mdl.c | 0 os/various/devices_lib/{ => mems}/lis3mdl.h | 0 os/various/devices_lib/{ => mems}/lsm303dlhc.c | 0 os/various/devices_lib/{ => mems}/lsm303dlhc.h | 2 -- os/various/devices_lib/{ => mems}/lsm6ds0.c | 0 os/various/devices_lib/{ => mems}/lsm6ds0.h | 3 --- os/various/devices_lib/{ => others}/max7219.c | 0 os/various/devices_lib/{ => others}/max7219.h | 0 os/various/devices_lib/{ => rf}/nrf24l01.c | 0 os/various/devices_lib/{ => rf}/nrf24l01.h | 0 12 files changed, 7 deletions(-) rename os/various/devices_lib/{ => mems}/l3gd20.c (100%) rename os/various/devices_lib/{ => mems}/l3gd20.h (99%) rename os/various/devices_lib/{ => mems}/lis3mdl.c (100%) rename os/various/devices_lib/{ => mems}/lis3mdl.h (100%) rename os/various/devices_lib/{ => mems}/lsm303dlhc.c (100%) rename os/various/devices_lib/{ => mems}/lsm303dlhc.h (99%) rename os/various/devices_lib/{ => mems}/lsm6ds0.c (100%) rename os/various/devices_lib/{ => mems}/lsm6ds0.h (99%) rename os/various/devices_lib/{ => others}/max7219.c (100%) rename os/various/devices_lib/{ => others}/max7219.h (100%) rename os/various/devices_lib/{ => rf}/nrf24l01.c (100%) rename os/various/devices_lib/{ => rf}/nrf24l01.h (100%) diff --git a/os/various/devices_lib/l3gd20.c b/os/various/devices_lib/mems/l3gd20.c similarity index 100% rename from os/various/devices_lib/l3gd20.c rename to os/various/devices_lib/mems/l3gd20.c diff --git a/os/various/devices_lib/l3gd20.h b/os/various/devices_lib/mems/l3gd20.h similarity index 99% rename from os/various/devices_lib/l3gd20.h rename to os/various/devices_lib/mems/l3gd20.h index ff67b21d..08d90927 100644 --- a/os/various/devices_lib/l3gd20.h +++ b/os/various/devices_lib/mems/l3gd20.h @@ -40,11 +40,9 @@ /* Driver constants. */ /*===========================================================================*/ -#if (PLAY_USE_FLOAT) || defined(__DOXYGEN__) #define L3GD20_SENS_250DPS ((float)131.072f) /*!< gyroscope sensitivity with 250 dps full scale [LSB/dps] */ #define L3GD20_SENS_500DPS ((float)65.536f) /*!< gyroscope sensitivity with 500 dps full scale [LSB/dps] */ #define L3GD20_SENS_2000DPS ((float)16.384f) /*!< gyroscope sensitivity with 2000 dps full scale [LSB/dps] */ -#endif /* PLAY_USE_FLOAT */ /** * @name L3GD20 register names * @{ diff --git a/os/various/devices_lib/lis3mdl.c b/os/various/devices_lib/mems/lis3mdl.c similarity index 100% rename from os/various/devices_lib/lis3mdl.c rename to os/various/devices_lib/mems/lis3mdl.c diff --git a/os/various/devices_lib/lis3mdl.h b/os/various/devices_lib/mems/lis3mdl.h similarity index 100% rename from os/various/devices_lib/lis3mdl.h rename to os/various/devices_lib/mems/lis3mdl.h diff --git a/os/various/devices_lib/lsm303dlhc.c b/os/various/devices_lib/mems/lsm303dlhc.c similarity index 100% rename from os/various/devices_lib/lsm303dlhc.c rename to os/various/devices_lib/mems/lsm303dlhc.c diff --git a/os/various/devices_lib/lsm303dlhc.h b/os/various/devices_lib/mems/lsm303dlhc.h similarity index 99% rename from os/various/devices_lib/lsm303dlhc.h rename to os/various/devices_lib/mems/lsm303dlhc.h index ed52e684..46b51bce 100644 --- a/os/various/devices_lib/lsm303dlhc.h +++ b/os/various/devices_lib/mems/lsm303dlhc.h @@ -41,7 +41,6 @@ /* Driver constants. */ /*===========================================================================*/ -#if (PLAY_USE_FLOAT) || defined(__DOXYGEN__) #define LSM303DLHC_ACC_SENS_2G ((float)1671.836f) /*!< Accelerometer sensitivity with 2 G full scale [LSB * s^2 / m] */ #define LSM303DLHC_ACC_SENS_4G ((float)835.918f) /*!< Accelerometer sensitivity with 4 G full scale [LSB * s^2 / m] */ #define LSM303DLHC_ACC_SENS_8G ((float)417.959f) /*!< Accelerometer sensitivity with 8 G full scale [LSB * s^2 / m] */ @@ -62,7 +61,6 @@ #define LSM303DLHC_COMP_SENS_Z_4_7GA ((float)355.0f) /*!< Compass sensitivity with 4.7 GA full scale [LSB / Ga] */ #define LSM303DLHC_COMP_SENS_Z_5_6GA ((float)295.0f) /*!< Compass sensitivity with 5.6 GA full scale [LSB / Ga] */ #define LSM303DLHC_COMP_SENS_Z_8_1GA ((float)205.0f) /*!< Compass sensitivity with 8.1 GA full scale [LSB / Ga] */ -#endif /* PLAY_USE_FLOAT */ /** * @name LSM303DLHC register names * @{ diff --git a/os/various/devices_lib/lsm6ds0.c b/os/various/devices_lib/mems/lsm6ds0.c similarity index 100% rename from os/various/devices_lib/lsm6ds0.c rename to os/various/devices_lib/mems/lsm6ds0.c diff --git a/os/various/devices_lib/lsm6ds0.h b/os/various/devices_lib/mems/lsm6ds0.h similarity index 99% rename from os/various/devices_lib/lsm6ds0.h rename to os/various/devices_lib/mems/lsm6ds0.h index 3631493a..57e20577 100644 --- a/os/various/devices_lib/lsm6ds0.h +++ b/os/various/devices_lib/mems/lsm6ds0.h @@ -40,7 +40,6 @@ /* Driver constants. */ /*===========================================================================*/ -#if (PLAY_USE_FLOAT) || defined(__DOXYGEN__) #define LSM6DS0_ACC_SENS_2G ((float)1671.095f) /*!< Accelerometer sensitivity with 2 G full scale [LSB * s^2 / m] */ #define LSM6DS0_ACC_SENS_4G ((float)835.547f) /*!< Accelerometer sensitivity with 4 G full scale [LSB * s^2 / m] */ #define LSM6DS0_ACC_SENS_8G ((float)417.774) /*!< Accelerometer sensitivity with 8 G full scale [LSB * s^2 / m] */ @@ -49,8 +48,6 @@ #define LSM6DS0_GYRO_SENS_245DPS ((float)114.286f) /*!< Gyroscope sensitivity with 245 dps full scale [LSB * s / °] */ #define LSM6DS0_GYRO_SENS_500DPS ((float)57.143f) /*!< Gyroscope sensitivity with 500 dps full scale [LSB * s / °] */ #define LSM6DS0_GYRO_SENS_2000DPS ((float)14.286f) /*!< Gyroscope sensitivity with 2000 dps full scale [LSB * s / °] */ - -#endif /* PLAY_USE_FLOAT */ /** * @name LSM6DS0 register names * @{ diff --git a/os/various/devices_lib/max7219.c b/os/various/devices_lib/others/max7219.c similarity index 100% rename from os/various/devices_lib/max7219.c rename to os/various/devices_lib/others/max7219.c diff --git a/os/various/devices_lib/max7219.h b/os/various/devices_lib/others/max7219.h similarity index 100% rename from os/various/devices_lib/max7219.h rename to os/various/devices_lib/others/max7219.h diff --git a/os/various/devices_lib/nrf24l01.c b/os/various/devices_lib/rf/nrf24l01.c similarity index 100% rename from os/various/devices_lib/nrf24l01.c rename to os/various/devices_lib/rf/nrf24l01.c diff --git a/os/various/devices_lib/nrf24l01.h b/os/various/devices_lib/rf/nrf24l01.h similarity index 100% rename from os/various/devices_lib/nrf24l01.h rename to os/various/devices_lib/rf/nrf24l01.h