fleg
/
Arduboy-homemade-package
mirror of https://github.com/MrBlinky/Arduboy-homemade-package.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added ST7565 library support

This commit is contained in:
Mr.Blinky 2018-09-16 18:34:36 +02:00 committed by GitHub
parent 38b628cbab
commit 753aa84d90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 162 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
board-package-source/libraries/Arduboy/src/core/core.cpp
View File

@ -37,6 +37,13 @@ const uint8_t PROGMEM lcdBootProgram[] = {
0xD9, 0xF1, // Set Precharge = 0xF1
OLED_SET_COLUMN_ADDRESS_LO, //Set column address for left most pixel
0xAF // Display On
#elif defined(LCD_ST7565)
0xC8, //SET_COM_REVERSE
0x28 | 0x7, //SET_POWER_CONTROL | 0x7
0x20 | 0x5, //SET_RESISTOR_RATIO | 0x5
0x81, //SET_VOLUME_FIRST
0x13, //SET_VOLUME_SECOND
0xAF //DISPLAY_ON
#elif defined(OLED_96X96) || defined(OLED_128X96) || defined(OLED_128X128) || defined(OLED_128X64_ON_96X96) || defined(OLED_128X64_ON_128X96) || defined(OLED_128X64_ON_128X128)|| defined(OLED_128X96_ON_128X128) || defined(OLED_96X96_ON_128X128) || defined(OLED_64X128_ON_128X128)
#if defined(OLED_96X96) || defined(OLED_128X64_ON_96X96)
0x15, 0x10, 0x3f, //left most 32 pixels are invisible
@ -281,7 +288,7 @@ void ArduboyCore::paint8Pixels(uint8_t pixels)
void ArduboyCore::paintScreen(const unsigned char *image)
{
#if defined OLED_SH1106
#if defined(OLED_SH1106) || defined(LCD_ST7565)
for (uint8_t i = 0; i < HEIGHT / 8; i++)
{
LCDCommandMode();
@ -356,7 +363,7 @@ void ArduboyCore::paintScreen(const unsigned char *image)
// will be used by any buffer based subclass
void ArduboyCore::paintScreen(unsigned char image[])
{
#if defined OLED_SH1106
#if defined(OLED_SH1106) || defined(LCD_ST7565)
for (uint8_t i = 0; i < HEIGHT / 8; i++)
{
LCDCommandMode();
@ -542,10 +549,22 @@ void ArduboyCore::flipHorizontal(boolean flipped)
void ArduboyCore::setRGBled(uint8_t red, uint8_t green, uint8_t blue)
{
#ifdef ARDUBOY_10 // RGB, all the pretty colors
#if defined(LCD_ST7565)
if ((red | green | blue) == 0) //prevent backlight off
{
red = 255;
green = 255;
blue = 255;
}
analogWrite(RED_LED, red);
analogWrite(GREEN_LED, green);
analogWrite(BLUE_LED, blue);
#else
// inversion is necessary because these are common annode LEDs
analogWrite(RED_LED, 255 - red);
analogWrite(GREEN_LED, 255 - green);
analogWrite(BLUE_LED, 255 - blue);
#endif
#elif defined(AB_DEVKIT)
// only blue on devkit
digitalWrite(BLUE_LED, ~blue);

33
board-package-source/libraries/Arduboy2/src/Arduboy2.cpp
View File

@ -170,7 +170,11 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
}
if (showLEDs) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_ON, RGB_OFF, RGB_OFF);
#else
digitalWriteRGB(RED_LED, RGB_ON);
#endif
}
for (int16_t y = -16; y <= 24; y++) {
@ -180,8 +184,12 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
}
if (showLEDs && y == 4) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_ON, RGB_OFF);
#else
digitalWriteRGB(RED_LED, RGB_OFF); // red LED off
digitalWriteRGB(GREEN_LED, RGB_ON); // green LED on
#endif
}
// Using display(CLEAR_BUFFER) instead of clear() may save code space.
@ -193,12 +201,19 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
}
if (showLEDs) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_OFF, RGB_ON);
#else
digitalWriteRGB(GREEN_LED, RGB_OFF); // green LED off
digitalWriteRGB(BLUE_LED, RGB_ON); // blue LED on
#endif
}
delayShort(400);
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_OFF, RGB_OFF);
#else
digitalWriteRGB(BLUE_LED, RGB_OFF);
#endif
bootLogoExtra();
}
@ -1203,7 +1218,11 @@ void Arduboy2::bootLogoText()
}
if (showLEDs) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_ON, RGB_OFF, RGB_OFF);
#else
digitalWriteRGB(RED_LED, RGB_ON);
#endif
}
for (int8_t y = -16; y <= 24; y++) {
@ -1213,8 +1232,12 @@ void Arduboy2::bootLogoText()
}
if (showLEDs && y == 4) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_ON, RGB_OFF);
#else
digitalWriteRGB(RED_LED, RGB_OFF); // red LED off
digitalWriteRGB(GREEN_LED, RGB_ON); // green LED on
#endif
}
// Using display(CLEAR_BUFFER) instead of clear() may save code space.
@ -1230,11 +1253,19 @@ void Arduboy2::bootLogoText()
}
if (showLEDs) {
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_OFF, RGB_ON);
#else
digitalWriteRGB(GREEN_LED, RGB_OFF); // green LED off
digitalWriteRGB(BLUE_LED, RGB_ON); // blue LED on
#endif
}
delayShort(400);
#if defined(LCD_ST7565)
digitalWriteRGB(RGB_OFF, RGB_OFF, RGB_OFF);
#else
digitalWriteRGB(BLUE_LED, RGB_OFF);
#endif
bootLogoExtra();
}

