diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-15 09:35:53 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-15 09:35:53 +0000 |
| commit | 3315894269767014e0510cc95bb52edd3b0b5161 (patch) | |
| tree | e85a80b1735c95c3bd662d510bbaec82498b78e0 | |
| parent | 1335d205f4186523bdffecac6d0fb145ffc4e671 (diff) | |
| parent | e9bf95e0f2de74590c57bfd64258559e4219dd1f (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/westm/westm68/config.h | 6 | ||||
| -rw-r--r-- | keyboards/westm/westm68/rev1/config.h | 5 | ||||
| -rw-r--r-- | keyboards/westm/westm68/rev1/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/westm/westm68/rules.mk | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h index 42e3eeb5a4..d1063583d3 100644 --- a/keyboards/westm/westm68/config.h +++ b/keyboards/westm/westm68/config.h @@ -23,6 +23,8 @@ /* USB Device descriptor parameter */ #define VENDOR_ID 0x574D // WM +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 #define MANUFACTURER WestM #define PRODUCT WestM68 @@ -41,7 +43,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Hold ESC key (first key of first column) to trigger bootloader */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 \ No newline at end of file diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h index 0e43d98613..054b47cca2 100644 --- a/keyboards/westm/westm68/rev1/config.h +++ b/keyboards/westm/westm68/rev1/config.h @@ -16,9 +16,6 @@ #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 @@ -31,4 +28,4 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE \ No newline at end of file +#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk index e69de29bb2..1e3cebb145 100644 --- a/keyboards/westm/westm68/rev1/rules.mk +++ b/keyboards/westm/westm68/rev1/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE = yes diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk index 0ad5e320fb..a54cc39924 100644 --- a/keyboards/westm/westm68/rules.mk +++ b/keyboards/westm/westm68/rules.mk @@ -17,5 +17,5 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output |