Skip to content

Commit a7b74ae

Browse files
committed
Release v1.12.0
1 parent 8b26821 commit a7b74ae

File tree

13,929 files changed

+1067686
-502129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,929 files changed

+1067686
-502129
lines changed

Drivers/BSP/Adafruit_Shield/Release_Notes.html

Lines changed: 425 additions & 8 deletions
Large diffs are not rendered by default.

Drivers/BSP/Adafruit_Shield/stm32_adafruit_lcd.c

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
******************************************************************************
33
* @file stm32_adafruit_lcd.c
44
* @author MCD Application Team
5-
* @version V2.0.1
6-
* @date 04-November-2015
75
* @brief This file includes the driver for Liquid Crystal Display (LCD) module
86
* mounted on the Adafruit 1.8" TFT LCD shield (reference ID 802),
97
* that is used with the STM32 Nucleo board through SPI interface.
108
******************************************************************************
119
* @attention
1210
*
13-
* <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
11+
* <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
1412
*
1513
* Redistribution and use in source and binary forms, with or without modification,
1614
* are permitted provided that the following conditions are met:
@@ -59,6 +57,16 @@
5957
on LCD using a set of functions.
6058
6159
------------------------------------------------------------------------------*/
60+
61+
/* Dependencies
62+
- st7735.c
63+
- fonts.h
64+
- font24.c
65+
- font20.c
66+
- font16.c
67+
- font12.c
68+
- font8.c"
69+
EndDependencies */
6270

6371
/* Includes ------------------------------------------------------------------*/
6472
#include "stm32_adafruit_lcd.h"
@@ -660,15 +668,14 @@ void BSP_LCD_DrawEllipse(int Xpos, int Ypos, int XRadius, int YRadius)
660668
*/
661669
void BSP_LCD_DrawBitmap(uint16_t Xpos, uint16_t Ypos, uint8_t *pBmp)
662670
{
663-
uint32_t height = 0, width = 0;
671+
uint32_t height = 0;
672+
uint32_t width = 0;
664673

665674
/* Read bitmap width */
666-
width = *(uint16_t *) (pBmp + 18);
667-
width |= (*(uint16_t *) (pBmp + 20)) << 16;
668-
675+
width = pBmp[18] + (pBmp[19] << 8) + (pBmp[20] << 16) + (pBmp[21] << 24);
676+
669677
/* Read bitmap height */
670-
height = *(uint16_t *) (pBmp + 22);
671-
height |= (*(uint16_t *) (pBmp + 24)) << 16;
678+
height = pBmp[22] + (pBmp[23] << 8) + (pBmp[24] << 16) + (pBmp[25] << 24);
672679

673680
/* Remap Ypos, st7735 works with inverted X in case of bitmap */
674681
/* X = 0, cursor is on Top corner */

Drivers/BSP/Adafruit_Shield/stm32_adafruit_lcd.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
******************************************************************************
33
* @file stm32_adafruit_lcd.h
44
* @author MCD Application Team
5-
* @version V2.0.1
6-
* @date 04-November-2015
75
* @brief This file contains the common defines and functions prototypes for
86
* the stm32_adafruit_lcd.c driver.
97
******************************************************************************
108
* @attention
119
*
12-
* <h2><center>&copy; COPYRIGHT(c) 2015 STMicroelectronics</center></h2>
10+
* <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
1311
*
1412
* Redistribution and use in source and binary forms, with or without modification,
1513
* are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)