Skip to content

Make LCD/SPI/USART units compatible to the Nuclei SDK #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gsauthof wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make LCD/SPI/USART units compatible to the Nuclei SDK #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c66ae84
Use more specific headers, add missing ones
gsauthof Apr 30, 2022
871d403
support line-feed and refactor to switch-case
gsauthof Apr 30, 2022
277c70e
Save a few data bytes by using initializer lists
gsauthof Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 39 additions & 43 deletions Lcd/src/lcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@

extern "C"
{
#include "gd32vf103.h"
#include <gd32vf103_rcu.h>
#include <gd32vf103_gpio.h>
}

#include "delay.h"
#include "spi.h"
#include "lcd.h"

struct LcdCmdData
{
uint8_t _cmd ;
uint8_t _size ;
uint8_t _data[16] ; // max size
} ;

Lcd::Lcd(Spi &spi, const uint8_t *font, uint8_t fontHeight, uint8_t fontWidth)
// LCD: B0 RS, B1 RST, B2 CS
Expand Down Expand Up @@ -46,43 +41,43 @@ void Lcd::setup()
// Display Inversion On
cmd(0x21) ;
// Frame Rate Control (In normal mode/ Full colors)
cmd({0xb1, 3, { 0x05, 0x3a, 0x3a } }) ;
cmd(0xb1, { 0x05, 0x3a, 0x3a } ) ;
// Frame Rate Control (In Idle mode/ 8-colors)
cmd({0xb2, 3, { 0x05, 0x3a, 0x3a } }) ;
cmd(0xb2, { 0x05, 0x3a, 0x3a } ) ;
// Frame Rate Control (In Partial mode/ full colors)
cmd({0xB3, 6, { 0x05, 0x3A, 0x3A, 0x05, 0x3A, 0x3A } }) ;
cmd(0xB3, { 0x05, 0x3A, 0x3A, 0x05, 0x3A, 0x3A } ) ;
// Display Inversion Control
cmd({0xB4, 1, { 0x03 } }) ;
cmd(0xB4, { 0x03 } ) ;
// Power Control 1
cmd({0xC0, 3, { 0x62, 0x02, 0x04} }) ;
cmd(0xC0, { 0x62, 0x02, 0x04} ) ;
// Power Control 2
cmd({0xC1, 1, { 0xC0 } }) ;
cmd(0xC1, { 0xC0 } ) ;
// Power Control 3 (in Normal mode/ Full colors)
cmd({0xC2, 2, { 0x0D, 0x00 } }) ;
cmd(0xC2, { 0x0D, 0x00 } ) ;
// Power Control 4 (in Idle mode/ 8-colors)
cmd({0xC3, 2, { 0x8D, 0x6A } }) ;
cmd(0xC3, { 0x8D, 0x6A } ) ;
// Power Control 5 (in Partial mode/ full-colors)
cmd({0xC4, 2, { 0x8D, 0xEE } }) ;
cmd(0xC4, { 0x8D, 0xEE } ) ;
// VCOM Control 1
cmd({0xC5, 1, { 0x0E } }) ;
cmd(0xC5, { 0x0E } ) ;
// Gamma (‘+’polarity) Correction Characteristics Setting
cmd({0xE0, 16, { 0x10, 0x0E, 0x02, 0x03, 0x0E, 0x07, 0x02, 0x07, 0x0A, 0x12, 0x27, 0x37, 0x00, 0x0D, 0x0E, 0x10 } }) ;
cmd(0xE0, { 0x10, 0x0E, 0x02, 0x03, 0x0E, 0x07, 0x02, 0x07, 0x0A, 0x12, 0x27, 0x37, 0x00, 0x0D, 0x0E, 0x10 } ) ;
// Gamma ‘-’polarity Correction Characteristics Setting
cmd({0xE1, 16, { 0x10, 0x0E, 0x03, 0x03, 0x0F, 0x06, 0x02, 0x08, 0x0A, 0x13, 0x26, 0x36, 0x00, 0x0D, 0x0E, 0x10 } }) ;
cmd(0xE1, { 0x10, 0x0E, 0x03, 0x03, 0x0F, 0x06, 0x02, 0x08, 0x0A, 0x13, 0x26, 0x36, 0x00, 0x0D, 0x0E, 0x10 } ) ;
// Interface Pixel Format
cmd({0x3A, 1, { 0x06 } }) ; // 18 bit/pixel
cmd(0x3A, { 0x06 } ) ; // 18 bit/pixel
// Memory Data Access Control
cmd({0x36, 1, { 0xa8 } }) ; // orientation 08, c8, 78, a8
cmd(0x36, { 0xa8 } ) ; // orientation 08, c8, 78, a8
// Display On
cmd(0x29) ;
}

