Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						513f5b0655
					
				
					 7 changed files with 30 additions and 12 deletions
				
			
		|  | @ -27,7 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
|   //┌─────────┬─────────┬─────────┐
 | ||||
|      KC_1,     KC_2,     KC_3, | ||||
|   //├─────────┼─────────┼─────────┤
 | ||||
|      KC_4,     KC_5,     KC_6 | ||||
|      KC_4,     KC_5,     KC_6, | ||||
|   //├─────────┼─────────┼─────────┤
 | ||||
|    | ||||
|   //├─────────┼─────────┼─────────┤
 | ||||
|      KC_7,     KC_8,     KC_9 | ||||
|   //└─────────┴─────────┴─────────┘
 | ||||
|   ) | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| # Default Gust Layout | ||||
| 
 | ||||
|  | ||||
|  | ||||
| 
 | ||||
| This is the default layout for Gust Macro Board. | ||||
|  |  | |||
|  | @ -25,11 +25,11 @@ | |||
| 
 | ||||
| /* key matrix size */ | ||||
| // Rows are doubled-up
 | ||||
| #define MATRIX_ROWS 2 | ||||
| #define MATRIX_ROWS 3 | ||||
| #define MATRIX_COLS 3 | ||||
| 
 | ||||
| // wiring of each half
 | ||||
| #define MATRIX_ROW_PINS { F5, F4 } | ||||
| #define MATRIX_ROW_PINS { F5, F4, D0 } | ||||
| #define MATRIX_COL_PINS { D1, D2, D3 } | ||||
| 
 | ||||
| /* Set 0 if debouncing isn't needed */ | ||||
|  |  | |||
|  | @ -31,6 +31,18 @@ | |||
|                 { | ||||
|                     "x": 2, | ||||
|                     "y": 1 | ||||
|                 }, | ||||
|                 { | ||||
|                     "x": 0, | ||||
|                     "y": 3 | ||||
|                 }, | ||||
|                 { | ||||
|                     "x": 1, | ||||
|                     "y": 3 | ||||
|                 }, | ||||
|                 { | ||||
|                     "x": 2, | ||||
|                     "y": 3 | ||||
|                 } | ||||
|             ] | ||||
|         } | ||||
|  |  | |||
|  | @ -2,11 +2,11 @@ | |||
| 
 | ||||
|  | ||||
| 
 | ||||
| Gust Macro Board is a simple 6 key cluster that comes as a free bonus with the [Breeze Split Keyboard](https://afternoonlabs.com/breeze). | ||||
| Gust Macro Board is a simple 3x3 key macro board. The bottom row can be snapped off to get a 2x3 board. Gust comes as a free bonus with the [Breeze Split Keyboard](https://afternoonlabs.com/breeze). | ||||
| 
 | ||||
| * Keyboard Maintainer: [Eithan Shavit](https://github.com/eithanshavit) | ||||
| * Keyboard Maintainer: [Afternoon Labs](https://github.com/afternoonlabs) | ||||
| * Hardware Supported: Gust Rev1 PCB | ||||
| * Hardware Availability: Coming soon | ||||
| * Hardware Availability: [store.afternoonlab.com](https://store.afternoonlabs.com) | ||||
| 
 | ||||
| Make example for this keyboard (after setting up your build environment): | ||||
| 
 | ||||
|  |  | |||
|  | @ -22,9 +22,11 @@ | |||
| 
 | ||||
| #define LAYOUT( \ | ||||
|     M00, M01, M02, \ | ||||
|     M10, M11, M12  \ | ||||
|     M10, M11, M12,  \ | ||||
|     M20, M21, M22  \ | ||||
| ) \ | ||||
| { \ | ||||
|     { M00, M01, M02 }, \ | ||||
|     { M10, M11, M12 }  \ | ||||
|     { M10, M11, M12 }, \ | ||||
|     { M20, M21, M22 }  \ | ||||
| } | ||||
|  |  | |||
|  | @ -8,8 +8,8 @@ BOOTLOADER = caterina | |||
| #   change yes to no to disable
 | ||||
| #
 | ||||
| BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration | ||||
| MOUSEKEY_ENABLE = no        # Mouse keys | ||||
| EXTRAKEY_ENABLE = no        # Audio control and System control | ||||
| MOUSEKEY_ENABLE = yes       # Mouse keys | ||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||
| CONSOLE_ENABLE = no         # Console for debug | ||||
| COMMAND_ENABLE = no         # Commands for debug and configuration | ||||
| # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 QMK Bot
						QMK Bot