mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 21:32:31 +01:00 
			
		
		
		
	Merge branch 'm0110_keymap_section'
This commit is contained in:
		
						commit
						a0f9c1fb4f
					
				| @ -78,6 +78,7 @@ CONSOLE_ENABLE = yes	# Console for debug(+400) | ||||
| COMMAND_ENABLE = yes    # Commands for debug and configuration | ||||
| #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 | ||||
| #NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 | ||||
| KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -126,12 +126,12 @@ static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|      * |Ctl  |Gui    |         Space         |Alt|  \|Lft|Rgt|Dn | |      0|  .|   | | ||||
|      * `---------------------------------------------------------' `---------------' | ||||
|      */ | ||||
|     KEYMAP( | ||||
|     [0] = KEYMAP( | ||||
|     GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,    CLR, EQL, PSLS,PAST, | ||||
|     TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,         P7,  P8,  P9,  PMNS, | ||||
|     LCAP,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     FN1,     P4,  P5,  P6,  PPLS, | ||||
|     LCAP,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     FN15,    P4,  P5,  P6,  PPLS, | ||||
|     LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          UP,      P1,  P2,  P3,  PENT, | ||||
|     LCTL,LGUI,               FN0,                LALT,FN2, LEFT,RGHT,DOWN,    P0,       PDOT | ||||
|     LCTL,LGUI,               FN16,               LALT,FN31,LEFT,RGHT,DOWN,    P0,       PDOT | ||||
|     ), | ||||
|     /* Cursor Layer(WASD, IJKL)
 | ||||
|      * ,---------------------------------------------------------. ,---------------. | ||||
| @ -146,13 +146,21 @@ static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | ||||
|      * |Ctl  |Gui    |         Space        |Alt |  \|Hom|End|PgD| |      0|  .|   | | ||||
|      * `---------------------------------------------------------' `---------------' | ||||
|      */ | ||||
|     KEYMAP( | ||||
|     [3] = KEYMAP( | ||||
|     ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST, | ||||
|     CAPS,HOME,UP,  PGUP,NO,  NO,  NO,  NO,  PSCR,SLCK,PAUS,UP,  INS,          P7,  P8,  P9,  PMNS, | ||||
|     LCAP,LEFT,DOWN,RGHT,NO,  NO,  NO,  NO,  HOME,PGUP,LEFT,RGHT,     FN1,     P4,  P5,  P6,  PPLS, | ||||
|     LCAP,LEFT,DOWN,RGHT,NO,  NO,  NO,  NO,  HOME,PGUP,LEFT,RGHT,     FN15,    P4,  P5,  P6,  PPLS, | ||||
|     LSFT,END, NO,  PGDN,NO,  NO,  NO,  NO,  END, PGDN,DOWN,          PGUP,    P1,  P2,  P3,  PENT, | ||||
|     LCTL,LGUI,               FN0,                LALT,FN2, HOME,END, PGDN,    P0,       PDOT | ||||
|     LCTL,LGUI,               FN16,               LALT,FN31,HOME,END, PGDN,    P0,       PDOT | ||||
|     ), | ||||
|     [4] = KEYMAP( | ||||
|     ESC, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST, | ||||
|     CAPS,HOME,UP,  PGUP,NO,  NO,  NO,  NO,  PSCR,SLCK,PAUS,UP,  INS,          P7,  P8,  P9,  PMNS, | ||||
|     LCAP,LEFT,DOWN,RGHT,NO,  NO,  NO,  NO,  HOME,PGUP,LEFT,RGHT,     FN15,    P4,  P5,  P6,  PPLS, | ||||
|     LSFT,END, NO,  PGDN,NO,  NO,  NO,  NO,  END, PGDN,DOWN,          PGUP,    P1,  P2,  P3,  PENT, | ||||
|     LCTL,LGUI,               FN16,               LALT,FN31,HOME,END, PGDN,    P0,       PDOT | ||||
|     ), | ||||
|     [7] = {}, | ||||
| }; | ||||
| 
 | ||||
| 
 | ||||
| @ -164,9 +172,38 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | ||||
| #else | ||||
| static const uint16_t fn_actions[] PROGMEM = { | ||||
| #endif | ||||
|     [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),        // Layer switch with Tap key Space
 | ||||
|     [1] = ACTION_LAYER_TAP_KEY(1, KC_ENTER),        // Layer switch with Tap key Enter
 | ||||
|     [2] = ACTION_MODS_TAP_KEY(MOD_LALT, KC_BSLS),   // LALT with Tap key Backslash
 | ||||
|     [0]  = ACTION_LAYER_MOMENTARY(1), | ||||
|     [1]  = ACTION_LAYER_MOMENTARY(2), | ||||
|     [2]  = ACTION_LAYER_MOMENTARY(3), | ||||
|     [3]  = ACTION_LAYER_MOMENTARY(4), | ||||
|     [4]  = ACTION_LAYER_MOMENTARY(5), | ||||
|     [5]  = ACTION_LAYER_MOMENTARY(6), | ||||
|     [6]  = ACTION_LAYER_MOMENTARY(7), | ||||
|     [7]  = ACTION_LAYER_TOGGLE(1), | ||||
|     [8]  = ACTION_LAYER_TOGGLE(2), | ||||
|     [9]  = ACTION_LAYER_TOGGLE(3), | ||||
|     [10] = ACTION_LAYER_TAP_TOGGLE(1), | ||||
|     [11] = ACTION_LAYER_TAP_TOGGLE(2), | ||||
|     [12] = ACTION_LAYER_TAP_TOGGLE(3), | ||||
|     [13] = ACTION_LAYER_TAP_KEY(1, KC_F), | ||||
|     [14] = ACTION_LAYER_TAP_KEY(2, KC_J), | ||||
|     [15] = ACTION_LAYER_TAP_KEY(3, KC_ENTER), | ||||
|     [16] = ACTION_LAYER_TAP_KEY(4, KC_SPACE), | ||||
|     [17] = ACTION_LAYER_TAP_KEY(5, KC_SCOLON), | ||||
|     [18] = ACTION_LAYER_TAP_KEY(6, KC_QUOTE), | ||||
|     [19] = ACTION_LAYER_TAP_KEY(7, KC_SLASH), | ||||
|     [20] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPACE), | ||||
|     [21] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_SPACE), | ||||
|     [22] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_QUOTE), | ||||
|     [23] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENTER), | ||||
|     [24] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ESC), | ||||
|     [25] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_BSPACE), | ||||
|     [26] = ACTION_MODS_ONESHOT(MOD_LCTL), | ||||
|     [27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC), | ||||
|     [28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE), | ||||
|     [29] = ACTION_MODS_ONESHOT(MOD_LSFT), | ||||
|     [30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRAVE), | ||||
|     [31] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_BSLASH), | ||||
| }; | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -505,29 +505,29 @@ Scan Code | ||||
|     m0110_recv_key() function returns following scan codes instead of raw key events. | ||||
|     Scan codes are 1 byte long and MSB(bit7) is set when key is released.  | ||||
| 
 | ||||
