Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
70f3d8e9
Commit
70f3d8e9
authored
Nov 28, 2011
by
Dean Camera
Browse files
Add support for the Paranoid Studio USB2AX boards (hardware revisions 1-3).
parent
2b233183
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
LUFA.pnproj
View file @
70f3d8e9
This diff is collapsed.
Click to expand it.
LUFA/Common/BoardTypes.h
View file @
70f3d8e9
...
...
@@ -162,6 +162,12 @@
/** Selects the Teensy version 2.x specific board drivers, including the driver for the board LEDs. */
#define BOARD_TEENSY2 32
/** Selects the USB2AX version 1 and 2 specific board drivers, including the Button and LEDs drivers. */
#define BOARD_USB2AX 33
/** Selects the USB2AX version 3 specific board drivers, including the Button and LEDs drivers. */
#define BOARD_USB2AX_V3 34
#if !defined(__DOXYGEN__)
#define BOARD_ BOARD_NONE
...
...
LUFA/DoxygenPages/ChangeLog.txt
View file @
70f3d8e9
...
...
@@ -12,6 +12,7 @@
* - Added support for the XMEGA A3BU Xplained board
* - Added support for the new B series XMEGA devices
* - Added support for version 2 of the Teensy boards (thanks to Christoph Redecker)
* - Added support for the USB2AX boards, hardware revision 1-3
* - Added new Android Accessory Host class driver
* - Added new USB_Host_GetDescriptor(), USB_Host_GetDeviceConfiguration() and USB_Host_GetInterfaceAltSetting() functions
* - Library Applications:
...
...
LUFA/DoxygenPages/DeviceSupport.txt
View file @
70f3d8e9
...
...
@@ -112,6 +112,7 @@
* - Microsin AVR-USB162
* - Minimus USB
* - Olimex AVR-USB-162
* - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
* - PJRC Teensy (1.x and 2.x versions)
* - Sparkfun U2 Breakout Board
* - TCNISO Blackcat USB JTAG
...
...
LUFA/DoxygenPages/LUFAPoweredProjects.txt
View file @
70f3d8e9
...
...
@@ -28,6 +28,7 @@
* - Sparkfun ATMEGA8U2 breakout board: http://www.sparkfun.com/products/10277
* - Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html
* - U2DIL/U4DIL, a set of DIP layout USB AVR boards: http://www.reworld.eu/re/en/products/u2dil/
* - USB2AX, a tiny USB to serial converter board: http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX
* - USBFOO 2, AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102
*
* \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)
...
...
LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h
0 → 100644
View file @
70f3d8e9
/*
LUFA Library
Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
Copyright 2011 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 Paranoid Studio USB2AX.
* \copydetails Group_Buttons_USB2AX
*
* \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_USB2AX_V3 USB2AX_V3
* \brief Board specific Button driver header for the Paranoid Studio USB2AX revision 3.
*
* See \ref Group_Buttons_USB2AX for more details.
*/
/** \ingroup Group_Buttons
* \defgroup Group_Buttons_USB2AX USB2AX
* \brief Board specific Buttons driver header for the Paranoid Studio USB2AX.
*
* \note For version 3 USB2AX boards, compile with <code>BOARD = USB2AX_V3</code>.
*
* Board specific Buttons driver header for the Paranoid Studio USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).
*
* @{
*/
#ifndef __BUTTONS_USB2AX_H__
#define __BUTTONS_USB2AX_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
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
/** @} */
LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
0 → 100644
View file @
70f3d8e9
/*
LUFA Library
Copyright (C) Dean Camera, 2011.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
Copyright 2011 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 Paranoid Studio USB2AX.
* \copydetails Group_LEDs_USB2AX
*
* \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_USB2AX_V3 USB2AX_V3
* \brief Board specific LED driver header for the Paranoid Studio USB2AX revision 3.
*
* See \ref Group_LEDs_USB2AX for more details.
*/
/** \ingroup Group_LEDs
* \defgroup Group_LEDs_USB2AX USB2AX
* \brief Board specific LED driver header for the Paranoid Studio USB2AX.
*
* \note For version 3 USB2AX boards, compile with <code>BOARD = USB2AX_V3</code>.
*
* Board specific LED driver header for the Paranoid Studio USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).
*
* @{
*/
#ifndef __LEDS_USB2AX_H__
#define __LEDS_USB2AX_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
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
#if (BOARD == BOARD_USB2AX)
#define USB2AX_LEDS_LED1 (1 << 6)
#else
#define USB2AX_LEDS_LED1 (1 << 1)
#endif
#endif
/* Public Interface - May be used in end-application: */
/* Macros: */
/** LED mask for the first LED on the board. */
#define LEDS_LED1 USB2AX_LEDS_LED1
/** 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
)
{
#if (BOARD == BOARD_USB2AX)
DDRC
|=
LEDS_ALL_LEDS
;
PORTC
|=
LEDS_ALL_LEDS
;
#else
DDRD
|=
LEDS_ALL_LEDS
;
PORTD
|=
LEDS_ALL_LEDS
;
#endif
}
static
inline
void
LEDs_TurnOnLEDs
(
const
uint8_t
LEDMask
)
{
#if (BOARD == BOARD_USB2AX)
PORTC
&=
~
LEDMask
;
#else
PORTD
&=
~
LEDMask
;
#endif
}
static
inline
void
LEDs_TurnOffLEDs
(
const
uint8_t
LEDMask
)
{
#if (BOARD == BOARD_USB2AX)
PORTC
|=
LEDMask
;
#else
PORTD
|=
LEDMask
;
#endif
}
static
inline
void
LEDs_SetAllLEDs
(
const
uint8_t
LEDMask
)
{
#if (BOARD == BOARD_USB2AX)
PORTC
=
((
PORTC
|
LEDS_ALL_LEDS
)
&
~
LEDMask
);
#else
PORTD
=
((
PORTD
|
LEDS_ALL_LEDS
)
&
~
LEDMask
);
#endif
}
static
inline
void
LEDs_ChangeLEDs
(
const
uint8_t
LEDMask
,
const
uint8_t
ActiveMask
)
{
#if (BOARD == BOARD_USB2AX)
PORTC
=
((
PORTC
|
LEDMask
)
&
~
ActiveMask
);
#else
PORTD
=
((
PORTD
|
LEDMask
)
&
~
ActiveMask
);
#endif
}
static
inline
void
LEDs_ToggleLEDs
(
const
uint8_t
LEDMask
)
{
#if (BOARD == BOARD_USB2AX)
PORTC
^=
LEDMask
;
#else
PORTD
^=
LEDMask
;
#endif
}
static
inline
uint8_t
LEDs_GetLEDs
(
void
)
ATTR_WARN_UNUSED_RESULT
;
static
inline
uint8_t
LEDs_GetLEDs
(
void
)
{
#if (BOARD == BOARD_USB2AX)
return
(
~
PORTC
&
LEDS_ALL_LEDS
);
#else
return
(
~
PORTD
&
LEDS_ALL_LEDS
);
#endif
}
#endif
/* Disable C linkage for C++ Compilers: */
#if defined(__cplusplus)
}
#endif
#endif
/** @} */
LUFA/Drivers/Board/Buttons.h
View file @
70f3d8e9
...
...
@@ -133,6 +133,8 @@
#include
"UC3/EVK1104/Buttons.h"
#elif (BOARD == BOARD_A3BU_XPLAINED)
#include
"XMEGA/A3BU_XPLAINED/Buttons.h"
#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3))
#include
"AVR8/USB2AX/Buttons.h"
#else
#include
"Board/Buttons.h"
#endif
...
...
LUFA/Drivers/Board/LEDs.h
View file @
70f3d8e9
...
...
@@ -131,7 +131,7 @@
#include
"AVR8/BUMBLEB/LEDs.h"
#elif (BOARD == BOARD_EVK527)
#include
"AVR8/EVK527/LEDs.h"
#elif (BOARD == BOARD_TEENSY)
#elif
(
(BOARD == BOARD_TEENSY)
|| (BOARD == BOARD_TEENSY2))
#include
"AVR8/TEENSY/LEDs.h"
#elif (BOARD == BOARD_USBTINYMKII)
#include
"AVR8/USBTINYMKII/LEDs.h"
...
...
@@ -173,8 +173,8 @@
#include
"UC3/EVK1104/LEDs.h"
#elif (BOARD == BOARD_A3BU_XPLAINED)
#include
"XMEGA/A3BU_XPLAINED/LEDs.h"
#elif (BOARD == BOARD_
TEENSY2
)
#include
"AVR8/
TEENSY
/LEDs.h"
#elif
(
(BOARD == BOARD_
USB2AX) || (BOARD == BOARD_USB2AX_V3)
)
#include
"AVR8/
USB2AX
/LEDs.h"
#else
#include
"Board/LEDs.h"
#endif
...
...
LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
View file @
70f3d8e9
...
...
@@ -382,7 +382,7 @@ uint8_t PRNT_Host_GetDeviceID(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo
char
*
const
DeviceIDString
,
const
uint16_t
BufferSize
)
{
uint8_t
ErrorCode
=
HOST_SENDCONTROL_Successful
;
uint8_t
ErrorCode
;
uint16_t
DeviceIDStringLength
=
0
;
USB_ControlRequest
=
(
USB_Request_Header_t
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment