Revision 4:3cdfcc4f7c9d, committed 2018-02-28

Comitter:

Jerome Coutant

Date:

Wed Feb 28 13:17:15 2018 +0100

Parent:

2:123b894b49dd

Commit message:

STM32Cube_FW_F4_V1.19.0 BSP_DISCO_F469NI

Changed in this revision

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/Components/cs43l22/cs43l22.c
--- a/Drivers/BSP/Components/cs43l22/cs43l22.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/Components/cs43l22/cs43l22.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    cs43l22.c
   * @author  MCD Application Team
-  * @version V2.0.2
-  * @date    06-October-2015
   * @brief   This file provides the CS43L22 Audio Codec driver.   
   ******************************************************************************
   * @attention
@@ -63,7 +61,7 @@
 /** @defgroup CS43L22_Private_Defines
   * @{
   */
-#define VOLUME_CONVERT(Volume)    (((Volume) > 100)? 100:((uint8_t)(((Volume) * 255) / 100)))  
+#define VOLUME_CONVERT(Volume)    (((Volume) > 100)? 255:((uint8_t)(((Volume) * 255) / 100)))  
 /* Uncomment this line to enable verifying data sent to codec after each write 
    operation (for debug purpose) */
 #if !defined (VERIFY_WRITTENDATA)  
@@ -339,7 +337,8 @@
   * @brief Sets higher or lower the codec volume level.
   * @param DeviceAddr: Device address on communication Bus.   
   * @param Volume: a byte value from 0 to 255 (refer to codec registers 
-  *         description for more details).
+  *                description for more details).
+  *         
   * @retval 0 if correct communication, else wrong communication
   */
 uint32_t cs43l22_SetVolume(uint16_t DeviceAddr, uint8_t Volume)
@@ -347,7 +346,7 @@
   uint32_t counter = 0;
   uint8_t convertedvol = VOLUME_CONVERT(Volume);
 
-  if(Volume > 0xE6)
+  if(convertedvol > 0xE6)
   {
     /* Set the Master volume */
     counter += CODEC_IO_Write(DeviceAddr, CS43L22_REG_MASTER_A_VOL, convertedvol - 0xE7); 

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/Components/cs43l22/cs43l22.h
--- a/Drivers/BSP/Components/cs43l22/cs43l22.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/Components/cs43l22/cs43l22.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    cs43l22.h
   * @author  MCD Application Team
-  * @version V2.0.2
-  * @date    06-October-2015
   * @brief   This file contains all the functions prototypes for the cs43l22.c driver.
   ******************************************************************************
   * @attention

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file provides a set of firmware functions to manage LEDs,
   *          push-buttons, external SDRAM, external QSPI Flash, RF EEPROM,
   *          available on STM32469I-Discovery
@@ -64,11 +62,11 @@
   * @{
   */
 /**
- * @brief STM32469I Discovery BSP Driver version number V2.0.0
+ * @brief STM32469I Discovery BSP Driver version number V2.0.1
    */
 #define __STM32469I_DISCOVERY_BSP_VERSION_MAIN   (0x02) /*!< [31:24] main version */
 #define __STM32469I_DISCOVERY_BSP_VERSION_SUB1   (0x00) /*!< [23:16] sub1 version */
-#define __STM32469I_DISCOVERY_BSP_VERSION_SUB2   (0x00) /*!< [15:8]  sub2 version */
+#define __STM32469I_DISCOVERY_BSP_VERSION_SUB2   (0x01) /*!< [15:8]  sub2 version */
 #define __STM32469I_DISCOVERY_BSP_VERSION_RC     (0x00) /*!< [7:0]  release candidate */
 #define __STM32469I_DISCOVERY_BSP_VERSION        ((__STM32469I_DISCOVERY_BSP_VERSION_MAIN << 24)\
                                                  |(__STM32469I_DISCOVERY_BSP_VERSION_SUB1 << 16)\

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains definitions for STM32469I-Discovery LEDs,
   *          push-buttons hardware resources.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_eeprom.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file provides a set of functions needed to manage an I2C M24LR64 
   *          EEPROM memory.
   *          To be able to use this driver, the switch EE_M24LR64 must be defined

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_eeprom.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_eeprom.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains all the functions prototypes for
   *          the stm32469i_discovery_eeprom.c firmware driver.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_lcd.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file includes the driver for Liquid Crystal Display (LCD) module
   *          mounted on STM32469I-Discovery evaluation board.
   ******************************************************************************
@@ -1051,19 +1049,16 @@
   uint32_t InputColorMode = 0;
 
   /* Get bitmap data address offset */
-  index = *(__IO uint16_t *) (pbmp + 10);
-  index |= (*(__IO uint16_t *) (pbmp + 12)) << 16;
+  index = pbmp[10] + (pbmp[11] << 8) + (pbmp[12] << 16)  + (pbmp[13] << 24);
 
   /* Read bitmap width */
-  width = *(uint16_t *) (pbmp + 18);
-  width |= (*(uint16_t *) (pbmp + 20)) << 16;
+  width = pbmp[18] + (pbmp[19] << 8) + (pbmp[20] << 16)  + (pbmp[21] << 24);
 
   /* Read bitmap height */
-  height = *(uint16_t *) (pbmp + 22);
-  height |= (*(uint16_t *) (pbmp + 24)) << 16;
+  height = pbmp[22] + (pbmp[23] << 8) + (pbmp[24] << 16)  + (pbmp[25] << 24);
 
   /* Read bit/pixel */
-  bit_pixel = *(uint16_t *) (pbmp + 28);
+  bit_pixel = pbmp[28] + (pbmp[29] << 8);
 
   /* Set the address */
   Address = hltdc_eval.LayerCfg[ActiveLayer].FBStartAdress + (((BSP_LCD_GetXSize()*Ypos) + Xpos)*(4));

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_lcd.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_lcd.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains the common defines and functions prototypes for
   *          the stm32469i_discovery_lcd.c driver.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_qspi.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file includes a standard driver for the N25Q128A QSPI
   *          memory mounted on STM32469I-Discovery board.
   @verbatim

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_qspi.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_qspi.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains the common defines and functions prototypes for
   *          the stm32469i_discovery_qspi.c driver.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_sd.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file includes the uSD card driver mounted on STM32469I-Discovery
   *          board.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sd.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_sd.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains the common defines and functions prototypes for
   *          the stm32469i_discovery_sd.c driver.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_sdram.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file includes the SDRAM driver for the MT48LC4M32B2B5-7 memory
   *          device mounted on STM32469I-Discovery board.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_sdram.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_sdram.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains the common defines and functions prototypes for
   *          the stm32469i_discovery_sdram.c driver.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.c
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.c	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.c	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_ts.c
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file provides a set of functions needed to manage the Touch
   *          Screen on STM32469I-Discovery board.
   ******************************************************************************

diff -r 123b894b49dd -r 3cdfcc4f7c9d Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.h
--- a/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.h	Tue May 16 10:50:26 2017 +0200
+++ b/Drivers/BSP/STM32469I-Discovery/stm32469i_discovery_ts.h	Wed Feb 28 13:17:15 2018 +0100
@@ -2,8 +2,6 @@
   ******************************************************************************
   * @file    stm32469i_discovery_ts.h
   * @author  MCD Application Team
-  * @version V2.0.0
-  * @date    27-January-2017
   * @brief   This file contains the common defines and functions prototypes for
   *          the stm32469i_discovery_ts.c driver.
   ******************************************************************************