|     M0110 | ||||
|     ,---------------------------------------------------------. | ||||
|     |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backs| | ||||
|     |---------------------------------------------------------| | ||||
|     |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \| | ||||
|     |---------------------------------------------------------| | ||||
|     |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return| | ||||
|     |---------------------------------------------------------| | ||||
|     |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|        | | ||||
|     `---------------------------------------------------------' | ||||
|          |Opt|Mac |         Space               |Enter|Opt| | ||||
|          `------------------------------------------------' | ||||
|     ,---------------------------------------------------------. | ||||
|     | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | ||||
|     |---------------------------------------------------------| | ||||
|     |   30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | ||||
|     |---------------------------------------------------------| | ||||
|     |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24| | ||||
|     |---------------------------------------------------------| | ||||
|     |      38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C|      38| | ||||
|     `---------------------------------------------------------' | ||||
|          | 3A|  37|             31              |   34| 3A| | ||||
|          `------------------------------------------------' | ||||
|     M0110                                                          M0120 | ||||
|     ,---------------------------------------------------------.    ,---------------. | ||||
|     |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backs|    |Clr|  -|Lft|Rgt| | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \|    |  7|  8|  9|Up | | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return|    |  4|  5|  6|Dn | | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|        |    |  1|  2|  3|   | | ||||
|     `---------------------------------------------------------'    |-----------|Ent| | ||||
|          |Opt|Mac |         Space               |Enter|Opt|        |      0|  .|   | | ||||
|          `------------------------------------------------'        `---------------' | ||||
|     ,---------------------------------------------------------.    ,---------------. | ||||
|     | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33|    | 47| 4E| 46| 42| | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |   30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A|    | 59| 5B| 5C| 4D| | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24|    | 56| 57| 58| 48| | ||||
|     |---------------------------------------------------------|    |---------------| | ||||
|     |      38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C|      38|    | 53| 54| 55|   | | ||||
|     `---------------------------------------------------------'    |-----------| 4C| | ||||
|          | 3A|  37|             31              |   34| 3A|        |     52| 41|   | | ||||
|          `------------------------------------------------'        `---------------' | ||||
| 
 | ||||
|     M0110A | ||||
|     ,---------------------------------------------------------. ,---------------. | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 tmk
						tmk