added support for ESP32 devices

Added support for ESP32 devices, and specifically tested in a Wemos LINOL32 LITE device.
Also fixed a bug with the Conway Game of Life examples.

Author: michaelkamprath

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 - Basic capability to specify the endian-ness of the column layout for a matrix. While column 0 is meant to indicate the left most column, the hardware layout of the matrix might not make the left most column the MSB in the shift register chain. This might happen if you make a mistake in your hardware (oops!). By setting the column endian value of the matrix,the high level software can still reference column 0 to mean the left most column, and the bit layout sent the shift registers will be adjusted according to where column 0 physically is in the hardware.
+- Added support for ESP32 microcontrollers. 
 
 ## [1.1.0] - 2018-02-09
 

examples/conway-game-of-life-10x10/conway-game-of-life-10x10.ino

@@ -54,11 +54,11 @@ public:
   );
 
   void setCellStatus(unsigned int row, unsigned int column, LifeState cellStatus);
-  LifeState getCellStatus(unsigned int row, unsigned int column) const;
+  LifeState getCellStatus(int row, int column) const;
   void createRandomState();
 
-  bool isAlive(unsigned int row, unsigned int column) const;
-  int countAliveNeighbors(unsigned int row, unsigned int column) const;
+  bool isAlive(int row, int column) const;
+  int countAliveNeighbors(int row, int column) const;
 
   void drawToScreen();
 };
@@ -86,13 +86,13 @@ void CellUniverse::setCellStatus(unsigned int row, unsigned int column, LifeStat
   _cells[idx] = cellStatus;
 }
 
-CellUniverse::LifeState CellUniverse::getCellStatus(unsigned int row, unsigned int column) const {
+CellUniverse::LifeState CellUniverse::getCellStatus(int row, int column) const {
   // this causes the matrix to be a toroidal array
   unsigned int r = row < 0 ? row + _leds.rows() : ( row >= _leds.rows() ? row - _leds.rows() : row );
   unsigned int c = column < 0 ? column + _leds.columns() : ( column >= _leds.columns() ? column - _leds.columns() : column );
 
   // double check just to be sure
-  if (r < 0 || r >= _leds.rows() || c < 0 || c >= _leds.columns()) {
+  if (r >= _leds.rows() || c >= _leds.columns()) {
     return CellUniverse::DEAD;
   }
 
@@ -101,15 +101,15 @@ CellUniverse::LifeState CellUniverse::getCellStatus(unsigned int row, unsigned i
   return _cells[idx];
 }
 
-bool CellUniverse::isAlive(unsigned int row, unsigned int column) const {
+bool CellUniverse::isAlive(int row, int column) const {
   return (this->getCellStatus(row, column) == CellUniverse::ALIVE || this->getCellStatus(row, column) == CellUniverse::BORN);
 }
 
-int CellUniverse::countAliveNeighbors(unsigned int row, unsigned int column) const {
+int CellUniverse::countAliveNeighbors(int row, int column) const {
     int aliveCount = 0;
 
-    for (unsigned int x = column - 1; x <= column+1; x++) {
-      for (unsigned int y = row - 1; y <= row + 1; y++ ) {
+    for (int x = column - 1; x <= column+1; x++) {
+      for (int y = row - 1; y <= row + 1; y++ ) {
         if (this->isAlive(y, x) && !(x == column && y == row)) {
           aliveCount++;
         }

examples/conway-game-of-life-8x8/conway-game-of-life-8x8.ino

@@ -54,11 +54,11 @@ public:
   );
 
   void setCellStatus(unsigned int row, unsigned int column, LifeState cellStatus);
-  LifeState getCellStatus(unsigned int row, unsigned int column) const;
+  LifeState getCellStatus(int row, int column) const;
   void createRandomState();
 
-  bool isAlive(unsigned int row, unsigned int column) const;
-  int countAliveNeighbors(unsigned int row, unsigned int column) const;
+  bool isAlive(int row, int column) const;
+  int countAliveNeighbors(int row, int column) const;
 
   void drawToScreen();
 };
@@ -77,7 +77,7 @@ CellUniverse::CellUniverse(
 }
 
 void CellUniverse::setCellStatus(unsigned int row, unsigned int column, LifeState cellStatus) {
-  if (row < 0 || row >= _leds.rows() || column < 0 || column >= _leds.columns()) {
+  if (row >= _leds.rows() || column >= _leds.columns()) {
     return;
   }
 
@@ -86,13 +86,13 @@ void CellUniverse::setCellStatus(unsigned int row, unsigned int column, LifeStat
   _cells[idx] = cellStatus;
 }
 
-CellUniverse::LifeState CellUniverse::getCellStatus(unsigned int row, unsigned int column) const {
+CellUniverse::LifeState CellUniverse::getCellStatus(int row, int column) const {
   // this causes the matrix to be a toroidal array
   unsigned int r = row < 0 ? row + _leds.rows() : ( row >= _leds.rows() ? row - _leds.rows() : row );
   unsigned int c = column < 0 ? column + _leds.columns() : ( column >= _leds.columns() ? column - _leds.columns() : column );
 
   // double check just to be sure
-  if (r < 0 || r >= _leds.rows() || c < 0 || c >= _leds.columns()) {
+  if (r >= _leds.rows() || c >= _leds.columns()) {
     return CellUniverse::DEAD;
   }
 
@@ -101,15 +101,15 @@ CellUniverse::LifeState CellUniverse::getCellStatus(unsigned int row, unsigned i
   return _cells[idx];
 }
 
-bool CellUniverse::isAlive(unsigned int row, unsigned int column) const {
+bool CellUniverse::isAlive(int row, int column) const {
   return (this->getCellStatus(row, column) == CellUniverse::ALIVE || this->getCellStatus(row, column) == CellUniverse::BORN);
 }
 
-int CellUniverse::countAliveNeighbors(unsigned int row, unsigned int column) const {
+int CellUniverse::countAliveNeighbors(int row, int column) const {
     int aliveCount = 0;
 
-    for (unsigned int x = column - 1; x <= column+1; x++) {
-      for (unsigned int y = row - 1; y <= row + 1; y++ ) {
+    for (int x = column - 1; x <= column+1; x++) {
+      for (int y = row - 1; y <= row + 1; y++ ) {
         if (this->isAlive(y, x) && !(x == column && y == row)) {
           aliveCount++;
         }

examples/plasma-10x10/plasma-10x10.ino

@@ -87,11 +87,11 @@ unsigned long loopCounter = 0;
 unsigned long timeCount = 0;
 bool timeIncrement = true;
 
-#if (defined(__arm__)&& defined(TEENSYDUINO))
-// slow things down for the Teensy
+#if (defined(__arm__)&& defined(TEENSYDUINO))||(defined( ESP32 ))
+// slow things down for the Teensy and other fast microcontrollers
 const unsigned long loopMod = 20000;
 #else
-const unsigned long loopMod = 50;
+const unsigned long loopMod = 500;
 #endif
 
 void loop() {

examples/plasma-8x8/plasma-8x8.ino

@@ -87,8 +87,8 @@ unsigned long loopCounter = 0;
 unsigned long timeCount = 0;
 bool timeIncrement = true;
 
-#if (defined(__arm__)&& defined(TEENSYDUINO))
-// slow things down for the Teensy
+#if (defined(__arm__)&& defined(TEENSYDUINO))||(defined( ESP32 ))
+// slow things down for the Teensy and other fast microcontrollers
 const unsigned long loopMod = 20000;
 #else
 const unsigned long loopMod = 500;

src/BaseLEDMatrix.cpp

@@ -225,6 +225,53 @@ unsigned int BaseLEDMatrix::nextRowScanTimerInterval(void) const {
 	return  100*this->baseIntervalMultiplier( _scanPass );
 }
 
+#pragma mark ESP32 Handlers
+#elif defined ( ESP32 )
+hw_timer_t * timer = NULL;
+portMUX_TYPE timerMux = portMUX_INITIALIZER_UNLOCKED;
+
+void IRAM_ATTR onTimer() {
+	portENTER_CRITICAL_ISR(&timerMux);
+	timerStop(timer);
+	if (gSingleton->doInterFrameTransmitOff()) {
+		gSingleton->shiftOutAllOff();
+	} else {
+		gSingleton->shiftOutCurrentRow();
+				
+		// update scan row. Done outside of interrupt stoppage since execution time can
+		// be inconsistent, which would lead to vary brightness in rows.
+		gSingleton->incrementScanRow();
+	}
+	timerAlarmWrite(timer, gSingleton->nextRowScanTimerInterval(), true);
+	timerRestart(timer);
+	portEXIT_CRITICAL_ISR(&timerMux);
+}
+
+void BaseLEDMatrix::startScanning(void) {
+	this->setup();
+	
+	_interFrameOffTimeInterval = _interFrameOffTimeMicros;
+	
+	noInterrupts();
+	
+	// this sets the timer to count every 1 micro seconds. use timer 3 for best compatibility
+	timer = timerBegin(3, 80, true);
+	timerAttachInterrupt(timer, &onTimer, true);
+	timerAlarmWrite(timer, this->nextRowScanTimerInterval(), true);
+	timerAlarmEnable(timer);
+	
+	interrupts();
+}
+
+void BaseLEDMatrix::stopScanning(void) {
+	timerEnd(timer);
+}
+
+unsigned int BaseLEDMatrix::nextRowScanTimerInterval(void) const {
+	// this sets the interrupt to fire a multiple every 25 timer counts, or 25 microseconds
+	return  25*this->baseIntervalMultiplier( _scanPass );
+}
+
 #pragma mark ESP8266 Handlers
 #elif defined ( ESP8266 )
 

src/BaseLEDMatrix.h

@@ -112,8 +112,10 @@ class BaseLEDMatrix : public TimerAction {
 			bool columnControlBitOn = LOW,
 			bool rowControlBitOn = LOW,
 			unsigned int interFrameOffTimeMicros = 0,
-#if defined ( ESP8266 )
+#if defined( ESP8266 )
 			int slavePin = D8	
+#elif defined( ESP32 )
+			int slavePin = 5	
 #else
 			int slavePin = 10	
 #endif

src/Glyph.cpp

@@ -17,7 +17,7 @@
 //     along with Shift Register LED Matrix Project.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Arduino.h>
-#if defined ( ESP8266 )
+#if defined( ESP8266 ) || defined( ESP32 )
   #include <pgmspace.h>
 #else
   #include <avr/pgmspace.h>

src/GrayScaleLEDMatrix.h

@@ -71,6 +71,8 @@ class GrayScaleLEDMatrix : public BaseLEDMatrix {
 			unsigned int interFrameOffTimeMicros = 0,
 #if defined ( ESP8266 )
 			int slavePin = D8	
+#elif defined( ESP32 )
+			int slavePin = 5	
 #else
 			int slavePin = 10	
 #endif

src/LEDImage.h

@@ -31,7 +31,7 @@
 
 #include <Arduino.h>
 #include <string.h>
-#if defined ( ESP8266 )
+#if defined( ESP8266 ) || defined( ESP32 ) 
   #include <pgmspace.h>
 #else
   #include <avr/pgmspace.h>