109
board-package-source/libraries/Arduboy2/src/Arduboy2Core.cpp
View File

@ -20,6 +20,13 @@ const uint8_t PROGMEM lcdBootProgram[] = {
0xD9, 0xF1, // Set Precharge = 0xF1
OLED_SET_COLUMN_ADDRESS_LO, //Set column address for left most pixel
0xAF // Display On
#elif defined(LCD_ST7565)
0xC8, //SET_COM_REVERSE
0x28 | 0x7, //SET_POWER_CONTROL | 0x7
0x20 | 0x5, //SET_RESISTOR_RATIO | 0x5
0x81, //SET_VOLUME_FIRST
0x13, //SET_VOLUME_SECOND
0xAF //DISPLAY_ON
#elif defined(OLED_96X96) || defined(OLED_128X96) || defined(OLED_128X128) || defined(OLED_128X64_ON_96X96) || defined(OLED_128X64_ON_128X96) || defined(OLED_128X64_ON_128X128)|| defined(OLED_128X96_ON_128X128) || defined(OLED_96X96_ON_128X128) || defined(OLED_64X128_ON_128X128)
#if defined(OLED_96X96) || defined(OLED_128X64_ON_96X96)
0x15, 0x10, 0x3f, //left most 32 pixels are invisible
@ -207,6 +214,9 @@ void Arduboy2Core::bootPins()
~(_BV(CS_BIT) | _BV(RST_BIT) //oled chip enabled, reset active
#ifdef AB_ALTERNATE_WIRING
| _BV(SPEAKER_2_BIT)
#endif
#ifdef LCD_ST7565
| _BV(POWER_LED_BIT)
#endif
);
@ -214,6 +224,9 @@ void Arduboy2Core::bootPins()
DDRD = _BV(RST_BIT) | _BV(CS_BIT) | _BV(DC_BIT) |
#ifdef AB_ALTERNATE_WIRING
_BV(GREEN_LED_BIT) |
#endif
#ifdef LCD_ST7565
_BV(POWER_LED_BIT) |
#endif
_BV(CART_BIT) | _BV(TX_LED_BIT);
// Port D inputs (none)
@ -424,7 +437,7 @@ void Arduboy2Core::paint8Pixels(uint8_t pixels)
void Arduboy2Core::paintScreen(const uint8_t *image)
{
#ifdef OLED_SH1106
#if defined(OLED_SH1106) || defined(LCD_ST7565)
for (uint8_t i = 0; i < HEIGHT / 8; i++)
{
LCDCommandMode();
@ -500,7 +513,7 @@ void Arduboy2Core::paintScreen(const uint8_t *image)
// will be used by any buffer based subclass
void Arduboy2Core::paintScreen(uint8_t image[], bool clear)
{
#ifdef OLED_SH1106
#if defined(OLED_SH1106) || defined(LCD_ST7565)
//Assembly optimized page mode display code with clear support.
//Each byte transfer takes 18 cycles
asm volatile (
@ -719,6 +732,14 @@ void Arduboy2Core::flipHorizontal(bool flipped)
void Arduboy2Core::setRGBled(uint8_t red, uint8_t green, uint8_t blue)
{
#ifdef LCD_ST7565
if ((red | green | blue) == 0) //prevent backlight off
{
red = 255;
green = 255;
blue = 255;
}
#endif
#ifdef ARDUBOY_10 // RGB, all the pretty colors
uint8_t pwmstate = TCCR0A;
#ifndef AB_ALTERNATE_WIRING
@ -727,14 +748,26 @@ void Arduboy2Core::setRGBled(uint8_t red, uint8_t green, uint8_t blue)
pwmstate &= ~_BV(COM0B1);
#endif
if (green == 0)
bitSet(GREEN_LED_PORT, GREEN_LED_BIT);
else if (green == 255)
#if defined(LCD_ST7565)
bitClear(GREEN_LED_PORT, GREEN_LED_BIT);
#else
bitSet(GREEN_LED_PORT, GREEN_LED_BIT);
#endif
else if (green == 255)
#if defined(LCD_ST7565)
bitSet(GREEN_LED_PORT, GREEN_LED_BIT);
#else
bitClear(GREEN_LED_PORT, GREEN_LED_BIT);
#endif
else
{
#ifndef AB_ALTERNATE_WIRING
pwmstate |= _BV(COM0A1); //configure pin as pwm pin
#if defined(LCD_ST7565)
OCR0A = green; //set pwm duty
#else
OCR0A = 255 - green; //set pwm duty
#endif
#else
pwmstate |= _BV(COM0B1);
OCR0B = 255 - green;
@ -742,21 +775,57 @@ void Arduboy2Core::setRGBled(uint8_t red, uint8_t green, uint8_t blue)
}
TCCR0A = pwmstate;
pwmstate = TCCR1A & ~(_BV(COM1B1) | _BV(COM1A1)); //default to digital pins for min and max values
if (red == 0) bitSet(RED_LED_PORT, RED_LED_BIT);
else if (red == 255) bitClear(RED_LED_PORT, RED_LED_BIT);
if (red == 0)
{
#if defined(LCD_ST7565)
bitClear(RED_LED_PORT, RED_LED_BIT);
#else
bitSet(RED_LED_PORT, RED_LED_BIT);
#endif
}
else if (red == 255)
{
#if defined(LCD_ST7565)
bitSet(RED_LED_PORT, RED_LED_BIT);
#else
bitClear(RED_LED_PORT, RED_LED_BIT);
#endif
}
else
{
pwmstate |= _BV(COM1B1); //configure pin as pwm pin
OCR1BH = 0;
#if defined(LCD_ST7565)
OCR1BL = red; //set pwm duty
#else
OCR1BL = 255 - red; //set pwm duty
#endif
}
if (blue == 0)
{
#if defined(LCD_ST7565)
bitClear(BLUE_LED_PORT, BLUE_LED_BIT);
#else
bitSet(BLUE_LED_PORT, BLUE_LED_BIT);
#endif
}
else if (blue == 255)
{
#if defined(LCD_ST7565)
bitSet(BLUE_LED_PORT, BLUE_LED_BIT);
#else
bitClear(BLUE_LED_PORT, BLUE_LED_BIT);
#endif
}
if (blue == 0) bitSet(BLUE_LED_PORT, BLUE_LED_BIT);
else if (blue == 255) bitClear(BLUE_LED_PORT, BLUE_LED_BIT);
else
{
pwmstate |= _BV(COM1A1); //configure pin as pwm pin
OCR1AH = 0;
#if defined(LCD_ST7565)
OCR1AL = blue; //set pwm duty
#else
OCR1AL = 255 - blue; //set pwm duty
#endif
}
TCCR1A = pwmstate;
#elif defined(AB_DEVKIT)
@ -772,19 +841,31 @@ void Arduboy2Core::setRGBled(uint8_t color, uint8_t val)
#ifdef ARDUBOY_10
if (color == RED_LED)
{
#ifdef LCD_ST7565
OCR1BL = 255 - val;
#else
OCR1BL = val;
#endif
}
else if (color == GREEN_LED)
{
#ifndef AB_ALTERNATE_WIRING
OCR0A = 255 - val;
#else
#ifdef LCD_ST7565
OCR0B = val;
#else
OCR0B = 255 - val;
#endif
#endif
}
else if (color == BLUE_LED)
{
#ifdef LCD_ST7565
OCR1AL = 255 - val;
#else
OCR1AL = val;
#endif
}
#elif defined(AB_DEVKIT)
// only blue on DevKit, which is not PWM capable
@ -806,6 +887,17 @@ void Arduboy2Core::freeRGBled()
void Arduboy2Core::digitalWriteRGB(uint8_t red, uint8_t green, uint8_t blue)
{
#ifdef LCD_ST7565
if ((red & green & blue) == RGB_OFF) //prevent backlight off
{
red = RGB_ON;
green = RGB_ON;
blue = RGB_ON;
}
bitWrite(RED_LED_PORT, RED_LED_BIT, !red);
bitWrite(GREEN_LED_PORT, GREEN_LED_BIT, !green);
bitWrite(BLUE_LED_PORT, BLUE_LED_BIT, !blue);
#else
#ifdef ARDUBOY_10
bitWrite(RED_LED_PORT, RED_LED_BIT, red);
bitWrite(GREEN_LED_PORT, GREEN_LED_BIT, green);
@ -816,6 +908,7 @@ void Arduboy2Core::digitalWriteRGB(uint8_t red, uint8_t green, uint8_t blue)
(void)green; // parameter unused
bitWrite(BLUE_LED_PORT, BLUE_LED_BIT, blue);
#endif
#endif
}
void Arduboy2Core::digitalWriteRGB(uint8_t color, uint8_t val)

5
board-package-source/libraries/Arduboy2/src/Arduboy2Core.h
View File

@ -100,6 +100,11 @@ extern volatile unsigned char bootloader_timer;
#define RX_LED_PORT PORTB
#define RX_LED_BIT PORTB0
#ifdef LCD_ST7565
#define POWER_LED_PORT PORTD
#define POWER_LED_BIT PORTD0
#endif
// bit values for button states
// these are determined by the buttonsState() function
#define LEFT_BUTTON _BV(5) /**< The Left button value for functions requiring a bitmask */