Add support for the Olimex AVR-ISP-MK2 board.
authorDean Camera <dean@fourwalledcubicle.com>
Thu, 26 Jul 2012 19:23:15 +0000 (19:23 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Thu, 26 Jul 2012 19:23:15 +0000 (19:23 +0000)
LUFA/Common/BoardTypes.h
LUFA/DoxygenPages/ChangeLog.txt
LUFA/DoxygenPages/DeviceSupport.txt
LUFA/DoxygenPages/LUFAPoweredProjects.txt
LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h [new file with mode: 0644]
LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h [new file with mode: 0644]
LUFA/Drivers/Board/Buttons.h
LUFA/Drivers/Board/LEDs.h

index 0a40b19..59e9bb7 100644 (file)
                        
                        /** Selects the Olimex AVR-USB-T32U4 specific board drivers, including the Button and LED drivers. */
                        #define BOARD_OLIMEXT32U4          49
                        
                        /** Selects the Olimex AVR-USB-T32U4 specific board drivers, including the Button and LED drivers. */
                        #define BOARD_OLIMEXT32U4          49
+                       
+                       /** Selects the Olimex AVR-ISP-MK2 specific board drivers, including the Button and LED drivers. */
+                       #define BOARD_OLIMEXISPMK2         50
 
 
                        #if !defined(__DOXYGEN__)
 
 
                        #if !defined(__DOXYGEN__)
index 9100599..4199716 100644 (file)
@@ -14,6 +14,7 @@
   *   - Added support for the DorkbotPDX Duce board
   *   - Added support for the Olimex AVR-USB-32U4 board
   *   - Added support for the Olimex AVR-USB-T32U4 board
   *   - Added support for the DorkbotPDX Duce board
   *   - Added support for the Olimex AVR-USB-32U4 board
   *   - Added support for the Olimex AVR-USB-T32U4 board
+  *   - Added support for the Olimex AVR-ISP-MK2 board
   *   - Added new Endpoint_ConfigureEndpointTable() function
   *   - Added new Pipe_ConfigurePipeTable() function
   *   - Added build test to verify correct compilation of all board drivers using all driver APIs
   *   - Added new Endpoint_ConfigureEndpointTable() function
   *   - Added new Pipe_ConfigurePipeTable() function
   *   - Added build test to verify correct compilation of all board drivers using all driver APIs
index 165f115..89a5e48 100644 (file)
  *   - Olimex AVR-USB-162
  *   - Olimex AVR-USB-32U4
  *   - Olimex AVR-USB-T32U4
  *   - Olimex AVR-USB-162
  *   - Olimex AVR-USB-32U4
  *   - Olimex AVR-USB-T32U4
+ *   - Olimex AVR-ISP-MK2
  *   - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
  *   - PJRC Teensy (1.x and 2.x versions)
  *   - Sparkfun U2 Breakout Board
  *   - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
  *   - PJRC Teensy (1.x and 2.x versions)
  *   - Sparkfun U2 Breakout Board
index 7d514aa..6afad65 100644 (file)
  *  \li Many of Busware's Products: http://www.busware.de/
  *  \li MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
  *  \li Norduino, a wireless Arduino: http://norduino.robomotic.com/norduino-is-now-usb-hid/
  *  \li Many of Busware's Products: http://www.busware.de/
  *  \li MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
  *  \li Norduino, a wireless Arduino: http://norduino.robomotic.com/norduino-is-now-usb-hid/
+ *  \li Olimex AVR-ISP-MK2, an AVRISP-MKII Clone AVR Programmer: https://www.olimex.com/dev/avr-isp-mk2.html
  *  \li Retrode, a USB Games Console Cartridge Reader: http://www.retrode.org
  *  \li RFI21.1EU UHF RFID reader: http://www.metra.cz/rfid/uhf-rfid-ctecky/rfi21-1eu-uhf-rfid-ctecka.htm
  *  \li SmartCardDetective, a Smart Card analysis tool: http://www.smartcarddetective.com/
  *  \li Retrode, a USB Games Console Cartridge Reader: http://www.retrode.org
  *  \li RFI21.1EU UHF RFID reader: http://www.metra.cz/rfid/uhf-rfid-ctecky/rfi21-1eu-uhf-rfid-ctecka.htm
  *  \li SmartCardDetective, a Smart Card analysis tool: http://www.smartcarddetective.com/
diff --git a/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h b/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h
new file mode 100644 (file)
index 0000000..9685fcd
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+             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 Buttons driver header for the Olimex AVR-ISP-MK2 Development Board.
+ *  \copydetails Group_Buttons_OLIMEXISPMK2
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
+ *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
+ */
+
+/** \ingroup Group_Buttons
+ *  \defgroup Group_Buttons_OLIMEXISPMK2 OLIMEXISPMK2
+ *  \brief Board specific Buttons driver header for the Olimex AVR-ISP-MK2.
+ *
+ *  Board specific Buttons driver header for the Olimex AVR-ISP-MK2 Development Board (https://www.olimex.com/dev/avr-isp-mk2.html).
+ *
+ *  <table>
+ *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
+ *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
+ *  </table>
+ *
+ *  @{
+ */
+
+#ifndef __BUTTONS_OLIMEXISPMK2_H__
+#define __BUTTONS_OLIMEXISPMK2_H__
+
+       /* Includes: */
+               #include "../../../../Common/Common.h"
+
+       /* Enable C linkage for C++ Compilers: */
+               #if defined(__cplusplus)
+                       extern "C" {
+               #endif
+
+       /* Preprocessor Checks: */
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)
+                       #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
+               #endif
+
+       /* Public Interface - May be used in end-application: */
+               /* Macros: */
+                       /** Button mask for the first button on the board. */
+                       #define BUTTONS_BUTTON1      (1 << 7)
+
+               /* Inline Functions: */
+               #if !defined(__DOXYGEN__)
+                       static inline void Buttons_Init(void)
+                       {
+                               DDRD  &= ~BUTTONS_BUTTON1;
+                               PORTD |=  BUTTONS_BUTTON1;
+                       }
+
+                       static inline void Buttons_Disable(void)
+                       {
+                               DDRD  &= ~BUTTONS_BUTTON1;
+                               PORTD &= ~BUTTONS_BUTTON1;
+                       }
+
+                       static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
+                       static inline uint8_t Buttons_GetStatus(void)
+                       {
+                               return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
+                       }
+               #endif
+
+       /* Disable C linkage for C++ Compilers: */
+               #if defined(__cplusplus)
+                       }
+               #endif
+
+#endif
+
+/** @} */
+
diff --git a/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h b/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h
new file mode 100644 (file)
index 0000000..9a5577a
--- /dev/null
@@ -0,0 +1,143 @@
+/*
+             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 LED driver header for the Olimex AVR-ISP-MK2 Development Board.
+ *  \copydetails Group_LEDs_OLIMEXISPMK2
+ *
+ *  \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_OLIMEXISPMK2 OLIMEXISPMK2
+ *  \brief Board specific LED driver header for the Olimex AVR-ISP-MK2.
+ *
+ *  Board specific LED driver header for the Olimex AVR-ISP-MK2 Development Board (https://www.olimex.com/dev/avr-isp-mk2.html).
+ *
+ *  <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>Yellow</td><td>Target Power</td><td>High</td><td>PORTB.5</td></tr>
+ *    <tr><td>LEDS_LED2</td><td>Red</td><td>Activity</td><td>High</td><td>PORTB.6</td></tr>
+ *    <tr><td>LEDS_LED3</td><td>Green</td><td>Ready</td><td>High</td><td>PORTB.7</td></tr>
+ *  </table>
+ *
+ *  @{
+ */
+
+#ifndef __LEDS_OLIMEXISPMK2_H__
+#define __LEDS_OLIMEXISPMK2_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 << 5)
+
+                       /** LED mask for the second LED on the board. */
+                       #define LEDS_LED2        (1 << 6)
+
+                       /** LED mask for the third LED on the board. */
+                       #define LEDS_LED3        (1 << 7)
+                       
+                       /** LED mask for all the LEDs on the board. */
+                       #define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
+
+                       /** LED mask for none of the board LEDs. */
+                       #define LEDS_NO_LEDS     0
+
+               /* Inline Functions: */
+               #if !defined(__DOXYGEN__)
+                       static inline void LEDs_Init(void)
+                       {
+                               DDRB  |=  LEDS_ALL_LEDS;
+                               PORTB &= ~LEDS_ALL_LEDS;
+                       }
+
+                       static inline void LEDs_Disable(void)
+                       {
+                               DDRB  &= ~LEDS_ALL_LEDS;
+                               PORTB &= ~LEDS_ALL_LEDS;
+                       }
+
+                       static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+                       {
+                               PORTB |= LEDMask;
+                       }
+
+                       static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+                       {
+                               PORTB &= ~LEDMask;
+                       }
+
+                       static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+                       {
+                               PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask);
+                       }
+
+                       static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
+                                                          const uint8_t ActiveMask)
+                       {
+                               PORTB = ((PORTB & ~LEDMask) | ActiveMask);
+                       }
+
+                       static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+                       {
+                               PINB  = LEDMask;
+                       }
+
+                       static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+                       static inline uint8_t LEDs_GetLEDs(void)
+                       {
+                               return (PORTB & LEDS_ALL_LEDS);
+                       }
+               #endif
+
+       /* Disable C linkage for C++ Compilers: */
+               #if defined(__cplusplus)
+                       }
+               #endif
+
+#endif
+
+/** @} */
+
index 73ccb41..b3c915f 100644 (file)
                        #include "AVR8/OLIMEX32U4/Buttons.h"            
                #elif (BOARD == BOARD_OLIMEXT32U4)
                        #include "AVR8/OLIMEXT32U4/Buttons.h"           
                        #include "AVR8/OLIMEX32U4/Buttons.h"            
                #elif (BOARD == BOARD_OLIMEXT32U4)
                        #include "AVR8/OLIMEXT32U4/Buttons.h"           
+               #elif (BOARD == BOARD_OLIMEXISPMK2)
+                       #include "AVR8/OLIMEXISPMK2/Buttons.h"  
                #else
                        #include "Board/Buttons.h"
                #endif
                #else
                        #include "Board/Buttons.h"
                #endif
index 21f89aa..946ea5e 100644 (file)
                        #include "AVR8/OLIMEX32U4/LEDs.h"               
                #elif (BOARD == BOARD_OLIMEXT32U4)
                        #include "AVR8/OLIMEXT32U4/LEDs.h"              
                        #include "AVR8/OLIMEX32U4/LEDs.h"               
                #elif (BOARD == BOARD_OLIMEXT32U4)
                        #include "AVR8/OLIMEXT32U4/LEDs.h"              
+               #elif (BOARD == BOARD_OLIMEXISPMK2)
+                       #include "AVR8/OLIMEXISPMK2/LEDs.h"             
                #else
                        #include "Board/LEDs.h"
                #endif
                #else
                        #include "Board/LEDs.h"
                #endif