diff options
| author | Nicolas Reinecke <nr@das-labor.org> | 2016-11-08 18:14:13 +0100 |
|---|---|---|
| committer | Nicolas Reinecke <nr@das-labor.org> | 2016-11-08 21:07:11 +0100 |
| commit | 3407abe5af32fd051795d7e0f58458179d703cee (patch) | |
| tree | 2b9e71d391630b43f62eca8bdbfe484cbb40e809 /demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c | |
| parent | a52e98875024ada52b9f1e912c12f0bbec231bb2 (diff) | |
| download | ChibiOS-Contrib-3407abe5af32fd051795d7e0f58458179d703cee.tar.gz ChibiOS-Contrib-3407abe5af32fd051795d7e0f58458179d703cee.tar.bz2 ChibiOS-Contrib-3407abe5af32fd051795d7e0f58458179d703cee.zip | |
fix stm32f429-dma2d demo build
Diffstat (limited to 'demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c')
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c index aa7ac10..2d8d356 100644 --- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c @@ -288,6 +288,7 @@ const SPIConfig spi_cfg5 = { GPIOC,
GPIOC_SPI5_LCD_CS,
(((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR),
+ 0
};
extern SPIDriver SPID5;
@@ -473,10 +474,6 @@ static void dma2d_test(void) { /* Command line related. */
/*===========================================================================*/
-#if (HAL_USE_SERIAL_USB == TRUE)
-/* Virtual serial port over USB.*/
-SerialUSBDriver SDU1;
-#endif
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
@@ -500,7 +497,7 @@ static const ShellCommand commands[] = { static const ShellConfig shell_cfg1 = {
#if (HAL_USE_SERIAL_USB == TRUE)
- (BaseSequentialStream *)&SDU1,
+ (BaseSequentialStream *)&SDU2,
#else
(BaseSequentialStream *)&SD1,
#endif
@@ -536,8 +533,8 @@ int main(void) { /*
* Initializes a serial-over-USB CDC driver.
*/
- sduObjectInit(&SDU1);
- sduStart(&SDU1, &serusbcfg);
+ sduObjectInit(&SDU2);
+ sduStart(&SDU2, &serusbcfg);
/*
* Activates the USB driver and then the USB bus pull-up on D+.
@@ -594,7 +591,7 @@ int main(void) { while (true) {
if (!shelltp) {
#if (HAL_USE_SERIAL_USB == TRUE)
- if (SDU1.config->usbp->state == USB_ACTIVE) {
+ if (SDU2.config->usbp->state == USB_ACTIVE) {
/* Spawns a new shell.*/
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1);
}
|