mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default layout and default makefile.
This commit is contained in:
		
							parent
							
								
									552399df4c
								
							
						
					
					
						commit
						39dd3d674c
					
				@ -1,2 +0,0 @@
 | 
				
			|||||||
# Zrevyx's Planck Layout
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@ -19,25 +19,19 @@ extern keymap_config_t keymap_config;
 | 
				
			|||||||
#define _DVORAK 2
 | 
					#define _DVORAK 2
 | 
				
			||||||
#define _LOWER 3
 | 
					#define _LOWER 3
 | 
				
			||||||
#define _RAISE 4
 | 
					#define _RAISE 4
 | 
				
			||||||
#define _MUSIC 5
 | 
					#define _PLOVER 5
 | 
				
			||||||
#define _PLOVER 6
 | 
					 | 
				
			||||||
#define _ADJUST 16
 | 
					#define _ADJUST 16
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Macro name shortcuts
 | 
					enum planck_keycodes {
 | 
				
			||||||
#define QWERTY M(_QWERTY)
 | 
					  QWERTY = SAFE_RANGE,
 | 
				
			||||||
#define COLEMAK M(_COLEMAK)
 | 
					  COLEMAK,
 | 
				
			||||||
#define DVORAK M(_DVORAK)
 | 
					  DVORAK,
 | 
				
			||||||
#define LOWER M(_LOWER)
 | 
					  PLOVER,
 | 
				
			||||||
#define RAISE M(_RAISE)
 | 
					  LOWER,
 | 
				
			||||||
#define M_BL 5
 | 
					  RAISE,
 | 
				
			||||||
#define AUD_OFF M(6)
 | 
					  BACKLIT,
 | 
				
			||||||
#define AUD_ON M(7)
 | 
					  EXT_PLV
 | 
				
			||||||
#define MUS_OFF M(8)
 | 
					};
 | 
				
			||||||
#define MUS_ON M(9)
 | 
					 | 
				
			||||||
#define VC_IN M(10)
 | 
					 | 
				
			||||||
#define VC_DE M(11)
 | 
					 | 
				
			||||||
#define PLOVER M(12)
 | 
					 | 
				
			||||||
#define EXT_PLV M(13)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Fillers to make layering more clear
 | 
					// Fillers to make layering more clear
 | 
				
			||||||
#define _______ KC_TRNS
 | 
					#define _______ KC_TRNS
 | 
				
			||||||
