mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-05-04 14:55:29 +00:00
AppConfigHeaders: Update several user projects to use configuration header files, rather than makefile defines.
This commit is contained in:
Dean Camera
@@ -42,6 +42,7 @@
|
||||
#include <avr/interrupt.h>
|
||||
|
||||
#include "Descriptors.h"
|
||||
#include "Config/AppConfig.h"
|
||||
|
||||
#include <LUFA/Version.h>
|
||||
#include <LUFA/Drivers/Board/LEDs.h>
|
||||
|
||||
@@ -68,37 +68,37 @@
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>AVR_RESET_LINE_PORT</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Indicates the PORT register of the pin used to generate the target /RESET line pulse.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>AVR_RESET_LINE_DDR</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Indicates the DDR register of the pin used to generate the target /RESET line pulse.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>AVR_RESET_LINE_MASK</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Indicates the mask of the pin used to generate the target /RESET line pulse.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>AVR_RESET_PULSE_MS</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Pulse length in milliseconds for the target /RESET pulse.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>TX_RX_LED_PULSE_MS</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Pulse length in milliseconds for the activity Tx/Rx LEDs.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>PING_PONG_LED_PULSE_MS</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Pulse length in milliseconds for the enumeration LED ping-ponging between toggles.</td>
|
||||
* </tr>
|
||||
* <tr>
|
||||
* <td>RECEIVE_BUFFER_FLUSH_MS</td>
|
||||
* <td>Makefile LUFA_OPTS</td>
|
||||
* <td>AppConfig.h</td>
|
||||
* <td>Period between flushings of received data buffer to the attached USB host.</td>
|
||||
* </tr>
|
||||
* </table>
|
||||
|
||||
56
Projects/Benito/Config/AppConfig.h
Normal file
56
Projects/Benito/Config/AppConfig.h
Normal file
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
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 Application Configuration Header File
|
||||
*
|
||||
* This is a header file which is be used to configure LUFA's
|
||||
* compile time options, as an alternative to the compile time
|
||||
* constants supplied through a makefile.
|
||||
*
|
||||
* For information on what each token does, refer to the
|
||||
* \ref Sec_Options section of the application documentation.
|
||||
*/
|
||||
|
||||
#ifndef _APP_CONFIG_H_
|
||||
#define _APP_CONFIG_H_
|
||||
|
||||
#define AVR_RESET_LINE_PORT PORTD
|
||||
#define AVR_RESET_LINE_DDR DDRD
|
||||
#define AVR_RESET_LINE_MASK (1 << 4)
|
||||
|
||||
#define AVR_RESET_PULSE_MS 10
|
||||
|
||||
#define TX_RX_LED_PULSE_MS 30
|
||||
#define PING_PONG_LED_PULSE_MS 100
|
||||
|
||||
#define RECEIVE_BUFFER_FLUSH_MS 10
|
||||
|
||||
#endif
|
||||
93
Projects/Benito/Config/LUFAConfig.h
Normal file
93
Projects/Benito/Config/LUFAConfig.h
Normal file
@@ -0,0 +1,93 @@
|
||||
/*
|
||||
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 LUFA Library Configuration Header File
|
||||
*
|
||||
* This header file is used to configure LUFA's compile time options,
|
||||
* as an alternative to the compile time constants supplied through
|
||||
* a makefile.
|
||||
*
|
||||
* For information on what each token does, refer to the LUFA
|
||||
* manual section "Summary of Compile Tokens".
|
||||
*/
|
||||
|
||||
#ifndef _LUFA_CONFIG_H_
|
||||
#define _LUFA_CONFIG_H_
|
||||
|
||||
#if (ARCH == ARCH_AVR8)
|
||||
|
||||
/* Non-USB Related Configuration Tokens: */
|
||||
// #define DISABLE_TERMINAL_CODES
|
||||
|
||||
/* USB Class Driver Related Tokens: */
|
||||
// #define HID_HOST_BOOT_PROTOCOL_ONLY
|
||||
// #define HID_STATETABLE_STACK_DEPTH {Insert Value Here}
|
||||
// #define HID_USAGE_STACK_DEPTH {Insert Value Here}
|
||||
// #define HID_MAX_COLLECTIONS {Insert Value Here}
|
||||
// #define HID_MAX_REPORTITEMS {Insert Value Here}
|
||||
// #define HID_MAX_REPORT_IDS {Insert Value Here}
|
||||
// #define NO_CLASS_DRIVER_AUTOFLUSH
|
||||
|
||||
/* General USB Driver Related Tokens: */
|
||||
#define ORDERED_EP_CONFIG
|
||||
#define USE_STATIC_OPTIONS (USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)
|
||||
#define USB_DEVICE_ONLY
|
||||
// #define USB_HOST_ONLY
|
||||
// #define USB_STREAM_TIMEOUT_MS {Insert Value Here}
|
||||
// #define NO_LIMITED_CONTROLLER_CONNECT
|
||||
// #define NO_SOF_EVENTS
|
||||
|
||||
/* USB Device Mode Driver Related Tokens: */
|
||||
// #define USE_RAM_DESCRIPTORS
|
||||
#define USE_FLASH_DESCRIPTORS
|
||||
// #define USE_EEPROM_DESCRIPTORS
|
||||
// #define NO_INTERNAL_SERIAL
|
||||
#define FIXED_CONTROL_ENDPOINT_SIZE 8
|
||||
#define DEVICE_STATE_AS_GPIOR 0
|
||||
#define FIXED_NUM_CONFIGURATIONS 1
|
||||
// #define CONTROL_ONLY_DEVICE
|
||||
#define INTERRUPT_CONTROL_ENDPOINT
|
||||
// #define NO_DEVICE_REMOTE_WAKEUP
|
||||
// #define NO_DEVICE_SELF_POWER
|
||||
|
||||
/* USB Host Mode Driver Related Tokens: */
|
||||
// #define HOST_STATE_AS_GPIOR {Insert Value Here}
|
||||
// #define USB_HOST_TIMEOUT_MS {Insert Value Here}
|
||||
// #define HOST_DEVICE_SETTLE_DELAY_MS {Insert Value Here}
|
||||
// #define NO_AUTO_VBUS_MANAGEMENT
|
||||
// #define INVERTED_VBUS_ENABLE_LINE
|
||||
|
||||
#else
|
||||
|
||||
#error Unsupported architecture for this LUFA configuration file.
|
||||
|
||||
#endif
|
||||
#endif
|
||||
@@ -120,22 +120,7 @@ LUFA_PATH = ../..
|
||||
|
||||
|
||||
# LUFA library compile-time options and predefined tokens
|
||||
LUFA_OPTS = -D USB_DEVICE_ONLY
|
||||
LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
|
||||
LUFA_OPTS += -D ORDERED_EP_CONFIG
|
||||
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
|
||||
LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
|
||||
LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
|
||||
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
|
||||
LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
|
||||
|
||||
LUFA_OPTS += -D AVR_RESET_LINE_PORT="PORTD"
|
||||
LUFA_OPTS += -D AVR_RESET_LINE_DDR="DDRD"
|
||||
LUFA_OPTS += -D AVR_RESET_LINE_MASK="(1 << 4)"
|
||||
LUFA_OPTS += -D AVR_RESET_PULSE_MS=10
|
||||
LUFA_OPTS += -D TX_RX_LED_PULSE_MS=30
|
||||
LUFA_OPTS += -D PING_PONG_LED_PULSE_MS=100
|
||||
LUFA_OPTS += -D RECEIVE_BUFFER_FLUSH_MS=10
|
||||
LUFA_OPTS = -D USE_LUFA_CONFIG_HEADER
|
||||
|
||||
|
||||
# Create the LUFA source path variables by including the LUFA root makefile
|
||||
@@ -180,7 +165,7 @@ DEBUG = dwarf-2
|
||||
# Each directory must be seperated by a space.
|
||||
# Use forward slashes for directory separators.
|
||||
# For a directory that has spaces, enclose it in quotes.
|
||||
EXTRAINCDIRS = $(LUFA_PATH)/
|
||||
EXTRAINCDIRS = $(LUFA_PATH)/ Config/
|
||||
|
||||
|
||||
# Compiler flag to set the C Standard level.
|
||||
|
||||
Reference in New Issue
Block a user