Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						31631537d5
					
				
							
								
								
									
										169
									
								
								keyboards/swagkeys/integral/keyboard.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										169
									
								
								keyboards/swagkeys/integral/keyboard.json
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,169 @@ | |||||||
|  | { | ||||||
|  |     "manufacturer": "CZMAO", | ||||||
|  |     "keyboard_name": "Swagkeys Integral", | ||||||
|  |     "maintainer": "Swagkeys", | ||||||
|  |     "bootloader": "stm32duino", | ||||||
|  |     "diode_direction": "COL2ROW", | ||||||
|  |     "features": { | ||||||
|  |         "bootmagic": true, | ||||||
|  |         "console": true, | ||||||
|  |         "extrakey": true, | ||||||
|  |         "mousekey": true, | ||||||
|  |         "nkro": true | ||||||
|  |     }, | ||||||
|  |     "indicators": { | ||||||
|  |         "caps_lock": "B15", | ||||||
|  |         "on_state": 0 | ||||||
|  |     }, | ||||||
|  |     "matrix_pins": { | ||||||
|  |         "cols": ["B7", "B6", "B5", "B4", "B3", "A15", "B1", "B8", "C14", "A6", "A5", "A4", "A3", "B14", "A1", "A0"], | ||||||
|  |         "rows": ["B9", "C13", "B12", "B11", "B10"] | ||||||
|  |     }, | ||||||
|  |     "processor": "STM32F103", | ||||||
|  |     "url": "NONE", | ||||||
|  |     "usb": { | ||||||
|  |         "device_version": "1.0.0", | ||||||
|  |         "pid": "0x4F21", | ||||||
|  |         "vid": "0x4E21" | ||||||
|  |     }, | ||||||
|  |     "community_layouts": [ | ||||||
|  |         "60_ansi_tsangan", | ||||||
|  |         "60_ansi_tsangan_split_bs_rshift" | ||||||
|  |     ], | ||||||
|  |     "layouts": { | ||||||
|  |         "LAYOUT_60_ansi_tsangan_split_bs_rshift": { | ||||||
|  |             "layout": [ | ||||||
|  |                 {"label": "`~", "matrix": [0, 0], "x": 0, "y": 0}, | ||||||
|  |                 {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0}, | ||||||
|  |                 {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0}, | ||||||
|  |                 {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0}, | ||||||
|  |                 {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0}, | ||||||
|  |                 {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0}, | ||||||
|  |                 {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0}, | ||||||
|  |                 {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0}, | ||||||
|  |                 {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0}, | ||||||
|  |                 {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0}, | ||||||
|  |                 {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0}, | ||||||
|  |                 {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0}, | ||||||
|  |                 {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0}, | ||||||
|  |                 {"label": "BSLS", "matrix": [0, 14], "x": 13, "y": 0}, | ||||||
|  |                 {"label": "Backspace", "matrix": [0, 15], "x": 14, "y": 0}, | ||||||
|  |                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, | ||||||
|  |                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, | ||||||
|  |                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, | ||||||
|  |                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, | ||||||
|  |                 {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, | ||||||
|  |                 {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, | ||||||
|  |                 {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, | ||||||
|  |                 {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, | ||||||
|  |                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, | ||||||
|  |                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, | ||||||
|  |                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, | ||||||
|  |                 {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1}, | ||||||
|  |                 {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1}, | ||||||
|  |                 {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, | ||||||
|  |                 {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, | ||||||
|  |                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, | ||||||
|  |                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, | ||||||
|  |                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, | ||||||
|  |                 {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, | ||||||
|  |                 {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, | ||||||
|  |                 {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, | ||||||
|  |                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, | ||||||
|  |                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, | ||||||
|  |                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, | ||||||
|  |                 {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2}, | ||||||
|  |                 {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2}, | ||||||
|  |                 {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, | ||||||
|  |                 {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, | ||||||
|  |                 {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, | ||||||
|  |                 {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, | ||||||
|  |                 {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, | ||||||
|  |                 {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, | ||||||
|  |                 {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, | ||||||
|  |                 {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3}, | ||||||
|  |                 {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3}, | ||||||
|  |                 {"label": ",<", "matrix": [3, 8], "x": 9.25, "y": 3}, | ||||||
|  |                 {"label": ".>", "matrix": [3, 9], "x": 10.25, "y": 3}, | ||||||
|  |                 {"label": "/?", "matrix": [3, 10], "x": 11.25, "y": 3}, | ||||||
|  |                 {"label": "Shift", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, | ||||||
|  |                 {"label": "MO", "matrix": [3, 12], "x": 14, "y": 3}, | ||||||
|  |                 {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, | ||||||
|  |                 {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, | ||||||
|  |                 {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, | ||||||
|  |                 {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, | ||||||
|  |                 {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, | ||||||
|  |                 {"label": "FN", "matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, | ||||||
|  |                 {"label": "Ctrl", "matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25} | ||||||
|  |             ] | ||||||
|  |         }, | ||||||
|  |         "LAYOUT_60_ansi_tsangan": { | ||||||
|  |             "layout": [ | ||||||
|  |                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, | ||||||
|  |                 {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, | ||||||
|  |                 {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, | ||||||
|  |                 {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, | ||||||
|  |                 {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, | ||||||
|  |                 {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, | ||||||
|  |                 {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, | ||||||
|  |                 {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, | ||||||
|  |                 {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, | ||||||
|  |                 {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, | ||||||
|  |                 {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, | ||||||
|  |                 {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, | ||||||
|  |                 {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, | ||||||
|  |                 {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, | ||||||
|  | 
 | ||||||
|  |                 {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, | ||||||
|  |                 {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, | ||||||
|  |                 {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, | ||||||
|  |                 {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, | ||||||
|  |                 {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, | ||||||
|  |                 {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, | ||||||
|  |                 {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, | ||||||
|  |                 {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, | ||||||
|  |                 {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, | ||||||
|  |                 {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, | ||||||
|  |                 {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, | ||||||
|  |                 {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, | ||||||
|  |                 {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, | ||||||
|  |                 {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, | ||||||
|  | 
 | ||||||
|  |                 {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, | ||||||
|  |                 {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, | ||||||
|  |                 {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, | ||||||
|  |                 {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, | ||||||
|  |                 {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, | ||||||
|  |                 {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, | ||||||
|  |                 {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, | ||||||
|  |                 {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, | ||||||
|  |                 {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, | ||||||
|  |                 {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, | ||||||
|  |                 {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, | ||||||
|  |                 {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, | ||||||
|  |                 {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, | ||||||
|  | 
 | ||||||
|  |                 {"label": "LShift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, | ||||||
|  |                 {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3}, | ||||||
|  |                 {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3}, | ||||||
|  |                 {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3}, | ||||||
|  |                 {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3}, | ||||||
|  |                 {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3}, | ||||||
|  |                 {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3}, | ||||||
|  |                 {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3}, | ||||||
|  |                 {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3}, | ||||||
|  |                 {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3}, | ||||||
|  |                 {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3}, | ||||||
|  |                 {"label": "RShift", "matrix": [3, 14], "x": 12.25, "y": 3, "w": 2.75}, | ||||||
|  | 
 | ||||||
|  |                 {"label": "LCtrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, | ||||||
|  |                 {"label": "LGui", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, | ||||||
|  |                 {"label": "LAlt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, | ||||||
|  |                 {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 7}, | ||||||
|  |                 {"label": "RAlt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5}, | ||||||
|  |                 {"label": "FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.5}, | ||||||
|  |                 {"label": "RCtrl", "matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.5} | ||||||
|  |             ] | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										35
									
								
								keyboards/swagkeys/integral/keymaps/default/keymap.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								keyboards/swagkeys/integral/keymaps/default/keymap.c
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,35 @@ | |||||||
|  | /*
 | ||||||
|  | Copyright 2024 Swagkeys | ||||||
|  | 
 | ||||||
|  | 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 | ||||||
|  | 
 | ||||||
|  | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||||
|  |     [0] = LAYOUT_60_ansi_tsangan( | ||||||
|  |         KC_GRV,  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_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_CAPS, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT, | ||||||
|  |         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                               KC_RALT, MO(1),   KC_RCTL | ||||||
|  |     ), | ||||||
|  |     [1] = LAYOUT_60_ansi_tsangan( | ||||||
|  |         QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|  |         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||||||
|  |         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, | ||||||
|  |         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_COMM, KC_TRNS, KC_TRNS,                   KC_TRNS, | ||||||
|  |         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS | ||||||
|  |     ) | ||||||
|  | 
 | ||||||
|  | }; | ||||||
							
								
								
									
										24
									
								
								keyboards/swagkeys/integral/readme.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								keyboards/swagkeys/integral/readme.md
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,24 @@ | |||||||
|  | # Swagkeys Integral | ||||||
|  | 
 | ||||||
|  | 60% Soldered PCB | ||||||
|  | 
 | ||||||
|  | * Keyboard Maintainer: [Swagkeys](https://github.com/swagkey) | ||||||
|  | * Hardware Supported: Integral PCB | ||||||
|  | * Hardware Availability: [Swagkeys Store](https://swagkeys.com/) | ||||||
|  | 
 | ||||||
|  | Make example for this keyboard (after setting up your build environment): | ||||||
|  | 
 | ||||||
|  |     make swagkeys/integral:default | ||||||
|  | 
 | ||||||
|  | Flashing example for this keyboard: | ||||||
|  | 
 | ||||||
|  |     make swagkeys/integral:default:flash | ||||||
|  | 
 | ||||||
|  | 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). | ||||||
|  | 
 | ||||||
|  | ## Bootloader | ||||||
|  | 
 | ||||||
|  | Enter the bootloader in 3 ways: | ||||||
|  | 
 | ||||||
|  | * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard | ||||||
|  | * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user