diff --git a/Adafruit_SH1106G.cpp b/Adafruit_SH1106G.cpp index 03db129..1a62b32 100644 --- a/Adafruit_SH1106G.cpp +++ b/Adafruit_SH1106G.cpp @@ -74,8 +74,8 @@ allocation is performed there! */ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, TwoWire *twi, - int8_t rst_pin, uint32_t clkDuring, - uint32_t clkAfter) + int8_t rst_pin, uint32_t clkDuring, + uint32_t clkAfter) : Adafruit_SH110X(w, h, twi, rst_pin, clkDuring, clkAfter) {} /*! @@ -105,8 +105,8 @@ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, TwoWire *twi, allocation is performed there! */ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, int8_t mosi_pin, - int8_t sclk_pin, int8_t dc_pin, int8_t rst_pin, - int8_t cs_pin) + int8_t sclk_pin, int8_t dc_pin, + int8_t rst_pin, int8_t cs_pin) : Adafruit_SH110X(w, h, mosi_pin, sclk_pin, dc_pin, rst_pin, cs_pin) {} /*! @@ -135,8 +135,8 @@ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, int8_t mosi_pin, allocation is performed there! */ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, SPIClass *spi, - int8_t dc_pin, int8_t rst_pin, int8_t cs_pin, - uint32_t bitrate) + int8_t dc_pin, int8_t rst_pin, int8_t cs_pin, + uint32_t bitrate) : Adafruit_SH110X(w, h, spi, dc_pin, rst_pin, cs_pin, bitrate) {} /*! @@ -144,10 +144,6 @@ Adafruit_SH1106G::Adafruit_SH1106G(uint16_t w, uint16_t h, SPIClass *spi, */ Adafruit_SH1106G::~Adafruit_SH1106G(void) {} - - - - /*! @brief Allocate RAM for image buffer, initialize peripherals and pins. @param addr @@ -173,12 +169,14 @@ bool Adafruit_SH1106G::begin(uint8_t addr, bool reset) { Adafruit_GrayOLED::_init(addr, reset); - _page_start_offset = 2; // the SH1106 display we have found requires a small offset into memory + _page_start_offset = + 2; // the SH1106 display we have found requires a small offset into memory drawBitmap((WIDTH - splash2_width) / 2, (HEIGHT - splash2_height) / 2, splash2_data, splash2_width, splash2_height, 1); // Init sequence, make sure its under 32 bytes, or split into multiples! + // clang-format off static const uint8_t init[] = { SH110X_DISPLAYOFF, // 0xAE SH110X_SETDISPLAYCLOCKDIV, 0x80, // 0xD5, 0x80, @@ -197,11 +195,12 @@ bool Adafruit_SH1106G::begin(uint8_t addr, bool reset) { SH110X_MEMORYMODE, 0x10, // 0x20, 0x00 SH110X_DISPLAYALLON_RESUME, }; + // clang-format on if (!oled_commandList(init, sizeof(init))) { return false; } - + delay(100); // 100ms delay recommended oled_command(SH110X_DISPLAYON); // 0xaf diff --git a/Adafruit_SH1107.cpp b/Adafruit_SH1107.cpp index e17406e..eab2955 100644 --- a/Adafruit_SH1107.cpp +++ b/Adafruit_SH1107.cpp @@ -144,7 +144,6 @@ Adafruit_SH1107::Adafruit_SH1107(uint16_t w, uint16_t h, SPIClass *spi, */ Adafruit_SH1107::~Adafruit_SH1107(void) {} - /*! @brief Allocate RAM for image buffer, initialize peripherals and pins. @param addr @@ -182,6 +181,7 @@ bool Adafruit_SH1107::begin(uint8_t addr, bool reset) { } // Init sequence, make sure its under 32 bytes, or split into multiples! + // clang-format off static const uint8_t init[] = { SH110X_DISPLAYOFF, // 0xAE SH110X_SETDISPLAYCLOCKDIV, 0x51, // 0xd5, 0x51, @@ -200,11 +200,12 @@ bool Adafruit_SH1107::begin(uint8_t addr, bool reset) { SH110X_DISPLAYALLON_RESUME, // 0xa4 SH110X_NORMALDISPLAY, // 0xa6 }; + // clang-format on if (!oled_commandList(init, sizeof(init))) { return false; } - + delay(100); // 100ms delay recommended oled_command(SH110X_DISPLAYON); // 0xaf diff --git a/Adafruit_SH110X.cpp b/Adafruit_SH110X.cpp index faecaf8..67acd47 100644 --- a/Adafruit_SH110X.cpp +++ b/Adafruit_SH110X.cpp @@ -206,12 +206,12 @@ void Adafruit_SH110X::display(void) { bytes_remaining -= page_start; // cut off end of dirty rectangle bytes_remaining -= (WIDTH - 1) - page_end; - + if (i2c_dev) { // I2C - uint8_t cmd[] = {0x00, - (uint8_t)(SH110X_SETPAGEADDR + p), - (uint8_t)(0x10 + ((page_start + _page_start_offset) >> 4)), - (uint8_t)((page_start + _page_start_offset) & 0xF)}; + uint8_t cmd[] = { + 0x00, (uint8_t)(SH110X_SETPAGEADDR + p), + (uint8_t)(0x10 + ((page_start + _page_start_offset) >> 4)), + (uint8_t)((page_start + _page_start_offset) & 0xF)}; // Set high speed clk i2c_dev->setSpeed(i2c_preclk); @@ -225,15 +225,15 @@ void Adafruit_SH110X::display(void) { bytes_remaining -= to_write; yield(); } - + // Set low speed clk i2c_dev->setSpeed(i2c_postclk); - - } - else { // SPI - uint8_t cmd[] = {(uint8_t)(SH110X_SETPAGEADDR + p), - (uint8_t)(0x10 + ((page_start + _page_start_offset) >> 4)), - (uint8_t)((page_start + _page_start_offset) & 0xF)}; + + } else { // SPI + uint8_t cmd[] = { + (uint8_t)(SH110X_SETPAGEADDR + p), + (uint8_t)(0x10 + ((page_start + _page_start_offset) >> 4)), + (uint8_t)((page_start + _page_start_offset) & 0xF)}; digitalWrite(dcPin, LOW); spi_dev->write(cmd, 3); diff --git a/Adafruit_SH110X.h b/Adafruit_SH110X.h index 4bc08be..7670c1c 100644 --- a/Adafruit_SH110X.h +++ b/Adafruit_SH110X.h @@ -82,9 +82,10 @@ public: void display(void); - protected: - uint8_t _page_start_offset = 0; // some displays are 'inset' in memory, so we have to skip some memory to display - private: +protected: + uint8_t _page_start_offset = 0; // some displays are 'inset' in memory, so we + // have to skip some memory to display +private: }; /*! @@ -94,12 +95,12 @@ public: class Adafruit_SH1106G : public Adafruit_SH110X { public: Adafruit_SH1106G(uint16_t w, uint16_t h, TwoWire *twi = &Wire, - int8_t rst_pin = -1, uint32_t preclk = 400000, - uint32_t postclk = 100000); + int8_t rst_pin = -1, uint32_t preclk = 400000, + uint32_t postclk = 100000); Adafruit_SH1106G(uint16_t w, uint16_t h, int8_t mosi_pin, int8_t sclk_pin, - int8_t dc_pin, int8_t rst_pin, int8_t cs_pin); + int8_t dc_pin, int8_t rst_pin, int8_t cs_pin); Adafruit_SH1106G(uint16_t w, uint16_t h, SPIClass *spi, int8_t dc_pin, - int8_t rst_pin, int8_t cs_pin, uint32_t bitrate = 8000000UL); + int8_t rst_pin, int8_t cs_pin, uint32_t bitrate = 8000000UL); ~Adafruit_SH1106G(void); diff --git a/splash.h b/splash.h index 8b55fa6..be92c06 100644 --- a/splash.h +++ b/splash.h @@ -3,180 +3,208 @@ #define splash1_height 64 const uint8_t PROGMEM splash1_data[] = { - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b10000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000011, 0b10000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, - 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b11000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00001111, 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, 0b11100000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00011111, 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11100000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00111111, 0b11110000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b01111111, - 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00011111, 0b11111000, 0b01111111, 0b11110000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11111110, - 0b01111111, 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00111111, 0b11111111, 0b01111111, 0b11110000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, - 0b11111111, 0b11111011, 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00001111, 0b11111111, 0b11111001, 0b11111111, - 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00001111, 0b11111111, 0b11111001, 0b11111111, 0b11111000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b11111111, 0b11110001, - 0b11111111, 0b11111111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000011, 0b11111100, 0b01110011, 0b11111111, 0b11111111, 0b10000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11111110, - 0b00111111, 0b11111111, 0b11111111, 0b10000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b00011110, 0b00001111, 0b11111111, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b01111111, 0b11111110, 0b00011111, 0b11111100, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11111111, 0b11111111, - 0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00001111, 0b11011111, 0b11111111, 0b11100000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, 0b00011001, - 0b11111111, 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00111111, 0b00111100, 0b11111111, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b01111110, - 0b01111100, 0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b01111111, 0b11111110, 0b01111100, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b11111111, 0b11111111, 0b11111100, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b11111111, 0b11111110, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b11111111, 0b11111111, 0b11111110, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11111111, 0b11101111, - 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000001, 0b11111111, 0b11001111, 0b11111110, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11111111, - 0b00000111, 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000011, 0b11111100, 0b00000111, 0b11111110, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, - 0b11110000, 0b00000011, 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b10000000, 0b00000000, 0b11111110, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b01111110, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00001100, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b10000000, 0b00000000, - 0b11111100, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000111, 0b10000000, 0b00000001, 0b11111100, 0b00000000, 0b00000000, - 0b00000011, 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b10000000, - 0b00000001, 0b11111100, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000111, 0b10000000, 0b00000001, 0b11100000, 0b00000000, - 0b00000000, 0b00000000, 0b00011110, 0b00000000, 0b00000000, 0b00000000, 0b00000111, - 0b10000000, 0b00000001, 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00011110, - 0b00000000, 0b01111111, 0b11100011, 0b11110111, 0b10011111, 0b11111001, 0b11111101, - 0b11100111, 0b01111000, 0b01111011, 0b11011111, 0b11000000, 0b11111111, 0b11110111, - 0b11111111, 0b10111111, 0b11111101, 0b11111101, 0b11111111, 0b01111000, 0b01111011, - 0b11011111, 0b11000000, 0b11111111, 0b11110111, 0b11111111, 0b10111111, 0b11111101, - 0b11111101, 0b11111111, 0b01111000, 0b01111011, 0b11011111, 0b11000000, 0b11110000, - 0b11110111, 0b10000111, 0b10111100, 0b00111101, 0b11100001, 0b11111111, 0b01111000, - 0b01111011, 0b11011110, 0b00000000, 0b11110000, 0b11110111, 0b10000111, 0b10111100, - 0b00111101, 0b11100001, 0b11110000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, - 0b00000000, 0b11110111, 0b10000111, 0b10000000, 0b00111101, 0b11100001, 0b11100000, - 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b01111111, 0b11110111, 0b10000111, - 0b10011111, 0b11111101, 0b11100001, 0b11100000, 0b01111000, 0b01111011, 0b11011110, - 0b00000000, 0b11111111, 0b11110111, 0b10000111, 0b10111111, 0b11111101, 0b11100001, - 0b11100000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b11110000, 0b11110111, - 0b10000111, 0b10111100, 0b00111101, 0b11100001, 0b11100000, 0b01111000, 0b01111011, - 0b11011110, 0b00000000, 0b11110000, 0b11110111, 0b10000111, 0b10111100, 0b00111101, - 0b11100001, 0b11100000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b11110000, - 0b11110111, 0b10000111, 0b10111100, 0b00111101, 0b11100001, 0b11100000, 0b01111000, - 0b01111011, 0b11011110, 0b00000000, 0b11111111, 0b11110111, 0b11111111, 0b10111111, - 0b11111101, 0b11100001, 0b11100000, 0b01111111, 0b11111011, 0b11011111, 0b11000000, - 0b11111111, 0b11110111, 0b11111111, 0b10111111, 0b11111101, 0b11100001, 0b11100000, - 0b01111111, 0b11111011, 0b11011111, 0b11000000, 0b01111100, 0b11110011, 0b11110011, - 0b10011111, 0b00111101, 0b11100001, 0b11100000, 0b00111110, 0b01111011, 0b11001111, - 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b11111111, - 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, - 0b11111111, 0b11000000, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111101, - 0b01101000, 0b11011011, 0b00010001, 0b00011010, 0b00110001, 0b11000000, 0b11111111, - 0b11111111, 0b11111111, 0b11111111, 0b11111101, 0b00101011, 0b01011010, 0b11111011, - 0b01101010, 0b11101111, 0b11000000, 0b11111111, 0b11111111, 0b11111111, 0b11111111, - 0b11111101, 0b01001011, 0b01011011, 0b00111011, 0b00011010, 0b00110011, 0b11000000, - 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111101, 0b01101011, 0b01011011, - 0b11011011, 0b01101010, 0b11111101, 0b11000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, + 0b10000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b10000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b11000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000111, 0b11000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00001111, 0b11000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00011111, 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, + 0b11100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11100000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11110000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b01111111, 0b11110000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, + 0b11111000, 0b01111111, 0b11110000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11111110, + 0b01111111, 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b11111111, 0b01111111, + 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00011111, 0b11111111, 0b11111011, 0b11100000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00001111, 0b11111111, 0b11111001, 0b11111111, 0b11000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00001111, 0b11111111, 0b11111001, 0b11111111, 0b11111000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, + 0b11111111, 0b11110001, 0b11111111, 0b11111111, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11111100, + 0b01110011, 0b11111111, 0b11111111, 0b10000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11111110, 0b00111111, + 0b11111111, 0b11111111, 0b10000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b11111111, 0b00011110, 0b00001111, + 0b11111111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b01111111, 0b11111110, 0b00011111, 0b11111100, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00111111, 0b11111111, 0b11111111, 0b11111000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00001111, 0b11011111, 0b11111111, 0b11100000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, + 0b00011001, 0b11111111, 0b11000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111111, 0b00111100, + 0b11111111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b01111110, 0b01111100, 0b11111000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b01111111, 0b11111110, 0b01111100, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b11111111, 0b11111111, 0b11111100, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b11111111, 0b11111111, 0b11111110, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11111111, + 0b11111111, 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11111111, 0b11101111, + 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000001, 0b11111111, 0b11001111, 0b11111110, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000011, 0b11111111, 0b00000111, 0b11111110, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000011, 0b11111100, 0b00000111, 0b11111110, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, + 0b11110000, 0b00000011, 0b11111110, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b10000000, + 0b00000000, 0b11111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b01111110, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00111110, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00001100, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, + 0b10000000, 0b00000000, 0b11111100, 0b00000000, 0b00000000, 0b00000011, + 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b10000000, + 0b00000001, 0b11111100, 0b00000000, 0b00000000, 0b00000011, 0b11000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b10000000, 0b00000001, + 0b11111100, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000111, 0b10000000, 0b00000001, 0b11100000, + 0b00000000, 0b00000000, 0b00000000, 0b00011110, 0b00000000, 0b00000000, + 0b00000000, 0b00000111, 0b10000000, 0b00000001, 0b11100000, 0b00000000, + 0b00000000, 0b00000000, 0b00011110, 0b00000000, 0b01111111, 0b11100011, + 0b11110111, 0b10011111, 0b11111001, 0b11111101, 0b11100111, 0b01111000, + 0b01111011, 0b11011111, 0b11000000, 0b11111111, 0b11110111, 0b11111111, + 0b10111111, 0b11111101, 0b11111101, 0b11111111, 0b01111000, 0b01111011, + 0b11011111, 0b11000000, 0b11111111, 0b11110111, 0b11111111, 0b10111111, + 0b11111101, 0b11111101, 0b11111111, 0b01111000, 0b01111011, 0b11011111, + 0b11000000, 0b11110000, 0b11110111, 0b10000111, 0b10111100, 0b00111101, + 0b11100001, 0b11111111, 0b01111000, 0b01111011, 0b11011110, 0b00000000, + 0b11110000, 0b11110111, 0b10000111, 0b10111100, 0b00111101, 0b11100001, + 0b11110000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b00000000, + 0b11110111, 0b10000111, 0b10000000, 0b00111101, 0b11100001, 0b11100000, + 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b01111111, 0b11110111, + 0b10000111, 0b10011111, 0b11111101, 0b11100001, 0b11100000, 0b01111000, + 0b01111011, 0b11011110, 0b00000000, 0b11111111, 0b11110111, 0b10000111, + 0b10111111, 0b11111101, 0b11100001, 0b11100000, 0b01111000, 0b01111011, + 0b11011110, 0b00000000, 0b11110000, 0b11110111, 0b10000111, 0b10111100, + 0b00111101, 0b11100001, 0b11100000, 0b01111000, 0b01111011, 0b11011110, + 0b00000000, 0b11110000, 0b11110111, 0b10000111, 0b10111100, 0b00111101, + 0b11100001, 0b11100000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, + 0b11110000, 0b11110111, 0b10000111, 0b10111100, 0b00111101, 0b11100001, + 0b11100000, 0b01111000, 0b01111011, 0b11011110, 0b00000000, 0b11111111, + 0b11110111, 0b11111111, 0b10111111, 0b11111101, 0b11100001, 0b11100000, + 0b01111111, 0b11111011, 0b11011111, 0b11000000, 0b11111111, 0b11110111, + 0b11111111, 0b10111111, 0b11111101, 0b11100001, 0b11100000, 0b01111111, + 0b11111011, 0b11011111, 0b11000000, 0b01111100, 0b11110011, 0b11110011, + 0b10011111, 0b00111101, 0b11100001, 0b11100000, 0b00111110, 0b01111011, + 0b11001111, 0b11000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, + 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11000000, + 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111101, 0b01101000, + 0b11011011, 0b00010001, 0b00011010, 0b00110001, 0b11000000, 0b11111111, + 0b11111111, 0b11111111, 0b11111111, 0b11111101, 0b00101011, 0b01011010, + 0b11111011, 0b01101010, 0b11101111, 0b11000000, 0b11111111, 0b11111111, + 0b11111111, 0b11111111, 0b11111101, 0b01001011, 0b01011011, 0b00111011, + 0b00011010, 0b00110011, 0b11000000, 0b11111111, 0b11111111, 0b11111111, + 0b11111111, 0b11111101, 0b01101011, 0b01011011, 0b11011011, 0b01101010, + 0b11111101, 0b11000000, }; #define splash2_width 115 #define splash2_height 32 const uint8_t PROGMEM splash2_data[] = { - 0b00000000, 0b00000000, 0b01100000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b11100000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11100000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11110000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11110000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, - 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00001111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, 0b00000011, - 0b11000000, 0b00000000, 0b01111110, 0b00000000, 0b00000000, 0b00000001, 0b11100000, - 0b00000000, 0b01111111, 0b00001111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, - 0b00000011, 0b11000000, 0b00000000, 0b11111110, 0b00000000, 0b00000000, 0b00000001, - 0b11100000, 0b00000000, 0b11111111, 0b11101111, 0b11111000, 0b00000000, 0b00000000, - 0b00000000, 0b00000011, 0b11000000, 0b00000000, 0b11111110, 0b00000000, 0b00000000, - 0b00000001, 0b11100000, 0b00000000, 0b11111111, 0b11111111, 0b11111000, 0b00000000, - 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, 0b11110000, 0b00000000, - 0b00000000, 0b00000000, 0b00001111, 0b00000000, 0b01111111, 0b11111110, 0b01111111, - 0b11000000, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, 0b11110000, - 0b00000000, 0b00000000, 0b00000000, 0b00001111, 0b00000000, 0b00111111, 0b11111110, - 0b01111111, 0b11111000, 0b00111111, 0b11110001, 0b11111011, 0b11001111, 0b11111100, - 0b11111110, 0b11110011, 0b10111100, 0b00111101, 0b11101111, 0b11100000, 0b00011111, - 0b11111110, 0b01111111, 0b11111111, 0b01111111, 0b11111011, 0b11111111, 0b11011111, - 0b11111110, 0b11111110, 0b11111111, 0b10111100, 0b00111101, 0b11101111, 0b11100000, - 0b00011111, 0b11000110, 0b11111111, 0b11111111, 0b01111111, 0b11111011, 0b11111111, - 0b11011111, 0b11111110, 0b11111110, 0b11111111, 0b10111100, 0b00111101, 0b11101111, - 0b11100000, 0b00001111, 0b11100011, 0b11000111, 0b11111110, 0b01111000, 0b01111011, - 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11111111, 0b10111100, 0b00111101, - 0b11101111, 0b00000000, 0b00000111, 0b11111111, 0b10000111, 0b11111100, 0b01111000, - 0b01111011, 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11111000, 0b00111100, - 0b00111101, 0b11101111, 0b00000000, 0b00000001, 0b11111111, 0b11111111, 0b11110000, - 0b00000000, 0b01111011, 0b11000011, 0b11000000, 0b00011110, 0b11110000, 0b11110000, - 0b00111100, 0b00111101, 0b11101111, 0b00000000, 0b00000001, 0b11110011, 0b01111111, - 0b11100000, 0b00111111, 0b11111011, 0b11000011, 0b11001111, 0b11111110, 0b11110000, - 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, 0b00000011, 0b11100011, - 0b00111111, 0b10000000, 0b01111111, 0b11111011, 0b11000011, 0b11011111, 0b11111110, - 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, 0b00000111, - 0b11100111, 0b00111100, 0b00000000, 0b01111000, 0b01111011, 0b11000011, 0b11011110, - 0b00011110, 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, - 0b00000111, 0b11111111, 0b10111110, 0b00000000, 0b01111000, 0b01111011, 0b11000011, - 0b11011110, 0b00011110, 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, - 0b00000000, 0b00000111, 0b11111111, 0b11111110, 0b00000000, 0b01111000, 0b01111011, - 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11110000, 0b00111100, 0b00111101, - 0b11101111, 0b00000000, 0b00001111, 0b11111111, 0b11111110, 0b00000000, 0b01111111, - 0b11111011, 0b11111111, 0b11011111, 0b11111110, 0b11110000, 0b11110000, 0b00111111, - 0b11111101, 0b11101111, 0b11100000, 0b00001111, 0b11111111, 0b11111111, 0b00000000, - 0b01111111, 0b11111011, 0b11111111, 0b11011111, 0b11111110, 0b11110000, 0b11110000, - 0b00111111, 0b11111101, 0b11101111, 0b11100000, 0b00001111, 0b11111001, 0b11111111, - 0b00000000, 0b00111110, 0b01111001, 0b11111001, 0b11001111, 0b10011110, 0b11110000, - 0b11110000, 0b00011111, 0b00111101, 0b11100111, 0b11100000, 0b00011111, 0b11110001, - 0b11111111, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, - 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00011111, - 0b10000000, 0b11111111, 0b00000000, 0b01111111, 0b11111111, 0b11111111, 0b11111111, - 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11100000, - 0b00011100, 0b00000000, 0b01111111, 0b00000000, 0b01111111, 0b11111111, 0b11111111, - 0b11111111, 0b11111110, 0b10110100, 0b01101101, 0b10001000, 0b10001101, 0b00011000, - 0b11100000, 0b00000000, 0b00000000, 0b00011111, 0b00000000, 0b01111111, 0b11111111, - 0b11111111, 0b11111111, 0b11111110, 0b10010101, 0b10101101, 0b01111101, 0b10110101, - 0b01110111, 0b11100000, 0b00000000, 0b00000000, 0b00001111, 0b00000000, 0b01111111, - 0b11111111, 0b11111111, 0b11111111, 0b11111110, 0b10100101, 0b10101101, 0b10011101, - 0b10001101, 0b00011001, 0b11100000, 0b00000000, 0b00000000, 0b00000110, 0b00000000, - 0b01111111, 0b11111111, 0b11111111, 0b11111111, 0b11111110, 0b10110101, 0b10101101, - 0b11101101, 0b10110101, 0b01111110, 0b11100000, + 0b00000000, 0b00000000, 0b01100000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b11100000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000001, 0b11100000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000001, 0b11110000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000011, 0b11110000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000111, 0b11110000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00001111, 0b11111000, + 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, + 0b01111110, 0b00000000, 0b00000000, 0b00000001, 0b11100000, 0b00000000, + 0b01111111, 0b00001111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, + 0b00000011, 0b11000000, 0b00000000, 0b11111110, 0b00000000, 0b00000000, + 0b00000001, 0b11100000, 0b00000000, 0b11111111, 0b11101111, 0b11111000, + 0b00000000, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, + 0b11111110, 0b00000000, 0b00000000, 0b00000001, 0b11100000, 0b00000000, + 0b11111111, 0b11111111, 0b11111000, 0b00000000, 0b00000000, 0b00000000, + 0b00000011, 0b11000000, 0b00000000, 0b11110000, 0b00000000, 0b00000000, + 0b00000000, 0b00001111, 0b00000000, 0b01111111, 0b11111110, 0b01111111, + 0b11000000, 0b00000000, 0b00000000, 0b00000011, 0b11000000, 0b00000000, + 0b11110000, 0b00000000, 0b00000000, 0b00000000, 0b00001111, 0b00000000, + 0b00111111, 0b11111110, 0b01111111, 0b11111000, 0b00111111, 0b11110001, + 0b11111011, 0b11001111, 0b11111100, 0b11111110, 0b11110011, 0b10111100, + 0b00111101, 0b11101111, 0b11100000, 0b00011111, 0b11111110, 0b01111111, + 0b11111111, 0b01111111, 0b11111011, 0b11111111, 0b11011111, 0b11111110, + 0b11111110, 0b11111111, 0b10111100, 0b00111101, 0b11101111, 0b11100000, + 0b00011111, 0b11000110, 0b11111111, 0b11111111, 0b01111111, 0b11111011, + 0b11111111, 0b11011111, 0b11111110, 0b11111110, 0b11111111, 0b10111100, + 0b00111101, 0b11101111, 0b11100000, 0b00001111, 0b11100011, 0b11000111, + 0b11111110, 0b01111000, 0b01111011, 0b11000011, 0b11011110, 0b00011110, + 0b11110000, 0b11111111, 0b10111100, 0b00111101, 0b11101111, 0b00000000, + 0b00000111, 0b11111111, 0b10000111, 0b11111100, 0b01111000, 0b01111011, + 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11111000, 0b00111100, + 0b00111101, 0b11101111, 0b00000000, 0b00000001, 0b11111111, 0b11111111, + 0b11110000, 0b00000000, 0b01111011, 0b11000011, 0b11000000, 0b00011110, + 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, + 0b00000001, 0b11110011, 0b01111111, 0b11100000, 0b00111111, 0b11111011, + 0b11000011, 0b11001111, 0b11111110, 0b11110000, 0b11110000, 0b00111100, + 0b00111101, 0b11101111, 0b00000000, 0b00000011, 0b11100011, 0b00111111, + 0b10000000, 0b01111111, 0b11111011, 0b11000011, 0b11011111, 0b11111110, + 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, + 0b00000111, 0b11100111, 0b00111100, 0b00000000, 0b01111000, 0b01111011, + 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11110000, 0b00111100, + 0b00111101, 0b11101111, 0b00000000, 0b00000111, 0b11111111, 0b10111110, + 0b00000000, 0b01111000, 0b01111011, 0b11000011, 0b11011110, 0b00011110, + 0b11110000, 0b11110000, 0b00111100, 0b00111101, 0b11101111, 0b00000000, + 0b00000111, 0b11111111, 0b11111110, 0b00000000, 0b01111000, 0b01111011, + 0b11000011, 0b11011110, 0b00011110, 0b11110000, 0b11110000, 0b00111100, + 0b00111101, 0b11101111, 0b00000000, 0b00001111, 0b11111111, 0b11111110, + 0b00000000, 0b01111111, 0b11111011, 0b11111111, 0b11011111, 0b11111110, + 0b11110000, 0b11110000, 0b00111111, 0b11111101, 0b11101111, 0b11100000, + 0b00001111, 0b11111111, 0b11111111, 0b00000000, 0b01111111, 0b11111011, + 0b11111111, 0b11011111, 0b11111110, 0b11110000, 0b11110000, 0b00111111, + 0b11111101, 0b11101111, 0b11100000, 0b00001111, 0b11111001, 0b11111111, + 0b00000000, 0b00111110, 0b01111001, 0b11111001, 0b11001111, 0b10011110, + 0b11110000, 0b11110000, 0b00011111, 0b00111101, 0b11100111, 0b11100000, + 0b00011111, 0b11110001, 0b11111111, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, 0b00011111, 0b10000000, 0b11111111, + 0b00000000, 0b01111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, + 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11111111, 0b11100000, + 0b00011100, 0b00000000, 0b01111111, 0b00000000, 0b01111111, 0b11111111, + 0b11111111, 0b11111111, 0b11111110, 0b10110100, 0b01101101, 0b10001000, + 0b10001101, 0b00011000, 0b11100000, 0b00000000, 0b00000000, 0b00011111, + 0b00000000, 0b01111111, 0b11111111, 0b11111111, 0b11111111, 0b11111110, + 0b10010101, 0b10101101, 0b01111101, 0b10110101, 0b01110111, 0b11100000, + 0b00000000, 0b00000000, 0b00001111, 0b00000000, 0b01111111, 0b11111111, + 0b11111111, 0b11111111, 0b11111110, 0b10100101, 0b10101101, 0b10011101, + 0b10001101, 0b00011001, 0b11100000, 0b00000000, 0b00000000, 0b00000110, + 0b00000000, 0b01111111, 0b11111111, 0b11111111, 0b11111111, 0b11111110, + 0b10110101, 0b10101101, 0b11101101, 0b10110101, 0b01111110, 0b11100000, };