clean up & rename

Author: ladyada

Adafruit_SSD1325.cpp

@@ -31,7 +31,6 @@ All text above, and the splash screen below must be included in any redistributi
 #include "Adafruit_SSD1325.h"
 #include "glcdfont.c"
 
-<<<<<<< HEAD
 #ifdef SPI_HAS_TRANSACTION
 SPISettings oledspi = SPISettings(4000000, MSBFIRST, SPI_MODE0);
 #else
@@ -41,8 +40,6 @@ SPISettings oledspi = SPISettings(4000000, MSBFIRST, SPI_MODE0);
 // a 5x7 font table
 extern const uint8_t PROGMEM font[];
 
-=======
->>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
 // the memory buffer for the LCD
 
 static uint8_t buffer[SSD1325_LCDHEIGHT * SSD1325_LCDWIDTH / 8] = {
@@ -114,11 +111,7 @@ static uint8_t buffer[SSD1325_LCDHEIGHT * SSD1325_LCDWIDTH / 8] = {
 
 // the most basic function, set a single pixel
 void Adafruit_SSD1325::drawPixel(int16_t x, int16_t y, uint16_t color) {
-<<<<<<< HEAD
   if ((x >= width()) || (y >= height()) || (x < 0) || (y < 0))
-=======
-  if ((x < 0) || (x >= width()) || (y < 0) || (y >= height()))
->>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
     return;
 
   // check rotation, move pixel around if necessary

Adafruit_SSD1325.h

@@ -95,17 +95,11 @@ All text above, and the splash screen must be included in any redistribution
 
 class Adafruit_SSD1325 : public Adafruit_GFX {
  public:
-<<<<<<< HEAD
   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) {}
 
   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) {}
   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) {}
 
-=======
-  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) {}
-    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) {}
->>>>>>> a7ceffe0dd471aad7e5eeeaeb0fd0377d22ec684
-
   void begin(void);
   void command(uint8_t c);
   void data(uint8_t c);

examples/rotation/rotationtest.ino renamed to examples/rotationtest/rotationtest.ino

@@ -16,20 +16,25 @@ BSD license, check license.txt for more information
 All text above, and the splash screen below must be included in any redistribution
 *********************************************************************/
 
-
-// You can use any (4 or) 5 pins 
-#define OLED_DC 11
-#define OLED_CS 12
-#define OLED_CLK 10
-#define OLED_MOSI 9
-#define OLED_RESET 13
-
+#include <SPI.h>
 #include <Adafruit_GFX.h>
 #include <Adafruit_SSD1325.h>
-#include <SPI.h>
 
+// If using software SPI, define CLK and MOSI
+#define OLED_CLK 13
+#define OLED_MOSI 11
+
+// These are neede for both hardware & softare SPI
+#define OLED_CS 10
+#define OLED_RESET 9
+#define OLED_DC 8
+
+// this is software SPI, slower but any pins
 Adafruit_SSD1325 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);
 
+// this is for hardware SPI, fast! but fixed oubs
+//Adafruit_SSD1325 display(OLED_DC, OLED_RESET, OLED_CS);
+
 
 void setup(void) {
   Serial.begin(9600);

examples/ssd1325test/ssd1325test.ino

@@ -26,8 +26,8 @@ All text above, and the splash screen below must be included in any redistributi
 
 // These are neede for both hardware & softare SPI
 #define OLED_CS 10
-#define OLED_DC 9
-#define OLED_RESET 8
+#define OLED_RESET 9
+#define OLED_DC 8
 
 // this is software SPI, slower but any pins
 Adafruit_SSD1325 display(OLED_MOSI, OLED_CLK, OLED_DC, OLED_RESET, OLED_CS);