Skip to content

Commit

Permalink
Merge pull request #163 from lovyan03/develop
Browse files Browse the repository at this point in the history 
0.4.7
  • Loading branch information
@lovyan03
lovyan03 authored Nov 13, 2021
2 parents ac1cc07 + 4281f5f commit cd6b0dc
Show file tree
Hide file tree
Showing 10 changed files with 14,305 additions and 14,105 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/onrelease.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
with:
ref: master # this must match the main/master branch name !!
ref: develop
- name: Semver-Iterator
run: |
chmod +x $GITHUB_WORKSPACE/.github/scripts/semver.sh
Expand Down
2 changes: 1 addition & 1 deletion library.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"type": "git",
"url": "https://github.com/lovyan03/LovyanGFX.git"
},
"version": "0.4.6",
"version": "0.4.7",
"frameworks": ["arduino", "espidf"],
"platforms": ["espressif32", "espressif8266", "atmelsam"],
"build": {
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=LovyanGFX
version=0.4.6
version=0.4.7
author=lovyan03
maintainer=lovyan03
sentence=TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51
Expand Down
2 changes: 1 addition & 1 deletion src/lgfx/v0/gitTagVersion.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define LGFX_VERSION_MAJOR 0
#define LGFX_VERSION_MINOR 4
#define LGFX_VERSION_PATCH 6
#define LGFX_VERSION_PATCH 7
#define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )
2 changes: 1 addition & 1 deletion src/lgfx/v1/gitTagVersion.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define LGFX_VERSION_MAJOR 1
#define LGFX_VERSION_MINOR 0
#define LGFX_VERSION_PATCH 6
#define LGFX_VERSION_PATCH 7
#define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )
196 changes: 115 additions & 81 deletions src/lgfx/v1/panel/Panel_M5HDMI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,15 @@ namespace lgfx
ESP_LOGI(TAG, "Waiting the FPGA gets idle...");
startWrite();
_bus->beginRead();
while (_bus->readData(8) != 0xff);
while (_bus->readData(8) != 0xFF) {}
cs_control(true);
_bus->endRead();
cs_control(false);
_bus->writeData(CMD_READ_ID, 8); // READ_ID
_bus->beginRead();
uint32_t data;
do {
data = _bus->readData(8);
} while ( data == 0x00 );
data = _bus->readData(32);
while (_bus->readData(8) == 0xFF) {}
_bus->readData(8); // skip 0xFF
uint32_t data = _bus->readData(32);
ESP_LOGI(TAG, "FPGA ID:%02x %02x %02x %02x", data & 0xFF, (data >> 8) & 0xFF, (data >> 16) & 0xFF, data >> 24);
cs_control(true);
_bus->endRead();
Expand All @@ -433,33 +431,36 @@ namespace lgfx
uint_fast16_t mem_height = _cfg.memory_height;

int hori_total;
int vert_total = mem_height + 16;
do
int vert_total = mem_height + 10;

for (;;)
{
hori_total = TOTAL_RESOLUTION / ++vert_total;
} while ( TOTAL_RESOLUTION != vert_total * hori_total || mem_width + 576 < hori_total );
if (mem_width + 768 < hori_total) { continue; }
if (24 >= abs(TOTAL_RESOLUTION - vert_total * hori_total)) { break; }
if (24 >= abs(TOTAL_RESOLUTION - vert_total * ++hori_total)) { break; }
}

video_timing_t vt;

vt.v.active = mem_height;
uint32_t remain = vert_total - mem_height;
int sync = 1;
remain -= sync;
int porch = remain >> 1;
vt.v.front_porch = porch;
remain -= porch;
int sync = remain >> 1;
vt.v.front_porch = porch;
vt.v.sync = sync;
remain -= sync;
vt.v.back_porch = remain;

vt.h.active = mem_width;
remain = hori_total - mem_width;
sync = remain >> 3;
if (sync < 8 && remain > 24) { sync = 8; }
vt.h.sync = sync;
sync = 24 + (remain >> 8);
remain -= sync;
porch = sync;
vt.h.front_porch = porch;
porch = (remain * 131) >> 8;
remain -= porch;
vt.h.front_porch = porch;
vt.h.sync = sync;
vt.h.back_porch = remain;

setVideoTiming(&vt);
Expand Down Expand Up @@ -494,10 +495,41 @@ namespace lgfx
_bus->endTransaction();
}

bool Panel_M5HDMI::_check_repeat(uint32_t cmd, uint_fast8_t limit)
void Panel_M5HDMI::waitDisplay(void)
{
while (displayBusy()) {}
}

bool Panel_M5HDMI::displayBusy(void)
{
if ((_last_cmd & ~7) == CMD_WRITE_RAW)
{
cs_control(true);
_total_send = 0;
_last_cmd = 0;
cs_control(false);
return false;
}
bool res = _total_send;
if (res)
{
startWrite();
_bus->beginRead();
res = (_bus->readData(8) == 0x00);
cs_control(true);
_bus->endRead();
if (!res) { _total_send = 0; }
cs_control(false);
endWrite();
}
return res;
}

bool Panel_M5HDMI::_check_repeat(uint32_t cmd, uint32_t length)
{
if ((_last_cmd & ~7) == CMD_WRITE_RAW)
{
_total_send = 0;
if (_last_cmd == cmd)
{
return true;
Expand All @@ -512,26 +544,19 @@ namespace lgfx

return false;
}

_last_cmd = cmd;

if (_need_delay)
if ((cmd && _total_send) || (_total_send += length) >= 512)
{
auto us = lgfx::micros() - _last_us;
if (_need_delay > us)
{
us = _need_delay - us;
delayMicroseconds(us);
}
_total_send = 0;
_bus->beginRead();
while (_bus->readData(8) == 0x00)
{
delayMicroseconds(1);
delayMicroseconds(++length>>3);
}
cs_control(true);
_bus->endRead();
cs_control(false);
_need_delay = 0;
}
return false;
}
Expand Down Expand Up @@ -628,14 +653,11 @@ namespace lgfx
buf[3] = _raw_color;
bytes += 4;
}
_check_repeat();
_bus->writeBytes(((uint8_t*)buf)+3, bytes, false, false);
if (w > 7 || h > 1)
if (rect || _total_send || _last_cmd)
{
uint32_t us = ((21 + (w >> 4) * 36 + (w & 15)) * h) >> 5;
_need_delay = 1 + us;
_last_us = lgfx::micros();
_check_repeat(0, bytes);
}
_bus->writeBytes(((uint8_t*)buf)+3, bytes, false, false);
}

void Panel_M5HDMI::writeFillRectPreclipped(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, uint32_t rawcolor)
Expand Down Expand Up @@ -688,7 +710,7 @@ namespace lgfx
cmd.data_x = ((xs >> 8) & mask) + ((xs & mask) << 8);
ys += _cfg.offset_y + ((ye + _cfg.offset_y) << 16);
cmd.data_y = ((ys >> 8) & mask) + ((ys & mask) << 8);
_check_repeat();
_check_repeat(0, sizeof(cmd_t));
_bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
}

Expand Down Expand Up @@ -892,64 +914,76 @@ namespace lgfx

void Panel_M5HDMI::writeImageARGB(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, pixelcopy_t* param)
{
// unimplemented
// ToDo:unimplemented
}

void Panel_M5HDMI::readRect(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, void* dst, pixelcopy_t* param)
{
// unimplemented
// ToDo:unimplemented
}

void Panel_M5HDMI::copyRect(uint_fast16_t dst_x, uint_fast16_t dst_y, uint_fast16_t w, uint_fast16_t h, uint_fast16_t src_x, uint_fast16_t src_y)
void Panel_M5HDMI::_copy_rect(uint32_t dst_xy, uint32_t src_xy, uint32_t wh)
{
uint8_t buf[26];
size_t idx = 0;
union cmd_t
{
uint8_t raw[13];
struct __attribute__((packed))
{
uint8_t cmd;
uint32_t src_xy1;
uint32_t src_xy2;
uint32_t dst_xy;
};
};
cmd_t cmd;
cmd.cmd = CMD_COPYRECT;
static constexpr uint32_t mask = 0xFF00FF;
cmd.src_xy1 = ((src_xy >> 8) & mask) + ((src_xy & mask) << 8);
src_xy += wh;
cmd.src_xy2 = ((src_xy >> 8) & mask) + ((src_xy & mask) << 8);
cmd.dst_xy = ((dst_xy >> 8) & mask) + ((dst_xy & mask) << 8);

_check_repeat(0, sizeof(cmd_t));
_bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
}

