andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rocco Marco Guglielmi 2016-07-08 16:15:01 +00:00
parent 72bb557dfb
commit 0c8fc98a9d
5 changed files with 80 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os/ex/ST/l3gd20.c
View File

@ -264,18 +264,6 @@ static msg_t set_full_scale(void *ip, l3gd20_fs_t fs) {
return MSG_OK; 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) { static msg_t set_meas_unit(void *ip, l3gd20_unit_t unit) {
unsigned i; unsigned i;
if(unit != ((L3GD20Driver *)ip)->meas_unit) { 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; return MSG_OK;
} }
static l3gd20_unit_t get_meas_unit(void *ip) {
return ((L3GD20Driver *)ip)->meas_unit;
}
static const struct BaseSensorVMT vmt_basesensor = { static const struct BaseSensorVMT vmt_basesensor = {
get_axes_number, read_raw, read_cooked get_axes_number, read_raw, read_cooked
}; };
@ -313,8 +296,7 @@ static const struct L3GD20VMT vmt_l3gd20 = {
get_axes_number, read_raw, read_cooked, get_axes_number, read_raw, read_cooked,
sample_bias, set_bias, reset_bias, sample_bias, set_bias, reset_bias,
set_sensivity, reset_sensivity, set_sensivity, reset_sensivity,
set_full_scale, get_full_scale, set_full_scale, set_meas_unit
set_meas_unit, get_meas_unit
}; };
/*===========================================================================*/ /*===========================================================================*/

6
os/ex/ST/l3gd20.h
View File

@ -490,12 +490,8 @@ typedef struct L3GD20Driver L3GD20Driver;
_base_gyroscope_methods \ _base_gyroscope_methods \
/* Change full scale value of L3GD20 .*/ \ /* Change full scale value of L3GD20 .*/ \
msg_t (*set_full_scale)(void *instance, l3gd20_fs_t fs); \ 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 .*/ \ /* Change measurement unit of L3GD20 .*/ \
msg_t (*set_meas_unit)(void *instance, l3gd20_unit_t unit); \ 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 * @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] ip pointer to a @p BaseGyroscope class.
* @param[in] fs the new full scale value. * @param[in] fs the new full scale value.

46
testhal/STM32/STM32F3xx/SPI-L3GD20/main.c
View File

@ -28,7 +28,7 @@
/* L3GD20 related. */ /* L3GD20 related. */
/*===========================================================================*/ /*===========================================================================*/
/* L3GD20 Driver: This object represent an L3GD20 instance */ /* L3GD20 Driver: This object represent an L3GD20 instance.*/
static L3GD20Driver L3GD20D1; static L3GD20Driver L3GD20D1;
static int32_t rawdata[L3GD20_NUMBER_OF_AXES]; static int32_t rawdata[L3GD20_NUMBER_OF_AXES];
@ -40,20 +40,20 @@ static uint32_t i;
static const SPIConfig spicfg = { static const SPIConfig spicfg = {
NULL, NULL,
GPIOE, /* port of L3GD20 CS */ GPIOE, /* port of L3GD20 CS.*/
GPIOE_L3GD20_CS, /* pin of L3GD20 CS */ GPIOE_L3GD20_CS, /* pin of L3GD20 CS.*/
SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA, /* CR1 register */ SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA, /* CR1 register.*/
0 /* CR2 register */ 0 /* CR2 register.*/
}; };
static L3GD20Config l3gd20cfg = { static L3GD20Config l3gd20cfg = {
&SPID1, /* Pointer to SPI Driver */ &SPID1, /* Pointer to SPI Driver.*/
&spicfg, /* Pointer to SPI Configuration */ &spicfg, /* Pointer to SPI Configuration.*/
{0, 0, 0}, /* Use default sensitivity */ {0, 0, 0}, /* Use default sensitivity.*/
{0, 0, 0}, /* Use default bias */ {0, 0, 0}, /* Use default bias.*/
L3GD20_UNIT_DPS, /* Measurement unit DPS */ L3GD20_UNIT_DPS, /* Measurement unit DPS.*/
L3GD20_FS_250DPS, /* Full scale value */ L3GD20_FS_250DPS, /* Full scale value.*/
L3GD20_ODR_760HZ, /* Output data rate */ L3GD20_ODR_760HZ, /* Output data rate.*/
#if L3GD20_USE_ADVANCED || defined(__DOXYGEN__) #if L3GD20_USE_ADVANCED || defined(__DOXYGEN__)
L3GD20_BDU_CONTINUOUS, L3GD20_BDU_CONTINUOUS,
L3GD20_END_LITTLE, L3GD20_END_LITTLE,
@ -75,7 +75,7 @@ static L3GD20Config l3gd20cfg = {
#define usb_lld_connect_bus(usbp) #define usb_lld_connect_bus(usbp)
#define usb_lld_disconnect_bus(usbp) #define usb_lld_disconnect_bus(usbp)
/* Enable use of special ANSI escape sequences */ /* Enable use of special ANSI escape sequences.*/
#define CHPRINTF_USE_ANSI_CODE TRUE #define CHPRINTF_USE_ANSI_CODE TRUE
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048) #define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
@ -259,9 +259,7 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
/* /* Initializes a serial-over-USB CDC driver.*/
* Initializes a serial-over-USB CDC driver.
*/
sduObjectInit(&SDU1); sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg); sduStart(&SDU1, &serusbcfg);
@ -275,24 +273,16 @@ int main(void) {
usbStart(serusbcfg.usbp, &usbcfg); usbStart(serusbcfg.usbp, &usbcfg);
usbConnectBus(serusbcfg.usbp); usbConnectBus(serusbcfg.usbp);
/* /* Creates the blinker thread.*/
* Creates the blinker thread.
*/
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL); chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL);
/* /* L3GD20 Object Initialization.*/
* L3GD20 Object Initialization
*/
l3gd20ObjectInit(&L3GD20D1); l3gd20ObjectInit(&L3GD20D1);
/* /* Activates the L3GD20 driver.*/
* Activates the L3GD20 driver.
*/
l3gd20Start(&L3GD20D1, &l3gd20cfg); l3gd20Start(&L3GD20D1, &l3gd20cfg);
/* /* Shell manager initialization.*/
* Shell manager initialization.
*/
shellInit(); shellInit();
while(TRUE) { while(TRUE) {

58
testhal/STM32/STM32F4xx/SPI-L3GD20/main.c
View File

@ -28,7 +28,7 @@
/* L3GD20 related. */ /* L3GD20 related. */
/*===========================================================================*/ /*===========================================================================*/
/* L3GD20 Driver: This object represent an L3GD20 instance */ /* L3GD20 Driver: This object represent an L3GD20 instance.*/
static L3GD20Driver L3GD20D1; static L3GD20Driver L3GD20D1;
static int32_t rawdata[L3GD20_NUMBER_OF_AXES]; static int32_t rawdata[L3GD20_NUMBER_OF_AXES];
@ -40,20 +40,20 @@ static uint32_t i;
static const SPIConfig spicfg = { static const SPIConfig spicfg = {
NULL, NULL,
GPIOE, /* port of L3GD20 CS */ GPIOE, /* port of L3GD20 CS.*/
GPIOE_L3GD20_CS, /* pin of L3GD20 CS */ GPIOE_L3GD20_CS, /* pin of L3GD20 CS.*/
SPI_CR1_BR_0 | SPI_CR1_CPOL | SPI_CR1_CPHA,/* CR1 register*/ SPI_CR1_BR_0 | SPI_CR1_CPOL | SPI_CR1_CPHA,/* CR1 register.*/
0 /* CR2 register */ 0 /* CR2 register.*/
}; };
static L3GD20Config l3gd20cfg = { static L3GD20Config l3gd20cfg = {
&SPID1, /* Pointer to SPI Driver */ &SPID1, /* Pointer to SPI Driver.*/
&spicfg, /* Pointer to SPI Configuration */ &spicfg, /* Pointer to SPI Configuration.*/
{0, 0, 0}, /* Use default sensitivity */ {0, 0, 0}, /* Use default sensitivity.*/
{0, 0, 0}, /* Use default bias */ {0, 0, 0}, /* Use default bias.*/
L3GD20_UNIT_DPS, /* Measurement unit DPS */ L3GD20_UNIT_DPS, /* Measurement unit DPS.*/
L3GD20_FS_250DPS, /* Full scale value */ L3GD20_FS_250DPS, /* Full scale value.*/
L3GD20_ODR_760HZ, /* Output data rate */ L3GD20_ODR_760HZ, /* Output data rate.*/
#if L3GD20_USE_ADVANCED || defined(__DOXYGEN__) #if L3GD20_USE_ADVANCED || defined(__DOXYGEN__)
L3GD20_BDU_CONTINUOUS, L3GD20_BDU_CONTINUOUS,
L3GD20_END_LITTLE, L3GD20_END_LITTLE,
@ -68,7 +68,14 @@ static L3GD20Config l3gd20cfg = {
/* Command line related. */ /* Command line related. */
/*===========================================================================*/ /*===========================================================================*/
/* Enable use of special ANSI escape sequences */
/* Enable use of special ANSI escape sequences.*/
#define CHPRINTF_USE_ANSI_CODE TRUE #define CHPRINTF_USE_ANSI_CODE TRUE
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048) #define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
@ -179,14 +186,15 @@ static void cmd_bias(BaseSequentialStream *chp, int argc, char *argv[]) {
#endif #endif
chprintf(chp, "Please don't move the device while Green LED is on!\r\n"); chprintf(chp, "Please don't move the device while Green LED is on!\r\n");
chprintf(chp, "Press a key to start...\r\n"); chprintf(chp, "Press a key to start...\r\n");
while (chnGetTimeout((BaseChannel *)chp, 500) == Q_TIMEOUT) { while (chnGetTimeout((BaseChannel *)chp, 500) == Q_TIMEOUT)
; ;
}
palSetLine(LINE_LED4); palSetLine(LINE_LED4);
chThdSleepMilliseconds(1000); chThdSleepMilliseconds(1000);
gyroscopeSampleBias(&L3GD20D1); gyroscopeSampleBias(&L3GD20D1);
palClearLine(LINE_LED4); palClearLine(LINE_LED4);
chprintf(chp, "Procedure completed!\r\n"); chprintf(chp, "Procedure completed!\r\n");
} }
else if(!strcmp (argv[0], "reset")) { else if(!strcmp (argv[0], "reset")) {
@ -252,9 +260,7 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
/* /* Initializes a serial-over-USB CDC driver.*/
* Initializes a serial-over-USB CDC driver.
*/
sduObjectInit(&SDU1); sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg); sduStart(&SDU1, &serusbcfg);
@ -268,24 +274,16 @@ int main(void) {
usbStart(serusbcfg.usbp, &usbcfg); usbStart(serusbcfg.usbp, &usbcfg);
usbConnectBus(serusbcfg.usbp); usbConnectBus(serusbcfg.usbp);
/* /* Creates the blinker thread.*/
* Creates the blinker thread.
*/
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL); chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL);
/* /* L3GD20 Object Initialization.*/
* L3GD20 Object Initialization
*/
l3gd20ObjectInit(&L3GD20D1); l3gd20ObjectInit(&L3GD20D1);
/* /* Activates the L3GD20 driver.*/
* Activates the L3GD20 driver.
*/
l3gd20Start(&L3GD20D1, &l3gd20cfg); l3gd20Start(&L3GD20D1, &l3gd20cfg);
/* /* Shell manager initialization.*/
* Shell manager initialization.
*/
shellInit(); shellInit();
while(TRUE) { while(TRUE) {

46
testhal/STM32/STM32L4xx/SPI-L3GD20/main.c
View File

@ -27,7 +27,7 @@
/* L3GD20 related. */ /* L3GD20 related. */
/*===========================================================================*/ /*===========================================================================*/
/* L3GD20 Driver: This object represent an L3GD20 instance */ /* L3GD20 Driver: This object represent an L3GD20 instance.*/
static L3GD20Driver L3GD20D1; static L3GD20Driver L3GD20D1;
static int32_t rawdata[L3GD20_NUMBER_OF_AXES]; static int32_t rawdata[L3GD20_NUMBER_OF_AXES];
@ -39,20 +39,20 @@ static uint32_t i;
static const SPIConfig spicfg = { static const SPIConfig spicfg = {
NULL, NULL,
GPIOD, /* port of L3GD20 CS */ GPIOD, /* port of L3GD20 CS.*/
GPIOD_GYRO_CS, /* pin of L3GD20 CS */ GPIOD_GYRO_CS, /* pin of L3GD20 CS.*/
SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA, /* CR1 register */ SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA, /* CR1 register.*/
0 /* CR2 register */ 0 /* CR2 register.*/
}; };
static L3GD20Config l3gd20cfg = { static L3GD20Config l3gd20cfg = {
&SPID2, /* Pointer to SPI Driver */ &SPID2, /* Pointer to SPI Driver.*/
&spicfg, /* Pointer to SPI Configuration */ &spicfg, /* Pointer to SPI Configuration.*/
{0, 0, 0}, /* Use default sensitivity */ {0, 0, 0}, /* Use default sensitivity.*/
{0, 0, 0}, /* Use default bias */ {0, 0, 0}, /* Use default bias.*/
L3GD20_UNIT_DPS, /* Measurement unit DPS */ L3GD20_UNIT_DPS, /* Measurement unit DPS.*/
L3GD20_FS_250DPS, /* Full scale value */ L3GD20_FS_250DPS, /* Full scale value.*/
L3GD20_ODR_760HZ, /* Output data rate */ L3GD20_ODR_760HZ, /* Output data rate.*/
#if L3GD20_USE_ADVANCED || defined(__DOXYGEN__) #if L3GD20_USE_ADVANCED || defined(__DOXYGEN__)
L3GD20_BDU_CONTINUOUS, L3GD20_BDU_CONTINUOUS,
L3GD20_END_LITTLE, L3GD20_END_LITTLE,
@ -74,7 +74,7 @@ static L3GD20Config l3gd20cfg = {
#define usb_lld_connect_bus(usbp) #define usb_lld_connect_bus(usbp)
#define usb_lld_disconnect_bus(usbp) #define usb_lld_disconnect_bus(usbp)
/* Enable use of special ANSI escape sequences */ /* Enable use of special ANSI escape sequences.*/
#define CHPRINTF_USE_ANSI_CODE TRUE #define CHPRINTF_USE_ANSI_CODE TRUE
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048) #define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
@ -253,29 +253,19 @@ int main(void) {
halInit(); halInit();
chSysInit(); chSysInit();
/* /* Activates the serial driver 2 using the driver default configuration.*/
* Activates the serial driver 2 using the driver default configuration.
*/
sdStart(&SD2, NULL); sdStart(&SD2, NULL);
/* /* Creates the blinker thread.*/
* Creates the blinker thread.
*/
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL); chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO + 1, Thread1, NULL);
/* /* L3GD20 Object Initialization.*/
* L3GD20 Object Initialization
*/
l3gd20ObjectInit(&L3GD20D1); l3gd20ObjectInit(&L3GD20D1);
/* /* Activates the L3GD20 driver.*/
* Activates the L3GD20 driver.
*/
l3gd20Start(&L3GD20D1, &l3gd20cfg); l3gd20Start(&L3GD20D1, &l3gd20cfg);
/* /* Shell manager initialization.*/
* Shell manager initialization.
*/
shellInit(); shellInit();
while(TRUE) { while(TRUE) {