Tweaks for Adafruit_GFX

Author: PaintYourDragon

Adafruit_SSD1325.cpp

@@ -99,8 +99,8 @@ static uint8_t buffer[SSD1325_LCDHEIGHT * SSD1325_LCDWIDTH / 8] = {
 };
 
 // the most basic function, set a single pixel
-void Adafruit_SSD1325::drawPixel(uint16_t x, uint16_t y, uint16_t color) {
-  if ((x >= width()) || (y >= height()))
+void Adafruit_SSD1325::drawPixel(int16_t x, int16_t y, uint16_t color) {
+  if ((x < 0) || (x >= width()) || (y < 0) || (y >= height()))
     return;
 
   // check rotation, move pixel around if necessary

Adafruit_SSD1325.h

@@ -25,8 +25,6 @@ All text above, and the splash screen must be included in any redistribution
 
 #include <Adafruit_GFX.h>
 
-#define swap(a, b) { uint8_t t = a; a = b; b = t; }
-
 #define BLACK 0
 #define WHITE 1
 
@@ -110,7 +108,7 @@ class Adafruit_SSD1325 : public Adafruit_GFX {
   void setBrightness(uint8_t i);
   void display();
 
-  void drawPixel(uint16_t x, uint16_t y, uint16_t color);
+  void drawPixel(int16_t x, int16_t y, uint16_t color);
 
  private:
   int8_t sid, sclk, dc, rst, cs;

examples/rotation/rotation.pde

@@ -17,10 +17,10 @@
 #define OLED_RESET 13
 
 #include <Adafruit_GFX.h>
-#include <Adafruit_SSD1305.h>
+#include <Adafruit_SSD1325.h>
 #include <SPI.h>
 
-Adafruit_SSD1305 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
+Adafruit_SSD1325 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
 
 
 void setup(void) {

examples/ssd1325/ssd1325.pde

@@ -5,9 +5,9 @@
 #define OLED_RESET 13
 
 #include <Adafruit_GFX.h>
-#include <Adafruit_SSD1305.h>
+#include <Adafruit_SSD1325.h>
 
-Adafruit_SSD1305 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
+Adafruit_SSD1325 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
 
 #define NUMFLAKES 10
 #define XPOS 0
@@ -200,7 +200,7 @@ void testdrawchar(void) {
   display.setTextColor(WHITE);
   display.setCursor(0,0);
 
-  for (uint8_t i=0; i < 168; i++) {
+  for (int16_t i=0; i < 168; i++) {
     if (i == '\n') continue;
     display.write(i);
     if ((i > 0) && (i % 21 == 0))
@@ -218,7 +218,7 @@ void testdrawcircle(void) {
 
 void testfillrect(void) {
   uint8_t color = 1;
-  for (uint8_t i=0; i<display.height()/2; i+=3) {
+  for (int16_t i=0; i<display.height()/2; i+=3) {
     // alternate colors
     display.fillRect(i, i, display.width()-i*2, display.height()-i*2, color%2);
     display.display();
@@ -227,7 +227,7 @@ void testfillrect(void) {
 }
 
 void testdrawtriangle(void) {
-  for (uint16_t i=0; i<min(display.width(),display.height())/2; i+=5) {
+  for (int16_t i=0; i<min(display.width(),display.height())/2; i+=5) {
     display.drawTriangle(display.width()/2, display.height()/2-i,
                      display.width()/2-i, display.height()/2+i,
                      display.width()/2+i, display.height()/2+i, WHITE);
@@ -248,15 +248,15 @@ void testfilltriangle(void) {
 }
 
 void testdrawroundrect(void) {
-  for (uint8_t i=0; i<display.height()/2-2; i+=2) {
+  for (int16_t i=0; i<display.height()/2-2; i+=2) {
     display.drawRoundRect(i, i, display.width()-2*i, display.height()-2*i, display.height()/4, WHITE);
     display.display();
   }
 }
 
 void testfillroundrect(void) {
   uint8_t color = WHITE;
-  for (uint8_t i=0; i<display.height()/2-2; i+=2) {
+  for (int16_t i=0; i<display.height()/2-2; i+=2) {
     display.fillRoundRect(i, i, display.width()-2*i, display.height()-2*i, display.height()/4, color);
     if (color == WHITE) color = BLACK;
     else color = WHITE;
@@ -265,53 +265,53 @@ void testfillroundrect(void) {
 }
 
 void testdrawrect(void) {
-  for (uint8_t i=0; i<display.height()/2; i+=2) {
+  for (int16_t i=0; i<display.height()/2; i+=2) {
     display.drawRect(i, i, display.width()-2*i, display.height()-2*i, WHITE);
     display.display();
   }
 }
 
 void testdrawline() {  
-  for (uint8_t i=0; i<display.width(); i+=4) {
+  for (int16_t i=0; i<display.width(); i+=4) {
     display.drawLine(0, 0, i, display.height()-1, WHITE);
     display.display();
   }
-  for (uint8_t i=0; i<display.height(); i+=4) {
+  for (int16_t i=0; i<display.height(); i+=4) {
     display.drawLine(0, 0, display.width()-1, i, WHITE);
     display.display();
   }
   delay(250);
 
   display.clearDisplay();
-  for (uint8_t i=0; i<display.width(); i+=4) {
+  for (int16_t i=0; i<display.width(); i+=4) {
     display.drawLine(0, display.height()-1, i, 0, WHITE);
     display.display();
   }
-  for (int8_t i=display.height()-1; i>=0; i-=4) {
+  for (int16_t i=display.height()-1; i>=0; i-=4) {
     display.drawLine(0, display.height()-1, display.width()-1, i, WHITE);
     display.display();
   }
   delay(250);
 
   display.clearDisplay();
-  for (int8_t i=display.width()-1; i>=0; i-=4) {
+  for (int16_t i=display.width()-1; i>=0; i-=4) {
     display.drawLine(display.width()-1, display.height()-1, i, 0, WHITE);
     display.display();
   }
-  for (int8_t i=display.height()-1; i>=0; i-=4) {
+  for (int16_t i=display.height()-1; i>=0; i-=4) {
     display.drawLine(display.width()-1, display.height()-1, 0, i, WHITE);
     display.display();
   }
   delay(250);
 
   display.clearDisplay();
-  for (uint8_t i=0; i<display.height(); i+=4) {
+  for (int16_t i=0; i<display.height(); i+=4) {
     display.drawLine(display.width()-1, 0, 0, i, WHITE);
     display.display();
   }
-  for (uint8_t i=0; i<display.width(); i+=4) {
+  for (int16_t i=0; i<display.width(); i+=4) {
     display.drawLine(display.width()-1, 0, i, display.height()-1, WHITE); 
     display.display();
   }
   delay(250);
-}
+}