adafruit-mirror/Adafruit_SSD1306
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tested with atsam21d but not working with 32u4?

Browse source
This commit is contained in:
ladyada 2015-10-01 18:22:54 -04:00
parent ace7d2bb21
commit 5674153e88
2 changed files with 59 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Adafruit_SSD1306.cpp
View file

@ -17,13 +17,13 @@ All text above, and the splash screen below must be included in any redistributi
*********************************************************************/
#include <avr/pgmspace.h>
#ifndef __SAM3X8E__
#if !defined(__SAM3X8E__) && !defined(ARDUINO_ARCH_SAMD)
#include <util/delay.h>
#endif
#include <stdlib.h>
#include <Wire.h>
#include <SPI.h>
#include "Adafruit_GFX.h"
#include "Adafruit_SSD1306.h"
@ -166,28 +166,32 @@ void Adafruit_SSD1306::begin(uint8_t vccstate, uint8_t i2caddr, bool reset) {
if (sid != -1){
pinMode(dc, OUTPUT);
pinMode(cs, OUTPUT);
#ifdef PortReg
csport = portOutputRegister(digitalPinToPort(cs));
cspinmask = digitalPinToBitMask(cs);
dcport = portOutputRegister(digitalPinToPort(dc));
dcpinmask = digitalPinToBitMask(dc);
#endif
if (!hwSPI){
// set pins for software-SPI
pinMode(sid, OUTPUT);
pinMode(sclk, OUTPUT);
#ifdef PortReg
clkport = portOutputRegister(digitalPinToPort(sclk));
clkpinmask = digitalPinToBitMask(sclk);
mosiport = portOutputRegister(digitalPinToPort(sid));
mosipinmask = digitalPinToBitMask(sid);
}
if (hwSPI){
SPI.begin ();
#ifdef __SAM3X8E__
SPI.setClockDivider (9); // 9.3 MHz
#else
SPI.setClockDivider (SPI_CLOCK_DIV2); // 8 MHz
#endif
}
if (hwSPI){
SPI.begin();
#ifdef SPI_HAS_TRANSACTION
SPI.beginTransaction(SPISettings(8000000, MSBFIRST, SPI_MODE0));
#else
SPI.setClockDivider (4);
#endif
}
}
else
{
// I2C Init
@ -338,15 +342,21 @@ void Adafruit_SSD1306::ssd1306_command(uint8_t c) {
if (sid != -1)
{
// SPI
//digitalWrite(cs, HIGH);
#ifdef PortReg
*csport |= cspinmask;
//digitalWrite(dc, LOW);
*dcport &= ~dcpinmask;
//digitalWrite(cs, LOW);
*csport &= ~cspinmask;
#else
digitalWrite(cs, HIGH);
digitalWrite(dc, LOW);
digitalWrite(cs, LOW);
#endif
fastSPIwrite(c);
//digitalWrite(cs, HIGH);
#ifdef PortReg
*csport |= cspinmask;
#else
digitalWrite(cs, HIGH);
#endif
}
else
{
@ -452,15 +462,21 @@ void Adafruit_SSD1306::ssd1306_data(uint8_t c) {
if (sid != -1)
{
// SPI
//digitalWrite(cs, HIGH);
#ifdef PortReg
*csport |= cspinmask;
//digitalWrite(dc, HIGH);
*dcport |= dcpinmask;
//digitalWrite(cs, LOW);
*csport &= ~cspinmask;
#else
digitalWrite(cs, HIGH);
digitalWrite(dc, HIGH);
digitalWrite(cs, LOW);
#endif
fastSPIwrite(c);
//digitalWrite(cs, HIGH);
#ifdef PortReg
*csport |= cspinmask;
#else
digitalWrite(cs, HIGH);
#endif
}
else
{
@ -493,20 +509,30 @@ void Adafruit_SSD1306::display(void) {
if (sid != -1)
{
// SPI
#ifdef PortReg
*csport |= cspinmask;
*dcport |= dcpinmask;
*csport &= ~cspinmask;
#else
digitalWrite(cs, HIGH);
digitalWrite(dc, HIGH);
digitalWrite(cs, LOW);
#endif
for (uint16_t i=0; i<(SSD1306_LCDWIDTH*SSD1306_LCDHEIGHT/8); i++) {
fastSPIwrite(buffer[i]);
//ssd1306_data(buffer[i]);
}
#ifdef PortReg
*csport |= cspinmask;
#else
digitalWrite(cs, HIGH);
#endif
}
else
{
// save I2C bitrate
#ifndef __SAM3X8E__
#ifdef TWBR
uint8_t twbrbackup = TWBR;
TWBR = 12; // upgrade to 400KHz!
#endif
@ -526,7 +552,7 @@ void Adafruit_SSD1306::display(void) {
i--;
Wire.endTransmission();
}
#ifndef __SAM3X8E__
#ifdef TWBR
TWBR = twbrbackup;
#endif
}
@ -544,13 +570,19 @@ inline void Adafruit_SSD1306::fastSPIwrite(uint8_t d) {
(void)SPI.transfer(d);
} else {
for(uint8_t bit = 0x80; bit; bit >>= 1) {
#ifdef PortReg
*clkport &= ~clkpinmask;
if(d & bit) *mosiport |= mosipinmask;
else *mosiport &= ~mosipinmask;
*clkport |= clkpinmask;
#else
digitalWrite(sclk, LOW);
if(d & bit) digitalWrite(sid, HIGH);
else digitalWrite(sid, LOW);
digitalWrite(sclk, HIGH);
#endif
}
}
//*csport |= cspinmask;
}
void Adafruit_SSD1306::drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color) {

10
Adafruit_SSD1306.h
View file

@ -24,9 +24,11 @@ All text above, and the splash screen must be included in any redistribution
#define WIRE_WRITE Wire.send
#endif
#ifdef __SAM3X8E__
#if defined(__SAM3X8E__)
typedef volatile RwReg PortReg;
typedef uint32_t PortMask;
#elif defined(ARDUINO_ARCH_SAMD)
// not supported
#else
typedef volatile uint8_t PortReg;
typedef uint8_t PortMask;
@ -57,8 +59,8 @@ All text above, and the splash screen must be included in any redistribution
SSD1306_96_16
-----------------------------------------------------------------------*/
#define SSD1306_128_64
// #define SSD1306_128_32
// #define SSD1306_128_64
#define SSD1306_128_32
// #define SSD1306_96_16
/*=========================================================================*/
@ -161,8 +163,10 @@ class Adafruit_SSD1306 : public Adafruit_GFX {
void fastSPIwrite(uint8_t c);
boolean hwSPI;
#ifdef PortReg
PortReg *mosiport, *clkport, *csport, *dcport;
PortMask mosipinmask, clkpinmask, cspinmask, dcpinmask;
#endif
inline void drawFastVLineInternal(int16_t x, int16_t y, int16_t h, uint16_t color) __attribute__((always_inline));
inline void drawFastHLineInternal(int16_t x, int16_t y, int16_t w, uint16_t color) __attribute__((always_inline));