void Panel_M5HDMI::copyRect(uint_fast16_t dst_x, uint_fast16_t dst_y, uint_fast16_t w, uint_fast16_t h, uint_fast16_t src_x, uint_fast16_t src_y)
{
uint_fast8_t r = _internal_rotation;
if (r)
{
if ((1u << r) & 0b10010110) { src_y = _height - (src_y + h); dst_y = _height - (dst_y + h); }
if (r & 2) { src_x = _width - (src_x + w); dst_x = _width - (dst_x + w); }
if (r & 1) { std::swap(src_x, src_y); std::swap(dst_x, dst_y); std::swap(w, h); }
}
src_x += _cfg.offset_x;
dst_x += _cfg.offset_x;
src_y += _cfg.offset_y;
dst_y += _cfg.offset_y;

auto xe = src_x + w - 1;
auto ye = src_y + h - 1;

buf[idx++] = CMD_COPYRECT;
buf[idx++] = src_x >> 8;
buf[idx++] = src_x;
buf[idx++] = src_y >> 8;
buf[idx++] = src_y;
buf[idx++] = xe >> 8;
buf[idx++] = xe;
buf[idx++] = ye >> 8;
buf[idx++] = ye;

if (src_y <= dst_y)
--w;
--h;
startWrite();
if (dst_y < src_y || (dst_y == src_y && dst_x <= src_x) || (src_y + h < dst_y) || (src_x + w < dst_x))
{
buf[idx++] = src_x >> 8;
buf[idx++] = src_x;
buf[idx++] = (_cfg.memory_height + src_y) >> 8;
buf[idx++] = (_cfg.memory_height + src_y);
buf[idx++] = CMD_COPYRECT;
buf[idx++] = src_x >> 8;
buf[idx++] = src_x;
buf[idx++] = (_cfg.memory_height + src_y) >> 8;
buf[idx++] = (_cfg.memory_height + src_y);
buf[idx++] = xe >> 8;
buf[idx++] = xe;
buf[idx++] = (_cfg.memory_height + ye) >> 8;
buf[idx++] = (_cfg.memory_height + ye);
_copy_rect(dst_x + (dst_y << 16), src_x + (src_y << 16), w + (h << 16));
}
else if (src_y < dst_y)
{
do
{
_copy_rect(dst_x + ((dst_y+h) << 16), src_x + ((src_y+h) << 16), w);
} while (h--);
}
else
{
uint32_t offscreen = _cfg.memory_height << 16;
do
{
_copy_rect(offscreen, src_x + ((src_y+h) << 16), w);
_copy_rect(dst_x + ((dst_y+h) << 16), offscreen, w);
} while (h--);
}
buf[idx++] = dst_x >> 8;
buf[idx++] = dst_x;
buf[idx++] = dst_y >> 8;
buf[idx++] = dst_y;

startWrite();
_check_repeat();
_bus->writeBytes(buf, idx, false, false);
--w;
_need_delay = (w + ((16 + (w >> 4) * 40 + (w & 15)) * ((h << 2) ))) >> (src_y > dst_y ? 6 : 5);
_last_us = lgfx::micros();
endWrite();
}

Expand Down Expand Up @@ -988,7 +1022,7 @@ namespace lgfx
cmd.chksum = ~sum;

startWrite();
_check_repeat();
waitDisplay();
_bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
endWrite();
}
Expand Down Expand Up @@ -1033,7 +1067,7 @@ namespace lgfx
cmd.chksum = ~sum;

startWrite();
_check_repeat();
waitDisplay();
_bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
endWrite();
}
Expand All @@ -1057,7 +1091,7 @@ namespace lgfx
cmd.xy = ((xy >> 8) & mask) + ((xy & mask) << 8);

startWrite();
_check_repeat();
waitDisplay();
_bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
endWrite();
}
Expand Down
11 changes: 5 additions & 6 deletions src/lgfx/v1/panel/Panel_M5HDMI.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ namespace lgfx
void setSleep(bool flg) override;
void setPowerSave(bool flg) override;

void waitDisplay(void) override {}
bool displayBusy(void) override { return false; }
void waitDisplay(void) override;
bool displayBusy(void) override;
void display(uint_fast16_t, uint_fast16_t, uint_fast16_t, uint_fast16_t) override {}

void writePixels(pixelcopy_t* param, uint32_t len, bool use_dma) override;
Expand Down Expand Up @@ -252,15 +252,14 @@ namespace lgfx
uint32_t _xpos;
uint32_t _ypos;
uint32_t _last_cmd;
uint32_t _buff_free_count;
uint32_t _last_us = 0;
uint32_t _need_delay = 0;
size_t _total_send = 0;

void _set_window(uint_fast16_t xs, uint_fast16_t ys, uint_fast16_t xe, uint_fast16_t ye);
void _fill_rect(uint_fast16_t x, uint_fast16_t y, uint_fast16_t w, uint_fast16_t h, uint_fast8_t bytes);
bool _check_repeat(uint32_t cmd = 0, uint_fast8_t limit = 64);
bool _check_repeat(uint32_t cmd, uint32_t length);
void _rotate_pixelcopy(uint_fast16_t& x, uint_fast16_t& y, uint_fast16_t& w, uint_fast16_t& h, pixelcopy_t* param, uint32_t& nextx, uint32_t& nexty);
void _set_video_timing(const video_timing_t::info_t* param, uint8_t cmd);
void _copy_rect(uint32_t dst_xy, uint32_t src_xy, uint32_t wh);
};

//----------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit cd6b0dc

Please sign in to comment.