From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 19 May 2013 22:06:37 +0000 (+0200)
Subject: Merge branch 'master' into XMEGA-Demo-Ports-ClockOnly
X-Git-Tag: LUFA-130901-BETA~65^2
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/10448970e5c4c5ad374f0887532fedc0daf97c42?hp=-c

Merge branch 'master' into XMEGA-Demo-Ports-ClockOnly
---

10448970e5c4c5ad374f0887532fedc0daf97c42
diff --combined LUFA/DoxygenPages/ChangeLog.txt
index e48b50817,b14738439..aec199cb0
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@@ -12,16 -12,15 +12,17 @@@
    *   - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt)
    *   - Added new CONCAT() and CONCAT_EXPANDED() convenience macros
    *   - Added new Printer Device Class driver
+   *   - Added support for the XMEGA C3 Xplained board
    *  - Library Applications:
    *   - Added new Printer class bootloader
    *   - Added new Mass Storage class bootloader
 +  *   - Added XMEGA support for class driver device demos (where applicable)
    *
    *  <b>Changed:</b>
    *  - Core:
    *   - Updated the BUILD build system module to produce binary BIN files in addition to Intel HEX files
    *   - Updated the Android Accessory Class to accept version 2 protocol devices (with version 1 functionality)
 +  *   - All board drivers now implement dummy functions and constants when BOARD is set to NONE
    *
    *  <b>Fixed:</b>
    *  - Core:
diff --combined LUFA/Drivers/Board/Buttons.h
index 9e319359a,8727507da..395d7901a
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@@ -92,9 -92,7 +92,9 @@@
  		#include "../../Common/Common.h"
  
  		#if (BOARD == BOARD_NONE)
 -			#error The Board Buttons driver cannot be used if the makefile BOARD option is not set.
 +			#define BUTTONS_BUTTON1  0
 +			static inline void       Buttons_Init(void) {};
 +			static inline uint_reg_t Buttons_GetStatus(void) { return 0; };
  		#elif (BOARD == BOARD_USBKEY)
  			#include "AVR8/USBKEY/Buttons.h"
  		#elif (BOARD == BOARD_STK525)
@@@ -155,6 -153,8 +155,8 @@@
  			#include "UC3/UC3A3_XPLAINED/Buttons.h"
  		#elif (BOARD == BOARD_STANGE_ISP)
  			#include "AVR8/STANGE_ISP/Buttons.h"
+ 		#elif (BOARD == BOARD_C3_XPLAINED)
+ 			#include "XMEGA/C3_XPLAINED/Buttons.h"
  		#else
  			#include "Board/Buttons.h"
  		#endif