Merge branch 'master' of https://github.com/nrf-rs/nrf-hal

Author: macthestack

nrf-hal-common/src/gpiote.rs

@@ -221,23 +221,21 @@ impl<'a, P: GpioteInputPin> GpioteChannelEvent<'_, P> {
         config_channel_event_pin(self.gpiote, self.channel, self.pin, EventPolarity::None);
         self
     }
-
-    /// Enables GPIOTE interrupt for pin.
+    /// Enables GPIOTE interrupt for channel.
     pub fn enable_interrupt(&self) -> &Self {
         unsafe {
             self.gpiote
                 .intenset
-                .modify(|r, w| w.bits(r.bits() | self.pin.pin() as u32))
+                .write(|w| w.bits(1 << self.channel))
         }
         self
     }
-
-    /// Disables GPIOTE interrupt for pin.
+    /// Disables GPIOTE interrupt for channel.
     pub fn disable_interrupt(&self) -> &Self {
         unsafe {
             self.gpiote
                 .intenclr
-                .write(|w| w.bits(self.pin.pin() as u32))
+                .write(|w| w.bits(1 << self.channel))
         }
         self
     }

nrf-hal-common/src/uarte.rs

@@ -260,7 +260,7 @@ where
         // This is overly restrictive. See (similar SPIM issue):
         // https://github.com/nrf-rs/nrf52/issues/17
         if rx_buffer.len() > u8::max_value() as usize {
-            return Err(Error::TxBufferTooLong);
+            return Err(Error::RxBufferTooLong);
         }
 
         // NOTE: RAM slice check is not necessary, as a mutable slice can only be