Updated to use GFX v1.9.0 (#13)

* transitioned pixel management to  GFX lib

Moved getting of raw pixel color values from something this library handles to something the underlying AdaFruit GFX library handles. Depends on this pull request in the AdaFruit GFX repository: adafruit/Adafruit-GFX-Library#237

* transitioned pixel management to  GFX lib

Moved getting of raw pixel color values from something this library handles to something the underlying AdaFruit GFX library handles. Depends on this pull request in the AdaFruit GFX repository: adafruit/Adafruit-GFX-Library#237

* improved monochrome exmaple

* fixed CHANGELOG

Author: michaelkamprath

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Specify library dependencies in library.properties
 
+### Changed
+- Moved methods for accessing raw pixel color values to the AdaFruit GFX library. This has no net change to the user, but improves the architecture of the code. Depends on [pull request #237 in the AdaFruit GFX repository](https://github.com/adafruit/Adafruit-GFX-Library/pull/237), which was incorporated in v1.9.0 of the GFX library. 
+
 ## [2.0.0]
 ### Changed
 - Transition library to use [Adafruit's GFX Library](https://github.com/adafruit/Adafruit-GFX-Library) to handle the graphics API. The befit of this is that it immediately brings a wealth of functionality pertaining to the programatic construction of the image, especially fonts and text drawing. The Adafruit GFX library is only used for the primary image buffer. The backend operations of the driver (i.e., the secondary buffer for the shift register bits) is still the same. This is a significant change to the library, likely requiring you to change your code. In the process, dropped support for simulating gray scale on monochrome LED matrices. This might be brought back later.

examples/other/monochrome-32x16/monochrome-32x16.ino

@@ -13,6 +13,8 @@ LEDMatrix leds(16,32, HIGH, HIGH, 3);
 
 uint16_t loopCounter;
 int16_t xpos = leds.columns() + 1;
+int16_t lineCounter = 0;
+int16_t lineCounterIncrement = 1;
 uint16_t textWidth;
 uint16_t textHeight;
 const char* str = "Hello World!";
@@ -42,8 +44,15 @@ void loop() {
 	loopCounter++;
 	if (loopCounter >= 2000) {
 		loopCounter = 0;
+		lineCounter += lineCounterIncrement;
+		if (lineCounter == 0) {
+			lineCounterIncrement = 1;
+		} else if ( lineCounter == leds.rows()/2 - 1) {
+			lineCounterIncrement = -1;
+		}
 		leds.startDrawing();
-		leds.fillRect(0, leds.rows()/2, leds.columns(), leds.rows()/2, LED_BLACK);
+		leds.fillRect(0, 0, leds.columns(), leds.rows(), LED_BLACK);
+		leds.drawLine(0, lineCounter, leds.columns(), leds.rows()/2-1-lineCounter, LED_WHITE);
 		xpos--;
 		if (xpos < -((int16_t)textWidth)) {
 			xpos = leds.columns() + 1;

src/LEDMatrix.cpp

@@ -76,7 +76,7 @@ void LEDMatrix::setRowBitsForFrame(
 		bool rowNeedsPower = false;
 		size_t colBitIdx = 0;
 		for (uint16_t col = 0; col < this->columns(); col++) {
-			uint16_t pixel = this->rawPixel(col, row);
+			uint16_t pixel = this->getRawPixel(col, row);
 
 			if (pixel > 0) {
 				frameBits.setColumnControlBit(row,colBitIdx,true);
@@ -95,38 +95,6 @@ ICACHE_RAM_ATTR unsigned int LEDMatrix::baseIntervalMultiplier( size_t frame ) c
 
 #pragma mark - Adafruit GFX Support
 
-uint16_t LEDMatrix::rawPixel( int16_t x, int16_t y ) const {
-	if((x < 0) || (y < 0) || (x >= _width) || (y >= _height)) return 0;
-	if(this->getBuffer()) {
-		uint8_t *buffer = this->getBuffer();
-		uint8_t *ptr  = &buffer[(x / 8) + y * ((WIDTH + 7) / 8)];
-		
-		return ((*ptr) & (0x80 >> (x & 7))) != 0;
-	}
-	return 0;
-}
-
-uint16_t LEDMatrix::pixel( int16_t x, int16_t y ) const {
-	int16_t t;
-	switch(this->getRotation()) {
-		case 1:
-			t = x;
-			x = WIDTH  - 1 - y;
-			y = t;
-			break;
-		case 2:
-			x = WIDTH  - 1 - x;
-			y = HEIGHT - 1 - y;
-			break;
-		case 3:
-			t = x;
-			x = y;
-			y = HEIGHT - 1 - t;
-			break;
-	}	
-	return this->rawPixel(x, y);
-}
-
 void LEDMatrix::drawPixel(int16_t x, int16_t y, uint16_t color) {
 	this->GFXcanvas1::drawPixel(x, y, color);
 	_matrixNeedsUpdate = true;

src/LEDMatrix.h

@@ -42,8 +42,6 @@ class LEDMatrix : public BaseLEDMatrix, public GFXcanvas1 {
 	virtual bool matrixNeedsUpdate(void) const;
 	virtual void matrixHasBeenUpdated(void);
 	virtual unsigned int baseIntervalMultiplier( size_t frame ) const;
-
-	uint16_t rawPixel( int16_t rawX, int16_t rawY ) const;  
 
 public:
 
@@ -92,8 +90,6 @@ class LEDMatrix : public BaseLEDMatrix, public GFXcanvas1 {
 	//
 	// Adafruit GFX Support
 	//
-	
-	uint16_t pixel( int16_t x, int16_t y ) const;  
 	virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
 	virtual void fillScreen(uint16_t color);
 };

src/RGBLEDMatrix.cpp

@@ -202,7 +202,7 @@ bool RGBLEDMatrix::setColumnBitsForControlRowAndFrame(
 			endianCol = this->columns() - (colByte+1)*8 + colBit;
 		}
 
-		RGBColorType rgbValue = this->rawPixel(endianCol, imageRow);
+		RGBColorType rgbValue = this->getRawPixel(endianCol, imageRow);
 		// a form of Binary Code Modulation is used to control
 		// the LED intensity at variou levels.
 
@@ -239,35 +239,6 @@ unsigned int RGBLEDMatrix::baseIntervalMultiplier( size_t frame ) const {
 
 #pragma mark - Adafruit GFX Support
 
-uint16_t RGBLEDMatrix::rawPixel( int16_t x, int16_t y ) const {
-	if((x < 0) || (y < 0) || (x >= _width) || (y >= _height)) return 0;
-	if(this->getBuffer()) {
-		return this->getBuffer()[x + y * this->WIDTH];
-	}
-	return 0;
-}
-
-uint16_t RGBLEDMatrix::pixel( int16_t x, int16_t y ) const {
-	int16_t t;
-	switch(this->getRotation()) {
-		case 1:
-			t = x;
-			x = WIDTH  - 1 - y;
-			y = t;
-			break;
-		case 2:
-			x = WIDTH  - 1 - x;
-			y = HEIGHT - 1 - y;
-			break;
-		case 3:
-			t = x;
-			x = y;
-			y = HEIGHT - 1 - t;
-			break;
-	}	
-	return this->rawPixel(x, y);
-}
-
 void RGBLEDMatrix::drawPixel(int16_t x, int16_t y, uint16_t color) {
 	this->GFXcanvas16::drawPixel(x, y, color);
 	_matrixNeedsUpdate = true;
@@ -287,7 +258,7 @@ void RGBLEDMatrix::debugPrintImageData(void) const {
 		Serial.print("    ");
 		for (uint16_t x = 0; x < this->WIDTH; x++) {
 			Serial.print("0x");
-			sprintf(c, "%04x", this->rawPixel(x,y));
+			sprintf(c, "%04x", this->getRawPixel(x,y));
 			Serial.print(c);
 			Serial.print(" ");
 		}

src/RGBLEDMatrix.h

@@ -84,8 +84,6 @@ class RGBLEDMatrix : public BaseLEDMatrix, public GFXcanvas16 {
 	virtual void matrixHasBeenUpdated(void);
 	virtual unsigned int baseIntervalMultiplier( size_t frame ) const;
 
-	uint16_t rawPixel( int16_t rawX, int16_t rawY ) const;  
-
 public:
 
 	/**
@@ -130,11 +128,16 @@ class RGBLEDMatrix : public BaseLEDMatrix, public GFXcanvas16 {
 	virtual ~RGBLEDMatrix();
 
 	virtual void setup();
-	
-	uint16_t pixel( int16_t x, int16_t y ) const;  
+
+	//
+	// Adafruit GFX Support
+	//
 	virtual void drawPixel(int16_t x, int16_t y, uint16_t color);
 	virtual void fillScreen(uint16_t color);
 
+	//
+	// debug
+	//
 	void debugPrintImageData(void) const;
 };