changing up the makefile a bit
This commit is contained in:
		
							parent
							
								
									ddbe430778
								
							
						
					
					
						commit
						63462bf8c1
					
				
					 6 changed files with 90 additions and 66 deletions
				
			
		| 
						 | 
				
			
			@ -38,6 +38,27 @@
 | 
			
		|||
# 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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -62,17 +83,28 @@ ifneq ("$(wildcard keymaps/$(KEYMAP).c)","")
 | 
			
		|||
else
 | 
			
		||||
ifneq ("$(wildcard keymaps/$(KEYMAP)/keymap.c)","")
 | 
			
		||||
	KEYMAP_FILE = keymaps/$(KEYMAP)/keymap.c
 | 
			
		||||
ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
 | 
			
		||||
	include keymaps/$(KEYMAP)/makefile.mk
 | 
			
		||||
endif
 | 
			
		||||
else
 | 
			
		||||
$(error Keymap file does not exist)
 | 
			
		||||
endif 
 | 
			
		||||
endif
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
else
 | 
			
		||||
 | 
			
		||||
ifneq ("$(wildcard keymaps/default.c)","")
 | 
			
		||||
	KEYMAP_FILE = keymaps/default.c
 | 
			
		||||
else
 | 
			
		||||
	KEYMAP_FILE = keymaps/default/keymap.c
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
ifneq ("$(wildcard keymaps/default/makefile.mk)","")
 | 
			
		||||
	include keymaps/default/makefile.mk
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
SRC := $(KEYMAP_FILE) $(SRC)
 | 
			
		||||
 | 
			
		||||
CONFIG_H = config.h
 | 
			
		||||
| 
						 | 
				
			
			@ -127,27 +159,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 | 
			
		|||
OPT_DEFS += -DBOOTLOADER_SIZE=4096
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Build Options
 | 
			
		||||
#   comment out to disable the options.
 | 
			
		||||
#
 | 
			
		||||
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 = yes         # 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 = yes         # MIDI controls
 | 
			
		||||
AUDIO_ENABLE = yes        # Audio output on port C6
 | 
			
		||||
# UNICODE_ENABLE = yes      # Unicode
 | 
			
		||||
# BLUETOOTH_ENABLE = ye     # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
			
		||||
# RGBLIGHT_ENABLE = yes     # 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 = yes    # Breathing sleep LED during USB suspend
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
ifdef BACKLIGHT_ENABLE
 | 
			
		||||
ifeq ($(BACKLIGHT_ENABLE), yes)
 | 
			
		||||
	SRC += backlight.c
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -89,24 +89,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, M(M_LW), KC_SPC,  KC_SPC,  M(M_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
			
		||||
},
 | 
			
		||||
 | 
			
		||||
/* Raise
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_RS] = {
 | 
			
		||||
  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
 | 
			
		||||
  {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
 | 
			
		||||
  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______},
 | 
			
		||||
  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 | 
			
		||||
},
 | 
			
		||||
 | 
			
		||||
/* Lower
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
 | 
			
		||||
| 
						 | 
				
			
			@ -125,6 +107,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 | 
			
		||||
},
 | 
			
		||||
 | 
			
		||||
/* Raise
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
 | 
			
		||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
			
		||||
 * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
 | 
			
		||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
			
		||||
 * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |Enter |
 | 
			
		||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
			
		||||
 * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
 | 
			
		||||
 * `-----------------------------------------------------------------------------------'
 | 
			
		||||
 */
 | 
			
		||||
