From a9f7f6b74151a3ac4e1e02d3981d722f4d7b0708 Mon Sep 17 00:00:00 2001
From: Jan Thomas <jan.thomas.118@gmail.com>
Date: Wed, 29 Jun 2022 17:12:42 +0200
Subject: [PATCH] Fix Display Build and add timeout to receive
---
.../Core/Inc/GFX_FUNCTIONS.h | 1 +
.../Core/Inc/ST7735.h | 18 +-
.../Core/Src/GFX_FUNCTIONS.c | 6 +-
.../Core/Src/ST7735.c | 523 +++++++++---------
.../F413_Abschluss_Bildschirm/Core/Src/main.c | 4 +-
5 files changed, 283 insertions(+), 269 deletions(-)
diff --git a/slave/F413_Abschluss_Bildschirm/Core/Inc/GFX_FUNCTIONS.h b/slave/F413_Abschluss_Bildschirm/Core/Inc/GFX_FUNCTIONS.h
index 3412add..0874027 100644
--- a/slave/F413_Abschluss_Bildschirm/Core/Inc/GFX_FUNCTIONS.h
+++ b/slave/F413_Abschluss_Bildschirm/Core/Inc/GFX_FUNCTIONS.h
@@ -8,6 +8,7 @@
#ifndef INC_GFX_FUNCTIONS_H_
#define INC_GFX_FUNCTIONS_H_
+#include "stdint.h"
void drawPixel(int16_t x, int16_t y, uint16_t color);
void writeLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint16_t color);
diff --git a/slave/F413_Abschluss_Bildschirm/Core/Inc/ST7735.h b/slave/F413_Abschluss_Bildschirm/Core/Inc/ST7735.h
index 01ba39b..923a1e8 100644
--- a/slave/F413_Abschluss_Bildschirm/Core/Inc/ST7735.h
+++ b/slave/F413_Abschluss_Bildschirm/Core/Inc/ST7735.h
@@ -103,14 +103,14 @@ void ST7735_FillScreen(uint16_t color);
void ST7735_DrawImage(uint16_t x, uint16_t y, uint16_t w, uint16_t h, const uint16_t* data);
void ST7735_InvertColors(bool invert);
-int16_t _width; ///< Display width as modified by current rotation
-int16_t _height; ///< Display height as modified by current rotation
-int16_t cursor_x; ///< x location to start print()ing text
-int16_t cursor_y; ///< y location to start print()ing text
-uint8_t rotation; ///< Display rotation (0 thru 3)
-uint8_t _colstart; ///< Some displays need this changed to offset
-uint8_t _rowstart; ///< Some displays need this changed to offset
-uint8_t _xstart;
-uint8_t _ystart;
+extern int16_t _width; ///< Display width as modified by current rotation
+extern int16_t _height; ///< Display height as modified by current rotation
+extern int16_t cursor_x; ///< x location to start print()ing text
+extern int16_t cursor_y; ///< y location to start print()ing text
+extern uint8_t rotation; ///< Display rotation (0 thru 3)
+extern uint8_t _colstart; ///< Some displays need this changed to offset
+extern uint8_t _rowstart; ///< Some displays need this changed to offset
+extern uint8_t _xstart;
+extern uint8_t _ystart;
#endif // __ST7735_H__
diff --git a/slave/F413_Abschluss_Bildschirm/Core/Src/GFX_FUNCTIONS.c b/slave/F413_Abschluss_Bildschirm/Core/Src/GFX_FUNCTIONS.c
index e75346b..67762cd 100644
--- a/slave/F413_Abschluss_Bildschirm/Core/Src/GFX_FUNCTIONS.c
+++ b/slave/F413_Abschluss_Bildschirm/Core/Src/GFX_FUNCTIONS.c
@@ -4,14 +4,12 @@
* Created on: 30-Oct-2020
* Author: meh
*/
-
-#include <ST7735.h>
-#include "stdint.h"
+#include "ST7735.h"
+#include "GFX_FUNCTIONS.h"
#include "stdlib.h"
-
void drawPixel(int16_t x, int16_t y, uint16_t color)
{
ST7735_DrawPixel(x, y, color);
diff --git a/slave/F413_Abschluss_Bildschirm/Core/Src/ST7735.c b/slave/F413_Abschluss_Bildschirm/Core/Src/ST7735.c
index 5a68f93..c46b103 100644
--- a/slave/F413_Abschluss_Bildschirm/Core/Src/ST7735.c
+++ b/slave/F413_Abschluss_Bildschirm/Core/Src/ST7735.c
@@ -1,338 +1,351 @@
#include <ST7735.h>
-
-
- const uint8_t
- init_cmds1[] = { // Init for 7735R, part 1 (red or green tab)
- 15, // 15 commands in list:
- ST7735_SWRESET, DELAY, // 1: Software reset, 0 args, w/delay
- 150, // 150 ms delay
- ST7735_SLPOUT , DELAY, // 2: Out of sleep mode, 0 args, w/delay
- 255, // 500 ms delay
- ST7735_FRMCTR1, 3 , // 3: Frame rate ctrl - normal mode, 3 args:
- 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
- ST7735_FRMCTR2, 3 , // 4: Frame rate control - idle mode, 3 args:
- 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
- ST7735_FRMCTR3, 6 , // 5: Frame rate ctrl - partial mode, 6 args:
- 0x01, 0x2C, 0x2D, // Dot inversion mode
- 0x01, 0x2C, 0x2D, // Line inversion mode
- ST7735_INVCTR , 1 , // 6: Display inversion ctrl, 1 arg, no delay:
- 0x07, // No inversion
- ST7735_PWCTR1 , 3 , // 7: Power control, 3 args, no delay:
- 0xA2,
- 0x02, // -4.6V
- 0x84, // AUTO mode
- ST7735_PWCTR2 , 1 , // 8: Power control, 1 arg, no delay:
- 0xC5, // VGH25 = 2.4C VGSEL = -10 VGH = 3 * AVDD
- ST7735_PWCTR3 , 2 , // 9: Power control, 2 args, no delay:
- 0x0A, // Opamp current small
- 0x00, // Boost frequency
- ST7735_PWCTR4 , 2 , // 10: Power control, 2 args, no delay:
- 0x8A, // BCLK/2, Opamp current small & Medium low
- 0x2A,
- ST7735_PWCTR5 , 2 , // 11: Power control, 2 args, no delay:
- 0x8A, 0xEE,
- ST7735_VMCTR1 , 1 , // 12: Power control, 1 arg, no delay:
- 0x0E,
- ST7735_INVOFF , 0 , // 13: Don't invert display, no args, no delay
- ST7735_COLMOD , 1 , // 15: set color mode, 1 arg, no delay:
- 0x05 }, // 16-bit color
+int16_t _width;
+int16_t _height;
+int16_t cursor_x;
+int16_t cursor_y;
+uint8_t rotation;
+uint8_t _colstart;
+uint8_t _rowstart;
+uint8_t _xstart;
+uint8_t _ystart;
+
+const uint8_t
+ init_cmds1[] = { // Init for 7735R, part 1 (red or green tab)
+ 15, // 15 commands in list:
+ ST7735_SWRESET, DELAY, // 1: Software reset, 0 args, w/delay
+ 150, // 150 ms delay
+ ST7735_SLPOUT, DELAY, // 2: Out of sleep mode, 0 args, w/delay
+ 255, // 500 ms delay
+ ST7735_FRMCTR1, 3, // 3: Frame rate ctrl - normal mode, 3 args:
+ 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
+ ST7735_FRMCTR2, 3, // 4: Frame rate control - idle mode, 3 args:
+ 0x01, 0x2C, 0x2D, // Rate = fosc/(1x2+40) * (LINE+2C+2D)
+ ST7735_FRMCTR3, 6, // 5: Frame rate ctrl - partial mode, 6 args:
+ 0x01, 0x2C, 0x2D, // Dot inversion mode
+ 0x01, 0x2C, 0x2D, // Line inversion mode
+ ST7735_INVCTR, 1, // 6: Display inversion ctrl, 1 arg, no delay:
+ 0x07, // No inversion
+ ST7735_PWCTR1, 3, // 7: Power control, 3 args, no delay:
+ 0xA2,
+ 0x02, // -4.6V
+ 0x84, // AUTO mode
+ ST7735_PWCTR2, 1, // 8: Power control, 1 arg, no delay:
+ 0xC5, // VGH25 = 2.4C VGSEL = -10 VGH = 3 * AVDD
+ ST7735_PWCTR3, 2, // 9: Power control, 2 args, no delay:
+ 0x0A, // Opamp current small
+ 0x00, // Boost frequency
+ ST7735_PWCTR4, 2, // 10: Power control, 2 args, no delay:
+ 0x8A, // BCLK/2, Opamp current small & Medium low
+ 0x2A,
+ ST7735_PWCTR5, 2, // 11: Power control, 2 args, no delay:
+ 0x8A, 0xEE,
+ ST7735_VMCTR1, 1, // 12: Power control, 1 arg, no delay:
+ 0x0E,
+ ST7735_INVOFF, 0, // 13: Don't invert display, no args, no delay
+ ST7735_COLMOD, 1, // 15: set color mode, 1 arg, no delay:
+ 0x05 }, // 16-bit color
#if (defined(ST7735_IS_128X128) || defined(ST7735_IS_160X128))
- init_cmds2[] = { // Init for 7735R, part 2 (1.44" display)
- 2, // 2 commands in list:
- ST7735_CASET , 4 , // 1: Column addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x7F, // XEND = 127
- ST7735_RASET , 4 , // 2: Row addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x7F }, // XEND = 127
+ init_cmds2[] = { // Init for 7735R, part 2 (1.44" display)
+ 2, // 2 commands in list:
+ ST7735_CASET, 4, // 1: Column addr set, 4 args, no delay:
+ 0x00, 0x00, // XSTART = 0
+ 0x00, 0x7F, // XEND = 127
+ ST7735_RASET, 4, // 2: Row addr set, 4 args, no delay:
+ 0x00, 0x00, // XSTART = 0
+ 0x00, 0x7F }, // XEND = 127
#endif // ST7735_IS_128X128
#ifdef ST7735_IS_160X80
- init_cmds2[] = { // Init for 7735S, part 2 (160x80 display)
- 3, // 3 commands in list:
- ST7735_CASET , 4 , // 1: Column addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x4F, // XEND = 79
- ST7735_RASET , 4 , // 2: Row addr set, 4 args, no delay:
- 0x00, 0x00, // XSTART = 0
- 0x00, 0x9F , // XEND = 159
- ST7735_INVON, 0 }, // 3: Invert colors
+init_cmds2[] = { // Init for 7735S, part 2 (160x80 display)
+ 3, // 3 commands in list:
+ ST7735_CASET , 4 , // 1: Column addr set, 4 args, no delay:
+ 0x00, 0x00, // XSTART = 0
+ 0x00, 0x4F, // XEND = 79
+ ST7735_RASET , 4 , // 2: Row addr set, 4 args, no delay:
+ 0x00, 0x00, // XSTART = 0
+ 0x00, 0x9F , // XEND = 159
+ ST7735_INVON, 0 }, // 3: Invert colors
#endif
- init_cmds3[] = { // Init for 7735R, part 3 (red or green tab)
- 4, // 4 commands in list:
- ST7735_GMCTRP1, 16 , // 1: Magical unicorn dust, 16 args, no delay:
- 0x02, 0x1c, 0x07, 0x12,
- 0x37, 0x32, 0x29, 0x2d,
- 0x29, 0x25, 0x2B, 0x39,
- 0x00, 0x01, 0x03, 0x10,
- ST7735_GMCTRN1, 16 , // 2: Sparkles and rainbows, 16 args, no delay:
- 0x03, 0x1d, 0x07, 0x06,
- 0x2E, 0x2C, 0x29, 0x2D,
- 0x2E, 0x2E, 0x37, 0x3F,
- 0x00, 0x00, 0x02, 0x10,
- ST7735_NORON , DELAY, // 3: Normal display on, no args, w/delay
- 10, // 10 ms delay
- ST7735_DISPON , DELAY, // 4: Main screen turn on, no args w/delay
- 100 }; // 100 ms delay
+ init_cmds3[] = { // Init for 7735R, part 3 (red or green tab)
+ 4, // 4 commands in list:
+ ST7735_GMCTRP1, 16, // 1: Magical unicorn dust, 16 args, no delay:
+ 0x02, 0x1c, 0x07, 0x12,
+ 0x37, 0x32, 0x29, 0x2d,
+ 0x29, 0x25, 0x2B, 0x39,
+ 0x00, 0x01, 0x03, 0x10,
+ ST7735_GMCTRN1, 16, // 2: Sparkles and rainbows, 16 args, no delay:
+ 0x03, 0x1d, 0x07, 0x06,
+ 0x2E, 0x2C, 0x29, 0x2D,
+ 0x2E, 0x2E, 0x37, 0x3F,
+ 0x00, 0x00, 0x02, 0x10,
+ ST7735_NORON, DELAY, // 3: Normal display on, no args, w/delay
+ 10, // 10 ms delay
+ ST7735_DISPON, DELAY, // 4: Main screen turn on, no args w/delay
+ 100 }; // 100 ms delay
void ST7735_Select()
{
- HAL_GPIO_WritePin(CS_PORT, CS_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(CS_PORT, CS_PIN, GPIO_PIN_RESET);
}
void ST7735_Unselect()
{
- HAL_GPIO_WritePin(CS_PORT, CS_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(CS_PORT, CS_PIN, GPIO_PIN_SET);
}
void ST7735_Reset()
{
- HAL_GPIO_WritePin(RST_PORT, RST_PIN, GPIO_PIN_RESET);
- HAL_Delay(5);
- HAL_GPIO_WritePin(RST_PORT, RST_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RST_PORT, RST_PIN, GPIO_PIN_RESET);
+ HAL_Delay(5);
+ HAL_GPIO_WritePin(RST_PORT, RST_PIN, GPIO_PIN_SET);
}
- void ST7735_WriteCommand(uint8_t cmd)
- {
- HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_RESET);
- HAL_SPI_Transmit(&ST7735_SPI_PORT, &cmd, sizeof(cmd), HAL_MAX_DELAY);
+void ST7735_WriteCommand(uint8_t cmd)
+{
+ HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_RESET);
+ HAL_SPI_Transmit(&ST7735_SPI_PORT, &cmd, sizeof(cmd), HAL_MAX_DELAY);
}
void ST7735_WriteData(uint8_t* buff, size_t buff_size)
{
- HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_SET);
- HAL_SPI_Transmit(&ST7735_SPI_PORT, buff, buff_size, HAL_MAX_DELAY);
+ HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_SET);
+ HAL_SPI_Transmit(&ST7735_SPI_PORT, buff, buff_size, HAL_MAX_DELAY);
}
-void DisplayInit(const uint8_t *addr)
+void DisplayInit(const uint8_t* addr)
{
- uint8_t numCommands, numArgs;
- uint16_t ms;
-
- numCommands = *addr++;
- while(numCommands--) {
- uint8_t cmd = *addr++;
- ST7735_WriteCommand(cmd);
-
- numArgs = *addr++;
- // If high bit set, delay follows args
- ms = numArgs & DELAY;
- numArgs &= ~DELAY;
- if(numArgs) {
- ST7735_WriteData((uint8_t*)addr, numArgs);
- addr += numArgs;
- }
-
- if(ms) {
- ms = *addr++;
- if(ms == 255) ms = 500;
- HAL_Delay(ms);
- }
- }
+ uint8_t numCommands, numArgs;
+ uint16_t ms;
+
+ numCommands = *addr++;
+ while (numCommands--) {
+ uint8_t cmd = *addr++;
+ ST7735_WriteCommand(cmd);
+
+ numArgs = *addr++;
+ // If high bit set, delay follows args
+ ms = numArgs & DELAY;
+ numArgs &= ~DELAY;
+ if (numArgs) {
+ ST7735_WriteData((uint8_t*)addr, numArgs);
+ addr += numArgs;
+ }
+
+ if (ms) {
+ ms = *addr++;
+ if (ms==255) ms = 500;
+ HAL_Delay(ms);
+ }
+ }
}
void ST7735_SetAddressWindow(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1)
{
- // column address set
- ST7735_WriteCommand(ST7735_CASET);
- uint8_t data[] = { 0x00, x0 + _xstart, 0x00, x1 + _xstart };
- ST7735_WriteData(data, sizeof(data));
-
- // row address set
- ST7735_WriteCommand(ST7735_RASET);
- data[1] = y0 + _ystart;
- data[3] = y1 + _ystart;
- ST7735_WriteData(data, sizeof(data));
-
- // write to RAM
- ST7735_WriteCommand(ST7735_RAMWR);
+ // column address set
+ ST7735_WriteCommand(ST7735_CASET);
+ uint8_t data[] = { 0x00, x0+_xstart, 0x00, x1+_xstart };
+ ST7735_WriteData(data, sizeof(data));
+
+ // row address set
+ ST7735_WriteCommand(ST7735_RASET);
+ data[1] = y0+_ystart;
+ data[3] = y1+_ystart;
+ ST7735_WriteData(data, sizeof(data));
+
+ // write to RAM
+ ST7735_WriteCommand(ST7735_RAMWR);
}
void ST7735_Init(uint8_t rotation)
{
- ST7735_Select();
- ST7735_Reset();
- DisplayInit(init_cmds1);
- DisplayInit(init_cmds2);
- DisplayInit(init_cmds3);
+ ST7735_Select();
+ ST7735_Reset();
+ DisplayInit(init_cmds1);
+ DisplayInit(init_cmds2);
+ DisplayInit(init_cmds3);
#if ST7735_IS_160X80
- _colstart = 24;
- _rowstart = 0;
+ _colstart = 24;
+ _rowstart = 0;
/***** IF Doesn't work, remove the code below (before #elif) *****/
- uint8_t data = 0xC0;
- ST7735_Select();
- ST7735_WriteCommand(ST7735_MADCTL);
- ST7735_WriteData(&data,1);
- ST7735_Unselect();
+ uint8_t data = 0xC0;
+ ST7735_Select();
+ ST7735_WriteCommand(ST7735_MADCTL);
+ ST7735_WriteData(&data,1);
+ ST7735_Unselect();
#elif ST7735_IS_128X128
- _colstart = 2;
- _rowstart = 3;
+ _colstart = 2;
+ _rowstart = 3;
#else
- _colstart = 0;
- _rowstart = 0;
+ _colstart = 0;
+ _rowstart = 0;
#endif
- ST7735_SetRotation (rotation);
- ST7735_Unselect();
+ ST7735_SetRotation(rotation);
+ ST7735_Unselect();
}
void ST7735_SetRotation(uint8_t m)
{
- uint8_t madctl = 0;
+ uint8_t madctl = 0;
- rotation = m % 4; // can't be higher than 3
+ rotation = m%4; // can't be higher than 3
- switch (rotation)
- {
- case 0:
+ switch (rotation) {
+ case 0:
#if ST7735_IS_160X80
- madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MY | ST7735_MADCTL_BGR;
+ madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MY | ST7735_MADCTL_BGR;
#else
- madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MY | ST7735_MADCTL_RGB;
- _height = ST7735_HEIGHT;
- _width = ST7735_WIDTH;
- _xstart = _colstart;
- _ystart = _rowstart;
+ madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MY | ST7735_MADCTL_RGB;
+ _height = ST7735_HEIGHT;
+ _width = ST7735_WIDTH;
+ _xstart = _colstart;
+ _ystart = _rowstart;
#endif
- break;
- case 1:
+ break;
+ case 1:
#if ST7735_IS_160X80
- madctl = ST7735_MADCTL_MY | ST7735_MADCTL_MV | ST7735_MADCTL_BGR;
+ madctl = ST7735_MADCTL_MY | ST7735_MADCTL_MV | ST7735_MADCTL_BGR;
#else
- madctl = ST7735_MADCTL_MY | ST7735_MADCTL_MV | ST7735_MADCTL_RGB;
- _width = ST7735_HEIGHT;
- _height = ST7735_WIDTH;
- _ystart = _colstart;
- _xstart = _rowstart;
+ madctl = ST7735_MADCTL_MY | ST7735_MADCTL_MV | ST7735_MADCTL_RGB;
+ _width = ST7735_HEIGHT;
+ _height = ST7735_WIDTH;
+ _ystart = _colstart;
+ _xstart = _rowstart;
#endif
- break;
- case 2:
+ break;
+ case 2:
#if ST7735_IS_160X80
- madctl = ST7735_MADCTL_BGR;
+ madctl = ST7735_MADCTL_BGR;
#else
- madctl = ST7735_MADCTL_RGB;
- _height = ST7735_HEIGHT;
- _width = ST7735_WIDTH;
- _xstart = _colstart;
- _ystart = _rowstart;
+ madctl = ST7735_MADCTL_RGB;
+ _height = ST7735_HEIGHT;
+ _width = ST7735_WIDTH;
+ _xstart = _colstart;
+ _ystart = _rowstart;
#endif
- break;
- case 3:
+ break;
+ case 3:
#if ST7735_IS_160X80
- madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MV | ST7735_MADCTL_BGR;
+ madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MV | ST7735_MADCTL_BGR;
#else
- madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MV | ST7735_MADCTL_RGB;
- _width = ST7735_HEIGHT;
- _height = ST7735_WIDTH;
- _ystart = _colstart;
- _xstart = _rowstart;
+ madctl = ST7735_MADCTL_MX | ST7735_MADCTL_MV | ST7735_MADCTL_RGB;
+ _width = ST7735_HEIGHT;
+ _height = ST7735_WIDTH;
+ _ystart = _colstart;
+ _xstart = _rowstart;
#endif
- break;
- }
- ST7735_Select();
- ST7735_WriteCommand(ST7735_MADCTL);
- ST7735_WriteData(&madctl,1);
- ST7735_Unselect();
+ break;
+ }
+ ST7735_Select();
+ ST7735_WriteCommand(ST7735_MADCTL);
+ ST7735_WriteData(&madctl, 1);
+ ST7735_Unselect();
}
-void ST7735_DrawPixel(uint16_t x, uint16_t y, uint16_t color) {
- if((x >= _width) || (y >= _height))
- return;
+void ST7735_DrawPixel(uint16_t x, uint16_t y, uint16_t color)
+{
+ if ((x>=_width) || (y>=_height))
+ return;
- ST7735_Select();
+ ST7735_Select();
- ST7735_SetAddressWindow(x, y, x+1, y+1);
- uint8_t data[] = { color >> 8, color & 0xFF };
- ST7735_WriteData(data, sizeof(data));
+ ST7735_SetAddressWindow(x, y, x+1, y+1);
+ uint8_t data[] = { color >> 8, color & 0xFF };
+ ST7735_WriteData(data, sizeof(data));
- ST7735_Unselect();
+ ST7735_Unselect();
}
-void ST7735_WriteChar(uint16_t x, uint16_t y, char ch, FontDef font, uint16_t color, uint16_t bgcolor) {
- uint32_t i, b, j;
-
- ST7735_SetAddressWindow(x, y, x+font.width-1, y+font.height-1);
-
- for(i = 0; i < font.height; i++) {
- b = font.data[(ch - 32) * font.height + i];
- for(j = 0; j < font.width; j++) {
- if((b << j) & 0x8000) {
- uint8_t data[] = { color >> 8, color & 0xFF };
- ST7735_WriteData(data, sizeof(data));
- } else {
- uint8_t data[] = { bgcolor >> 8, bgcolor & 0xFF };
- ST7735_WriteData(data, sizeof(data));
- }
- }
- }
+void ST7735_WriteChar(uint16_t x, uint16_t y, char ch, FontDef font, uint16_t color, uint16_t bgcolor)
+{
+ uint32_t i, b, j;
+
+ ST7735_SetAddressWindow(x, y, x+font.width-1, y+font.height-1);
+
+ for (i = 0; i<font.height; i++) {
+ b = font.data[(ch-32)*font.height+i];
+ for (j = 0; j<font.width; j++) {
+ if ((b << j) & 0x8000) {
+ uint8_t data[] = { color >> 8, color & 0xFF };
+ ST7735_WriteData(data, sizeof(data));
+ }
+ else {
+ uint8_t data[] = { bgcolor >> 8, bgcolor & 0xFF };
+ ST7735_WriteData(data, sizeof(data));
+ }
+ }
+ }
}
-void ST7735_WriteString(uint16_t x, uint16_t y, const char* str, FontDef font, uint16_t color, uint16_t bgcolor) {
- ST7735_Select();
-
- while(*str) {
- if(x + font.width >= _width) {
- x = 0;
- y += font.height;
- if(y + font.height >= _height) {
- break;
- }
-
- if(*str == ' ') {
- // skip spaces in the beginning of the new line
- str++;
- continue;
- }
- }
-
- ST7735_WriteChar(x, y, *str, font, color, bgcolor);
- x += font.width;
- str++;
- }
-
- ST7735_Unselect();
+void ST7735_WriteString(uint16_t x, uint16_t y, const char* str, FontDef font, uint16_t color, uint16_t bgcolor)
+{
+ ST7735_Select();
+
+ while (*str) {
+ if (x+font.width>=_width) {
+ x = 0;
+ y += font.height;
+ if (y+font.height>=_height) {
+ break;
+ }
+
+ if (*str==' ') {
+ // skip spaces in the beginning of the new line
+ str++;
+ continue;
+ }
+ }
+
+ ST7735_WriteChar(x, y, *str, font, color, bgcolor);
+ x += font.width;
+ str++;
+ }
+
+ ST7735_Unselect();
}
void ST7735_FillRectangle(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color)
{
- if((x >= _width) || (y >= _height)) return;
- if((x + w - 1) >= _width) w = _width - x;
- if((y + h - 1) >= _height) h = _height - y;
-
- ST7735_Select();
- ST7735_SetAddressWindow(x, y, x+w-1, y+h-1);
-
- uint8_t data[] = { color >> 8, color & 0xFF };
- HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_SET);
- for(y = h; y > 0; y--) {
- for(x = w; x > 0; x--) {
- HAL_SPI_Transmit(&ST7735_SPI_PORT, data, sizeof(data), HAL_MAX_DELAY);
- }
- }
-
- ST7735_Unselect();
+ if ((x>=_width) || (y>=_height)) return;
+ if ((x+w-1)>=_width) w = _width-x;
+ if ((y+h-1)>=_height) h = _height-y;
+
+ ST7735_Select();
+ ST7735_SetAddressWindow(x, y, x+w-1, y+h-1);
+
+ uint8_t data[] = { color >> 8, color & 0xFF };
+ HAL_GPIO_WritePin(DC_PORT, DC_PIN, GPIO_PIN_SET);
+ for (y = h; y>0; y--) {
+ for (x = w; x>0; x--) {
+ HAL_SPI_Transmit(&ST7735_SPI_PORT, data, sizeof(data), HAL_MAX_DELAY);
+ }
+ }
+
+ ST7735_Unselect();
}
-void ST7735_DrawImage(uint16_t x, uint16_t y, uint16_t w, uint16_t h, const uint16_t* data) {
- if((x >= _width) || (y >= _height)) return;
- if((x + w - 1) >= _width) return;
- if((y + h - 1) >= _height) return;
-
- ST7735_Select();
- ST7735_SetAddressWindow(x, y, x+w-1, y+h-1);
- ST7735_WriteData((uint8_t*)data, sizeof(uint16_t)*w*h);
- ST7735_Unselect();
+void ST7735_DrawImage(uint16_t x, uint16_t y, uint16_t w, uint16_t h, const uint16_t* data)
+{
+ if ((x>=_width) || (y>=_height)) return;
+ if ((x+w-1)>=_width) return;
+ if ((y+h-1)>=_height) return;
+
+ ST7735_Select();
+ ST7735_SetAddressWindow(x, y, x+w-1, y+h-1);
+ ST7735_WriteData((uint8_t*)data, sizeof(uint16_t)*w*h);
+ ST7735_Unselect();
}
-void ST7735_InvertColors(bool invert) {
- ST7735_Select();
- ST7735_WriteCommand(invert ? ST7735_INVON : ST7735_INVOFF);
- ST7735_Unselect();
+void ST7735_InvertColors(bool invert)
+{
+ ST7735_Select();
+ ST7735_WriteCommand(invert ? ST7735_INVON : ST7735_INVOFF);
+ ST7735_Unselect();
}
diff --git a/slave/F413_Abschluss_Bildschirm/Core/Src/main.c b/slave/F413_Abschluss_Bildschirm/Core/Src/main.c
index 632e5cd..3d4f247 100644
--- a/slave/F413_Abschluss_Bildschirm/Core/Src/main.c
+++ b/slave/F413_Abschluss_Bildschirm/Core/Src/main.c
@@ -154,7 +154,9 @@ int main(void)
/* Infinite loop */
/* USER CODE BEGIN WHILE */
while (1) {
- HAL_SPI_Receive(&hspi1, &measurement, sizeof(measurement), HAL_MAX_DELAY);
+ // Low Timeout to ensure we always read the data from one transfer.
+ // Otherwise, we could ready the latter half of one transfer and the first half of the next
+ HAL_SPI_Receive(&hspi1, &measurement, sizeof(measurement), 500);
print_to_Display();
/* USER CODE END WHILE */
--
GitLab