keymap and C6 audio testing
This commit is contained in:
		
							parent
							
								
									274b1c53fb
								
							
						
					
					
						commit
						748401e5c1
					
				
					 3 changed files with 125 additions and 28 deletions
				
			
		| 
						 | 
				
			
			@ -10,7 +10,7 @@ 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 = no       # Enable keyboard backlight functionality
 | 
			
		||||
MIDI_ENABLE = no            # MIDI controls
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output on port C6
 | 
			
		||||
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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,5 +4,4 @@
 | 
			
		|||
#include "../../config.h"
 | 
			
		||||
 | 
			
		||||
// place overrides here
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,11 +1,26 @@
 | 
			
		|||
#include "MS-sculpt-mobile.h"
 | 
			
		||||
#include "action_layer.h"
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
  #include "audio.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define _QWR 0
 | 
			
		||||
#define _CDH 1
 | 
			
		||||
#define _SYM 2
 | 
			
		||||
#define _MOV 3
 | 
			
		||||
#define _NUM 4 
 | 
			
		||||
#define _TRAN 9 
 | 
			
		||||
#define _CDH 2
 | 
			
		||||
#define _SYM 3
 | 
			
		||||
#define _MOV 4
 | 
			
		||||
#define _TRAN 5
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
enum layer_keycodes {
 | 
			
		||||
QWR,
 | 
			
		||||
CDH,
 | 
			
		||||
SYM,
 | 
			
		||||
MOV,
 | 
			
		||||
NUM, 
 | 
			
		||||
TRAN
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// Shorter spacing
 | 
			
		||||
#define XXXX  KC_NO
 | 
			
		||||
| 
						 | 
				
			
			@ -15,31 +30,36 @@
 | 
			
		|||
 | 
			
		||||
/* Fn Keys */
 | 
			
		||||
#define TT_SYM MO(_SYM)
 | 
			
		||||
#define TO_CDH TG(_CDH)
 | 
			
		||||
#define TT_MOV KC_FN2
 | 
			
		||||
#define TT_NUM MO(_NUM)
 | 
			
		||||
#define SSFT ACTION_MODS_ONESHOT(MOD_LSFT)
 | 
			
		||||
 | 
			
		||||
enum macro_keycodes {
 | 
			
		||||
DHPASTE=1,
 | 
			
		||||
VIBRK,
 | 
			
