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

Prepping for merge with new_defaults

Browse source
This commit is contained in:
IBNobody 2016-04-15 13:09:42 -05:00
commit 39e520c010
8 changed files with 93 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
keyboard/planck/Makefile
View file

@ -38,31 +38,9 @@
# To rebuild project do "make clean" then "make all". # To rebuild project do "make clean" then "make all".
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Build Options
# change to "no" to disable the options, or define them in the makefile.mk in
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
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
NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here:
# https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# Target file name (without extension). # Target file name (without extension).
TARGET = planck TARGET = planck
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../.. TOP_DIR = ../..
TMK_DIR = ../../tmk_core TMK_DIR = ../../tmk_core
@ -126,7 +104,6 @@ MCU = atmega32u4
# software delays. # software delays.
F_CPU = 16000000 F_CPU = 16000000
# #
# LUFA specific # LUFA specific
# #
@ -158,7 +135,29 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# USBaspLoader 2048 # USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# change to "no" to disable the options, or define them in the makefile.mk in
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
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
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifdef KEYMAP
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
@ -185,8 +184,25 @@ ifdef BACKLIGHT_ENABLE
ifeq ($(BACKLIGHT_ENABLE), yes) ifeq ($(BACKLIGHT_ENABLE), yes)
>>>>>>> master >>>>>>> master
SRC += backlight.c SRC += backlight.c
=======
ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
include keymaps/$(KEYMAP)/makefile.mk
endif
>>>>>>> remotes/jackhumbert/new_defaults
endif endif
else
ifneq ("$(wildcard keymaps/default/makefile.mk)","")
include keymaps/default/makefile.mk
endif
endif
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
SRC := backlight.c $(SRC)
endif
# Optimize size but this may cause error "relocation truncated to fit" # Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax #EXTRALDFLAGS = -Wl,--relax

49
keyboard/planck/keymaps/default/keymap.c
View file

