ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backlight abstraction and other changes (#439)

Browse source 
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
This commit is contained in:
Jack Humbert 2016-06-23 22:18:20 -04:00 • committed by GitHub
parent ba116ceb49
commit 13bb6b4b7f
239 changed files with 1146 additions and 139888 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tmk_core/rules.mk
View file

@ -40,7 +40,7 @@ OPT = s
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
COLOR?=true
COLOR ?= true
ifeq ($(COLOR),true)
NO_COLOR=\033[0m
@ -129,10 +129,8 @@ CFLAGS += -fshort-enums
CFLAGS += -fno-strict-aliasing
# add color
ifeq ($(COLOR),true)
ifeq ("$(echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
CFLAGS+= -fdiagnostics-color
else ifeq ("$(echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "")
CFLAGS+= -fcolor-diagnostics
endif
endif
CFLAGS += -Wall
@ -450,15 +448,6 @@ endif
dfu-programmer $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
dfu-programmer $(MCU) reset
dfu-no-build:
ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
dfu-programmer $(MCU) erase --force
else
dfu-programmer $(MCU) erase
endif
dfu-programmer $(MCU) flash $(KEYMAP_PATH)/compiled.hex
dfu-programmer $(MCU) reset
dfu-start:
dfu-programmer $(MCU) reset
dfu-programmer $(MCU) start
@ -536,9 +525,6 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf
$(eval CMD=$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@)
@$(BUILD_CMD)
@$(COPY) $@ $(TARGET).hex
$(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/compiled.hex" | $(AWK_CMD)
$(eval CMD=$(COPY) $@ $(KEYMAP_PATH)/compiled.hex)
@$(BUILD_CMD)
%.eep: %.elf
@$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)