pin register

Author: dylanmmartins

Encoder.h

@@ -58,8 +58,6 @@
 #define ENCODER_ISR_ATTR
 #endif
 
-
-
 // All the data needed by interrupts is consolidated into this ugly struct
 // to facilitate assembly language optimizing of the speed critical update.
 // The assembly code uses auto-incrementing addressing modes, so the struct
@@ -76,7 +74,12 @@ typedef struct {
 class Encoder
 {
 public:
-	Encoder(uint8_t pin1, uint8_t pin2) {
+	// one step setup like before
+	Encoder(uint8_t pin1, uint8_t pin2) { begin(pin1, pin2);}
+
+	// two step setup for platforms that have issues with constructor ordering
+	Encoder() { }
+	void begin(uint8_t pin1, uint8_t pin2) {
 		#ifdef INPUT_PULLUP
 		pinMode(pin1, INPUT_PULLUP);
 		pinMode(pin2, INPUT_PULLUP);
@@ -303,8 +306,12 @@ class Encoder
 		uint8_t p1val = DIRECT_PIN_READ(arg->pin1_register, arg->pin1_bitmask);
 		uint8_t p2val = DIRECT_PIN_READ(arg->pin2_register, arg->pin2_bitmask);
 		uint8_t state = arg->state & 3;
+		//Serial.print(p1val); Serial.print(", ");
+		//Serial.print(p2val); Serial.print(", ");
+		//Serial.print(state); Serial.print(", ");
 		if (p1val) state |= 4;
 		if (p2val) state |= 8;
+		//Serial.print(state); Serial.println(", ");
 		arg->state = (state >> 2);
 		switch (state) {
 			case 1: case 7: case 8: case 14:
@@ -769,7 +776,7 @@ class Encoder
 	static ENCODER_ISR_ATTR void isr2(void) { update(interruptArgs[2]); }
 	#endif
 	#ifdef CORE_INT3_PIN
-	static ENCODER_ISR_ATTR void isr3(void) { update(interruptArgs[3]); }
+	static ENCODER_ISR_ATTR void isr3(void) { update(interruptArgs[3]);}
 	#endif
 	#ifdef CORE_INT4_PIN
 	static ENCODER_ISR_ATTR void isr4(void) { update(interruptArgs[4]); }

library.properties

@@ -1,5 +1,5 @@
 name=Encoder
-version=1.4.4
+version=1.4.3
 author=Paul Stoffregen
 maintainer=Paul Stoffregen
 sentence=Counts quadrature pulses from rotary & linear position encoders.

utility/direct_pin_read.h

@@ -3,7 +3,6 @@
 
 #if defined(__AVR__)
 
-#define IO_REG_TYPE			uint8_t
 #define PIN_TO_BASEREG(pin)             (portInputRegister(digitalPinToPort(pin)))
 #define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
 #define DIRECT_PIN_READ(base, mask)     (((*(base)) & (mask)) ? 1 : 0)
@@ -111,6 +110,25 @@ IO_REG_TYPE directRead(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
 }
 #define DIRECT_PIN_READ(base, pin)      directRead(base, pin)
 
+#elif defined(ARDUINO_UNOR4_WIFI) || defined(ARDUINO_UNOR4_MINIMA) /*Arduino UnoR4 */
+
+#define IO_REG_TYPE			uint32_t
+#define PIN_TO_BASEREG(pin)             (volatile uint32_t*)(portInputRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define DIRECT_PIN_READ(base, mask)     (((*(base)) & (mask)) ? 1 : 0)
+
+#elif defined(ARDUINO_GIGA)
+
+    #define digitalPinToPort(P) (digitalPinToPinName(P)/32)
+    #define digitalPinToBitMask(P) (1 << (digitalPinToPinName(P) % 32))
+    #define portModeRegister(P) (uint32_t*)P
+
+    #define IO_REG_TYPE uint32_t
+    #define PIN_TO_BASEREG(pin) portModeRegister(digitalPinToPort(pin))
+    #define PIN_TO_BITMASK(pin) (digitalPinToBitMask(pin))
+    #define DIRECT_PIN_READ(base, pin) digitalRead(pin)
+    
+
 #endif
 
 #endif

utility/interrupt_config.h

@@ -1,4 +1,4 @@
-#if defined(__AVR__)
+#if defined(__AVR__)  
 
 #include <avr/io.h>
 #include <avr/interrupt.h>

utility/interrupt_pins.h

@@ -384,6 +384,38 @@
   // #define CORE_INT20_PIN	A6
   // #define CORE_INT21_PIN	A7
 
+// Arduino Uno R4
+#elif defined(ARDUINO_UNOR4_MINIMA)
+//0, 1, 2, 3, 8, 12, 13, 15, 16, 17, 18 and 19.
+  #define CORE_NUM_INTERRUPT	20
+  #define CORE_INT0_PIN		0
+  #define CORE_INT1_PIN		1
+  #define CORE_INT2_PIN		2
+  #define CORE_INT3_PIN		3
+  #define CORE_INT8_PIN		8
+  #define CORE_INT12_PIN	12
+  #define CORE_INT13_PIN	13
+  #define CORE_INT15_PIN	15
+  #define CORE_INT16_PIN	16
+  #define CORE_INT17_PIN	17
+  #define CORE_INT18_PIN	18
+  #define CORE_INT19_PIN	19
+#elif defined(ARDUINO_UNOR4_WIFI)
+//0, 1, 2, 3, 8, 11, 12, 15, 16, 17, 18 and 19.
+  #define CORE_NUM_INTERRUPT	20
+  #define CORE_INT0_PIN		0
+  #define CORE_INT1_PIN		1
+  #define CORE_INT2_PIN		2
+  #define CORE_INT3_PIN		3
+  #define CORE_INT8_PIN		8
+  #define CORE_INT11_PIN	11
+  #define CORE_INT12_PIN	12
+  #define CORE_INT15_PIN	15
+  #define CORE_INT16_PIN	16
+  #define CORE_INT17_PIN	17
+  #define CORE_INT18_PIN	18
+  #define CORE_INT19_PIN	19
+
 
 // Arduino Giga R1 WiFi
 // All pins are interrupt capable
@@ -466,8 +498,7 @@
   #define CORE_INT74_PIN 74
   #define CORE_INT75_PIN 75
   #define CORE_INT76_PIN 76
-
-
+  
 #endif
 #endif