Merge pull request #791 from rmccaskill/master

hathach · web-flow · commit af19cea3143b · 2023-10-16T15:30:00.000+07:00
Fix _irq_handler
diff --git a/libraries/RotaryEncoder/SwRotaryEncoder.cpp b/libraries/RotaryEncoder/SwRotaryEncoder.cpp
@@ -120,14 +120,14 @@ void SwRotaryEncoder::clearAbs(void)
 
 void SwRotaryEncoder::_irq_handler(void)
 {
-  uint32_t val = NRF_GPIO->IN;
-  uint8_t bita = bitRead(val, _pina);
+  uint8_t bita = digitalRead(_pina);
+  uint8_t bitb = digitalRead(_pinb);
 
   if ( bita != _a_last)
   {
     int32_t step;
 
-    if ( bita != bitRead(val, _pinb) )
+    if ( bita != bitb )
     {
       step = 1;
     }else

Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,14 @@ void SwRotaryEncoder::clearAbs(void)`
`120`	`120`
`121`	`121`	`void SwRotaryEncoder::_irq_handler(void)`
`122`	`122`	`{`
`123`		`- uint32_t val = NRF_GPIO->IN;`
`124`		`- uint8_t bita = bitRead(val, _pina);`
	`123`	`+ uint8_t bita = digitalRead(_pina);`
	`124`	`+ uint8_t bitb = digitalRead(_pinb);`
`125`	`125`
`126`	`126`	`if ( bita != _a_last)`
`127`	`127`	`{`
`128`	`128`	`int32_t step;`
`129`	`129`
`130`		`- if ( bita != bitRead(val, _pinb) )`
	`130`	`+ if ( bita != bitb )`
`131`	`131`	`{`
`132`	`132`	`step = 1;`
`133`	`133`	`}else`