@ -2,9 +2,6 @@
// this is the style you want to emulate. // this is the style you want to emulate.
#include "planck.h" #include "planck.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
#endif
#include "action_layer.h" #include "action_layer.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#include "audio.h" #include "audio.h"
@ -150,30 +147,30 @@ const uint16_t PROGMEM fn_actions[] = {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float tone_qw[][2] = { float tone_qw[][2] = {
{440.0*pow(2.0,(67)/12.0), 400}, {440.0*pow(2.0,(59)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 400}, {440.0*pow(2.0,(60)/12.0), 8},
{0, 800}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 1600} {440.0*pow(2.0,(67)/12.0), 16}
}; };
float tone_cm[][2] = { float tone_cm[][2] = {
{440.0*pow(2.0,(67)/12.0), 400}, {440.0*pow(2.0,(59)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 400}, {440.0*pow(2.0,(60)/12.0), 8},
{0, 800}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 1000}, {440.0*pow(2.0,(67)/12.0), 16},
{0, 200}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 1000} {440.0*pow(2.0,(71)/12.0), 16}
}; };
float tone_dv[][2] = { float tone_dv[][2] = {
{440.0*pow(2.0,(67)/12.0), 400}, {440.0*pow(2.0,(59)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 400}, {440.0*pow(2.0,(60)/12.0), 8},
{0, 800}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 800}, {440.0*pow(2.0,(67)/12.0), 16},
{0, 200}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 800}, {440.0*pow(2.0,(69)/12.0), 16},
{0, 200}, {0, 4},
{440.0*pow(2.0,(67)/12.0), 800} {440.0*pow(2.0,(67)/12.0), 16}
}; };
#endif #endif
@ -249,11 +246,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
float start_up[][2] = { float start_up[][2] = {
{440.0*pow(2.0,(67)/12.0), 650}, {440.0*pow(2.0,(67)/12.0), 12},
{440.0*pow(2.0,(64)/12.0), 450}, {440.0*pow(2.0,(64)/12.0), 8},
{440.0*pow(2.0,(55)/12.0), 450}, {440.0*pow(2.0,(55)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 450}, {440.0*pow(2.0,(60)/12.0), 8},
{440.0*pow(2.0,(64)/12.0), 1000} {440.0*pow(2.0,(64)/12.0), 20}
}; };
#endif #endif

7
quantum/audio.c
View file

@ -255,7 +255,12 @@ ISR(TIMER3_COMPA_vect) {
note_position++; note_position++;
if (note_position >= note_length) { bool end_of_note = false;
if (ICR3 > 0)
end_of_note = (note_position >= (note_length / ICR3 * 0xFFFF));
else
end_of_note = (note_position >= (note_length * 0x7FF));
if (end_of_note) {
current_note++; current_note++;
if (current_note >= notes_length) { if (current_note >= notes_length) {
if (notes_repeat) { if (notes_repeat) {

10
quantum/keymap_common.c
View file

@ -33,11 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "audio.h" #include "audio.h"
float goodbye[][2] = { float goodbye[][2] = {
{440.0*pow(2.0,(67)/12.0), 400}, {440.0*pow(2.0,(67)/12.0), 8},
{0, 50}, {440.0*pow(2.0,(60)/12.0), 8},
{440.0*pow(2.0,(60)/12.0), 400}, {440.0*pow(2.0,(55)/12.0), 12},
{0, 50},
{440.0*pow(2.0,(55)/12.0), 600},
}; };
#endif #endif
@ -90,7 +88,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
action_t action; action_t action;
clear_keyboard(); clear_keyboard();
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
play_notes(&goodbye, 5, false); play_notes(&goodbye, 3, false);
#endif #endif
_delay_ms(250); _delay_ms(250);
#ifdef ATREUS_ASTAR #ifdef ATREUS_ASTAR

8
quantum/quantum.mk
View file

@ -23,19 +23,19 @@ ifndef CUSTOM_MATRIX
SRC += $(QUANTUM_DIR)/matrix.c SRC += $(QUANTUM_DIR)/matrix.c
endif endif
ifeq ($(MIDI_ENABLE), yes) ifeq ($(strip $(MIDI_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/keymap_midi.c SRC += $(QUANTUM_DIR)/keymap_midi.c
endif endif
ifeq ($(AUDIO_ENABLE), yes) ifeq ($(strip $(AUDIO_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/audio.c SRC += $(QUANTUM_DIR)/audio.c
endif endif
ifeq ($(UNICODE_ENABLE), yes) ifeq ($(strip $(UNICODE_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/keymap_unicode.c SRC += $(QUANTUM_DIR)/keymap_unicode.c
endif endif
ifeq ($(RGBLIGHT_ENABLE), yes) ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/light_ws2812.c SRC += $(QUANTUM_DIR)/light_ws2812.c
SRC += $(QUANTUM_DIR)/rgblight.c SRC += $(QUANTUM_DIR)/rgblight.c
OPT_DEFS += -DRGBLIGHT_ENABLE OPT_DEFS += -DRGBLIGHT_ENABLE

27
tmk_core/common.mk
View file

@ -17,66 +17,67 @@ SRC += $(COMMON_DIR)/host.c \
# Option modules # Option modules
ifeq ($(BOOTMAGIC_ENABLE), yes) ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
SRC += $(COMMON_DIR)/bootmagic.c SRC += $(COMMON_DIR)/bootmagic.c
SRC += $(COMMON_DIR)/avr/eeconfig.c SRC += $(COMMON_DIR)/avr/eeconfig.c
OPT_DEFS += -DBOOTMAGIC_ENABLE OPT_DEFS += -DBOOTMAGIC_ENABLE
endif endif
ifeq ($(MOUSEKEY_ENABLE), yes) ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
SRC += $(COMMON_DIR)/mousekey.c SRC += $(COMMON_DIR)/mousekey.c
OPT_DEFS += -DMOUSEKEY_ENABLE OPT_DEFS += -DMOUSEKEY_ENABLE
OPT_DEFS += -DMOUSE_ENABLE OPT_DEFS += -DMOUSE_ENABLE
endif endif
ifeq ($(EXTRAKEY_ENABLE), yes) ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
OPT_DEFS += -DEXTRAKEY_ENABLE OPT_DEFS += -DEXTRAKEY_ENABLE
endif endif
ifeq ($(CONSOLE_ENABLE), yes) ifeq ($(strip $(CONSOLE_ENABLE)), yes)
OPT_DEFS += -DCONSOLE_ENABLE OPT_DEFS += -DCONSOLE_ENABLE
else else
OPT_DEFS += -DNO_PRINT OPT_DEFS += -DNO_PRINT
OPT_DEFS += -DNO_DEBUG OPT_DEFS += -DNO_DEBUG
endif endif
ifeq ($(COMMAND_ENABLE), yes) ifeq ($(strip $(COMMAND_ENABLE)), yes)
SRC += $(COMMON_DIR)/command.c SRC += $(COMMON_DIR)/command.c
OPT_DEFS += -DCOMMAND_ENABLE OPT_DEFS += -DCOMMAND_ENABLE
endif endif
ifeq ($(NKRO_ENABLE), yes) ifeq ($(strip $(NKRO_ENABLE)), yes)
OPT_DEFS += -DNKRO_ENABLE OPT_DEFS += -DNKRO_ENABLE
endif endif
ifeq ($(MIDI_ENABLE), yes) ifeq ($(strip $(MIDI_ENABLE)), yes)
OPT_DEFS += -DMIDI_ENABLE OPT_DEFS += -DMIDI_ENABLE
endif endif
ifeq ($(AUDIO_ENABLE), yes) ifeq ($(strip $(AUDIO_ENABLE)), yes)
OPT_DEFS += -DAUDIO_ENABLE OPT_DEFS += -DAUDIO_ENABLE
endif endif
ifeq ($(USB_6KRO_ENABLE), yes) ifeq ($(strip $(USB_6KRO_ENABLE)), yes)
OPT_DEFS += -DUSB_6KRO_ENABLE OPT_DEFS += -DUSB_6KRO_ENABLE
endif endif
ifeq ($(SLEEP_LED_ENABLE), yes) ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
SRC += $(COMMON_DIR)/sleep_led.c SRC += $(COMMON_DIR)/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE OPT_DEFS += -DSLEEP_LED_ENABLE
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
endif endif
ifeq ($(BACKLIGHT_ENABLE), yes) ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
SRC += $(COMMON_DIR)/backlight.c SRC += $(COMMON_DIR)/backlight.c
SRC += $(COMMON_DIR)/avr/eeconfig.c
OPT_DEFS += -DBACKLIGHT_ENABLE OPT_DEFS += -DBACKLIGHT_ENABLE
endif endif
ifeq ($(BLUETOOTH_ENABLE), yes) ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
OPT_DEFS += -DBLUETOOTH_ENABLE OPT_DEFS += -DBLUETOOTH_ENABLE
endif endif
ifeq ($(KEYMAP_SECTION_ENABLE), yes) ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
OPT_DEFS += -DKEYMAP_SECTION_ENABLE OPT_DEFS += -DKEYMAP_SECTION_ENABLE
ifeq ($(strip $(MCU)),atmega32u2) ifeq ($(strip $(MCU)),atmega32u2)

4
tmk_core/protocol/lufa.mk
View file

@ -17,7 +17,7 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
$(LUFA_DIR)/descriptor.c \ $(LUFA_DIR)/descriptor.c \
$(LUFA_SRC_USB) $(LUFA_SRC_USB)
ifeq ($(MIDI_ENABLE), yes) ifeq ($(strip $(MIDI_ENABLE)), yes)
LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ LUFA_SRC += $(LUFA_DIR)/midi/midi.c \
$(LUFA_DIR)/midi/midi_device.c \ $(LUFA_DIR)/midi/midi_device.c \
$(LUFA_DIR)/midi/bytequeue/bytequeue.c \ $(LUFA_DIR)/midi/bytequeue/bytequeue.c \
@ -25,7 +25,7 @@ ifeq ($(MIDI_ENABLE), yes)
$(LUFA_SRC_USBCLASS) $(LUFA_SRC_USBCLASS)
endif endif
ifeq ($(BLUETOOTH_ENABLE), yes) ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \ LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
$(TMK_DIR)/protocol/serial_uart.c $(TMK_DIR)/protocol/serial_uart.c
endif endif