@ -60,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
 | 
					  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
 | 
					  {KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
				
			||||||
  {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
					  {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Colemak
 | 
					/* Colemak
 | 
				
			||||||
@ -78,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
 | 
					  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
 | 
					  {KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
 | 
				
			||||||
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
					  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
 | 
				
			||||||
  {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
					  {BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Dvorak
 | 
					/* Dvorak
 | 
				
			||||||
@ -95,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
[_DVORAK] = {
 | 
					[_DVORAK] = {
 | 
				
			||||||
  {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH},
 | 
					  {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH},
 | 
				
			||||||
  {KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS},
 | 
					  {KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS},
 | 
				
			||||||
  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT},
 | 
					  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_T(KC_ENT)},
 | 
				
			||||||
  {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT }
 | 
					  {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT }
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -114,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______},
 | 
					  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______},
 | 
				
			||||||
  {KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
 | 
					  {KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
 | 
				
			||||||
  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______},
 | 
					  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_VOLD, KC_VOLU, _______, _______},
 | 
				
			||||||
  {M(M_BL), _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______}
 | 
					  {BACKLIT, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______}
 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Raise
 | 
					/* Raise
 | 
				
			||||||
@ -132,17 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______},
 | 
					  {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______},
 | 
				
			||||||
  {KC_CAPS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
 | 
					  {KC_CAPS, 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_MPRV, KC_MPLY, KC_MNXT, _______, _______},
 | 
					  {_______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______},
 | 
				
			||||||
  {M(M_BL), _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______}
 | 
					  {BACKLIT, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______}
 | 
				
			||||||
},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Music (reserved for process_action_user)
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
[_MUSIC] = {
 | 
					 | 
				
			||||||
  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
 | 
					 | 
				
			||||||
  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
 | 
					 | 
				
			||||||
  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
 | 
					 | 
				
			||||||
  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER,   XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
 | 
					 | 
				
			||||||
},
 | 
					},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Plover layer (http://opensteno.org)
 | 
					/* Plover layer (http://opensteno.org)
 | 
				
			||||||
@ -151,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
				
			||||||
 * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
 | 
					 * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
 | 
				
			||||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
				
			||||||
 * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
 | 
					 * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
 | 
				
			||||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
				
			||||||
 * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
 | 
					 * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
 | 
				
			||||||
 * `-----------------------------------------------------------------------------------'
 | 
					 * `-----------------------------------------------------------------------------------'
 | 
				
			||||||
@ -170,42 +154,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
				
			|||||||
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+-------------+------+------+------+------+------|
 | 
				
			||||||
 * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
 | 
					 * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
 | 
				
			||||||
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+------|------+------+------+------+------+------|
 | 
				
			||||||
 * |      |Voice-|Voice+|Mus on|Musoff|      |      |      |      |      |      |      |
 | 
					 * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
 | 
				
			||||||
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
					 * |------+------+------+------+------+------+------+------+------+------+------+------|
 | 
				
			||||||
 * |      |      |      |      |      |             |      |      |      |      |      |
 | 
					 * |      |      |      |      |      |             |      |      |      |      |      |
 | 
				
			||||||
 * `-----------------------------------------------------------------------------------'
 | 
					 * `-----------------------------------------------------------------------------------'
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
[_ADJUST] = {
 | 
					[_ADJUST] = {
 | 
				
			||||||
  {_______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
 | 
					  {_______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
 | 
				
			||||||
  {_______, _______, _______, AUD_ON,  AUD_OFF, AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______},
 | 
					  {_______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______},
 | 
				
			||||||
  {_______, VC_DE,   VC_IN,   MUS_ON,  MUS_OFF, _______, _______, _______, _______, _______, _______, _______},
 | 
					  {_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______},
 | 
				
			||||||
  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
 | 
					  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
const uint16_t PROGMEM fn_actions[] = {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef AUDIO_ENABLE
 | 
					#ifdef AUDIO_ENABLE
 | 
				
			||||||
float tone_startup[][2] = {
 | 
					 | 
				
			||||||
  {440.0*pow(2.0,(31)/12.0), 12},
 | 
					 | 
				
			||||||
  {440.0*pow(2.0,(28)/12.0), 8},
 | 
					 | 
				
			||||||
  {440.0*pow(2.0,(19)/12.0), 8},
 | 
					 | 
				
			||||||
  {440.0*pow(2.0,(24)/12.0), 8},
 | 
					 | 
				
			||||||
  {440.0*pow(2.0,(28)/12.0), 20}
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					float tone_startup[][2]    = SONG(STARTUP_SOUND);
 | 
				
			||||||
float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 | 
					float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 | 
				
			||||||
float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 | 
					float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 | 
				
			||||||
float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 | 
					float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 | 
				
			||||||
float tone_plover[][2]     = SONG(PLOVER_SOUND);
 | 
					float tone_plover[][2]     = SONG(PLOVER_SOUND);
 | 
				
			||||||
float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 | 
					float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 | 
				
			||||||
 | 
					 | 
				
			||||||
float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
 | 
					float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
 | 
				
			||||||
float goodbye[][2] = SONG(GOODBYE_SOUND);
 | 
					
 | 
				
			||||||
 | 
					float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -214,34 +188,36 @@ void persistant_default_layer_set(uint16_t default_layer) {
 | 
				
			|||||||
  default_layer_set(default_layer);
 | 
					  default_layer_set(default_layer);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
					bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
				
			||||||
{
 | 
					  switch (keycode) {
 | 
				
			||||||
      switch(id) {
 | 
					    case QWERTY:
 | 
				
			||||||
        case _QWERTY:
 | 
					 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        #ifdef AUDIO_ENABLE
 | 
					        #ifdef AUDIO_ENABLE
 | 
				
			||||||
          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
 | 
					          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
 | 
				
			||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
        persistant_default_layer_set(1UL<<_QWERTY);
 | 
					        persistant_default_layer_set(1UL<<_QWERTY);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case _COLEMAK:
 | 
					    case COLEMAK:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        #ifdef AUDIO_ENABLE
 | 
					        #ifdef AUDIO_ENABLE
 | 
				
			||||||
          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
 | 
					          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
 | 
				
			||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
        persistant_default_layer_set(1UL<<_COLEMAK);
 | 
					        persistant_default_layer_set(1UL<<_COLEMAK);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case _DVORAK:
 | 
					    case DVORAK:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        #ifdef AUDIO_ENABLE
 | 
					        #ifdef AUDIO_ENABLE
 | 
				
			||||||
          PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
 | 
					          PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
 | 
				
			||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
        persistant_default_layer_set(1UL<<_DVORAK);
 | 
					        persistant_default_layer_set(1UL<<_DVORAK);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case _LOWER:
 | 
					    case LOWER:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        layer_on(_LOWER);
 | 
					        layer_on(_LOWER);
 | 
				
			||||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
					        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
				
			||||||
@ -249,8 +225,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			|||||||
        layer_off(_LOWER);
 | 
					        layer_off(_LOWER);
 | 
				
			||||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
					        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case _RAISE:
 | 
					    case RAISE:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        layer_on(_RAISE);
 | 
					        layer_on(_RAISE);
 | 
				
			||||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
					        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
				
			||||||
@ -258,8 +235,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			|||||||
        layer_off(_RAISE);
 | 
					        layer_off(_RAISE);
 | 
				
			||||||
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
					        update_tri_layer(_LOWER, _RAISE, _ADJUST);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case M_BL:
 | 
					    case BACKLIT:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        register_code(KC_RSFT);
 | 
					        register_code(KC_RSFT);
 | 
				
			||||||
        #ifdef BACKLIGHT_ENABLE
 | 
					        #ifdef BACKLIGHT_ENABLE
 | 
				
			||||||
@ -268,64 +246,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			|||||||
      } else {
 | 
					      } else {
 | 
				
			||||||
        unregister_code(KC_RSFT);
 | 
					        unregister_code(KC_RSFT);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case 6:
 | 
					    case PLOVER:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        #ifdef AUDIO_ENABLE
 | 
					        #ifdef AUDIO_ENABLE
 | 
				
			||||||
              audio_off();
 | 
					 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 7:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
              audio_on();
 | 
					 | 
				
			||||||
              PLAY_NOTE_ARRAY(tone_startup, false, 0);
 | 
					 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 8:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
              layer_off(_MUSIC);
 | 
					 | 
				
			||||||
          stop_all_notes();
 | 
					          stop_all_notes();
 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 9:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
              PLAY_NOTE_ARRAY(music_scale, false, 0);
 | 
					 | 
				
			||||||
              layer_on(_MUSIC);
 | 
					 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 10:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
              voice_iterate();
 | 
					 | 
				
			||||||
              PLAY_NOTE_ARRAY(music_scale, false, 0);
 | 
					 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 11:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
              voice_deiterate();
 | 
					 | 
				
			||||||
              PLAY_NOTE_ARRAY(music_scale, false, 0);
 | 
					 | 
				
			||||||
            #endif
 | 
					 | 
				
			||||||
          }
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
        case 12:
 | 
					 | 
				
			||||||
          if (record->event.pressed) {
 | 
					 | 
				
			||||||
            #ifdef AUDIO_ENABLE
 | 
					 | 
				
			||||||
          PLAY_NOTE_ARRAY(tone_plover, false, 0);
 | 
					          PLAY_NOTE_ARRAY(tone_plover, false, 0);
 | 
				
			||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
        layer_off(_RAISE);
 | 
					        layer_off(_RAISE);
 | 
				
			||||||
        layer_off(_LOWER);
 | 
					        layer_off(_LOWER);
 | 
				
			||||||
        layer_off(_ADJUST);
 | 
					        layer_off(_ADJUST);
 | 
				
			||||||
            layer_off(_MUSIC);
 | 
					 | 
				
			||||||
            stop_all_notes();
 | 
					 | 
				
			||||||
        layer_on(_PLOVER);
 | 
					        layer_on(_PLOVER);
 | 
				
			||||||
        if (!eeconfig_is_enabled()) {
 | 
					        if (!eeconfig_is_enabled()) {
 | 
				
			||||||
            eeconfig_init();
 | 
					            eeconfig_init();
 | 
				
			||||||
@ -334,46 +265,50 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
				
			|||||||
        keymap_config.nkro = 1;
 | 
					        keymap_config.nkro = 1;
 | 
				
			||||||
        eeconfig_update_keymap(keymap_config.raw);
 | 
					        eeconfig_update_keymap(keymap_config.raw);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
        case 13:
 | 
					    case EXT_PLV:
 | 
				
			||||||
      if (record->event.pressed) {
 | 
					      if (record->event.pressed) {
 | 
				
			||||||
        #ifdef AUDIO_ENABLE
 | 
					        #ifdef AUDIO_ENABLE
 | 
				
			||||||
          PLAY_NOTE_ARRAY(tone_plover_gb, false, 0);
 | 
					          PLAY_NOTE_ARRAY(tone_plover_gb, false, 0);
 | 
				
			||||||
        #endif
 | 
					        #endif
 | 
				
			||||||
        layer_off(_PLOVER);
 | 
					        layer_off(_PLOVER);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
      break;
 | 
					      break;
 | 
				
			||||||
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
    return MACRO_NONE;
 | 
					  return true;
 | 
				
			||||||
};
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void matrix_init_user(void) {
 | 
					void matrix_init_user(void) {
 | 
				
			||||||
    #ifdef AUDIO_ENABLE
 | 
					    #ifdef AUDIO_ENABLE
 | 
				
			||||||
    _delay_ms(20); // stops the tick
 | 
					        startup_user();
 | 
				
			||||||
    PLAY_NOTE_ARRAY(tone_startup, false, 0);
 | 
					 | 
				
			||||||
    #endif
 | 
					    #endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef AUDIO_ENABLE
 | 
					#ifdef AUDIO_ENABLE
 | 
				
			||||||
void play_goodbye_tone()
 | 
					
 | 
				
			||||||
 | 
					void startup_user()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  PLAY_NOTE_ARRAY(goodbye, false, 0);
 | 
					    _delay_ms(20); // gets rid of tick
 | 
				
			||||||
 | 
					    PLAY_NOTE_ARRAY(tone_startup, false, 0);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void shutdown_user()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
 | 
				
			||||||
    _delay_ms(150);
 | 
					    _delay_ms(150);
 | 
				
			||||||
 | 
					    stop_all_notes();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint8_t starting_note = 0x0C;
 | 
					void music_on_user(void)
 | 
				
			||||||
int offset = 7;
 | 
					{
 | 
				
			||||||
 | 
					    music_scale_user();
 | 
				
			||||||
void process_action_user(keyrecord_t *record) {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (IS_LAYER_ON(_MUSIC)) {
 | 
					 | 
				
			||||||
    if (record->event.pressed) {
 | 
					 | 
				
			||||||
        play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
 | 
					 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
        stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void music_scale_user(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    PLAY_NOTE_ARRAY(music_scale, false, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@ -1,2 +1,25 @@
 | 
				
			|||||||
AUDIO_ENABLE = yes
 | 
					
 | 
				
			||||||
NKRO_ENABLE = yes
 | 
					
 | 
				
			||||||
 | 
					# Build Options
 | 
				
			||||||
 | 
					#   change to "no" to disable the options, or define them in the Makefile in 
 | 
				
			||||||
 | 
					#   the appropriate keymap folder that will get included automatically
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 | 
				
			||||||
 | 
					MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 | 
				
			||||||
 | 
					EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 | 
				
			||||||
 | 
					CONSOLE_ENABLE = no         # Console for debug(+400)
 | 
				
			||||||
 | 
					COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
				
			||||||
 | 
					NKRO_ENABLE = yes            # 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 = yes           # 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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ifndef QUANTUM_DIR
 | 
				
			||||||
 | 
						include ../../../../Makefile
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user