		||||
TO_CDH, 
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
/*  QWERTY
 | 
			
		||||
*
 | 
			
		||||
* |ESC | F1 | F2 | F3 | F4 | F5 | F6 | f7 | F8 | F9 | F10| F11| F12|Vol-|Vol+|Mute|
 | 
			
		||||
* |ESC | F1 | F2 | F3 | F4 | F5 | F6 | f7 | F8 | F9 | F10| F11| F12|Vol-|Vol+|_CDH|
 | 
			
		||||
*  -------------------------------------------------------------------------------'
 | 
			
		||||
* |  ~ |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace| Del |
 | 
			
		||||
* --------------------------------------------------------------------------
 | 
			
		||||
* | tab  |  q |  w |  e |  r |  t |  y |  u |  i |  o |  p |  [ |  ] |  \   |     |
 | 
			
		||||
* | ESC |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace| Del|
 | 
			
		||||
* ---------------------------------------------------------------------------
 | 
			
		||||
* | tab  |  q |  w |  e |  r |  t |  y |  u |  i |  o |  p |  [ |  ] |  \    |    |
 | 
			
		||||
*  -------------------------------------------------------------------------------'
 | 
			
		||||
* | caps  |  a |  s |  d |  f |  g |  h |  j |  k |  l |  ; |  ' | enter     |PgUp|
 | 
			
		||||
* |Bak/Mov|  a |  s |  d |  f |  g |  h |  j |  k |  l |  ; |  ' | enter     |PgUp|
 | 
			
		||||
* --------------------------------------------------------------------------------	
 | 
			
		||||
* |Lsft    |  z |  x |  c |  v |  b |  n |  m |  , |  . |  / |      Rsft| Up| PgDn|
 | 
			
		||||
* ---------------------------------------------------------------------------------	
 | 
			
		||||
* |Lctl   |Lgui  |Lalt |       Space          |Ralt  |  FN |  Rctl |Left|Down|Rght|
 | 
			
		||||
* |Lctl   |Lgui  |Lalt |       Space/Sym      | GUI |  Sym |  Rctl |Left|Down|Rght|
 | 
			
		||||
* ---------------------------------------------------------------------------------	
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
[_QWR] = KEYMAP( \
 | 
			
		||||
   KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9, KC_F10,    KC_F11,   KC_F12, KC_VOLD, KC_VOLU, TO_CDH,\
 | 
			
		||||
   KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,   KC_F9, KC_F10,    KC_F11,   KC_F12, KC_VOLD, KC_VOLU, CDH,\
 | 
			
		||||
   KC_ESC,   KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINUS, KC_EQL, KC_BSPC, KC_DEL,\
 | 
			
		||||
   KC_TAB,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,   KC_O, KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,\
 | 
			
		||||
   TT_MOV,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,   KC_L, KC_SCLN, KC_QUOT,  KC_ENT, KC_PGUP,\
 | 
			
		||||
| 
						 | 
				
			
			@ -48,29 +68,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
),
 | 
			
		||||
 | 
			
		||||
[_CDH] = KEYMAP (\
 | 
			
		||||
   ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
 | 
			
		||||
   ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     QWR,  \
 | 
			
		||||
   KC_ESC,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
 | 
			
		||||
   KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U,    KC_Y,   KC_SCLN, ____,    ____,   ____,\
 | 
			
		||||
   TT_MOV,  KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E,    KC_I,   KC_O,    KC_QUOT, KC_ENT, ____,\
 | 
			
		||||
   KC_LSFT, KC_Z, KC_X, KC_C, M(1), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, ____,   ____,\
 | 
			
		||||
   KC_LSFT, KC_Z, KC_X, KC_C, M(DHPASTE), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, ____,   ____,\
 | 
			
		||||
  ____,     ____, ____ , KC_FN1, ____, ____, ____, ____, ____,   ____
 | 
			
		||||
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/*  SYM
 | 
			
		||||
*
 | 
			
		||||
* |ESC | F1 | F2 | F3 | F4 | F5 | F6 | f7 | F8 | F9 | F10| F11| F12|Vol-|Vol+|_CDH|
 | 
			
		||||
*  -------------------------------------------------------------------------------'
 | 
			
		||||
* | ESC |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Bakspace|Del |
 | 
			
		||||
*  --------------------------------------------------------------------------
 | 
			
		||||
* | ESC: | ^  |  { |  } |  @ |  % |    |   [ | ( | )  | _  |  [ |  ] |  \    |    |
 | 
			
		||||
*  -------------------------------------------------------------------------------'
 | 
			
		||||
* |Bak/Mov|  ! |  # |  0 | =  |    |   * | -  | 1 |  + |  ] |  ` | enter     |PgUp|
 | 
			
		||||
* --------------------------------------------------------------------------------	
 | 
			
		||||
* |Lsft    |  ; | ~ |  : | ~  | "|"|  $ |  ~ |    |    |  / |      Rsft| Up| PgDn|
 | 
			
		||||
* ---------------------------------------------------------------------------------	
 | 
			
		||||
* |Lctl   |Lgui  |Lalt |       Space/Sym      | GUI |  Sym |  Rctl |Left|Down|Rght|
 | 
			
		||||
* ---------------------------------------------------------------------------------	
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
[_SYM] = KEYMAP (\
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
 | 
			
		||||
  ____,  KC_CIRC, KC_LCBR, KC_RCBR,KC_AT, KC_PERC,         ____,   KC_LBRC,KC_LPRN,KC_RPRN,KC_UNDS,   ____,   ____,   ____,\
 | 
			
		||||
  ____,  KC_EXLM, KC_HASH,  KC_0,  KC_EQL, ____,           KC_ASTR,KC_MINS,KC_1,  KC_PLUS,KC_RBRC,  KC_GRV,   ____,  ____,\
 | 
			
		||||
  ____,     ____, ____, ____, KC_TILDE,  KC_PIPE,          KC_DLR,   ____, ____,   ____,   ____,     ____, ____, ____,\
 | 
			
		||||
  M(VIBRK),  KC_CIRC, KC_LCBR, KC_RCBR,KC_AT, KC_PERC,         ____,   KC_LBRC,KC_LPRN,KC_RPRN,KC_UNDS,   ____,   ____,   ____,\
 | 
			
		||||
  ____,    KC_EXLM, KC_HASH,  KC_0,  KC_EQL, ____,           KC_ASTR,KC_MINS,KC_1,  KC_PLUS,KC_RBRC,  KC_GRV,   ____,  ____,\
 | 
			
		||||
  ____,    KC_SCLN, KC_TILDE,  KC_COLN,  KC_TILDE,  KC_PIPE,          KC_DLR, KC_TILDE,____,  ____,   KC_SLSH,     ____, ____, ____,\
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____
 | 
			
		||||
),
 | 
			
		||||
 | 
			
		||||
[_MOV] = KEYMAP (\
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,     ____,  \
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____,    ____,   \
 | 
			
		||||
  ____,     ____, RGUI(KC_TAB), ____, ____, RCTL(KC_B), ____, ____, ____,   ____, ____,    ____,     ____,   ____, \
 | 
			
		||||
  ____,     RCTL(KC_A), KC_S, RCTL(KC_K), RCTL(KC_E), ____,   KC_LEFT,KC_DOWN, KC_UP,  KC_RIGHT, ____, ____,____,____,\
 | 
			
		||||
  ____,     ____,RGUI(KC_TAB), ____,  ____, RCTL(KC_B), ____, ____, KC_UP,   ____,   ____,  ____,     ____,   ____, \
 | 
			
		||||
  ____,     RCTL(KC_A), KC_S, RCTL(KC_K), RCTL(KC_E), ____,   ____, KC_LEFT,KC_DOWN, KC_RIGHT, ____, ____,____,____,\
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____, ____,    ____,     ____,   ____, \
 | 
			
		||||
  ____,     ____, ____, ____, ____, ____, ____, ____, ____,   ____
 | 
			
		||||
),
 | 
			
		||||
| 
						 | 
				
			
			@ -88,9 +125,54 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 | 
			
		||||
const uint16_t PROGMEM fn_actions[] = {
 | 
			
		||||
[1] = ACTION_LAYER_TAP_KEY(_SYM,KC_SPACE),
 | 
			
		||||
[2] = ACTION_LAYER_TAP_KEY(_MOV,KC_BSPC),
 | 
			
		||||
[2] = ACTION_LAYER_TAP_KEY(_MOV,KC_BSPC)
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
 | 
			
		||||
float tone_startup[][2]    = SONG(STARTUP_SOUND);
 | 
			
		||||
float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 | 
			
		||||
float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
    case QWR:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        #ifdef AUDIO_ENABLE
 | 
			
		||||
          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
 | 
			
		||||
        #endif
 | 
			
		||||
        layer_off(_CDH);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
      
 | 
			
		||||
    case CDH:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        #ifdef AUDIO_ENABLE
 | 
			
		||||
          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
 | 
			
		||||
        #endif
 | 
			
		||||
        layer_on(_CDH);
 | 
			
		||||
      }
 | 
			
		||||
      return false;
 | 
			
		||||
      break;
 | 
			
		||||
      
 | 
			
		||||
    case SYM:
 | 
			
		||||
      if (record->event.pressed) {
 | 
			
		||||
        layer_on(_SYM);
 | 
			
		||||
      } else {
 | 
			
		||||
		layer_off(_SYM);
 | 
			
		||||
      }
 | 
			
		||||
     return false;
 | 
			
		||||
     break;
 | 
			
		||||
     
 | 
			
		||||
   }
 | 
			
		||||
 return true;
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		||||
{
 | 
			
		||||
  // MACRODOWN only works in this function
 | 
			
		||||
| 
						 | 
				
			
			@ -104,7 +186,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
        break;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 	case 1 :
 | 
			
		||||
 	case DHPASTE:
 | 
			
		||||
	  if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) {
 | 
			
		||||
              if (record->event.pressed) {
 | 
			
		||||
	  	 clear_keyboard_but_mods();
 | 
			
		||||
| 
						 | 
				
			
			@ -121,12 +203,29 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 | 
			
		|||
	}
 | 
			
		||||
	break;
 | 
			
		||||
			
 | 
			
		||||
		
 | 
			
		||||
	case VIBRK: // vi esc:
 | 
			
		||||
		 if (record->event.pressed) {
 | 
			
		||||
			return MACRO( T(E),D(LSFT),T(SCLN),U(LSFT), END );
 | 
			
		||||
		 }
 | 
			
		||||
	break;	
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    return MACRO_NONE;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void startup_user()
 | 
			
		||||
{
 | 
			
		||||
    _delay_ms(20); // gets rid of tick
 | 
			
		||||
    PLAY_NOTE_ARRAY(tone_startup, false, 0);
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void matrix_init_user(void) {
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -135,10 +234,9 @@ void matrix_scan_user(void) {
 | 
			
		|||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void led_set_user(uint8_t usb_led) {
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue