forked from mfulz_github/qmk_firmware
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						e9783df2c5
					
				| @ -16,10 +16,13 @@ | |||||||
| 
 | 
 | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
|  | #include "config_common.h" | ||||||
|  | 
 | ||||||
|  | /* Ensure we jump to bootloader if the RESET keycode was pressed */ | ||||||
|  | #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE | ||||||
|  | 
 | ||||||
| /* USB Device descriptor parameter */ | /* USB Device descriptor parameter */ | ||||||
| #define VENDOR_ID       0x574D // WM
 | #define VENDOR_ID       0x574D // WM
 | ||||||
| #define PRODUCT_ID      0x0001  |  | ||||||
| #define DEVICE_VER      0x0001 // Revision prototype
 |  | ||||||
| #define MANUFACTURER    WestM | #define MANUFACTURER    WestM | ||||||
| #define PRODUCT         WestM68 | #define PRODUCT         WestM68 | ||||||
| 
 | 
 | ||||||
| @ -31,23 +34,6 @@ | |||||||
| #define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } | #define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } | ||||||
| #define DIODE_DIRECTION COL2ROW | #define DIODE_DIRECTION COL2ROW | ||||||
| 
 | 
 | ||||||
| #define RGBLIGHT_EFFECT_BREATHING |  | ||||||
| #define RGBLIGHT_EFFECT_RAINBOW_MOOD |  | ||||||
| #define RGBLIGHT_EFFECT_RAINBOW_SWIRL |  | ||||||
| #define RGBLIGHT_EFFECT_SNAKE |  | ||||||
| #define RGBLIGHT_EFFECT_KNIGHT |  | ||||||
| #define RGBLIGHT_EFFECT_CHRISTMAS |  | ||||||
| #define RGBLIGHT_EFFECT_STATIC_GRADIENT |  | ||||||
| #define RGBLIGHT_EFFECT_RGB_TEST |  | ||||||
| #define RGBLIGHT_EFFECT_ALTERNATING |  | ||||||
| #define RGBLIGHT_EFFECT_TWINKLE |  | ||||||
| // The pin connected to the data pin of the LEDs
 |  | ||||||
| #define RGB_DI_PIN A8 |  | ||||||
| #define RGBLED_NUM 19 |  | ||||||
| 
 |  | ||||||
| /* define if matrix has ghost */ |  | ||||||
| //#define MATRIX_HAS_GHOST
 |  | ||||||
| 
 |  | ||||||
| /* Set 0 if debouncing isn't needed */ | /* Set 0 if debouncing isn't needed */ | ||||||
| #define DEBOUNCE    5 | #define DEBOUNCE    5 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -14,7 +14,6 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 |  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #define HAL_USE_PWM TRUE | #define HAL_USE_PWM TRUE | ||||||
|  | |||||||
							
								
								
									
										34
									
								
								keyboards/westm/westm68/rev1/config.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								keyboards/westm/westm68/rev1/config.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,34 @@ | |||||||
|  | /* Copyright 2021 WestM
 | ||||||
|  |  * | ||||||
|  |  * 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/>.
 | ||||||
|  |  */ | ||||||
|  | 
 | ||||||
|  | #pragma once | ||||||
|  | 
 | ||||||
|  | #define PRODUCT_ID      0x0001 | ||||||
|  | #define DEVICE_VER      0x0001 | ||||||
|  | 
 | ||||||
|  | // The pin connected to the data pin of the LEDs
 | ||||||
|  | #define RGB_DI_PIN A8 | ||||||
|  | #define RGBLED_NUM 16 | ||||||
|  | #define RGBLIGHT_EFFECT_BREATHING | ||||||
|  | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | ||||||
|  | #define RGBLIGHT_EFFECT_RAINBOW_SWIRL | ||||||
|  | #define RGBLIGHT_EFFECT_SNAKE | ||||||
|  | #define RGBLIGHT_EFFECT_KNIGHT | ||||||
|  | #define RGBLIGHT_EFFECT_CHRISTMAS | ||||||
|  | #define RGBLIGHT_EFFECT_STATIC_GRADIENT | ||||||
|  | #define RGBLIGHT_EFFECT_RGB_TEST | ||||||
|  | #define RGBLIGHT_EFFECT_ALTERNATING | ||||||
|  | #define RGBLIGHT_EFFECT_TWINKLE | ||||||
							
								
								
									
										22
									
								
								keyboards/westm/westm68/rev1/rev1.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								keyboards/westm/westm68/rev1/rev1.c
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,22 @@ | |||||||
|  | /* Copyright 2021 WestM
 | ||||||
|  |  * | ||||||
|  |  * 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 "rev1.h" | ||||||
|  | 
 | ||||||
|  | void board_init(void) { | ||||||
|  |     rgblight_toggle(); // Fixes if LEDs were off in the first place buggy LED turns on
 | ||||||
|  |     rgblight_set(); // Need this to fix buggy first LED upon plugging in PCB
 | ||||||
|  | } | ||||||
							
								
								
									
										17
									
								
								keyboards/westm/westm68/rev1/rev1.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								keyboards/westm/westm68/rev1/rev1.h
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,17 @@ | |||||||
|  | /* Copyright 2021 WestM
 | ||||||
|  |  * | ||||||
|  |  * 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 "westm68.h" | ||||||
							
								
								
									
										0
									
								
								keyboards/westm/westm68/rev1/rules.mk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								keyboards/westm/westm68/rev1/rules.mk
									
									
									
									
									
										Normal file
									
								
							| @ -14,5 +14,4 @@ | |||||||
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 |  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| #include "westm68.h" | #include "westm68.h" | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot