diff --git a/MusicRing.ino b/MusicRing.ino index 019f37c..f8a0d55 100644 --- a/MusicRing.ino +++ b/MusicRing.ino @@ -16,7 +16,7 @@ void setup() { ring.begin(); screen.begin(); - screen.drawBitmap(0, 0, DashyFox_logo, 128, 32); + screen.adafruit->drawBitmap(0, 0, DashyFox_logo, 128, 32, WHITE); screen.adafruit->display(); } diff --git a/misc/bitmaps.h b/misc/bitmaps.h index 418a016..0742d04 100644 --- a/misc/bitmaps.h +++ b/misc/bitmaps.h @@ -37,7 +37,7 @@ static const uint8_t DashyFox_logo [] PROGMEM = { /* 32 */ 0b11111111, 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b11111111 }; -static uint8_t DashyFox_logo_point_1 [] = { +static uint8_t DashyFox_logo_point_1 [6] = { 0x3f >> 1, 0xf0 ,0x7f >> 3, 0xf8, 0x3f >> 1, 0xf0 }; -static uint8_t DashyFox_logo_point_2 [] = {0}; \ No newline at end of file +static uint8_t DashyFox_logo_point_2 [6] = {0}; \ No newline at end of file diff --git a/modules/Display.h b/modules/Display.h index 0e1004e..3598314 100644 --- a/modules/Display.h +++ b/modules/Display.h @@ -47,8 +47,10 @@ public: for (uint16_t iY = 1; iY <= sizeY; iY++) { for (uint16_t iX = 1; iX <= sizeX; iX++) { + uint16_t local = iY * (sizeY - 1) + iX; uint16_t global = screen.height * (posY + iY - 1) + (posX + iX); + bool localPixel = (bitmap[local / 8] >> (7 - (local % 8))) & 1; bool globalPixel = (screenBuffer[global / 8] >> (7 - (global % 8))) & 1;