drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Makefile redo & other features (#395)

Browse source 
* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
This commit is contained in:
Jack Humbert 2016-06-11 13:31:31 -04:00 • committed by GitHub
parent a5d638ad30
commit d9e4dad0a8
317 changed files with 135651 additions and 67504 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tmk_core/protocol/lufa.mk
View file

@ -5,23 +5,23 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
# Create the LUFA source path variables by including the LUFA makefile
ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
# New build system from 20120730
LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk
include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk
else
include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile
include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile
endif
LUFA_SRC = $(LUFA_DIR)/lufa.c \
$(LUFA_DIR)/descriptor.c \
LUFA_SRC = lufa.c \
descriptor.c \
$(LUFA_SRC_USB)
ifeq ($(strip $(MIDI_ENABLE)), yes)
LUFA_SRC += $(LUFA_DIR)/midi/midi.c \
$(LUFA_DIR)/midi/midi_device.c \
$(LUFA_DIR)/midi/bytequeue/bytequeue.c \
$(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \
LUFA_SRC += midi/midi.c \
midi/midi_device.c \
midi/bytequeue/bytequeue.c \
midi/bytequeue/interrupt_setting.c \
$(LUFA_SRC_USBCLASS)
endif
@ -33,8 +33,8 @@ endif
SRC += $(LUFA_SRC)
# Search Path
VPATH += $(TMK_DIR)/$(LUFA_DIR)
VPATH += $(TMK_DIR)/$(LUFA_PATH)
VPATH += $(TMK_PATH)/$(LUFA_DIR)
VPATH += $(TMK_PATH)/$(LUFA_PATH)
# Option modules
#ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)

5
tmk_core/protocol/lufa/lufa.c
View file

@ -838,7 +838,10 @@ static void setup_mcu(void)
wdt_disable();
/* Disable clock division */
clock_prescale_set(clock_div_1);
// clock_prescale_set(clock_div_1);
CLKPR = (1 << CLKPCE);
CLKPR = (0 << CLKPS3) | (0 << CLKPS2) | (0 << CLKPS1) | (0 << CLKPS0);
}
static void setup_usb(void)