From 0c8fc98a9d6608eda478b3e5db3e48ce921e4375 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Fri, 8 Jul 2016 16:15:01 +0000 Subject: Removed unused functions in L3GD20 driver, Indent fixes in L3GD20 related demos. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9695 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ex/ST/l3gd20.c | 28 +++++----------------------- os/ex/ST/l3gd20.h | 14 +++++--------- 2 files changed, 10 insertions(+), 32 deletions(-) (limited to 'os/ex') diff --git a/os/ex/ST/l3gd20.c b/os/ex/ST/l3gd20.c index 255026fba..60aeee8cf 100644 --- a/os/ex/ST/l3gd20.c +++ b/os/ex/ST/l3gd20.c @@ -264,18 +264,6 @@ static msg_t set_full_scale(void *ip, l3gd20_fs_t fs) { return MSG_OK; } -static l3gd20_fs_t get_full_scale(void *ip) { - if(((L3GD20Driver *)ip)->fullscale == L3GD20_250DPS) { - return L3GD20_FS_250DPS; - } - else if(((L3GD20Driver *)ip)->fullscale == L3GD20_500DPS) { - return L3GD20_FS_500DPS; - } - else { - return L3GD20_FS_2000DPS; - } -} - static msg_t set_meas_unit(void *ip, l3gd20_unit_t unit) { unsigned i; if(unit != ((L3GD20Driver *)ip)->meas_unit) { @@ -294,11 +282,6 @@ static msg_t set_meas_unit(void *ip, l3gd20_unit_t unit) { return MSG_OK; } -static l3gd20_unit_t get_meas_unit(void *ip) { - - return ((L3GD20Driver *)ip)->meas_unit; -} - static const struct BaseSensorVMT vmt_basesensor = { get_axes_number, read_raw, read_cooked }; @@ -313,8 +296,7 @@ static const struct L3GD20VMT vmt_l3gd20 = { get_axes_number, read_raw, read_cooked, sample_bias, set_bias, reset_bias, set_sensivity, reset_sensivity, - set_full_scale, get_full_scale, - set_meas_unit, get_meas_unit + set_full_scale, set_meas_unit }; /*===========================================================================*/ @@ -353,7 +335,7 @@ void l3gd20Start(L3GD20Driver *devp, const L3GD20Config *config) { osalDbgCheck((devp != NULL) && (config != NULL)); osalDbgAssert((devp->state == L3GD20_STOP) || (devp->state == L3GD20_READY), - "l3gd20Start(), invalid state"); + "l3gd20Start(), invalid state"); devp->config = config; @@ -403,7 +385,7 @@ void l3gd20Start(L3GD20Driver *devp, const L3GD20Config *config) { cr[4] = L3GD20_CTRL_REG5_HPEN; if(devp->config->lp2mode != L3GD20_LP2M_BYPASSED) { cr[4] |= L3GD20_CTRL_REG5_INT1_SEL1 | - L3GD20_CTRL_REG5_OUT_SEL1; + L3GD20_CTRL_REG5_OUT_SEL1; } else { cr[4] |= L3GD20_CTRL_REG5_INT1_SEL0 | @@ -416,7 +398,7 @@ void l3gd20Start(L3GD20Driver *devp, const L3GD20Config *config) { 5, cr); #if L3GD20_SHARED_SPI spiReleaseBus((devp)->config->spip); -#endif /* L3GD20_SHARED_SPI */ +#endif /* L3GD20_SHARED_SPI */ #endif /* L3GD20_USE_SPI */ /* Storing sensitivity information according to full scale and unit value */ @@ -498,7 +480,7 @@ void l3gd20Stop(L3GD20Driver *devp) { spiStop((devp)->config->spip); #if L3GD20_SHARED_SPI spiReleaseBus((devp)->config->spip); -#endif /* L3GD20_SHARED_SPI */ +#endif /* L3GD20_SHARED_SPI */ } #endif /* L3GD20_USE_SPI */ devp->state = L3GD20_STOP; diff --git a/os/ex/ST/l3gd20.h b/os/ex/ST/l3gd20.h index 5d21f6a76..1b3f2993a 100644 --- a/os/ex/ST/l3gd20.h +++ b/os/ex/ST/l3gd20.h @@ -40,22 +40,22 @@ /** * @brief L3GD20 driver version string. */ -#define EX_L3GD20_VERSION "1.0.0" +#define EX_L3GD20_VERSION "1.0.0" /** * @brief L3GD20 driver version major number. */ -#define EX_L3GD20_MAJOR 1 +#define EX_L3GD20_MAJOR 1 /** * @brief L3GD20 driver version minor number. */ -#define EX_L3GD20_MINOR 0 +#define EX_L3GD20_MINOR 0 /** * @brief L3GD20 driver version patch number. */ -#define EX_L3GD20_PATCH 0 +#define EX_L3GD20_PATCH 0 /** @} */ /** @@ -490,12 +490,8 @@ typedef struct L3GD20Driver L3GD20Driver; _base_gyroscope_methods \ /* Change full scale value of L3GD20 .*/ \ msg_t (*set_full_scale)(void *instance, l3gd20_fs_t fs); \ - /* Get full scale value of L3GD20 .*/ \ - l3gd20_fs_t (*get_full_scale)(void *instance); \ /* Change measurement unit of L3GD20 .*/ \ msg_t (*set_meas_unit)(void *instance, l3gd20_unit_t unit); \ - /* Get measurement unit of L3GD20 .*/ \ - l3gd20_unit_t (*get_meas_unit)(void *instance); /** * @extends BaseGyroscopeVMT @@ -547,7 +543,7 @@ struct L3GD20Driver { /*===========================================================================*/ /** - * @brief Change initial fullscale value. + * @brief Change gyroscope fullscale value. * * @param[in] ip pointer to a @p BaseGyroscope class. * @param[in] fs the new full scale value. -- cgit v1.2.3