added support for ATmega1284 mcu

Author: michaelkamprath

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Added support for the Arduino Zero and Due boards (and related)
 - Added support for older ATmega8535, ATmega16 and ATmega32 microcontrollers
+- Added support for ATmega1284 and ATmega1284P microcontrollers
 - Added method to LEDImage for drawing circles
 - Added a Red-Blue-Green bit layout mode for the RGB matrix object
 

src/BaseLEDMatrix.cpp

@@ -129,7 +129,7 @@ ICACHE_RAM_ATTR void BaseLEDMatrix::incrementScanRow( void ) {
 }
 
 // Number of 5 microsecond units
-ICACHE_RAM_ATTR unsigned int BaseLEDMatrix::multiplier5microseconds( size_t frame ) const {
+ICACHE_RAM_ATTR unsigned int BaseLEDMatrix::baseIntervalMultiplier( size_t frame ) const {
 	// base case does nothing interesting
 	return  1;
 }
@@ -182,7 +182,7 @@ void BaseLEDMatrix::stopScanning(void) {
 
 unsigned int BaseLEDMatrix::nextTimerInterval(void) const {
 	// Calculates the microseconds for each scan	
-	return  5*this->multiplier5microseconds( _scanPass );
+	return  5*this->baseIntervalMultiplier( _scanPass );
 }
 
 #pragma mark ESP8266 Handlers
@@ -227,7 +227,7 @@ void BaseLEDMatrix::stopScanning(void) {
 
 ICACHE_RAM_ATTR unsigned int BaseLEDMatrix::nextTimerInterval(void) const {
 	// Calculates the microseconds for each scan
-	return  5*this->multiplier5microseconds( _scanPass );
+	return  5*this->baseIntervalMultiplier( _scanPass );
 }
 
 #pragma mark Arduino Due Handlers
@@ -259,7 +259,7 @@ unsigned int BaseLEDMatrix::nextTimerInterval(void) const {
 	// Calculates the microseconds for each scan
 	// The base interval is set to 55, which for the 
 	// 10.5MHz CLOCK2 yields a ~5 micro second interval.
-	return  55*this->multiplier5microseconds( _scanPass );
+	return  55*this->baseIntervalMultiplier( _scanPass );
 }
 
 void BaseLEDMatrix::stopScanning(void) {
@@ -325,7 +325,7 @@ unsigned int BaseLEDMatrix::nextTimerInterval(void) const {
 	// Calculates the microseconds for each scan
 	// The base interval is set to 59, which with a /4
 	// prescaler should yield a 5 ms interval.
-	return  59*this->multiplier5microseconds( _scanPass );
+	return  59*this->baseIntervalMultiplier( _scanPass );
 }
 
 void BaseLEDMatrix::stopScanning(void) {
@@ -372,20 +372,19 @@ void BaseLEDMatrix::startScanning(void) {
 	this->setup();
 
 	noInterrupts(); // disable all interrupts
-	
-  	TIMSK2 &= ~(1<<TOIE2); // disable timer overflow interupt
+
+	TIMSK2 &= ~(1<<TOIE2); // disable timer overflow interupt
 
 	// SET timer2 to count up mode
 	TCCR2A &= ~((1<<WGM21) | (1<<WGM20));
 	TCCR2B &= ~(1<<WGM22);
-
 	// set clock to I/O clock
-  	ASSR &= ~(1<<AS2);
- 
-  	// overflow only mode
-  	TIMSK2 &= ~(1<<OCIE2A);
-  	
-  	// configure to fire about every 5 micro-second 
+	ASSR &= ~(1<<AS2);
+
+	// overflow only mode
+	TIMSK2 &= ~(1<<OCIE2A);
+
+	// configure to fire about every 5 micro-second 
 	TCCR2B |= (1<<CS22) ; 
 	TCCR2B &= ~(1<<CS20);
 	TCCR2B &= ~(1<<CS21);
@@ -402,19 +401,21 @@ void BaseLEDMatrix::stopScanning(void) {
 }
 
 unsigned int BaseLEDMatrix::nextTimerInterval(void) const {
-	return  max(257 - this->multiplier5microseconds( _scanPass )*BASE_SCAN_TIMER_INTERVALS, 0 );
+	return  max(257 - this->baseIntervalMultiplier( _scanPass )*BASE_SCAN_TIMER_INTERVALS, 0 );
 }
 
-
 ISR(TIMER2_OVF_vect) {
-	noInterrupts(); 
+	noInterrupts(); // disable all interrupts
+
 	// shift out next row
 	gSingleton->shiftOutCurrentRow();
+	
 	// reload the timer
-	TCNT2 = gSingleton->nextTimerInterval();
-  	interrupts(); 
-  	// update scan row. Done outside of interrupt stoppage since execution time can
-  	// be inconsistent, which would lead to vary brightness in rows.
-  	gSingleton->incrementScanRow();
+	TCNT2 = gSingleton->nextTimerInterval();	
+	interrupts(); // enable all interrupts
+	
+	// update scan row. Done outside of interrupt stoppage since execution time can
+	// be inconsistent, which would lead to vary brightness in rows.
+	gSingleton->incrementScanRow();
 }
 #endif

src/BaseLEDMatrix.h

@@ -54,7 +54,7 @@ class BaseLEDMatrix : public TimerAction {
 	virtual bool matrixNeedsUpdate(void) const = 0;
 	virtual void matrixHasBeenUpdated(void) = 0;
 
-	virtual unsigned int multiplier5microseconds( size_t frame ) const;
+	virtual unsigned int baseIntervalMultiplier( size_t frame ) const;
 public:
 
 	/**

src/LEDImage.h

@@ -84,11 +84,10 @@ template <class PixelType>
 const PixelType LEDImageBase<PixelType>::pixel( int row, int column ) const {
 	if (this->isProgMem()) {
 		switch (sizeof(PixelType)) {
-			case 4:
+			case 2:
 				return (PixelType)pgm_read_word_near( this->data() + row*this->columns() + column );
 				break;
-			default:
-			case 2:
+			case 1:
 				return (PixelType)pgm_read_byte_near( this->data() + row*this->columns() + column );
 				break;
 		}

src/RGBColor.h

@@ -22,7 +22,9 @@
 #ifndef TWELVE_BIT_COLOR
 #define TWELVE_BIT_COLOR (defined(__arm__)&& defined(TEENSYDUINO)) \
 							||defined(__AVR_ATmega2560__) \
-							||defined ( ESP8266 ) \
+							||defined(__AVR_ATmega1284__) \
+							||defined(__AVR_ATmega1284P__) \
+							||defined( ESP8266 ) \
 							||defined(ARDUINO_SAMD_ZERO) \
 							||defined(_SAM3XA_)
 #endif
@@ -45,7 +47,7 @@ The bits of the byte are laid out as follows in a 2-byte integer:
 
 */
 
-typedef unsigned int RGBColorType;
+typedef uint16_t RGBColorType;
 
 
 const RGBColorType AQUA_COLOR = 0x00FF;

src/RGBLEDMatrix.cpp

@@ -248,20 +248,25 @@ void RGBLEDMatrix::setRowBitsForFrame(
 
 
 // Number of 5 microsecond units
-unsigned int RGBLEDMatrix::multiplier5microseconds( size_t frame ) const {
-	unsigned int mulitplier = 1;
+unsigned int RGBLEDMatrix::baseIntervalMultiplier( size_t frame ) const {
 #if TWELVE_BIT_COLOR
-	mulitplier = frame/4+1;
+#if defined(__AVR_ATmega2560__)||defined(__AVR_ATmega1284__)||defined(__AVR_ATmega1284P__)
+	unsigned int multiplier = frame/8 + 1;
 #else
+	unsigned int multiplier = frame/4 + 1;
+#endif
+
+#else
+	unsigned int multiplier = 1;
 	switch (frame) {
 		case 2:
-			mulitplier = 3;
+			multiplier = 3;
 			break;
 		case 3:
-			mulitplier = 8;
+			multiplier = 8;
 			break;
 	}
 #endif
-
-	return  mulitplier;
+	
+	return  multiplier;
 }

src/RGBLEDMatrix.h

@@ -56,7 +56,7 @@ class RGBLEDMatrix : public BaseLEDMatrix {
 	virtual void generateFrameBits(LEDMatrixBits& frameBits, size_t frame ) const;
 	virtual bool matrixNeedsUpdate(void) const;
 	virtual void matrixHasBeenUpdated(void);
-	virtual unsigned int multiplier5microseconds( size_t frame ) const;
+	virtual unsigned int baseIntervalMultiplier( size_t frame ) const;
 public:
 
 	/**