George Sanger / BSP_DISCO_F429ZI_bug_fix

Simple Bug fix

Utilities/Fonts/fonts.h@1:2371382139dd, 2017-05-16 (annotated)

Committer:
Jerome Coutant
Date:
Tue May 16 10:50:25 2017 +0200
Revision:
1:2371382139dd
STM32Cube_FW__ BSP_DISCO_F429ZI

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Jerome Coutant 1:2371382139dd 1 /**
Jerome Coutant 1:2371382139dd 2 ******************************************************************************
Jerome Coutant 1:2371382139dd 3 * @file fonts.h
Jerome Coutant 1:2371382139dd 4 * @author MCD Application Team
Jerome Coutant 1:2371382139dd 5 * @version V1.0.0
Jerome Coutant 1:2371382139dd 6 * @date 18-February-2014
Jerome Coutant 1:2371382139dd 7 * @brief Header for fonts.c file
Jerome Coutant 1:2371382139dd 8 ******************************************************************************
Jerome Coutant 1:2371382139dd 9 * @attention
Jerome Coutant 1:2371382139dd 10 *
Jerome Coutant 1:2371382139dd 11 * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
Jerome Coutant 1:2371382139dd 12 *
Jerome Coutant 1:2371382139dd 13 * Redistribution and use in source and binary forms, with or without modification,
Jerome Coutant 1:2371382139dd 14 * are permitted provided that the following conditions are met:
Jerome Coutant 1:2371382139dd 15 * 1. Redistributions of source code must retain the above copyright notice,
Jerome Coutant 1:2371382139dd 16 * this list of conditions and the following disclaimer.
Jerome Coutant 1:2371382139dd 17 * 2. Redistributions in binary form must reproduce the above copyright notice,
Jerome Coutant 1:2371382139dd 18 * this list of conditions and the following disclaimer in the documentation
Jerome Coutant 1:2371382139dd 19 * and/or other materials provided with the distribution.
Jerome Coutant 1:2371382139dd 20 * 3. Neither the name of STMicroelectronics nor the names of its contributors
Jerome Coutant 1:2371382139dd 21 * may be used to endorse or promote products derived from this software
Jerome Coutant 1:2371382139dd 22 * without specific prior written permission.
Jerome Coutant 1:2371382139dd 23 *
Jerome Coutant 1:2371382139dd 24 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
Jerome Coutant 1:2371382139dd 25 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Jerome Coutant 1:2371382139dd 26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
Jerome Coutant 1:2371382139dd 27 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
Jerome Coutant 1:2371382139dd 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
Jerome Coutant 1:2371382139dd 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
Jerome Coutant 1:2371382139dd 30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
Jerome Coutant 1:2371382139dd 31 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
Jerome Coutant 1:2371382139dd 32 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
Jerome Coutant 1:2371382139dd 33 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Jerome Coutant 1:2371382139dd 34 *
Jerome Coutant 1:2371382139dd 35 ******************************************************************************
Jerome Coutant 1:2371382139dd 36 */
Jerome Coutant 1:2371382139dd 37
Jerome Coutant 1:2371382139dd 38 /* Define to prevent recursive inclusion -------------------------------------*/
Jerome Coutant 1:2371382139dd 39 #ifndef __FONTS_H
Jerome Coutant 1:2371382139dd 40 #define __FONTS_H
Jerome Coutant 1:2371382139dd 41
Jerome Coutant 1:2371382139dd 42 #ifdef __cplusplus
Jerome Coutant 1:2371382139dd 43 extern "C" {
Jerome Coutant 1:2371382139dd 44 #endif
Jerome Coutant 1:2371382139dd 45
Jerome Coutant 1:2371382139dd 46 /* Includes ------------------------------------------------------------------*/
Jerome Coutant 1:2371382139dd 47 #include <stdint.h>
Jerome Coutant 1:2371382139dd 48
Jerome Coutant 1:2371382139dd 49 /** @addtogroup Utilities
Jerome Coutant 1:2371382139dd 50 * @{
Jerome Coutant 1:2371382139dd 51 */
Jerome Coutant 1:2371382139dd 52
Jerome Coutant 1:2371382139dd 53 /** @addtogroup STM32_EVAL
Jerome Coutant 1:2371382139dd 54 * @{
Jerome Coutant 1:2371382139dd 55 */
Jerome Coutant 1:2371382139dd 56
Jerome Coutant 1:2371382139dd 57 /** @addtogroup Common
Jerome Coutant 1:2371382139dd 58 * @{
Jerome Coutant 1:2371382139dd 59 */
Jerome Coutant 1:2371382139dd 60
Jerome Coutant 1:2371382139dd 61 /** @addtogroup FONTS
Jerome Coutant 1:2371382139dd 62 * @{
Jerome Coutant 1:2371382139dd 63 */
Jerome Coutant 1:2371382139dd 64
Jerome Coutant 1:2371382139dd 65 /** @defgroup FONTS_Exported_Types
Jerome Coutant 1:2371382139dd 66 * @{
Jerome Coutant 1:2371382139dd 67 */
Jerome Coutant 1:2371382139dd 68 typedef struct _tFont
Jerome Coutant 1:2371382139dd 69 {
Jerome Coutant 1:2371382139dd 70 const uint8_t *table;
Jerome Coutant 1:2371382139dd 71 uint16_t Width;
Jerome Coutant 1:2371382139dd 72 uint16_t Height;
Jerome Coutant 1:2371382139dd 73
Jerome Coutant 1:2371382139dd 74 } sFONT;
Jerome Coutant 1:2371382139dd 75
Jerome Coutant 1:2371382139dd 76 extern sFONT Font24;
Jerome Coutant 1:2371382139dd 77 extern sFONT Font20;
Jerome Coutant 1:2371382139dd 78 extern sFONT Font16;
Jerome Coutant 1:2371382139dd 79 extern sFONT Font12;
Jerome Coutant 1:2371382139dd 80 extern sFONT Font8;
Jerome Coutant 1:2371382139dd 81 /**
Jerome Coutant 1:2371382139dd 82 * @}
Jerome Coutant 1:2371382139dd 83 */
Jerome Coutant 1:2371382139dd 84
Jerome Coutant 1:2371382139dd 85 /** @defgroup FONTS_Exported_Constants
Jerome Coutant 1:2371382139dd 86 * @{
Jerome Coutant 1:2371382139dd 87 */
Jerome Coutant 1:2371382139dd 88 #define LINE(x) ((x) * (((sFONT *)BSP_LCD_GetFont())->Height))
Jerome Coutant 1:2371382139dd 89
Jerome Coutant 1:2371382139dd 90 /**
Jerome Coutant 1:2371382139dd 91 * @}
Jerome Coutant 1:2371382139dd 92 */
Jerome Coutant 1:2371382139dd 93
Jerome Coutant 1:2371382139dd 94 /** @defgroup FONTS_Exported_Macros
Jerome Coutant 1:2371382139dd 95 * @{
Jerome Coutant 1:2371382139dd 96 */
Jerome Coutant 1:2371382139dd 97 /**
Jerome Coutant 1:2371382139dd 98 * @}
Jerome Coutant 1:2371382139dd 99 */
Jerome Coutant 1:2371382139dd 100
Jerome Coutant 1:2371382139dd 101 /** @defgroup FONTS_Exported_Functions
Jerome Coutant 1:2371382139dd 102 * @{
Jerome Coutant 1:2371382139dd 103 */
Jerome Coutant 1:2371382139dd 104 /**
Jerome Coutant 1:2371382139dd 105 * @}
Jerome Coutant 1:2371382139dd 106 */
Jerome Coutant 1:2371382139dd 107
Jerome Coutant 1:2371382139dd 108 #ifdef __cplusplus
Jerome Coutant 1:2371382139dd 109 }
Jerome Coutant 1:2371382139dd 110 #endif
Jerome Coutant 1:2371382139dd 111
Jerome Coutant 1:2371382139dd 112 #endif /* __FONTS_H */
Jerome Coutant 1:2371382139dd 113
Jerome Coutant 1:2371382139dd 114 /**
Jerome Coutant 1:2371382139dd 115 * @}
Jerome Coutant 1:2371382139dd 116 */
Jerome Coutant 1:2371382139dd 117
Jerome Coutant 1:2371382139dd 118 /**
Jerome Coutant 1:2371382139dd 119 * @}
Jerome Coutant 1:2371382139dd 120 */
Jerome Coutant 1:2371382139dd 121
Jerome Coutant 1:2371382139dd 122 /**
Jerome Coutant 1:2371382139dd 123 * @}
Jerome Coutant 1:2371382139dd 124 */
Jerome Coutant 1:2371382139dd 125
Jerome Coutant 1:2371382139dd 126 /**
Jerome Coutant 1:2371382139dd 127 * @}
Jerome Coutant 1:2371382139dd 128 */
Jerome Coutant 1:2371382139dd 129
Jerome Coutant 1:2371382139dd 130 /**
Jerome Coutant 1:2371382139dd 131 * @}
Jerome Coutant 1:2371382139dd 132 */
Jerome Coutant 1:2371382139dd 133
Jerome Coutant 1:2371382139dd 134 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/