Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						22f830d67c
					
				
							
								
								
									
										94
									
								
								keyboards/4pplet/ibe60/keyboard.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										94
									
								
								keyboards/4pplet/ibe60/keyboard.json
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,94 @@ | ||||
| { | ||||
|     "manufacturer": "4pplet", | ||||
|     "keyboard_name": "IBE60 Rev A", | ||||
|     "maintainer": "4pplet", | ||||
|     "bootloader": "stm32-dfu", | ||||
|     "diode_direction": "COL2ROW", | ||||
|     "features": { | ||||
|         "bootmagic": true, | ||||
|         "extrakey": true, | ||||
|         "key_lock": true, | ||||
|         "mousekey": true, | ||||
|         "nkro": true | ||||
|     }, | ||||
|     "matrix_pins": { | ||||
|         "cols": ["B2", "A5", "A4", "A3", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"], | ||||
|         "rows": ["B14", "A9", "B6", "B5", "B4"] | ||||
|     }, | ||||
|     "processor": "STM32F072", | ||||
|     "usb": { | ||||
|         "device_version": "0.0.1", | ||||
|         "pid": "0x0001", | ||||
|         "vid": "0x4448" | ||||
|     }, | ||||
|     "indicators": { | ||||
|         "caps_lock": "A8" | ||||
|     }, | ||||
|     "community_layouts": ["60_hhkb"], | ||||
|     "layouts": { | ||||
|         "LAYOUT_60_hhkb": { | ||||
|             "layout": [ | ||||
|                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, | ||||
|                 {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, | ||||
|                 {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, | ||||
|                 {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, | ||||
|                 {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, | ||||
|                 {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, | ||||
|                 {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, | ||||
|                 {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, | ||||
|                 {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, | ||||
|                 {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, | ||||
|                 {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, | ||||
|                 {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, | ||||
|                 {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, | ||||
|                 {"label": "|", "matrix": [0, 13], "x": 13, "y": 0}, | ||||
|                 {"label": "~", "matrix": [2, 13], "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": [3, 13], "x": 12.75, "y": 2, "w": 2.25}, | ||||
|                 {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, | ||||
|                 {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, | ||||
|                 {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, | ||||
|                 {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, | ||||
|                 {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, | ||||
|                 {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, | ||||
|                 {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, | ||||
|                 {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, | ||||
|                 {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, | ||||
|                 {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, | ||||
|                 {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, | ||||
|                 {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, | ||||
|                 {"label": "Fn", "matrix": [4, 13], "x": 14, "y": 3}, | ||||
|                 {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4}, | ||||
|                 {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, | ||||
|                 {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7}, | ||||
|                 {"label": "Alt", "matrix": [4, 9], "x": 11, "y": 4, "w": 1.5}, | ||||
|                 {"label": "Win", "matrix": [4, 10], "x": 12.5, "y": 4} | ||||
|             ] | ||||
|         } | ||||
|     } | ||||
| } | ||||
							
								
								
									
										34
									
								
								keyboards/4pplet/ibe60/keymaps/default/keymap.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								keyboards/4pplet/ibe60/keymaps/default/keymap.c
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,34 @@ | ||||
| /*
 | ||||
| Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com> | ||||
| 
 | ||||
| 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] = { | ||||
| // main layer
 | ||||
| [0] = LAYOUT_60_hhkb( | ||||
|   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_GRV, | ||||
|   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_BSPC, | ||||
|   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, MO(1), | ||||
|   KC_LGUI,  KC_LALT,                                KC_SPC,                           KC_RALT, KC_RGUI), | ||||
| // basic function layer
 | ||||
| [1] = LAYOUT_60_hhkb( | ||||
|   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_TRNS, KC_TRNS, | ||||
|   KC_TRNS,  KC_TRNS,  KC_UP,    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_LEFT,  KC_DOWN,  KC_RIGHT, 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) | ||||
| }; | ||||
							
								
								
									
										35
									
								
								keyboards/4pplet/ibe60/keymaps/via/keymap.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								keyboards/4pplet/ibe60/keymaps/via/keymap.c
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,35 @@ | ||||
| /*
 | ||||
| Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com> | ||||
| 
 | ||||
| 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] = { | ||||
| // main layer
 | ||||
| [0] = LAYOUT_60_hhkb( | ||||
|   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_GRV, | ||||
|   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_BSPC, | ||||
|   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, MO(1), | ||||
|   KC_LGUI,  KC_LALT,                                KC_SPC,                           KC_RALT, KC_RGUI), | ||||
| // basic function layer
 | ||||
| [1] = LAYOUT_60_hhkb( | ||||
|   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_TRNS, KC_TRNS, | ||||
|   KC_TRNS,  KC_TRNS,  KC_UP,    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_LEFT,  KC_DOWN,  KC_RIGHT, 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) | ||||
| }; | ||||
| 
 | ||||
							
								
								
									
										1
									
								
								keyboards/4pplet/ibe60/keymaps/via/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/4pplet/ibe60/keymaps/via/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| VIA_ENABLE = yes | ||||
							
								
								
									
										24
									
								
								keyboards/4pplet/ibe60/readme.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								keyboards/4pplet/ibe60/readme.md
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,24 @@ | ||||
| # IBE60 | ||||
| 
 | ||||
| PCB mounted 60% PCB for the IBE60 in fixed true HHKB layout | ||||
| 
 | ||||
| * Keyboard Maintainer: [Stefan Sundin](https://github.com/4pplet) | ||||
| * Hardware Supported: IBE60 Solder PCB | ||||
| 
 | ||||
| Make example for this keyboard (after setting up your build environment): | ||||
| 
 | ||||
|     make 4pplet/ibe60:default | ||||
| 
 | ||||
| Flashing example for this keyboard: | ||||
| 
 | ||||
|     make 4pplet/ibe60: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 Escape key and plug in the keyboard | ||||
| * **Physical reset button**: Short the reset-header (labled BL/RESET) on the back of the PCB for about 2 seconds for the keyboard to enter bootloader | ||||
| * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available | ||||
							
								
								
									
										2
									
								
								keyboards/4pplet/ibe60/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								keyboards/4pplet/ibe60/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,2 @@ | ||||
| # Wildcard to allow APM32 MCU
 | ||||
| DFU_SUFFIX_ARGS = -p FFFF -v FFFF | ||||
| @ -16,5 +16,3 @@ | ||||
| #pragma once | ||||
| 
 | ||||
| #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND | ||||
| 
 | ||||
| #define RGB_MATRIX_LED_COUNT 64 | ||||
|  | ||||
| @ -60,6 +60,76 @@ | ||||
|             "solid_multisplash": true | ||||
|         }, | ||||
|         "driver": "is31fl3733", | ||||
|         "layout": [ | ||||
|             {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, | ||||
|             {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, | ||||
|             {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1}, | ||||
| 
 | ||||
|             {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1}, | ||||
|             {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4}, | ||||
|             {"matrix": [1, 13], "x": 220, "y": 16, "flags": 1}, | ||||
| 
 | ||||
|             {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1}, | ||||
|             {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4}, | ||||
|             {"matrix": [2, 12], "x": 214, "y": 32, "flags": 1}, | ||||
| 
 | ||||
|             {"matrix": [3, 0], "x": 8, "y": 48, "flags": 1}, | ||||
|             {"matrix": [3, 1], "x": 32, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 2], "x": 48, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 4], "x": 80, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 5], "x": 96, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 6], "x": 112, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 7], "x": 128, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 8], "x": 144, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 9], "x": 160, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 10], "x": 176, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 11], "x": 192, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 12], "x": 208, "y": 48, "flags": 4}, | ||||
|             {"matrix": [3, 13], "x": 224, "y": 48, "flags": 1}, | ||||
| 
 | ||||
|             {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, | ||||
|             {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1}, | ||||
|             {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1}, | ||||
|             {"matrix": [4, 5], "x": 102, "y": 64, "flags": 4}, | ||||
|             {"matrix": [4, 9], "x": 160, "y": 64, "flags": 1}, | ||||
|             {"matrix": [4, 10], "x": 176, "y": 64, "flags": 1}, | ||||
|             {"matrix": [4, 11], "x": 192, "y": 64, "flags": 4}, | ||||
|             {"matrix": [4, 12], "x": 208, "y": 64, "flags": 4}, | ||||
|             {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4} | ||||
|         ], | ||||
|         "led_flush_limit": 26, | ||||
|         "led_process_limit": 20, | ||||
|         "max_brightness": 160 | ||||
|  | ||||
| @ -37,9 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| }; | ||||
| 
 | ||||
| bool rgb_matrix_indicators_user(void) { | ||||
|     if (layer_state_is(1)) { | ||||
|         rgb_matrix_set_color(77,0xFF, 0x80, 0x00); | ||||
|     } | ||||
|     if (host_keyboard_led_state().caps_lock) { | ||||
|           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); | ||||
|     } | ||||
|  | ||||
| @ -34,9 +34,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| }; | ||||
| 
 | ||||
| bool rgb_matrix_indicators_user(void) { | ||||
|     if (layer_state_is(1)) { | ||||
|         rgb_matrix_set_color(77,0xFF, 0x80, 0x00); | ||||
|     } | ||||
|     if (host_keyboard_led_state().caps_lock) { | ||||
|           rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); | ||||
|     } | ||||
|  | ||||
| @ -93,24 +93,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { | ||||
|    {0, SW10_CS10,  SW11_CS10,  SW12_CS10}, | ||||
|    {0, SW10_CS15,  SW11_CS15,  SW12_CS15} | ||||
| }; | ||||
| 
 | ||||
| led_config_t g_led_config = {{ | ||||
|     {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13 }, | ||||
|     { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, | ||||
|     { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40}, | ||||
|     { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54 }, | ||||
|     { 55, 56, 57, 58, 59, 60, 61, 62, 63} | ||||
| }, { | ||||
|     {   0,  0 }, {  16,  0 }, {  32,  0 }, {  48,  0 }, {  64,  0 }, { 80,  0 }, { 96,  0 }, { 112,  0 }, { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 216,  0 }, | ||||
|     {   4, 16 }, {  18, 16 }, {  34, 16 }, {  50, 16 }, {  66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194,  16 }, { 220,  16 }, | ||||
|     {   6, 32 }, {  20, 32 }, {  36, 32 }, {  52, 32 }, {  68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 212,  32 }, | ||||
|     {   9, 48 }, {  27, 48 }, {  43, 48 }, {  59, 48 }, {  75, 48 }, { 91, 48 }, { 107, 48 }, { 123, 48 }, { 139, 48 }, { 155, 48 }, { 171, 48 }, { 187, 48 }, { 203,  48 }, { 219,  48 }, | ||||
|     {   2, 64 }, {  16, 64 }, {  32, 64 }, {  64, 64 },  { 114, 64 }, { 130, 64 }, { 146, 64 }, { 204, 64 }, { 224, 64 } | ||||
| }, { | ||||
|     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||||
|     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||||
|     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||||
|     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, | ||||
|     1, 1, 1,         4,              1, 1, 4, 4, 4, | ||||
| }}; | ||||
| #endif | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user