aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-23 22:18:20 -0400
committerGitHub <noreply@github.com>2016-06-23 22:18:20 -0400
commit13bb6b4b7fdd2b3e419d0f89c93fb980b00eeb9b (patch)
tree2777e5c95bad3f5a9773fc58524a6ad99df63738 /tmk_core
parentba116ceb496011bb35ce074a3ba8c2448f059260 (diff)
downloadqmk_firmware-13bb6b4b7fdd2b3e419d0f89c93fb980b00eeb9b.tar.gz
qmk_firmware-13bb6b4b7fdd2b3e419d0f89c93fb980b00eeb9b.zip
Backlight abstraction and other changes (#439)
* 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
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/led.h4
-rw-r--r--tmk_core/common/matrix.h7
-rw-r--r--tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile2
-rw-r--r--tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md (renamed from tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md)0
-rw-r--r--tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md (renamed from tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md)0
-rw-r--r--tmk_core/protocol/vusb/usbdrv/Changelog.txt2
-rw-r--r--tmk_core/protocol/vusb/usbdrv/License.txt2
-rw-r--r--tmk_core/protocol/vusb/usbdrv/Readme.txt6
-rw-r--r--tmk_core/readme.md (renamed from tmk_core/README.md)0
-rw-r--r--tmk_core/rules.mk18
10 files changed, 15 insertions, 26 deletions
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h
index 9dc898780..61c971c10 100644
--- a/tmk_core/common/led.h
+++ b/tmk_core/common/led.h
@@ -34,10 +34,6 @@ extern "C" {
34 34
35void led_set(uint8_t usb_led); 35void led_set(uint8_t usb_led);
36 36
37/* keyboard-specific LED functionality */
38void led_set_kb(uint8_t usb_led);
39
40
41void led_init_ports(void); 37void led_init_ports(void);
42 38
43#ifdef __cplusplus 39#ifdef __cplusplus
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 5f380aaab..5f2f831b4 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -76,6 +76,13 @@ void matrix_power_down(void);
76/* executes code for Quantum */ 76/* executes code for Quantum */
77void matrix_init_quantum(void); 77void matrix_init_quantum(void);
78void matrix_scan_quantum(void); 78void matrix_scan_quantum(void);
79
80void matrix_init_kb(void);
81void matrix_scan_kb(void);
82
83void matrix_init_user(void);
84void matrix_scan_user(void);
85
79#ifdef __cplusplus 86#ifdef __cplusplus
80} 87}
81#endif 88#endif
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
index 2649598d9..9d6329b5f 100644
--- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
+++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile
@@ -109,7 +109,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) $(MSHELP_OUTPUT_XML)
109 109
110 @echo Archiving XDK content... 110 @echo Archiving XDK content...
111 @rm -f contents.zip 111 @rm -f contents.zip
112 @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects README.txt 112 @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects readme.txt
113 113
114 @echo Creating VSIX dependencies... 114 @echo Creating VSIX dependencies...
115 @cp $(VSIX_ASSETS) $(LUFA_ROOT)/.. 115 @cp $(VSIX_ASSETS) $(LUFA_ROOT)/..
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md
index d8b4296b1..d8b4296b1 100644
--- a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/README.md
+++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/examples/testusbhostFAT/readme.md
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md
index 49cd83e0a..49cd83e0a 100644
--- a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/README.md
+++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0/readme.md
diff --git a/tmk_core/protocol/vusb/usbdrv/Changelog.txt b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
index 5c6354ab1..1e74180a9 100644
--- a/tmk_core/protocol/vusb/usbdrv/Changelog.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Changelog.txt
@@ -28,7 +28,7 @@ Scroll down to the bottom to see the most recent changes.
28 - Added (free) default Vendor- and Product-IDs bought from voti.nl. 28 - Added (free) default Vendor- and Product-IDs bought from voti.nl.
29 - Added USBID-License.txt file which defines the rules for using the free 29 - Added USBID-License.txt file which defines the rules for using the free
30 shared VID/PID pair. 30 shared VID/PID pair.
31 - Added Readme.txt to the usbdrv directory which clarifies administrative 31 - Added readme.txt to the usbdrv directory which clarifies administrative
32 issues. 32 issues.
33 33
342006-01-25: 342006-01-25:
diff --git a/tmk_core/protocol/vusb/usbdrv/License.txt b/tmk_core/protocol/vusb/usbdrv/License.txt
index 4460cfbae..ce4c3aed4 100644
--- a/tmk_core/protocol/vusb/usbdrv/License.txt
+++ b/tmk_core/protocol/vusb/usbdrv/License.txt
@@ -10,7 +10,7 @@ Use the form at http://www.obdev.at/vusb/feedback.html for your submission.
10(2) Adhere to minimum publication standards. Please include AT LEAST: 10(2) Adhere to minimum publication standards. Please include AT LEAST:
11 - a circuit diagram in PDF, PNG or GIF format 11 - a circuit diagram in PDF, PNG or GIF format
12 - full source code for the host software 12 - full source code for the host software
13 - a Readme.txt file in ASCII format which describes the purpose of the 13 - a readme.txt file in ASCII format which describes the purpose of the
14 project and what can be found in which directories and which files 14 project and what can be found in which directories and which files
15 - a reference to http://www.obdev.at/vusb/ 15 - a reference to http://www.obdev.at/vusb/
16 16
diff --git a/tmk_core/protocol/vusb/usbdrv/Readme.txt b/tmk_core/protocol/vusb/usbdrv/Readme.txt
index 970dc66b2..3cff49f6f 100644
--- a/tmk_core/protocol/vusb/usbdrv/Readme.txt
+++ b/tmk_core/protocol/vusb/usbdrv/Readme.txt
@@ -1,4 +1,4 @@
1This is the Readme file to Objective Development's firmware-only USB driver 1This is the readme file to Objective Development's firmware-only USB driver
2for Atmel AVR microcontrollers. For more information please visit 2for Atmel AVR microcontrollers. For more information please visit
3http://www.obdev.at/vusb/ 3http://www.obdev.at/vusb/
4 4
@@ -15,7 +15,7 @@ file "usbdrv.h". Please read all of it carefully! Configuration options are
15documented in "usbconfig-prototype.h". 15documented in "usbconfig-prototype.h".
16 16
17The driver consists of the following files: 17The driver consists of the following files:
18 Readme.txt ............. The file you are currently reading. 18 readme.txt ............. The file you are currently reading.
19 Changelog.txt .......... Release notes for all versions of the driver. 19 Changelog.txt .......... Release notes for all versions of the driver.
20 usbdrv.h ............... Driver interface definitions and technical docs. 20 usbdrv.h ............... Driver interface definitions and technical docs.
21* usbdrv.c ............... High level language part of the driver. Link this 21* usbdrv.c ............... High level language part of the driver. Link this
@@ -155,7 +155,7 @@ http://www.obdev.at/goto.php?t=vusb-wiki&p=hosted-projects.
155(2) Adhere to minimum publication standards. Please include AT LEAST: 155(2) Adhere to minimum publication standards. Please include AT LEAST:
156 - a circuit diagram in PDF, PNG or GIF format 156 - a circuit diagram in PDF, PNG or GIF format
157 - full source code for the host software 157 - full source code for the host software
158 - a Readme.txt file in ASCII format which describes the purpose of the 158 - a readme.txt file in ASCII format which describes the purpose of the
159 project and what can be found in which directories and which files 159 project and what can be found in which directories and which files
160 - a reference to http://www.obdev.at/vusb/ 160 - a reference to http://www.obdev.at/vusb/
161 161
diff --git a/tmk_core/README.md b/tmk_core/readme.md
index 6b6714a6a..6b6714a6a 100644
--- a/tmk_core/README.md
+++ b/tmk_core/readme.md
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 07700283e..aaaba1c2c 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -40,7 +40,7 @@ OPT = s
40# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run. 40# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
41DEBUG = dwarf-2 41DEBUG = dwarf-2
42 42
43COLOR?=true 43COLOR ?= true
44 44
45ifeq ($(COLOR),true) 45ifeq ($(COLOR),true)
46 NO_COLOR=\033[0m 46 NO_COLOR=\033[0m
@@ -129,10 +129,8 @@ CFLAGS += -fshort-enums
129CFLAGS += -fno-strict-aliasing 129CFLAGS += -fno-strict-aliasing
130# add color 130# add color
131ifeq ($(COLOR),true) 131ifeq ($(COLOR),true)
132ifeq ("$(echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "") 132ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
133 CFLAGS+= -fdiagnostics-color 133 CFLAGS+= -fdiagnostics-color
134else ifeq ("$(echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "")
135 CFLAGS+= -fcolor-diagnostics
136endif 134endif
137endif 135endif
138CFLAGS += -Wall 136CFLAGS += -Wall
@@ -450,15 +448,6 @@ endif
450 dfu-programmer $(MCU) flash $(BUILD_DIR)/$(TARGET).hex 448 dfu-programmer $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
451 dfu-programmer $(MCU) reset 449 dfu-programmer $(MCU) reset
452 450
453dfu-no-build:
454ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
455 dfu-programmer $(MCU) erase --force
456else
457 dfu-programmer $(MCU) erase
458endif
459 dfu-programmer $(MCU) flash $(KEYMAP_PATH)/compiled.hex
460 dfu-programmer $(MCU) reset
461
462dfu-start: 451dfu-start:
463 dfu-programmer $(MCU) reset 452 dfu-programmer $(MCU) reset
464 dfu-programmer $(MCU) start 453 dfu-programmer $(MCU) start
@@ -536,9 +525,6 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf
536 $(eval CMD=$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@) 525 $(eval CMD=$(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@)
537 @$(BUILD_CMD) 526 @$(BUILD_CMD)
538 @$(COPY) $@ $(TARGET).hex 527 @$(COPY) $@ $(TARGET).hex
539 $(SILENT) || printf "Copying $(TARGET).hex to keymaps/$(KEYMAP)/compiled.hex" | $(AWK_CMD)
540 $(eval CMD=$(COPY) $@ $(KEYMAP_PATH)/compiled.hex)
541 @$(BUILD_CMD)
542 528
543%.eep: %.elf 529%.eep: %.elf
544 @$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD) 530 @$(SILENT) || printf "$(MSG_EEPROM) $@" | $(AWK_CMD)