alex/esp-idf-ssd1306
1
0
Fork 0
mirror of https://github.com/nopnop2002/esp-idf-ssd1306.git synced 2024-09-19 09:45:59 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the unit of width parameter from bytes to pixels

Browse Source
This commit is contained in:
nopnop2002 2022-04-27 13:55:44 +09:00
parent f236e59895
commit ee66bd1ed4
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ImageDemo/main/main.c
View File

@ -258,7 +258,7 @@ void app_main(void)
xpos = xpos - bitmapWidth/2;
int ypos = 16;
ESP_LOGD(TAG, "width=%d xpos=%d", width, xpos);
ssd1306_bitmaps(&dev, xpos, ypos, batman, 4, 12, false);
ssd1306_bitmaps(&dev, xpos, ypos, batman, 32, 13, false);
vTaskDelay(3000 / portTICK_PERIOD_MS);
for(int i=0;i<128;i++) {
@ -268,7 +268,7 @@ void app_main(void)
#if CONFIG_SSD1306_128x64
ssd1306_clear_screen(&dev, false);
ssd1306_bitmaps(&dev, 0, 0, logoMischianti, 16, 64, false);
ssd1306_bitmaps(&dev, 0, 0, logoMischianti, 128, 64, false);
vTaskDelay(2000 / portTICK_PERIOD_MS);
for(int i=0;i<64;i++) {
@ -277,7 +277,7 @@ void app_main(void)
vTaskDelay(2000 / portTICK_PERIOD_MS);
ssd1306_clear_screen(&dev, false);
ssd1306_bitmaps(&dev, 0, 0, fleischer, 16, 64, false);
ssd1306_bitmaps(&dev, 0, 0, fleischer, 128, 64, false);
vTaskDelay(2000 / portTICK_PERIOD_MS);
#endif
}

13
components/ssd1306/ssd1306.c
View File

@ -377,6 +377,11 @@ void ssd1306_wrap_arround(SSD1306_t * dev, ssd1306_scroll_type_t scroll, int sta
void ssd1306_bitmaps(SSD1306_t * dev, int xpos, int ypos, uint8_t * bitmap, int width, int height, bool invert)
{
if ( (width % 8) != 0) {
ESP_LOGE(TAG, "width must be a multiple of 8");
return;
}
int _width = width / 8;
uint8_t wk0;
uint8_t wk1;
uint8_t wk2;
@ -386,7 +391,7 @@ void ssd1306_bitmaps(SSD1306_t * dev, int xpos, int ypos, uint8_t * bitmap, int
ESP_LOGI(TAG, "ypos=%d page=%d dstBits=%d", ypos, page, dstBits);
int offset = 0;
for(int _height=0;_height<height;_height++) {
for (int index=0;index<width;index++) {
for (int index=0;index<_width;index++) {
for (int srcBits=7; srcBits>=0; srcBits--) {
wk0 = dev->_page[page]._segs[_seg];
@ -401,7 +406,7 @@ void ssd1306_bitmaps(SSD1306_t * dev, int xpos, int ypos, uint8_t * bitmap, int
}
}
vTaskDelay(1);
offset = offset + width;
offset = offset + _width;
dstBits++;
_seg = xpos;
if (dstBits == 8) {
@ -411,10 +416,10 @@ void ssd1306_bitmaps(SSD1306_t * dev, int xpos, int ypos, uint8_t * bitmap, int
}
#if 0
for (int _seg=ypos;_seg<ypos+width*8;_seg++) {
for (int _seg=ypos;_seg<ypos+width;_seg++) {
ssd1306_dump_page(dev, page-1, _seg);
}
for (int _seg=ypos;_seg<ypos+width*8;_seg++) {
for (int _seg=ypos;_seg<ypos+width;_seg++) {
ssd1306_dump_page(dev, page, _seg);
}
#endif