aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-07-30 10:54:57 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-07-30 10:54:57 +0000
commitce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e (patch)
tree20b47413eb5f24317cbef4d08a9cafe4abc157c4 /LUFA
parent5ca1d7bf8f1aa774c076b614fa692c2026d7e854 (diff)
downloadlufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.tar.gz
lufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.tar.bz2
lufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.zip
Added standard stream example to the ClassDriver CDC device demo.
Fix incorrect HWB button mask in the STK526 Buttons driver.
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/Drivers/Board/STK526/Buttons.h2
-rw-r--r--LUFA/ManPages/ChangeLog.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h
index fba578cb2..9d392f2de 100644
--- a/LUFA/Drivers/Board/STK526/Buttons.h
+++ b/LUFA/Drivers/Board/STK526/Buttons.h
@@ -64,7 +64,7 @@
/* Public Interface - May be used in end-application: */
/* Macros: */
/** Button mask for the first button on the board. */
- #define BUTTONS_BUTTON1 (1 << 2)
+ #define BUTTONS_BUTTON1 (1 << 7)
/* Inline Functions: */
#if !defined(__DOXYGEN__)
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 483e0a6fd..02146a20a 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -76,6 +76,7 @@
* - Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint addresses of 8 and above (thanks to John Andrews)
* - Fixed report data alignment issues in the MouseHostWithParser demo when X and Y movement data size is not a multiple of 8 bits
* - Fixed HID Report Descriptor Parser not correctly resetting internal states when a REPORT ID element is encountered
+ * - Fixed incorrect BUTTONS_BUTTON1 for the STK526 target
*
*
* \section Sec_ChangeLog090605 Version 090605