void Lcd::fill(uint8_t x1, uint8_t x2, uint8_t y1, uint8_t y2, uint32_t rgb)
{
// Column Address Set
cmd({0x2a, 4, { 0x00, 1+x1, 0x00, 1+x2 } }) ; // x-offset 1
cmd(0x2a, { 0x00, uint8_t(1+x1), 0x00, uint8_t(1+x2) } ) ; // x-offset 1
// Row Address Set
cmd({0x2b, 4, { 0x00, 26+y1, 0x00, 26+y2 } }) ; // y-offset 26
cmd(0x2b, { 0x00, uint8_t(26+y1), 0x00, uint8_t(26+y2) } ) ; // y-offset 26
// Memory Write
cmd(0x2c) ;

Expand Down Expand Up @@ -118,8 +113,8 @@ void Lcd::putChar(char ch)
uint8_t x = (uint8_t)_txtPosX + 1 ; // x-offset 1
uint8_t y = (uint8_t)_txtPosY + 26 ; // y-offset 26
_txtPosX += _fontWidth ;
cmd({0x2a, 4, { 0x00, x+0, 0x00, x+_fontWidth -1 } }) ;
cmd({0x2b, 4, { 0x00, y+0, 0x00, y+_fontHeight-1 } }) ;
cmd(0x2a, { 0x00, uint8_t(x+0), 0x00, uint8_t(x+_fontWidth -1) } ) ;
cmd(0x2b, { 0x00, uint8_t(y+0), 0x00, uint8_t(y+_fontHeight-1) } ) ;

// Memory Write
cmd(0x2c) ;
Expand Down Expand Up @@ -149,20 +144,21 @@ void Lcd::putChar(char ch)
}
else
{
if (ch == 0x0a) // LF
{
_txtPosX = _txtAreaXmin ;
_txtPosY += _fontHeight ;
if ((_txtPosY + _fontHeight) > _txtAreaYmax+1)
_txtPosY = _txtAreaYmin ;
return ;
}
if (ch == 0x0c) // FF
{
_txtPosX = _txtAreaXmin ;
_txtPosY = _txtAreaYmin ;
fill(_txtAreaXmin, _txtAreaXmax, _txtAreaYmin, _txtAreaYmax, _txtBg) ;
return ;
switch (ch) {
case '\n': // 0x0a // LF
_txtPosX = _txtAreaXmin ;
_txtPosY += _fontHeight ;
if (_txtPosY + _fontHeight > _txtAreaYmax+1)
_txtPosY = _txtAreaYmin ;
break;
case '\f': // 0x0c // FF
_txtPosX = _txtAreaXmin ;
_txtPosY = _txtAreaYmin ;
fill(_txtAreaXmin, _txtAreaXmax, _txtAreaYmin, _txtAreaYmax, _txtBg) ;
break;
case '\r': // 0x0d // CR
_txtPosX = _txtAreaXmin ;
break;
}
}
}
Expand Down Expand Up @@ -223,17 +219,17 @@ void Lcd::data(uint8_t data)
csHi() ;
}

void Lcd::cmd(const LcdCmdData &cmdData)
void Lcd::cmd(uint8_t cmd, std::initializer_list<uint8_t> data)
{
csLo() ;

rsLo() ;
_spi.putByte(cmdData._cmd) ;
_spi.putByte(cmd) ;
while (_spi.isTransmit()) ;

rsHi() ;
for (uint8_t i = 0 ; i < cmdData._size ; ++i)
_spi.putByte(cmdData._data[i]) ;
for (uint8_t x : data)
_spi.putByte(x) ;
while (_spi.isTransmit()) ;

csHi() ;
Expand Down
9 changes: 7 additions & 2 deletions Lcd/src/lcd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@

#pragma once

class LcdCmdData ;
#include <stdint.h>
#include <initializer_list>


// LCD library for the Sitronix ST7735S controller
// cf. https://dl.sipeed.com/fileList/LONGAN/Nano/HDK/driver%20chip%20ST7735S_V1.5_20150303.pdf
// https://www.mipi.org/specifications/display-command-set
class Lcd
{
public:
Expand All @@ -29,7 +34,7 @@ class Lcd

void cmd(uint8_t cmd) ;
void data(uint8_t data) ;
void cmd(const LcdCmdData &cmdData) ;
void cmd(uint8_t cmd, std::initializer_list<uint8_t> data) ;

Spi &_spi ;
rcu_periph_enum _rcuGpio ;
Expand Down
4 changes: 3 additions & 1 deletion Lcd/src/spi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

extern "C"
{
#include "gd32vf103.h"
#include <gd32vf103_rcu.h>
#include <gd32vf103_gpio.h>
#include <gd32vf103_spi.h>
}

#include "spi.h"
Expand Down
2 changes: 2 additions & 0 deletions Lcd/src/spi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#pragma once

#include <stdint.h>

class Spi
{
protected:
Expand Down
3 changes: 2 additions & 1 deletion Usart/src/usart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

extern "C"
{
#include "gd32vf103.h"
#include <gd32vf103_gpio.h>
#include <gd32vf103_usart.h>
}

#include "usart.h"
Expand Down
2 changes: 2 additions & 0 deletions Usart/src/usart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#pragma once

#include <gd32vf103_rcu.h>

class Usart
{
protected:
Expand Down