DM: fix some bugs

adafruit · Sep 20, 2018 · 757cb3a · 757cb3a
1 parent f958316
commit 757cb3a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/Adafruit_NeoTrellis.cpp b/Adafruit_NeoTrellis.cpp
@@ -77,11 +77,12 @@ void Adafruit_NeoTrellis::activateKey(uint8_t key, uint8_t edge, bool enable)
     @brief  read all events currently stored in the seesaw fifo and call any callbacks.
 */
 /**************************************************************************/
-void Adafruit_NeoTrellis::read()
+void Adafruit_NeoTrellis::read(bool polling)
 {
     uint8_t count = getKeypadCount();
     delayMicroseconds(500);
     if(count > 0){
+        if(polling) count = count + 2;
         keyEventRaw e[count];
         readKeypad(e, count);
         for(int i=0; i<count; i++){
@@ -311,6 +312,7 @@ void Adafruit_MultiTrellis::read()
             uint8_t count = t->getKeypadCount();
             delayMicroseconds(500);
             if(count > 0){
+                count = count + 2;
                 keyEventRaw e[count];
                 t->readKeypad(e, count);
                 for(int i=0; i<count; i++){

diff --git a/Adafruit_NeoTrellis.h b/Adafruit_NeoTrellis.h
@@ -42,7 +42,7 @@ class Adafruit_NeoTrellis : public Adafruit_seesaw {
 
     void activateKey(uint8_t key, uint8_t edge, bool enable=true);
 
-    void read();
+    void read(bool polling = true);
 
     seesaw_NeoPixel pixels; ///< the onboard neopixel matrix
 

diff --git a/Adafruit_seesaw.cpp b/Adafruit_seesaw.cpp
@@ -627,7 +627,7 @@ void Adafruit_seesaw::disableKeypadInterrupt()
  ****************************************************************************************/
 uint8_t Adafruit_seesaw::getKeypadCount()
 {
-	return this->read8(SEESAW_KEYPAD_BASE, SEESAW_KEYPAD_COUNT);
+	return this->read8(SEESAW_KEYPAD_BASE, SEESAW_KEYPAD_COUNT, 500);
 }
 
 /**
@@ -682,10 +682,10 @@ void Adafruit_seesaw::write8(byte regHigh, byte regLow, byte value)
  *
  *  @return     the value between 0 and 255 read from the passed register
  ****************************************************************************************/
-uint8_t Adafruit_seesaw::read8(byte regHigh, byte regLow)
+uint8_t Adafruit_seesaw::read8(byte regHigh, byte regLow, uint16_t delay)
 {
 	uint8_t ret;
-	this->read(regHigh, regLow, &ret, 1);
+	this->read(regHigh, regLow, &ret, 1, delay);
 
 	return ret;
 }

diff --git a/Adafruit_seesaw.h b/Adafruit_seesaw.h
@@ -273,7 +273,7 @@ class Adafruit_seesaw : public Print {
 		int8_t _flow; /*!< The flow control pin to use */
 
 		void      write8(byte regHigh, byte regLow, byte value);
-		uint8_t   read8(byte regHigh, byte regLow);
+		uint8_t   read8(byte regHigh, byte regLow, uint16_t delay = 125);
 
 		void read(uint8_t regHigh, uint8_t regLow, uint8_t *buf, uint8_t num, uint16_t delay = 125);
 		void write(uint8_t regHigh, uint8_t regLow, uint8_t *buf, uint8_t num);

diff --git a/examples/NeoTrellis/interrupt/interrupt.ino b/examples/NeoTrellis/interrupt/interrupt.ino
@@ -71,7 +71,7 @@ void setup() {
 
 void loop() {
   if(!digitalRead(INT_PIN)){
-    trellis.read();
+    trellis.read(false);
   }
   delay(2);
 }
diff --git a/examples/NeoTrellis/ripples/ripples.ino b/examples/NeoTrellis/ripples/ripples.ino
@@ -173,7 +173,7 @@ void processRipples(){
 
 void loop() {
   if(!digitalRead(INT_PIN)){
-    trellis.read();
+    trellis.read(false);
   }
   processRipples();
   delay(20);

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit seesaw Library
-version=1.1.7
+version=1.1.8
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=This is a library for the Adafruit seesaw helper IC.