Skip to content

Commit f852c15

Browse files
ladyadaladyada
committed
Merge branch 'master' of github.com:adafruit/Adafruit-SSD1325
Conflicts: Adafruit_SSD1325.cpp Adafruit_SSD1325.h examples/ssd1325test/ssd1325test.ino
2 parents 6eb8136 + a7ceffe commit f852c15

File tree

4 files changed

+28
-15
lines changed

4 files changed

+28
-15
lines changed

‎Adafruit_SSD1325.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ All text above, and the splash screen below must be included in any redistributi
3131
#include "Adafruit_SSD1325.h"
3232
#include "glcdfont.c"
3333

34+
<<<<<<< HEAD
3435
#ifdef SPI_HAS_TRANSACTION
3536
SPISettings oledspi = SPISettings(4000000, MSBFIRST, SPI_MODE0);
3637
#else
@@ -40,6 +41,8 @@ SPISettings oledspi = SPISettings(4000000, MSBFIRST, SPI_MODE0);
4041
// a 5x7 font table
4142
extern const uint8_t PROGMEM font[];
4243

44+
=======
45+
>>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
4346
// the memory buffer for the LCD
4447

4548
static uint8_t buffer[SSD1325_LCDHEIGHT * SSD1325_LCDWIDTH / 8] = {
@@ -111,7 +114,11 @@ static uint8_t buffer[SSD1325_LCDHEIGHT * SSD1325_LCDWIDTH / 8] = {
111114

112115
// the most basic function, set a single pixel
113116
void Adafruit_SSD1325::drawPixel(int16_t x, int16_t y, uint16_t color) {
117+
<<<<<<< HEAD
114118
if ((x >= width()) || (y >= height()) || (x < 0) || (y < 0))
119+
=======
120+
if ((x < 0) || (x >= width()) || (y < 0) || (y >= height()))
121+
>>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
115122
return;
116123

117124
// check rotation, move pixel around if necessary

‎Adafruit_SSD1325.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,16 @@ All text above, and the splash screen must be included in any redistribution
9595

9696
class Adafruit_SSD1325 : public Adafruit_GFX {
9797
public:
98+
<<<<<<< HEAD
9899
Adafruit_SSD1325(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST, int8_t CS) : Adafruit_GFX(128,64), sid(SID), sclk(SCLK), dc(DC), rst(RST), cs(CS) {}
99100

100101
Adafruit_SSD1325(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST) : Adafruit_GFX(128,64), sid(SID), sclk(SCLK), dc(DC), rst(RST), cs(-1) {}
101102
Adafruit_SSD1325(int8_t DC, int8_t RST, int8_t CS) : Adafruit_GFX(128,64), sid(-1), sclk(-1), dc(DC), rst(RST), cs(CS) {}
102103

104+
=======
105+
Adafruit_SSD1325(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST, int8_t CS) : Adafruit_GFX(SSD1325_LCDWIDTH, SSD1325_LCDHEIGHT), sid(SID), sclk(SCLK), dc(DC), rst(RST), cs(CS) {}
106+
Adafruit_SSD1325(int8_t SID, int8_t SCLK, int8_t DC, int8_t RST) : Adafruit_GFX(SSD1325_LCDWIDTH, SSD1325_LCDHEIGHT), sid(SID), sclk(SCLK), dc(DC), rst(RST), cs(-1) {}
107+
>>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
103108

104109
void begin(void);
105110
void command(uint8_t c);

‎examples/rotation/rotationtest.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ All text above, and the splash screen below must be included in any redistributi
2525
#define OLED_RESET 13
2626

2727
#include <Adafruit_GFX.h>
28-
#include <Adafruit_SSD1305.h>
28+
#include <Adafruit_SSD1325.h>
2929
#include <SPI.h>
3030

31-
Adafruit_SSD1305 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
31+
Adafruit_SSD1325 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
3232

3333

3434
void setup(void) {

‎examples/ssd1325test/ssd1325test.ino‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void testdrawchar(void) {
267267
display.setTextColor(WHITE);
268268
display.setCursor(0,0);
269269

270-
for (uint8_t i=0; i < 168; i++) {
270+
for (int16_t i=0; i < 168; i++) {
271271
if (i == '\n') continue;
272272
display.write(i);
273273
if ((i > 0) && (i % 21 == 0))
@@ -285,7 +285,7 @@ void testdrawcircle(void) {
285285

286286
void testfillrect(void) {
287287
uint8_t color = 1;
288-
for (uint8_t i=0; i<display.height()/2; i+=3) {
288+
for (int16_t i=0; i<display.height()/2; i+=3) {
289289
// alternate colors
290290
display.fillRect(i, i, display.width()-i*2, display.height()-i*2, color%2);
291291
display.display();
@@ -294,7 +294,7 @@ void testfillrect(void) {
294294
}
295295

296296
void testdrawtriangle(void) {
297-
for (uint16_t i=0; i<min(display.width(),display.height())/2; i+=5) {
297+
for (int16_t i=0; i<min(display.width(),display.height())/2; i+=5) {
298298
display.drawTriangle(display.width()/2, display.height()/2-i,
299299
display.width()/2-i, display.height()/2+i,
300300
display.width()/2+i, display.height()/2+i, WHITE);
@@ -315,14 +315,15 @@ void testfilltriangle(void) {
315315
}
316316

317317
void testdrawroundrect(void) {
318-
for (uint8_t i=0; i<display.height()/4-2; i+=2) {
318+
for (uint8_t i=0; i<display.height()/3-2; i+=2) {
319319
display.drawRoundRect(i, i, display.width()-2*i, display.height()-2*i, display.height()/4, WHITE);
320320
display.display();
321321
}
322322
}
323323

324324
void testfillroundrect(void) {
325325
uint8_t color = WHITE;
326+
326327
for (uint8_t i=0; i<display.height()/3-2; i+=2) {
327328
display.fillRoundRect(i, i, display.width()-2*i, display.height()-2*i, display.height()/4, color);
328329
if (color == WHITE) color = BLACK;
@@ -332,51 +333,51 @@ void testfillroundrect(void) {
332333
}
333334

334335
void testdrawrect(void) {
335-
for (uint8_t i=0; i<display.height()/2; i+=2) {
336+
for (int16_t i=0; i<display.height()/2; i+=2) {
336337
display.drawRect(i, i, display.width()-2*i, display.height()-2*i, WHITE);
337338
display.display();
338339
}
339340
}
340341

341342
void testdrawline() {
342-
for (uint8_t i=0; i<display.width(); i+=4) {
343+
for (int16_t i=0; i<display.width(); i+=4) {
343344
display.drawLine(0, 0, i, display.height()-1, WHITE);
344345
display.display();
345346
}
346-
for (uint8_t i=0; i<display.height(); i+=4) {
347+
for (int16_t i=0; i<display.height(); i+=4) {
347348
display.drawLine(0, 0, display.width()-1, i, WHITE);
348349
display.display();
349350
}
350351
delay(250);
351352

352353
display.clearDisplay();
353-
for (uint8_t i=0; i<display.width(); i+=4) {
354+
for (int16_t i=0; i<display.width(); i+=4) {
354355
display.drawLine(0, display.height()-1, i, 0, WHITE);
355356
display.display();
356357
}
357-
for (int8_t i=display.height()-1; i>=0; i-=4) {
358+
for (int16_t i=display.height()-1; i>=0; i-=4) {
358359
display.drawLine(0, display.height()-1, display.width()-1, i, WHITE);
359360
display.display();
360361
}
361362
delay(250);
362363

363364
display.clearDisplay();
364-
for (int8_t i=display.width()-1; i>=0; i-=4) {
365+
for (int16_t i=display.width()-1; i>=0; i-=4) {
365366
display.drawLine(display.width()-1, display.height()-1, i, 0, WHITE);
366367
display.display();
367368
}
368-
for (int8_t i=display.height()-1; i>=0; i-=4) {
369+
for (int16_t i=display.height()-1; i>=0; i-=4) {
369370
display.drawLine(display.width()-1, display.height()-1, 0, i, WHITE);
370371
display.display();
371372
}
372373
delay(250);
373374

374375
display.clearDisplay();
375-
for (uint8_t i=0; i<display.height(); i+=4) {
376+
for (int16_t i=0; i<display.height(); i+=4) {
376377
display.drawLine(display.width()-1, 0, 0, i, WHITE);
377378
display.display();
378379
}
379-
for (uint8_t i=0; i<display.width(); i+=4) {
380+
for (int16_t i=0; i<display.width(); i+=4) {
380381
display.drawLine(display.width()-1, 0, i, display.height()-1, WHITE);
381382
display.display();
382383
}

0 commit comments

Comments
 (0)