[_RS] = {
 | 
			
		||||
  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
 | 
			
		||||
  {KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
 | 
			
		||||
  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______},
 | 
			
		||||
  {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 | 
			
		||||
},
 | 
			
		||||
 | 
			
		||||
/* Adjust (Lower + Raise)
 | 
			
		||||
 * ,-----------------------------------------------------------------------------------.
 | 
			
		||||
 * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
 | 
			
		||||
| 
						 | 
				
			
			@ -148,17 +148,18 @@ 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, 400},
 | 
			
		||||
  {0, 800},
 | 
			
		||||
  {440.0*pow(2.0,(67)/12.0), 1600}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
float tone_cm[][2] = {
 | 
			
		||||
  {440.0*pow(2.0,(67)/12.0), 400},
 | 
			
		||||
  {440.0*pow(2.0,(60)/12.0), 400},
 | 
			
		||||
  {0, 400},
 | 
			
		||||
  {0, 800},
 | 
			
		||||
  {440.0*pow(2.0,(67)/12.0), 1000},
 | 
			
		||||
  {0, 200},
 | 
			
		||||
  {440.0*pow(2.0,(67)/12.0), 1000}
 | 
			
		||||
| 
						 | 
				
			
			@ -167,14 +168,14 @@ float tone_cm[][2] = {
 | 
			
		|||
float tone_dv[][2] = {
 | 
			
		||||
  {440.0*pow(2.0,(67)/12.0), 400},
 | 
			
		||||
  {440.0*pow(2.0,(60)/12.0), 400},
 | 
			
		||||
  {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}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define IS_LAYER_ON(layer)  ((layer_state) & (1<<(layer)))
 | 
			
		||||
#define IS_LAYER_OFF(layer) ((!layer_state) & (1<<(layer)))
 | 
			
		||||
| 
						 | 
				
			
			@ -192,19 +193,25 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
      switch(id) {
 | 
			
		||||
        case M_QW:
 | 
			
		||||
          if (record->event.pressed) {
 | 
			
		||||
            play_notes(&tone_qw, 4, false);
 | 
			
		||||
            #ifdef AUDIO_ENABLE
 | 
			
		||||
              play_notes(&tone_qw, 4, false);
 | 
			
		||||
            #endif
 | 
			
		||||
            default_layer_set(1UL<<_QW);
 | 
			
		||||
          }
 | 
			
		||||
          break;
 | 
			
		||||
        case M_CM:
 | 
			
		||||
          if (record->event.pressed) {
 | 
			
		||||
            play_notes(&tone_cm, 6, false);
 | 
			
		||||
            #ifdef AUDIO_ENABLE
 | 
			
		||||
              play_notes(&tone_cm, 6, false);
 | 
			
		||||
            #endif
 | 
			
		||||
            default_layer_set(1UL<<_CM);
 | 
			
		||||
          }
 | 
			
		||||
          break;
 | 
			
		||||
        case M_DV:
 | 
			
		||||
          if (record->event.pressed) {
 | 
			
		||||
            play_notes(&tone_dv, 8, false);
 | 
			
		||||
            #ifdef AUDIO_ENABLE
 | 
			
		||||
              play_notes(&tone_dv, 8, false);
 | 
			
		||||
            #endif
 | 
			
		||||
            default_layer_set(1UL<<_DV);
 | 
			
		||||
          }
 | 
			
		||||
          break;
 | 
			
		||||
| 
						 | 
				
			
			@ -240,6 +247,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
    return MACRO_NONE;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#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},
 | 
			
		||||
| 
						 | 
				
			
			@ -247,8 +255,11 @@ float start_up[][2] = {
 | 
			
		|||
  {440.0*pow(2.0,(60)/12.0), 450},
 | 
			
		||||
  {440.0*pow(2.0,(64)/12.0), 1000}
 | 
			
		||||
};
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
void matrix_init_user(void) {
 | 
			
		||||
  #ifdef AUDIO_ENABLE
 | 
			
		||||
    init_notes();
 | 
			
		||||
    play_notes(&start_up, 5, false);
 | 
			
		||||
  #endif
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										1
									
								
								keyboard/planck/keymaps/default/makefile.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboard/planck/keymaps/default/makefile.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
AUDIO_ENABLE = yes
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue