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

Fixed DMA2D example

This commit is contained in:
Fabien Poussin 2019-10-30 13:19:08 +01:00
parent b15b68c1c4
commit f6b1a12ecf
6 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h
View File

@ -31,6 +31,20 @@
#define HAL_USE_FSMC TRUE #define HAL_USE_FSMC TRUE
#endif #endif
/**
* @brief Enables the SDRAM subsystem.
*/
#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)
#define HAL_USE_SDRAM TRUE
#endif
/**
* @brief Enables the SRAM subsystem.
*/
#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)
#define HAL_USE_SRAM FALSE
#endif
/** /**
* @brief Enables the NAND subsystem. * @brief Enables the NAND subsystem.
*/ */

3
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c
View File

@ -23,7 +23,6 @@
#include "usbcfg.h" #include "usbcfg.h"
#endif #endif
#include "hal_fsmc_sdram.h"
#include "ili9341.h" #include "ili9341.h"
#include "hal_stm32_ltdc.h" #include "hal_stm32_ltdc.h"
#include "hal_stm32_dma2d.h" #include "hal_stm32_dma2d.h"
@ -557,7 +556,7 @@ int main(void) {
* Initialise FSMC for SDRAM. * Initialise FSMC for SDRAM.
*/ */
sdramInit(); sdramInit();
sdramStart(&SDRAMD, &sdram_cfg); sdramStart(&SDRAMD1, &sdram_cfg);
sdram_bulk_erase(); sdram_bulk_erase();
/* /*

26
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf_community.h
View File

@ -19,6 +19,7 @@
*/ */
#define STM32_FSMC_USE_FSMC1 TRUE #define STM32_FSMC_USE_FSMC1 TRUE
#define STM32_FSMC_FSMC1_IRQ_PRIORITY 10 #define STM32_FSMC_FSMC1_IRQ_PRIORITY 10
#define STM32_FSMC_DMA_CHN 0x03010201
/* /*
* FSMC NAND driver system settings. * FSMC NAND driver system settings.
@ -26,22 +27,23 @@
#define STM32_NAND_USE_NAND1 FALSE #define STM32_NAND_USE_NAND1 FALSE
#define STM32_NAND_USE_NAND2 FALSE #define STM32_NAND_USE_NAND2 FALSE
#define STM32_NAND_USE_EXT_INT FALSE #define STM32_NAND_USE_EXT_INT FALSE
#define STM32_NAND_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
/* #define STM32_NAND_DMA_PRIORITY 0
* FSMC SDRAM driver system settings. #define STM32_NAND_DMA_ERROR_HOOK(nandp) osalSysHalt("DMA failure")
*/
#define STM32_USE_FSMC_SDRAM TRUE
#define STM32_SDRAM_USE_FSMC_SDRAM1 FALSE
#define STM32_SDRAM_USE_FSMC_SDRAM2 TRUE
/* /*
* FSMC SRAM driver system settings. * FSMC SRAM driver system settings.
*/ */
#define STM32_USE_FSMC_SRAM FALSE #define STM32_SRAM_USE_SRAM1 FALSE
#define STM32_SRAM_USE_FSMC_SRAM1 FALSE #define STM32_SRAM_USE_SRAM2 FALSE
#define STM32_SRAM_USE_FSMC_SRAM2 FALSE #define STM32_SRAM_USE_SRAM3 FALSE
#define STM32_SRAM_USE_FSMC_SRAM3 FALSE #define STM32_SRAM_USE_SRAM4 FALSE
#define STM32_SRAM_USE_FSMC_SRAM4 FALSE
/*
* FSMC SDRAM driver system settings.
*/
#define STM32_SDRAM_USE_SDRAM1 FALSE
#define STM32_SDRAM_USE_SDRAM2 TRUE
/* /*
* LTDC driver system settings. * LTDC driver system settings.

2
os/hal/include/hal_sdram.h
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* @file hal_fsmc_sdram.h * @file hal_sdram.h
* @brief SDRAM Driver subsystem low level driver header. * @brief SDRAM Driver subsystem low level driver header.
* *
* @addtogroup SDRAM * @addtogroup SDRAM

2
os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* @file hal_fsmc_sdram.h * @file hal_sdram.h
* @brief SDRAM Driver subsystem low level driver header. * @brief SDRAM Driver subsystem low level driver header.
* *
* @addtogroup SDRAM * @addtogroup SDRAM

1
testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
View File

@ -51,6 +51,7 @@
#if !defined(HAL_USE_NAND) || defined(__DOXYGEN__) #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)
#define HAL_USE_NAND FALSE #define HAL_USE_NAND FALSE
#endif #endif
/** /**
* @brief Enables the 1-wire subsystem. * @brief Enables the 1-wire subsystem.
*/ */