UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 06:40:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/device] pushRectUniform goes in the same direction as the screen

Browse Source 
refresh

Change-Id: Iec3cc67c20bd128bbd7d16b6132b2878fe883aa2
This commit is contained in:
Romain Goyet
2017-04-10 14:11:45 +02:00
parent 37647d8537
commit ea7a82b5a4
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ion/src/device/display.cpp
View File

@@ -18,19 +18,19 @@ namespace Display {
void pushRect(KDRect r, const KDColor * pixels) {
Device::waitForPendingDMAUploadCompletion();
Device::setDrawingArea(r);
Device::setDrawingArea(r, Device::Orientation::Landscape);
Device::pushPixels(pixels, r.width()*r.height());
}
void pushRectUniform(KDRect r, KDColor c) {
Device::waitForPendingDMAUploadCompletion();
Device::setDrawingArea(r);
Device::setDrawingArea(r, Device::Orientation::Portrait);
Device::pushColor(c, r.width()*r.height());
}
void pullRect(KDRect r, KDColor * pixels) {
Device::waitForPendingDMAUploadCompletion();
Device::setDrawingArea(r);
Device::setDrawingArea(r, Device::Orientation::Landscape);
Device::pullPixels(pixels, r.width()*r.height());
}
@@ -56,7 +56,6 @@ namespace Device {
#define SEND_COMMAND(c, ...) {*CommandAddress = Command::c; uint8_t data[] = {__VA_ARGS__}; for (unsigned int i=0;i<sizeof(data);i++) { *DataAddress = data[i];};}
void init() {
initDMA();
initGPIO();
@@ -225,7 +224,7 @@ void initPanel() {
msleep(5);
SEND_COMMAND(PixelFormatSet, 0x05);
SEND_COMMAND(MemoryAccessControl, 0xA0);
//SEND_COMMAND(MemoryAccessControl, 0xA0);
SEND_COMMAND(TearingEffectLineOn, 0x00);
SEND_COMMAND(FrameRateControl, 0x1E); // 40 Hz frame rate
@@ -238,11 +237,22 @@ void shutdownPanel() {
msleep(5);
}
void setDrawingArea(KDRect r) {
uint16_t x_start = r.x();
uint16_t x_end = r.x() + r.width() - 1;
uint16_t y_start = r.y();
uint16_t y_end = r.y() + r.height() - 1;
void setDrawingArea(KDRect r, Orientation o) {
uint16_t x_start, x_end, y_start, y_end;
if (o == Orientation::Landscape) {
SEND_COMMAND(MemoryAccessControl, 0xA0);
x_start = r.x();
x_end = r.x() + r.width() - 1;
y_start = r.y();
y_end = r.y() + r.height() - 1;
} else {
SEND_COMMAND(MemoryAccessControl, 0x00);
x_start = r.y();
x_end = r.y() + r.height() - 1;
y_start = Ion::Display::Width - (r.x() + r.width());
y_end = Ion::Display::Width - r.x() - 1;
}
*CommandAddress = Command::ColumnAddressSet;
*DataAddress = (x_start >> 8);

7
ion/src/device/display.h
View File

@@ -49,7 +49,12 @@ void shutdownFSMC();
void initPanel();
void shutdownPanel();
void setDrawingArea(KDRect r);
enum class Orientation {
Landscape = 0,
Portrait = 1
};
void setDrawingArea(KDRect r, Orientation o);
void waitForPendingDMAUploadCompletion();
void pushPixels(const KDColor * pixels, size_t numberOfPixels);
void pushColor(KDColor color, size_t numberOfPixels);