Skip to content
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

Jump to bottom

pico: generic st7789 rotation config #844

Merged
merged 1 commit into from
Feb 23, 2024
Merged

pico: generic st7789 rotation config #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions 32blit-pico/board/display_pack/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#define DISPLAY_HEIGHT 135
#define LCD_ROTATION 90

#define LED_INVERTED
#define LED_R_PIN 6
Expand Down
1 change: 1 addition & 0 deletions 32blit-pico/board/display_pack_2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#define DISPLAY_WIDTH 320
#define LCD_ROTATION 90

#define LED_INVERTED
#define LED_R_PIN 6
Expand Down
2 changes: 1 addition & 1 deletion 32blit-pico/board/tufty2040/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


#define ST7789_8BIT
#define ST7789_ROTATE_180
#define LCD_ROTATION 270
#define LCD_CS_PIN 10
#define LCD_DC_PIN 11
#define LCD_SCK_PIN 12 // WR
Expand Down
4 changes: 4 additions & 0 deletions 32blit-pico/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
#define LCD_BACKLIGHT_PIN 20
#endif

#ifndef LCD_ROTATION
#define LCD_ROTATION 0
#endif

#ifndef OVERCLOCK_250
#define OVERCLOCK_250 1
#endif
Expand Down
28 changes: 13 additions & 15 deletions 32blit-pico/st7789.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,25 @@
namespace st7789 {

enum MADCTL : uint8_t {
ROW_ORDER = 0b10000000,
COL_ORDER = 0b01000000,
// writing to internal memory
ROW_ORDER = 0b10000000, // MY / y flip
COL_ORDER = 0b01000000, // MX / x flip
SWAP_XY = 0b00100000, // AKA "MV"

// scanning out from internal memory
SCAN_ORDER = 0b00010000,
RGB = 0b00001000,
HORIZ_ORDER = 0b00000100
};

#define ROT_240_240_0 0
#define ROT_240_240_90 MADCTL::SWAP_XY | MADCTL::HORIZ_ORDER | MADCTL::COL_ORDER
#define ROT_240_240_180 MADCTL::SCAN_ORDER | MADCTL::HORIZ_ORDER | MADCTL::COL_ORDER | MADCTL::ROW_ORDER
#define ROT_240_240_270 MADCTL::SWAP_XY | MADCTL::HORIZ_ORDER | MADCTL::ROW_ORDER
static const uint8_t rotations[]{
0, // 0
MADCTL::HORIZ_ORDER | MADCTL::SWAP_XY | MADCTL::COL_ORDER, // 90
MADCTL::HORIZ_ORDER | MADCTL::SCAN_ORDER | MADCTL::COL_ORDER | MADCTL::ROW_ORDER, // 180
MADCTL::SCAN_ORDER | MADCTL::SWAP_XY | MADCTL::ROW_ORDER // 270
};

enum reg {
enum reg {
SWRESET = 0x01,
TEOFF = 0x34,
TEON = 0x35,
Expand Down Expand Up @@ -268,23 +273,16 @@ namespace st7789 {
sleep_ms(100);

// setup correct addressing window
uint8_t madctl = MADCTL::RGB;
uint8_t madctl = MADCTL::RGB | rotations[LCD_ROTATION / 90];
if(width == 240 && height == 240) {
madctl |= MADCTL::HORIZ_ORDER;
set_window(0, 0, 240, 240);
}

if(width == 240 && height == 135) {
madctl |= MADCTL::COL_ORDER | MADCTL::SWAP_XY | MADCTL::SCAN_ORDER;
set_window(40, 53, 240, 135);
}

if(width == 320 && height == 240) {
#ifdef ST7789_ROTATE_180
madctl |= MADCTL::ROW_ORDER | MADCTL::SWAP_XY | MADCTL::SCAN_ORDER;
#else
madctl |= MADCTL::COL_ORDER | MADCTL::SWAP_XY | MADCTL::SCAN_ORDER;
#endif
set_window(0, 0, 320, 240);
}

Expand Down
Loading