Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						876b9ed680
					
				
					 6 changed files with 213 additions and 0 deletions
				
			
		
							
								
								
									
										99
									
								
								keyboards/drewkeys/mercury65/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										99
									
								
								keyboards/drewkeys/mercury65/info.json
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,99 @@ | |||
| { | ||||
|     "keyboard_name": "mercury65", | ||||
|     "maintainer": "Drewkeys", | ||||
|     "manufacturer": "RocketKeyboards", | ||||
|     "processor": "atmega32u4", | ||||
|     "bootloader": "atmel-dfu", | ||||
|     "diode_direction": "COL2ROW", | ||||
|     "url": "https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard", | ||||
|     "usb": { | ||||
|         "vid": "0xDE43", | ||||
|         "pid": "0x1034", | ||||
|         "device_version": "0.0.1" | ||||
|     }, | ||||
|     "features": { | ||||
|         "bootmagic": true, | ||||
|         "extrakey": true, | ||||
|         "mousekey": true, | ||||
|         "nkro": true | ||||
|     }, | ||||
|     "matrix_pins": { | ||||
|         "cols": ["B0", "B1", "B2", "B3", "B7", "D1", "D2", "D3", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5"], | ||||
|         "rows": ["D5", "D4", "D6", "D0", "E6"] | ||||
|     }, | ||||
|     "layouts": { | ||||
|         "LAYOUT": { | ||||
|             "layout": [ | ||||
|                 {"matrix": [0, 0], "label":"`", "x":0, "y":0},  | ||||
|                 {"matrix": [0, 1], "label":"!", "x":1, "y":0},  | ||||
|                 {"matrix": [0, 2], "label":"@", "x":2, "y":0},  | ||||
|                 {"matrix": [0, 3], "label":"#", "x":3, "y":0},  | ||||
|                 {"matrix": [0, 4], "label":"$", "x":4, "y":0},  | ||||
|                 {"matrix": [0, 5], "label":"%", "x":5, "y":0},  | ||||
|                 {"matrix": [0, 6], "label":"^", "x":6, "y":0},  | ||||
|                 {"matrix": [0, 7], "label":"&", "x":7, "y":0},  | ||||
|                 {"matrix": [0, 8], "label":"*", "x":8, "y":0},  | ||||
|                 {"matrix": [0, 9], "label":"(", "x":9, "y":0},  | ||||
|                 {"matrix": [0, 10], "label":")", "x":10, "y":0},  | ||||
|                 {"matrix": [0, 11], "label":"_", "x":11, "y":0},  | ||||
|                 {"matrix": [0, 12], "label":"+", "x":12, "y":0},  | ||||
|                 {"matrix": [0, 13], "label":"Del", "x":13, "y":0},  | ||||
|                 {"matrix": [0, 14], "label":"Bsp", "x":14, "y":0},  | ||||
|                 {"matrix": [1, 0], "label":"Tab", "x":0, "y":1, "w":1.5},  | ||||
|                 {"matrix": [1, 2], "label":"Q", "x":1.5, "y":1},  | ||||
|                 {"matrix": [1, 3], "label":"W", "x":2.5, "y":1},  | ||||
|                 {"matrix": [1, 4], "label":"E", "x":3.5, "y":1},  | ||||
|                 {"matrix": [1, 5], "label":"R", "x":4.5, "y":1},  | ||||
|                 {"matrix": [1, 6], "label":"T", "x":5.5, "y":1},  | ||||
|                 {"matrix": [1, 7], "label":"Y", "x":6.5, "y":1},  | ||||
|                 {"matrix": [1, 8], "label":"U", "x":7.5, "y":1},  | ||||
|                 {"matrix": [1, 9], "label":"I", "x":8.5, "y":1},  | ||||
|                 {"matrix": [1, 10], "label":"O", "x":9.5, "y":1},  | ||||
|                 {"matrix": [1, 11], "label":"P", "x":10.5, "y":1},  | ||||
|                 {"matrix": [1, 12], "label":"{", "x":11.5, "y":1},  | ||||
|                 {"matrix": [1, 13], "label":"}", "x":12.5, "y":1},  | ||||
|                 {"matrix": [1, 14], "label":"|", "x":13.5, "y":1, "w":1.5},  | ||||
|                 {"matrix": [1, 16], "label":"PgUp", "x":15.5, "y":1},  | ||||
|                 {"matrix": [2, 0], "label":"Caps Lock", "x":0, "y":2, "w":1.75},  | ||||
|                 {"matrix": [2, 2], "label":"A", "x":1.75, "y":2},  | ||||
|                 {"matrix": [2, 3], "label":"S", "x":2.75, "y":2},  | ||||
|                 {"matrix": [2, 4], "label":"D", "x":3.75, "y":2},  | ||||
|                 {"matrix": [2, 5], "label":"F", "x":4.75, "y":2},  | ||||
|                 {"matrix": [2, 6], "label":"G", "x":5.75, "y":2},  | ||||
|                 {"matrix": [2, 7], "label":"H", "x":6.75, "y":2},  | ||||
|                 {"matrix": [2, 8], "label":"J", "x":7.75, "y":2},  | ||||
|                 {"matrix": [2, 9], "label":"K", "x":8.75, "y":2},  | ||||
|                 {"matrix": [2, 10], "label":"L", "x":9.75, "y":2},  | ||||
|                 {"matrix": [2, 11], "label":":", "x":10.75, "y":2},  | ||||
|                 {"matrix": [2, 12], "label":"@", "x":11.75, "y":2},  | ||||
|                 {"matrix": [2, 13], "label":"ISO", "x":12.75, "y":2},  | ||||
|                 {"matrix": [2, 14], "label":"Enter", "x":13.75, "y":2, "w":1.25},  | ||||
|                 {"matrix": [2, 16], "label":"Home", "x":15.5, "y":2},  | ||||
|                 {"matrix": [3, 0], "label":"Shift", "x":0, "y":3, "w":1.25},  | ||||
|                 {"matrix": [3, 1], "label":"\\", "x":1.25, "y":3},  | ||||
|                 {"matrix": [3, 2], "label":"Z", "x":2.25, "y":3},  | ||||
|                 {"matrix": [3, 3], "label":"X", "x":3.25, "y":3},  | ||||
|                 {"matrix": [3, 4], "label":"C", "x":4.25, "y":3},  | ||||
|                 {"matrix": [3, 5], "label":"V", "x":5.25, "y":3},  | ||||
|                 {"matrix": [3, 6], "label":"B", "x":6.25, "y":3},  | ||||
|                 {"matrix": [3, 7], "label":"N", "x":7.25, "y":3},  | ||||
|                 {"matrix": [3, 8], "label":"M", "x":8.25, "y":3},  | ||||
|                 {"matrix": [3, 9], "label":"<", "x":9.25, "y":3},  | ||||
|                 {"matrix": [3, 10], "label":">", "x":10.25, "y":3},  | ||||
|                 {"matrix": [3, 11], "label":"?", "x":11.25, "y":3},  | ||||
|                 {"matrix": [3, 13], "label":"Shift", "x":12.25, "y":3, "w":1.75},  | ||||
|                 {"matrix": [3, 14], "label":"End", "x":15.5, "y":3},  | ||||
|                 {"matrix": [3, 16], "label":"\u2191", "x":14.25, "y":3.25},  | ||||
|                 {"matrix": [4, 0], "label":"Ctrl", "x":0, "y":4, "w":1.25},  | ||||
|                 {"matrix": [4, 1], "label":"Win", "x":1.25, "y":4, "w":1.25},  | ||||
|                 {"matrix": [4, 2], "label":"Alt", "x":2.5, "y":4, "w":1.25},  | ||||
|                 {"matrix": [4, 6], "x":3.75, "y":4, "w":6.25},  | ||||
|                 {"matrix": [4, 10], "label":"AltGr", "x":10, "y":4, "w":1.25},  | ||||
|                 {"matrix": [4, 11], "label":"Win", "x":11.25, "y":4, "w":1.25},  | ||||
|                 {"matrix": [4, 13], "label":"\u2190", "x":13.25, "y":4.25},  | ||||
|                 {"matrix": [4, 14], "label":"\u2193", "x":14.25, "y":4.25},  | ||||
|                 {"matrix": [4, 15], "label":"\u2192", "x":15.25, "y":4.25}] | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
| } | ||||
							
								
								
									
										45
									
								
								keyboards/drewkeys/mercury65/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								keyboards/drewkeys/mercury65/keymaps/default/keymap.c
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,45 @@ | |||
| /* Copyright 2023 Drewkeys
 | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | ||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | ||||
| // Layer names don't all need to be of the same length, obviously, and you can also skip them
 | ||||
| // entirely and just use numbers.
 | ||||
| enum layer_names { | ||||
|     _BASE, | ||||
|     _FN | ||||
| }; | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /* Base https://i.imgur.com/viQdtbB.png */ | ||||
|     [_BASE] = LAYOUT( | ||||
|         KC_ESC,     KC_1, KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,     KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSLS, 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_LBRC, KC_RBRC, KC_BSLS,          KC_DEL, | ||||
|         KC_CAPS,          KC_A,    KC_S,  KC_D,  KC_F,   KC_G,  KC_H,  KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT,          KC_PGUP, | ||||
|         KC_LSFT, KC_BSLS, KC_Z,    KC_X,  KC_C,  KC_V,   KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP,          KC_PGDN, | ||||
|         KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                           MO(1), KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     ), | ||||
| 
 | ||||
|     [_FN] = LAYOUT( | ||||
|         QK_BOOT,   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_BSLS, KC_BSPC, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,          _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______ | ||||
|     ) | ||||
| 
 | ||||
| }; | ||||
							
								
								
									
										44
									
								
								keyboards/drewkeys/mercury65/keymaps/via/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								keyboards/drewkeys/mercury65/keymaps/via/keymap.c
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,44 @@ | |||
| /* Copyright 2023 Drewkeys
 | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 2 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| #include QMK_KEYBOARD_H | ||||
| 
 | ||||
| // Each layer gets a name for readability, which is then used in the keymap matrix below.
 | ||||
| // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | ||||
| // Layer names don't all need to be of the same length, obviously, and you can also skip them
 | ||||
| // entirely and just use numbers.
 | ||||
| enum layer_names { | ||||
|     _BASE, | ||||
|     _FN1 | ||||
| }; | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /* Base https://i.imgur.com/viQdtbB.png */ | ||||
|     [_BASE] = LAYOUT( | ||||
|         KC_ESC,     KC_1, KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,     KC_9,    KC_0, KC_MINS, KC_EQL,  KC_BSLS, 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_LBRC, KC_RBRC, KC_BSLS,          KC_DEL, | ||||
|         KC_CAPS,          KC_A,    KC_S,  KC_D,  KC_F,   KC_G,  KC_H,  KC_J,     KC_K,    KC_L, KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT,          KC_PGUP, | ||||
|         KC_LSFT, KC_BSLS, KC_Z,    KC_X,  KC_C,  KC_V,   KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT, KC_SLSH,          KC_RSFT,   KC_UP,          KC_PGDN, | ||||
|         KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                           MO(1), KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT | ||||
|     ), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT( | ||||
|         QK_BOOT,   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_BSLS, KC_BSPC, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,          _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______ | ||||
|     ) | ||||
| }; | ||||
							
								
								
									
										1
									
								
								keyboards/drewkeys/mercury65/keymaps/via/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/drewkeys/mercury65/keymaps/via/rules.mk
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| VIA_ENABLE = yes | ||||
							
								
								
									
										23
									
								
								keyboards/drewkeys/mercury65/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								keyboards/drewkeys/mercury65/readme.md
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,23 @@ | |||
| # Mercury65 | ||||
| 
 | ||||
|  | ||||
| 
 | ||||
| *65% Form Factor with a Separated Arrow Cluster used for Mercury65* | ||||
| 
 | ||||
| 
 | ||||
| * Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) | ||||
| * Hardware Supported: Made specifically for Mercury65, 65% hotswap supported | ||||
| * Hardware Availability: https://www.rocketkeyboards.com/collections/mercury65/products/gb-mercury65-keyboard | ||||
| 
 | ||||
| Make example for this keyboard (after setting up your build environment): | ||||
| 
 | ||||
|     make drewkeys/mercury65:default | ||||
| 
 | ||||
| Flashing example for this keyboard: | ||||
| 
 | ||||
|     make drewkeys/mercury65:default:flash | ||||
| ## Bootloader | ||||
| 
 | ||||
| Resetting Board: Press the button on the PCB next to the spacebar to soft reset the board to reflash (bootloader mode). | ||||
| 
 | ||||
| See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). | ||||
							
								
								
									
										1
									
								
								keyboards/drewkeys/mercury65/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/drewkeys/mercury65/rules.mk
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| # This file intentionally left blank
 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot