diff options
| author | Rocco Marco Guglielmi <roccomarco.guglielmi@gmail.com> | 2018-01-14 11:19:39 +0000 |
|---|---|---|
| committer | Rocco Marco Guglielmi <roccomarco.guglielmi@gmail.com> | 2018-01-14 11:19:39 +0000 |
| commit | b28c62685d857b55dd8bc7e759a9f93ab0a51632 (patch) | |
| tree | cc3285cdd4c1b4ec07340784f0c9087efa5c9a02 /testex/STM32/STM32F3xx | |
| parent | f6b807fd5a089607a1e21dbcad3c060363650fa1 (diff) | |
| download | ChibiOS-b28c62685d857b55dd8bc7e759a9f93ab0a51632.tar.gz ChibiOS-b28c62685d857b55dd8bc7e759a9f93ab0a51632.tar.bz2 ChibiOS-b28c62685d857b55dd8bc7e759a9f93ab0a51632.zip | |
Updated EX demos to be compliant with latest ChibiOS/HAL edit
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11273 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testex/STM32/STM32F3xx')
| -rw-r--r-- | testex/STM32/STM32F3xx/I2C-LSM303DLHC/main.c | 26 | ||||
| -rw-r--r-- | testex/STM32/STM32F3xx/SPI-L3GD20/main.c | 23 |
2 files changed, 25 insertions, 24 deletions
diff --git a/testex/STM32/STM32F3xx/I2C-LSM303DLHC/main.c b/testex/STM32/STM32F3xx/I2C-LSM303DLHC/main.c index 55935b568..367562254 100644 --- a/testex/STM32/STM32F3xx/I2C-LSM303DLHC/main.c +++ b/testex/STM32/STM32F3xx/I2C-LSM303DLHC/main.c @@ -49,11 +49,11 @@ static const I2CConfig i2ccfg = { };
static const LSM303DLHCAccConfig lsm303dlhcacccfg = {
- NULL, /* Use default sensitivity.*/
- NULL, /* Use default bias.*/
- LSM303DLHC_ACC_FS_4G, /* Full scale value 2g.*/
- LSM303DLHC_ACC_ODR_100Hz, /* Output data rate 100 Hz.*/
-#if LSM303DLHC_ACC_USE_ADVANCED || defined(__DOXYGEN__)
+ NULL,
+ NULL,
+ LSM303DLHC_ACC_FS_4G,
+ LSM303DLHC_ACC_ODR_100Hz,
+#if LSM303DLHC_ACC_USE_ADVANCED
LSM303DLHC_ACC_LP_DISABLED,
LSM303DLHC_ACC_HR_DISABLED,
LSM303DLHC_ACC_BDU_BLOCK,
@@ -62,11 +62,11 @@ static const LSM303DLHCAccConfig lsm303dlhcacccfg = { };
static const LSM303DLHCCompConfig lsm303dlhccompcfg = {
- NULL, /* Use default sensitivity.*/
- NULL, /* Use default bias.*/
- LSM303DLHC_COMP_FS_1P3GA, /* Full scale value 1.3 Gauss.*/
- LSM303DLHC_COMP_ODR_30HZ, /* Output data rate 30 Hz.*/
-#if LSM303DLHC_COMP_USE_ADVANCED || defined(__DOXYGEN__)
+ NULL,
+ NULL,
+ LSM303DLHC_COMP_FS_1P3GA,
+ LSM303DLHC_COMP_ODR_30HZ,
+#if LSM303DLHC_COMP_USE_ADVANCED
LSM303DLHC_COMP_MD_BLOCK
#endif
};
@@ -345,7 +345,7 @@ int main(void) { * Creates the blinker thread.
*/
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
-
+
/*
* LSM303DLHC Object Initialization
*/
@@ -355,10 +355,10 @@ int main(void) { * Activates the LSM303DLHC driver.
*/
lsm303dlhcStart(&LSM303DLHCD1, &lsm303dlhccfg);
-
+
/*
* Normal main() thread activity, spawning shells.
- */
+ */
while (true) {
if (SDU1.config->usbp->state == USB_ACTIVE) {
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
diff --git a/testex/STM32/STM32F3xx/SPI-L3GD20/main.c b/testex/STM32/STM32F3xx/SPI-L3GD20/main.c index 2df0437b1..e83b53303 100644 --- a/testex/STM32/STM32F3xx/SPI-L3GD20/main.c +++ b/testex/STM32/STM32F3xx/SPI-L3GD20/main.c @@ -38,21 +38,22 @@ static char axisID[L3GD20_NUMBER_OF_AXES] = {'X', 'Y', 'Z'}; static uint32_t i;
static const SPIConfig spicfg = {
+ FALSE,
NULL,
- GPIOE, /* port of L3GD20 CS.*/
- GPIOE_L3GD20_CS, /* pin of L3GD20 CS.*/
- SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA, /* CR1 register.*/
- 0 /* CR2 register.*/
+ GPIOE,
+ GPIOE_L3GD20_CS,
+ SPI_CR1_BR | SPI_CR1_CPOL | SPI_CR1_CPHA,
+ 0
};
static L3GD20Config l3gd20cfg = {
- &SPID1, /* Pointer to SPI Driver.*/
- &spicfg, /* Pointer to SPI Configuration.*/
- NULL, /* Use default sensitivity.*/
- NULL, /* Use default bias.*/
- L3GD20_FS_250DPS, /* Full scale value.*/
- L3GD20_ODR_760HZ, /* Output data rate.*/
-#if L3GD20_USE_ADVANCED || defined(__DOXYGEN__)
+ &SPID1,
+ &spicfg,
+ NULL,
+ NULL,
+ L3GD20_FS_250DPS,
+ L3GD20_ODR_760HZ,
+#if L3GD20_USE_ADVANCED
L3GD20_BDU_CONTINUOUS,
L3GD20_END_LITTLE,
L3GD20_BW3,
|