From 15b9bce6bab13d85529fe9aaa91b3df9cd773e13 Mon Sep 17 00:00:00 2001 From: Wilba6582 Date: Tue, 17 Mar 2015 00:43:37 +1100 Subject: Initial commit for Planck PCB Rev 1. - Backlight on PB7 controlled by Timer1 Fast PWM (no interrupts). - Backlight commands connected temporarily to top left keys. - Backlight init called from matrix.c, since there's no generic keyboard_init() override function. --- keyboard/planck/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index c456cb51b3..001f17f316 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -50,7 +50,8 @@ TARGET_DIR = . # project specific files SRC = keymap_common.c \ matrix.c \ - led.c + led.c \ + backlight.c ifdef KEYMAP SRC := keymap_$(KEYMAP).c $(SRC) @@ -118,9 +119,10 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA - +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax -- cgit v1.2.3 From 708f95a472327e25355b28899fbd13d89f6925f5 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 20 Mar 2015 13:36:13 -0400 Subject: working extended keymap --- keyboard/planck/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 001f17f316..3716f0db92 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -47,16 +47,28 @@ TOP_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . +# # project specific files +# SRC = keymap_common.c \ +# matrix_handwire.c \ +# led.c \ +# backlight.c + +# ifdef KEYMAP +# SRC := keymap_$(KEYMAP).c $(SRC) +# else +# SRC := keymap_jack.c $(SRC) +# endif + # project specific files -SRC = keymap_common.c \ - matrix.c \ +SRC = extended_keymap_common.c \ + matrix_handwire.c \ led.c \ backlight.c ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) + SRC := extended_keymap_$(KEYMAP).c $(SRC) else - SRC := keymap_jack.c $(SRC) + SRC := extended_keymap_jack.c $(SRC) endif CONFIG_H = config.h -- cgit v1.2.3 From bf1987e23311b6ea19899e4d12eec26b02539379 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 22 Apr 2015 00:45:03 -0400 Subject: updated makefile --- keyboard/planck/Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 3716f0db92..68a4181f9a 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -48,18 +48,22 @@ TOP_DIR = ../.. TARGET_DIR = . # # project specific files -# SRC = keymap_common.c \ -# matrix_handwire.c \ -# led.c \ -# backlight.c +ifdef COMMON +SRC = keymap_common.c \ + matrix_handwire.c \ + led.c \ + backlight.c -# ifdef KEYMAP -# SRC := keymap_$(KEYMAP).c $(SRC) -# else -# SRC := keymap_jack.c $(SRC) -# endif +ifdef KEYMAP + SRC := keymap_$(KEYMAP).c $(SRC) +else + SRC := keymap_jack.c $(SRC) +endif + +else # project specific files + SRC = extended_keymap_common.c \ matrix_handwire.c \ led.c \ @@ -71,6 +75,8 @@ else SRC := extended_keymap_jack.c $(SRC) endif +endif + CONFIG_H = config.h # MCU name -- cgit v1.2.3 From 0541af4ff9a7f510f3d0f1ef55df86f995023748 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Thu, 23 Apr 2015 04:31:39 -0400 Subject: Updated makefile to properly handle non extended keymaps --- keyboard/planck/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 68a4181f9a..ef11e3d32b 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -47,9 +47,12 @@ TOP_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . + + # # project specific files -ifdef COMMON -SRC = keymap_common.c \ +ifdef COMMON_KEYMAP + + SRC = keymap_common.c \ matrix_handwire.c \ led.c \ backlight.c @@ -62,9 +65,7 @@ endif else -# project specific files - -SRC = extended_keymap_common.c \ +SRC = extended_keymap_common.c \ matrix_handwire.c \ led.c \ backlight.c -- cgit v1.2.3 From 85f8506caa00b06f525fc8e62a9fac2093ab8310 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 29 Apr 2015 02:47:56 -0400 Subject: Moved keymap file location and fixed bugs in keymap_reed.c --- keyboard/planck/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index ef11e3d32b..e32e4f97e8 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -58,9 +58,9 @@ ifdef COMMON_KEYMAP backlight.c ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) + SRC := common_keymaps/keymap_$(KEYMAP).c $(SRC) else - SRC := keymap_jack.c $(SRC) + SRC := common_keymaps/keymap_jack.c $(SRC) endif else @@ -71,9 +71,9 @@ SRC = extended_keymap_common.c \ backlight.c ifdef KEYMAP - SRC := extended_keymap_$(KEYMAP).c $(SRC) + SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC) else - SRC := extended_keymap_jack.c $(SRC) + SRC := extended_keymaps/extended_keymap_jack.c $(SRC) endif endif -- cgit v1.2.3 From 15110bf7a06badecb80dba351bb52fce6588dabe Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 29 Apr 2015 02:49:58 -0400 Subject: Corrected makefile common var --- keyboard/planck/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index e32e4f97e8..e021e9e90b 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -50,7 +50,7 @@ TARGET_DIR = . # # project specific files -ifdef COMMON_KEYMAP +ifdef COMMON SRC = keymap_common.c \ matrix_handwire.c \ -- cgit v1.2.3 From cb3e499cc7dbff2607bc43cb05fc8c29a2eb9d30 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Thu, 7 May 2015 15:34:46 -0400 Subject: backlight stuff --- keyboard/planck/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index e021e9e90b..773783ad1d 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -53,7 +53,7 @@ TARGET_DIR = . ifdef COMMON SRC = keymap_common.c \ - matrix_handwire.c \ + matrix.c \ led.c \ backlight.c @@ -66,7 +66,7 @@ endif else SRC = extended_keymap_common.c \ - matrix_handwire.c \ + matrix.c \ led.c \ backlight.c -- cgit v1.2.3 From 0e189b6bddb6b71d2aaa019689fbdb03beafa8a3 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 15 May 2015 21:57:29 -0400 Subject: quark --- keyboard/planck/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 773783ad1d..2f5517b1b1 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -53,7 +53,7 @@ TARGET_DIR = . ifdef COMMON SRC = keymap_common.c \ - matrix.c \ + matrix_pcb.c \ led.c \ backlight.c @@ -66,7 +66,7 @@ endif else SRC = extended_keymap_common.c \ - matrix.c \ + matrix_pcb.c \ led.c \ backlight.c -- cgit v1.2.3 From d61d1f5ca3a7dcccc495ac6688e0632c601c0623 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Thu, 21 May 2015 19:59:39 -0400 Subject: layouts, default --- keyboard/planck/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 2f5517b1b1..964e6832ea 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -73,7 +73,7 @@ SRC = extended_keymap_common.c \ ifdef KEYMAP SRC := extended_keymaps/extended_keymap_$(KEYMAP).c $(SRC) else - SRC := extended_keymaps/extended_keymap_jack.c $(SRC) + SRC := extended_keymaps/extended_keymap_default.c $(SRC) endif endif -- cgit v1.2.3