Prepping for merge with new_defaults
This commit is contained in:
IBNobody
commit
39e520c010
|
|
@ -38,31 +38,9 @@
|
|||
# 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 = planck
|
||||
|
||||
|
||||
# Directory common source filess exist
|
||||
TOP_DIR = ../..
|
||||
TMK_DIR = ../../tmk_core
|
||||
|
|
@ -126,7 +104,6 @@ MCU = atmega32u4
|
|||
# software delays.
|
||||
F_CPU = 16000000
|
||||
|
||||
|
||||
#
|
||||
# LUFA specific
|
||||
#
|
||||
|
|
@ -158,7 +135,29 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
|||
# USBaspLoader 2048
|
||||
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
|
||||
# Build Options
|
||||
# comment out to disable the options.
|
||||
|
|
@ -185,8 +184,25 @@ ifdef BACKLIGHT_ENABLE
|
|||
ifeq ($(BACKLIGHT_ENABLE), yes)
|
||||
>>>>>>> master
|
||||
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
|
||||
|
||||
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"
|
||||
#EXTRALDFLAGS = -Wl,--relax
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
// this is the style you want to emulate.
|
||||
|
||||
#include "planck.h"
|
||||
#ifdef BACKLIGHT_ENABLE
|
||||
#include "backlight.h"
|
||||
#endif
|
||||
#include "action_layer.h"
|
||||
#ifdef AUDIO_ENABLE
|
||||
#include "audio.h"
|
||||
|
|
@ -150,30 +147,30 @@ const uint16_t PROGMEM fn_actions[] = {
|
|||
|
||||
#ifdef AUDIO_ENABLE
|
||||
float tone_qw[][2] = {
|
||||
{440.0*pow(2.0,(67)/12.0), 400},
|
||||
{440.0*pow(2.0,(60)/12.0), 400},
|
||||
{0, 800},
|
||||
{440.0*pow(2.0,(67)/12.0), 1600}
|
||||
{440.0*pow(2.0,(59)/12.0), 8},
|
||||
{440.0*pow(2.0,(60)/12.0), 8},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(67)/12.0), 16}
|
||||
};
|
||||
|
||||
float tone_cm[][2] = {
|
||||
{440.0*pow(2.0,(67)/12.0), 400},
|
||||
{440.0*pow(2.0,(60)/12.0), 400},
|
||||
{0, 800},
|
||||
{440.0*pow(2.0,(67)/12.0), 1000},
|
||||
{0, 200},
|
||||
{440.0*pow(2.0,(67)/12.0), 1000}
|
||||
{440.0*pow(2.0,(59)/12.0), 8},
|
||||
{440.0*pow(2.0,(60)/12.0), 8},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(67)/12.0), 16},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(71)/12.0), 16}
|
||||
};
|
||||
|
||||
float tone_dv[][2] = {
|
||||
{440.0*pow(2.0,(67)/12.0), 400},
|
||||
{440.0*pow(2.0,(60)/12.0), 400},
|
||||
{0, 800},
|
||||
{440.0*pow(2.0,(67)/12.0), 800},
|
||||
{0, 200},
|
||||
{440.0*pow(2.0,(67)/12.0), 800},
|
||||
{0, 200},
|
||||
{440.0*pow(2.0,(67)/12.0), 800}
|
||||
{440.0*pow(2.0,(59)/12.0), 8},
|
||||
{440.0*pow(2.0,(60)/12.0), 8},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(67)/12.0), 16},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(69)/12.0), 16},
|
||||
{0, 4},
|
||||
{440.0*pow(2.0,(67)/12.0), 16}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -249,11 +246,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
|
||||
#ifdef AUDIO_ENABLE
|
||||
float start_up[][2] = {
|
||||
{440.0*pow(2.0,(67)/12.0), 650},
|
||||
{440.0*pow(2.0,(64)/12.0), 450},
|
||||
{440.0*pow(2.0,(55)/12.0), 450},
|
||||
{440.0*pow(2.0,(60)/12.0), 450},
|
||||
{440.0*pow(2.0,(64)/12.0), 1000}
|
||||
{440.0*pow(2.0,(67)/12.0), 12},
|
||||
{440.0*pow(2.0,(64)/12.0), 8},
|
||||
{440.0*pow(2.0,(55)/12.0), 8},
|
||||
{440.0*pow(2.0,(60)/12.0), 8},
|
||||
{440.0*pow(2.0,(64)/12.0), 20}
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
AUDIO_ENABLE = yes
|
||||
AUDIO_ENABLE = yes
|
||||
|
|
@ -255,7 +255,12 @@ ISR(TIMER3_COMPA_vect) {
|
|||
|
||||
|
||||
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++;
|
||||
if (current_note >= notes_length) {
|
||||
if (notes_repeat) {
|
||||
|
|
|
|||
|
|
@ -33,11 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "audio.h"
|
||||
|
||||
float goodbye[][2] = {
|
||||
{440.0*pow(2.0,(67)/12.0), 400},
|
||||
{0, 50},
|
||||
{440.0*pow(2.0,(60)/12.0), 400},
|
||||
{0, 50},
|
||||
{440.0*pow(2.0,(55)/12.0), 600},
|
||||
{440.0*pow(2.0,(67)/12.0), 8},
|
||||
{440.0*pow(2.0,(60)/12.0), 8},
|
||||
{440.0*pow(2.0,(55)/12.0), 12},
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -90,7 +88,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
|
|||
action_t action;
|
||||
clear_keyboard();
|
||||
#ifdef AUDIO_ENABLE
|
||||
play_notes(&goodbye, 5, false);
|
||||
play_notes(&goodbye, 3, false);
|
||||
#endif
|
||||
_delay_ms(250);
|
||||
#ifdef ATREUS_ASTAR
|
||||
|
|
|
|||
|
|
@ -23,19 +23,19 @@ ifndef CUSTOM_MATRIX
|
|||
SRC += $(QUANTUM_DIR)/matrix.c
|
||||
endif
|
||||
|
||||
ifeq ($(MIDI_ENABLE), yes)
|
||||
ifeq ($(strip $(MIDI_ENABLE)), yes)
|
||||
SRC += $(QUANTUM_DIR)/keymap_midi.c
|
||||
endif
|
||||
|
||||
ifeq ($(AUDIO_ENABLE), yes)
|
||||
ifeq ($(strip $(AUDIO_ENABLE)), yes)
|
||||
SRC += $(QUANTUM_DIR)/audio.c
|
||||
endif
|
||||
|
||||
ifeq ($(UNICODE_ENABLE), yes)
|
||||
ifeq ($(strip $(UNICODE_ENABLE)), yes)
|
||||
SRC += $(QUANTUM_DIR)/keymap_unicode.c
|
||||
endif
|
||||
|
||||
ifeq ($(RGBLIGHT_ENABLE), yes)
|
||||
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
|
||||
SRC += $(QUANTUM_DIR)/light_ws2812.c
|
||||
SRC += $(QUANTUM_DIR)/rgblight.c
|
||||
OPT_DEFS += -DRGBLIGHT_ENABLE
|
||||
|
|
|
|||
|
|
@ -17,66 +17,67 @@ SRC += $(COMMON_DIR)/host.c \
|
|||
|
||||
|
||||
# Option modules
|
||||
ifeq ($(BOOTMAGIC_ENABLE), yes)
|
||||
ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
|
||||
SRC += $(COMMON_DIR)/bootmagic.c
|
||||
SRC += $(COMMON_DIR)/avr/eeconfig.c
|
||||
OPT_DEFS += -DBOOTMAGIC_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(MOUSEKEY_ENABLE), yes)
|
||||
ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
|
||||
SRC += $(COMMON_DIR)/mousekey.c
|
||||
OPT_DEFS += -DMOUSEKEY_ENABLE
|
||||
OPT_DEFS += -DMOUSE_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(EXTRAKEY_ENABLE), yes)
|
||||
ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
|
||||
OPT_DEFS += -DEXTRAKEY_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(CONSOLE_ENABLE), yes)
|
||||
ifeq ($(strip $(CONSOLE_ENABLE)), yes)
|
||||
OPT_DEFS += -DCONSOLE_ENABLE
|
||||
else
|
||||
OPT_DEFS += -DNO_PRINT
|
||||
OPT_DEFS += -DNO_DEBUG
|
||||
endif
|
||||
|
||||
ifeq ($(COMMAND_ENABLE), yes)
|
||||
ifeq ($(strip $(COMMAND_ENABLE)), yes)
|
||||
SRC += $(COMMON_DIR)/command.c
|
||||
OPT_DEFS += -DCOMMAND_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(NKRO_ENABLE), yes)
|
||||
ifeq ($(strip $(NKRO_ENABLE)), yes)
|
||||
OPT_DEFS += -DNKRO_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(MIDI_ENABLE), yes)
|
||||
ifeq ($(strip $(MIDI_ENABLE)), yes)
|
||||
OPT_DEFS += -DMIDI_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(AUDIO_ENABLE), yes)
|
||||
ifeq ($(strip $(AUDIO_ENABLE)), yes)
|
||||
OPT_DEFS += -DAUDIO_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(USB_6KRO_ENABLE), yes)
|
||||
ifeq ($(strip $(USB_6KRO_ENABLE)), yes)
|
||||
OPT_DEFS += -DUSB_6KRO_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(SLEEP_LED_ENABLE), yes)
|
||||
ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
|
||||
SRC += $(COMMON_DIR)/sleep_led.c
|
||||
OPT_DEFS += -DSLEEP_LED_ENABLE
|
||||
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
|
||||
endif
|
||||
|
||||
ifeq ($(BACKLIGHT_ENABLE), yes)
|
||||
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
|
||||
SRC += $(COMMON_DIR)/backlight.c
|
||||
SRC += $(COMMON_DIR)/avr/eeconfig.c
|
||||
OPT_DEFS += -DBACKLIGHT_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(BLUETOOTH_ENABLE), yes)
|
||||
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
||||
OPT_DEFS += -DBLUETOOTH_ENABLE
|
||||
endif
|
||||
|
||||
ifeq ($(KEYMAP_SECTION_ENABLE), yes)
|
||||
ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
|
||||
OPT_DEFS += -DKEYMAP_SECTION_ENABLE
|
||||
|
||||
ifeq ($(strip $(MCU)),atmega32u2)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
|
|||
$(LUFA_DIR)/descriptor.c \
|
||||
$(LUFA_SRC_USB)
|
||||
|
||||
ifeq ($(MIDI_ENABLE), yes)
|
||||
ifeq ($(strip $(MIDI_ENABLE)), yes)
|
||||
LUFA_SRC += $(LUFA_DIR)/midi/midi.c \
|
||||
$(LUFA_DIR)/midi/midi_device.c \
|
||||
$(LUFA_DIR)/midi/bytequeue/bytequeue.c \
|
||||
|
|
@ -25,7 +25,7 @@ ifeq ($(MIDI_ENABLE), yes)
|
|||
$(LUFA_SRC_USBCLASS)
|
||||
endif
|
||||
|
||||
ifeq ($(BLUETOOTH_ENABLE), yes)
|
||||
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
|
||||
LUFA_SRC += $(LUFA_DIR)/bluetooth.c \
|
||||
$(TMK_DIR)/protocol/serial_uart.c
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue