Update XMEGA board drivers to use the port inversion feature of the XMEGA architecture rather than performing the inversion in software. Add partially completed XMEGA-B1-XPLAINED Dataflash board driver and revert implementation of the XMEGA-A3BU-XPLAINED Dataflash driver as the chip is connected to the USART, not the SPI interface.

6 files changed, 289 insertions, 53 deletions

diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
index 738279123..d4e208407 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
@@ -76,28 +76,28 @@
 		#if !defined(__DOXYGEN__)
 			static inline void Buttons_Init(void)
 			{
-				PORTE_OUTCLR = BUTTONS_BUTTON1;
-				PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+				PORTE.OUTCLR   = BUTTONS_BUTTON1;
+				PORTE.PIN5CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
 
-				PORTE_PIN5CTRL = PORT_OPC_PULLUP_gc;
-				PORTF_PIN1CTRL = PORT_OPC_PULLUP_gc;
-				PORTF_PIN2CTRL = PORT_OPC_PULLUP_gc;
+				PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+				PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
+				PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
 			}
 
 			static inline void Buttons_Disable(void)
 			{
-				PORTE_OUTCLR = BUTTONS_BUTTON1;
-				PORTF_OUTCLR = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
-
-				PORTE_PIN5CTRL = 0;
-				PORTF_PIN1CTRL = 0;
-				PORTF_PIN2CTRL = 0;
+				PORTE.OUTCLR   = BUTTONS_BUTTON1;
+				PORTE.PIN5CTRL = 0;
+				
+				PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
+				PORTF.PIN1CTRL = 0;
+				PORTF.PIN2CTRL = 0;
 			}
 
 			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
 			static inline uint8_t Buttons_GetStatus(void)
 			{
-				return ((~PORTE_IN & BUTTONS_BUTTON1) | (~PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
+				return ((PORTE_IN & BUTTONS_BUTTON1) | (PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
 			}
 		#endif
 
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
index 9eb3b38ea..c263853ee 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
@@ -29,24 +29,24 @@
 */
 
 /** \file
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
- *  \copydetails Group_Dataflash_A3BU_XPLAINED
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
+ *  \copydetails Group_Dataflash_B1_XPLAINED
  *
  *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
  */
 
 /** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *  \defgroup Group_Dataflash_B1_XPLAINED B1_XPLAINED
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
  *
- *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.
+ *  Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board.
  *
  *  @{
  */
 
-#ifndef __DATAFLASH_A3BU_XPLAINED_H__
-#define __DATAFLASH_A3BU_XPLAINED_H__
+#ifndef __DATAFLASH_B1_XPLAINED_H__
+#define __DATAFLASH_B1_XPLAINED_H__
 
 	/* Includes: */
 		#include "../../../../Common/Common.h"
@@ -100,7 +100,9 @@
 			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
 			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
 			{
-				return SPI_TransferByte(&SPID, Byte);
+				// TODO: USART in SPI mode on PORT D
+				#warning The Dataflash driver for the selected board is currently incomplete and non-functional.
+				return 0;
 			}
 
 			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
@@ -110,7 +112,7 @@
 			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
 			static inline void Dataflash_SendByte(const uint8_t Byte)
 			{
-				SPI_SendByte(&SPID, Byte);
+				return; // TODO
 			}
 
 			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
@@ -120,7 +122,7 @@
 			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
 			static inline uint8_t Dataflash_ReceiveByte(void)
 			{
-				return SPI_ReceiveByte(&SPID);
+				return 0; // TODO
 			}
 
 			/** Determines the currently selected dataflash chip.
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
index fdc2a4141..6212c9aed 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
@@ -79,24 +79,30 @@
 		#if !defined(__DOXYGEN__)
 			static inline void LEDs_Init(void)
 			{
-				PORTR_DIRSET = LEDS_ALL_LEDS;
-				PORTR_OUTSET = LEDS_ALL_LEDS;
+				PORTR.DIRSET    = LEDS_ALL_LEDS;
+				PORTR.OUTCLR    = LEDS_ALL_LEDS;
+				
+				PORTCFG.MPCMASK = LEDS_ALL_LEDS;
+				PORTR.PIN0CTRL  = PORT_INVEN_bm;				
 			}
 
 			static inline void LEDs_Disable(void)
 			{
-				PORTR_DIRCLR = LEDS_ALL_LEDS;
-				PORTR_OUTCLR = LEDS_ALL_LEDS;
+				PORTR.DIRCLR    = LEDS_ALL_LEDS;
+				PORTR.OUTCLR    = LEDS_ALL_LEDS;
+
+				PORTCFG.MPCMASK = 0;
+				PORTR.PIN0CTRL  = LEDS_ALL_LEDS;
 			}
 
 			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
 			{
-				PORTR_OUTCLR = LEDMask;
+				PORTR_OUTSET = LEDMask;
 			}
 
 			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
 			{
-				PORTR_OUTSET = LEDMask;
+				PORTR_OUTCLR = LEDMask;
 			}
 
 			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
@@ -117,7 +123,7 @@
 			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
 			static inline uint8_t LEDs_GetLEDs(void)
 			{
-				return (~PORTR_OUT & LEDS_ALL_LEDS);
+				return (PORTR_OUT & LEDS_ALL_LEDS);
 			}
 		#endif
 
diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h
index 3dd1dfe53..15ae804d4 100644
--- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h
+++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h
@@ -79,24 +79,24 @@
 		#if !defined(__DOXYGEN__)

 			static inline void Buttons_Init(void)

 			{

-				PORTE_OUTCLR    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

+				PORTE.OUTSET    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

 

-				PORTCFG_MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

-				PORTE_PIN0CTRL  = PORT_OPC_PULLUP_gc;

+				PORTCFG.MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

+				PORTE.PIN0CTRL  = (PORT_INVEN_bm | PORT_OPC_PULLUP_gc);

 			}

 

 			static inline void Buttons_Disable(void)

 			{

-				PORTE_OUTCLR    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

+				PORTE.OUTCLR    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

 

-				PORTCFG_MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

-				PORTE_PIN0CTRL  = 0;

+				PORTCFG.MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);

+				PORTE.PIN0CTRL  = 0;

 			}

 

 			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;

 			static inline uint8_t Buttons_GetStatus(void)

 			{

-				return (~PORTE_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4));

+				return (PORTE_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4));

 			}

 		#endif

 

diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h
new file mode 100644
index 000000000..74a215b6c
--- /dev/null
+++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h
@@ -0,0 +1,220 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *  \copydetails Group_Dataflash_A3BU_XPLAINED
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
+ *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
+ */
+
+/** \ingroup Group_Dataflash
+ *  \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *
+ *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.
+ *
+ *  @{
+ */
+
+#ifndef __DATAFLASH_A3BU_XPLAINED_H__
+#define __DATAFLASH_A3BU_XPLAINED_H__
+
+	/* Includes: */
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB642D.h"
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
+		#endif
+
+	/* Private Interface - For use in library only: */
+	#if !defined(__DOXYGEN__)
+		/* Macros: */
+			#define DATAFLASH_CHIPCS_MASK                (1 << 2)
+			#define DATAFLASH_CHIPCS_PORT                PORTD
+	#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
+			#define DATAFLASH_TOTALCHIPS                 1
+
+			/** Mask for no dataflash chip selected. */
+			#define DATAFLASH_NO_CHIP                    DATAFLASH_CHIPCS_MASK
+
+			/** Mask for the first dataflash chip selected. */
+			#define DATAFLASH_CHIP1                      0
+
+			/** Internal main memory page size for the board's dataflash ICs. */
+			#define DATAFLASH_PAGE_SIZE                  1024
+
+			/** Total number of pages inside each of the board's dataflash ICs. */
+			#define DATAFLASH_PAGES                      8192
+
+		/* Inline Functions: */
+			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
+			 *  The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
+			 */
+			static inline void Dataflash_Init(void)
+			{
+				DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK;
+				DATAFLASH_CHIPCS_PORT.OUTSET = DATAFLASH_CHIPCS_MASK;
+			}
+
+			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
+			 *
+			 *  \param[in] Byte  Byte of data to send to the dataflash
+			 *
+			 *  \return Last response byte from the dataflash
+			 */
+			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
+			{
+				// TODO: USART in SPI mode on PORT C
+				#warning The Dataflash driver for the selected board is currently incomplete and non-functional.
+				return 0;
+			}
+
+			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
+			 *
+			 *  \param[in] Byte  Byte of data to send to the dataflash
+			 */
+			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_SendByte(const uint8_t Byte)
+			{
+				return; // TODO
+			}
+
+			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
+			 *
+			 *  \return Last response byte from the dataflash
+			 */
+			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t Dataflash_ReceiveByte(void)
+			{
+				return 0; // TODO
+			}
+
+			/** Determines the currently selected dataflash chip.
+			 *
+			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
+			 *  or a DATAFLASH_CHIPn mask (where n is the chip number).
+			 */
+			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t Dataflash_GetSelectedChip(void)
+			{
+				return (DATAFLASH_CHIPCS_PORT.OUT & DATAFLASH_CHIPCS_MASK);
+			}
+
+			/** Selects the given dataflash chip.
+			 *
+			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of DATAFLASH_CHIPn mask (where n is
+			 *              the chip number).
+			 */
+			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
+			{
+				DATAFLASH_CHIPCS_PORT.OUT = ((DATAFLASH_CHIPCS_PORT.OUT & ~DATAFLASH_CHIPCS_MASK) | ChipMask);
+			}
+
+			/** Deselects the current dataflash chip, so that no dataflash is selected. */
+			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
+			static inline void Dataflash_DeselectChip(void)
+			{
+				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
+			}
+
+			/** Selects a dataflash IC from the given page number, which should range from 0 to
+			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
+			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
+			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
+			 *  are deselected.
+			 *
+			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
+			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
+			 */
+			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
+			{
+				Dataflash_DeselectChip();
+
+				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
+				  return;
+
+				if (PageAddress & 0x01)
+				  Dataflash_SelectChip(DATAFLASH_CHIP2);
+				else
+				  Dataflash_SelectChip(DATAFLASH_CHIP1);
+			}
+
+			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
+			 *  a new command.
+			 */
+			static inline void Dataflash_ToggleSelectedChipCS(void)
+			{
+				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
+
+				Dataflash_DeselectChip();
+				Dataflash_SelectChip(SelectedChipMask);
+			}
+
+			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
+			 *  memory page program or main memory to buffer transfer.
+			 */
+			static inline void Dataflash_WaitWhileBusy(void)
+			{
+				Dataflash_ToggleSelectedChipCS();
+				Dataflash_SendByte(DF_CMD_GETSTATUS);
+				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
+				Dataflash_ToggleSelectedChipCS();
+			}
+
+			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
+			 *  dataflash commands which require a complete 24-bit address.
+			 *
+			 *  \param[in] PageAddress  Page address within the selected dataflash IC
+			 *  \param[in] BufferByte   Address within the dataflash's buffer
+			 */
+			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
+			                                              const uint16_t BufferByte)
+			{
+				PageAddress >>= 1;
+
+				Dataflash_SendByte(PageAddress >> 5);
+				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
+				Dataflash_SendByte(BufferByte);
+			}
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
index b8c14d559..ee8a2773c 100644
--- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
+++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
@@ -97,48 +97,56 @@
 		#if !defined(__DOXYGEN__)

 			static inline void LEDs_Init(void)

 			{

-				PORTB_DIRSET = LEDS_PORTB_LEDS;

-				PORTB_OUTSET = LEDS_PORTB_LEDS;

+				PORTB.DIRSET    = LEDS_PORTB_LEDS;

+				PORTB.OUTCLR    = LEDS_PORTB_LEDS;

 

-				PORTE_DIRSET = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

-				PORTE_OUTCLR = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

+				PORTCFG.MPCMASK = LEDS_PORTB_LEDS;

+				PORTB.PIN0CTRL  = PORT_INVEN_bm;

+

+				PORTE.DIRSET    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

+				PORTE.OUTCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_Disable(void)

 			{

-				PORTB_DIRCLR = LEDS_PORTB_LEDS;

-				PORTB_OUTCLR = LEDS_PORTB_LEDS;

-

-				PORTE_DIRCLR = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

-				PORTE_OUTCLR = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

+				PORTB.DIRCLR    = LEDS_PORTB_LEDS;

+				PORTB.OUTCLR    = LEDS_PORTB_LEDS;

+				

+				PORTCFG.MPCMASK = 0;

+				PORTB.PIN0CTRL  = LEDS_PORTB_LEDS;

+

+				PORTE.DIRCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

+				PORTE.OUTCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)

 			{

-				PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS);

+				PORTB_OUTSET = (LEDMask & LEDS_PORTB_LEDS);

 				PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)

 			{

-				PORTB_OUTSET = (LEDMask & LEDS_PORTB_LEDS);

+				PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS);

 				PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)

 			{

-				PORTB_OUTSET = LEDS_PORTB_LEDS;

+				PORTB_OUTCLR = LEDS_PORTB_LEDS;

 				PORTE_OUTCLR = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);

 

-				PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS);

+				PORTB_OUTSET = (LEDMask & LEDS_PORTB_LEDS);

 				PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)

 			{

-				PORTB_OUT = (PORTB.OUT & (~LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS);

-				PORTE_OUT = (PORTB.OUT & (((~LEDMask & LEDS_PORTB_LEDS)) << LEDS_PORTE_MASK_SHIFT) &

-				             ~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));

+				PORTB_OUTCLR =  (LEDMask & LEDS_PORTB_LEDS);

+				PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);

+			

+				PORTB_OUTSET =  (ActiveMask & LEDS_PORTB_LEDS);

+				PORTE_OUTSET = ((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);

 			}

 

 			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)

@@ -150,7 +158,7 @@
 			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

 			static inline uint8_t LEDs_GetLEDs(void)

 			{

-				return ((~PORTB_OUT & LEDS_PORTB_LEDS) | (PORTE_OUT & (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT)));

+				return ((PORTB_OUT & LEDS_PORTB_LEDS) | (PORTE_OUT & (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT)));

 			}

 		#endif