From e37e86583cfa9735c1436e9e2450a775d7b1c0dc Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 20 Nov 2014 14:45:20 +1100
Subject: [PATCH] Add board drivers for the Atmel Xplained-MINI kits.
---
BuildTests/BoardDriverTest/BoardDeviceMap.cfg | 1 +
LUFA/Common/BoardTypes.h | 3 +
LUFA/DoxygenPages/ChangeLog.txt | 2 +-
LUFA/DoxygenPages/DeviceSupport.txt | 1 +
LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h | 78 ++++++++++
LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h | 135 ++++++++++++++++++
LUFA/Drivers/Board/Board.h | 2 +
LUFA/Drivers/Board/LEDs.h | 2 +
8 files changed, 223 insertions(+), 1 deletion(-)
create mode 100644 LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h
create mode 100644 LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h
diff --git a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
index 3fee2f1e3..fe07eac21 100644
--- a/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
+++ b/BuildTests/BoardDriverTest/BoardDeviceMap.cfg
@@ -73,6 +73,7 @@ BOARD_STANGE_ISP = AVR8 : at90usb162 :
BOARD_U2S = AVR8 : atmega32u2 :
BOARD_YUN = AVR8 : atmega32u4 :
BOARD_MICRO = AVR8 : atmega32u4 :
+BOARD_XPLAINED_MINI = AVR8 : atmega32u4 :
#
# ----------------- XMEGA Boards -----------------
BOARD_A3BU_XPLAINED = XMEGA : atxmega256a3bu :
diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index 06ff4ddb4..48e3306d1 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -240,6 +240,9 @@
/** Selects the Arduino Micro specific board drivers, including the driver for the board LEDs. */
#define BOARD_MICRO 58
+ /** Selects the Atmel Xplained-MINI specific board drivers, including the driver for the board LEDs. */
+ #define BOARD_XPLAINED_MINI 59
+
#if !defined(__DOXYGEN__)
#define BOARD_ BOARD_NONE
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 647f62148..3b28fe57f 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -8,7 +8,7 @@
*
* \section Sec_ChangeLogXXXXXX Version XXXXXX
* <b>New:</b>
- * - None.
+ * - Added support for the Atmel Xplained-MINI series of development kits.
*
* <b>Changed:</b>
* - Library Applications:
diff --git a/LUFA/DoxygenPages/DeviceSupport.txt b/LUFA/DoxygenPages/DeviceSupport.txt
index 2a4b9c335..657739e29 100644
--- a/LUFA/DoxygenPages/DeviceSupport.txt
+++ b/LUFA/DoxygenPages/DeviceSupport.txt
@@ -92,6 +92,7 @@
* - STK525
* - STK526
* - XPLAIN (Original green board, <i>not</i> the newer blue XPLAINED family boards)
+ * - Xplained-MINI
*
* \section Sec_AVR8Support_ThirdParty Supported Third Party Boards
* Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
diff --git a/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h b/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h
new file mode 100644
index 000000000..eeae569cd
--- /dev/null
+++ b/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h
@@ -0,0 +1,78 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2014.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.lufa-lib.org
+*/
+
+/*
+ Copyright 2014 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 disclaims 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 information header for the Atmel Xplained-MINI series kits.
+ * \copydetails Group_BoardInfo_XPLAINED_MINI
+ *
+ * \note This file should not be included directly. It is automatically included as needed by the Board driver
+ * dispatch header located in LUFA/Drivers/Board/Board.h.
+ */
+
+/** \ingroup Group_BoardInfo
+ * \defgroup Group_BoardInfo_XPLAINED_MINI XPLAINED_MINI
+ * \brief Board specific information header for the Atmel Xplained-MINI series kits.
+ *
+ * Board specific information header for the Atmel Xplained-MINI series kits.
+ *
+ * @{
+ */
+
+#ifndef __BOARD_XPLAINED_MINI_H__
+#define __BOARD_XPLAINED_MINI_H__
+
+ /* Includes: */
+ #include "../../../../Common/Common.h"
+ #include "../../LEDs.h"
+
+ /* Enable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+
+ /* Preprocessor Checks: */
+ #if !defined(__INCLUDE_FROM_BOARD_H)
+ #error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
+ #endif
+
+ /* Public Interface - May be used in end-application: */
+ /* Macros: */
+ /** Indicates the board has hardware LEDs mounted. */
+ #define BOARD_HAS_LEDS
+
+ /* Disable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ }
+ #endif
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h b/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h
new file mode 100644
index 000000000..27e0e32d7
--- /dev/null
+++ b/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h
@@ -0,0 +1,135 @@
+/*
+ LUFA Library
+ Copyright (C) Dean Camera, 2014.
+
+ dean [at] fourwalledcubicle [dot] com
+ www.lufa-lib.org
+*/
+
+/*
+ Copyright 2014 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 disclaims 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 LED driver header for the Atmel Xplained-MINI series kits..
+ * \copydetails Group_LEDs_XPLAINED_MINI
+ *
+ * \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ * dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ */
+
+/** \ingroup Group_LEDs
+ * \defgroup Group_LEDs_XPLAINED XPLAINED_MINI
+ * \brief Board specific LED driver header for the Atmel Xplained-MINI series kits.
+ *
+ * Board specific LED driver header for the Atmel Xplained-MINI series kits.
+ *
+ * <table>
+ * <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
+ * <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTC.6</td></tr>
+ * </table>
+ *
+ * @{
+ */
+
+#ifndef __LEDS_XPLAINED_MINI_H__
+#define __LEDS_XPLAINED_MINI_H__
+
+ /* Includes: */
+ #include "../../../../Common/Common.h"
+
+ /* Enable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+
+ /* Preprocessor Checks: */
+ #if !defined(__INCLUDE_FROM_LEDS_H)
+ #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+ #endif
+
+ /* Public Interface - May be used in end-application: */
+ /* Macros: */
+ /** LED mask for the first LED on the board. */
+ #define LEDS_LED1 (1 << 6)
+
+ /** LED mask for all the LEDs on the board. */
+ #define LEDS_ALL_LEDS LEDS_LED1
+
+ /** LED mask for none of the board LEDs. */
+ #define LEDS_NO_LEDS 0
+
+ /* Inline Functions: */
+ #if !defined(__DOXYGEN__)
+ static inline void LEDs_Init(void)
+ {
+ DDRC |= LEDS_ALL_LEDS;
+ PORTC |= LEDS_ALL_LEDS;
+ }
+
+ static inline void LEDs_Disable(void)
+ {
+ DDRC &= ~LEDS_ALL_LEDS;
+ PORTC &= ~LEDS_ALL_LEDS;
+ }
+
+ static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+ {
+ PORTC &= ~LEDMask;
+ }
+
+ static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+ {
+ PORTC |= LEDMask;
+ }
+
+ static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+ {
+ PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);
+ }
+
+ static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
+ const uint8_t ActiveMask)
+ {
+ PORTC = ((PORTC | LEDMask) & ~ActiveMask);
+ }
+
+ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+ {
+ PINC = LEDMask;
+ }
+
+ static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+ static inline uint8_t LEDs_GetLEDs(void)
+ {
+ return (~PORTC & LEDS_ALL_LEDS);
+ }
+ #endif
+
+ /* Disable C linkage for C++ Compilers: */
+ #if defined(__cplusplus)
+ }
+ #endif
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/Board.h b/LUFA/Drivers/Board/Board.h
index 27f495361..e59460589 100644
--- a/LUFA/Drivers/Board/Board.h
+++ b/LUFA/Drivers/Board/Board.h
@@ -157,6 +157,8 @@
#include "AVR8/YUN/Board.h"
#elif (BOARD == BOARD_MICRO)
#include "AVR8/MICRO/Board.h"
+ #elif (BOARD == BOARD_XPLAINED_MINI)
+ #include "AVR8/XPLAINED_MINI/Board.h"
#else
#include "Board/Board.h"
#endif
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 392714a4e..fa011fce0 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -207,6 +207,8 @@
#include "AVR8/YUN/LEDs.h"
#elif (BOARD == BOARD_MICRO)
#include "AVR8/MICRO/LEDs.h"
+ #elif (BOARD == BOARD_XPLAINED_MINI)
+ #include "AVR8/XPLAINED_MINI/LEDs.h"
#else
#include "Board/LEDs.h"
#endif
--
GitLab