Updated revisions and added a keyboard (#16731)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: WestM <93159069+WestMProducts@users.noreply.github.com>

10 files changed, 90 insertions, 19 deletions

diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index d1063583d3..96534c80c7 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -23,7 +23,6 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x574D // WM
-#define PRODUCT_ID      0x0001
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    WestM
 #define PRODUCT         WestM68
@@ -43,3 +42,7 @@
 #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/keymaps/default/keymap.c b/keyboards/westm/westm68/keymaps/default/keymap.c
index d49c8f81ea..0ed64abebd 100755
--- a/keyboards/westm/westm68/keymaps/default/keymap.c
+++ b/keyboards/westm/westm68/keymaps/default/keymap.c
@@ -20,15 +20,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
 			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_BSPC,   KC_INS,
 		    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_BSLASH, KC_DEL,
-			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_PGUP,
+			MO(1),   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_PGUP,
 		    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_UP,     KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
-			KC_ESC,   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_DEL,   KC_HOME,
-			_______,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+			KC_GRAVE,   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_DEL,   KC_HOME,
+			KC_CAPS_LOCK,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
             _______,   KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC__VOLDOWN,  KC__VOLUP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
+		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
 	)
 };
\ No newline at end of file
diff --git a/keyboards/westm/westm68/keymaps/via/keymap.c b/keyboards/westm/westm68/keymaps/via/keymap.c
index a4818ea81a..604213140d 100644
--- a/keyboards/westm/westm68/keymaps/via/keymap.c
+++ b/keyboards/westm/westm68/keymaps/via/keymap.c
@@ -18,31 +18,31 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_65_ansi( /* Base */
-			KC_GESC,   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_INS,
+			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_BSPC,   KC_INS,
 		    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_BSLASH, KC_DEL,
 			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_PGUP,
 		    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_UP,              KC_PGDN,
 		    KC_LCTL,   KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT, KC_DOWN,   KC_RIGHT
 	),
 	[1] = LAYOUT_65_ansi( /* FN */
-			KC_GESC,   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_DEL,   KC_HOME,
-			_______,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+			KC_GRAVE,   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_DEL,   KC_HOME,
+			KC_CAPS_LOCK,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
             _______,   KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC__VOLDOWN,  KC__VOLUP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
+		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
 	),
 	[2] = LAYOUT_65_ansi( /* 2 */
-			KC_GESC,   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_DEL,   KC_HOME,
-			_______,   _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-            _______,   _______,  _______,  _______,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC__VOLDOWN,  KC__VOLUP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
+			KC_GRAVE,   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_DEL,   KC_HOME,
+			KC_CAPS_LOCK,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+            _______,   KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
+		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
 	),
 	[3] = LAYOUT_65_ansi( /* 3 */
-			KC_GESC,   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_DEL,   KC_HOME,
-			_______,   _______,  _______,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-            _______,   _______,  _______,  _______,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
-		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC__VOLDOWN,  KC__VOLUP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
+			KC_GRAVE,   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_DEL,   KC_HOME,
+			KC_CAPS_LOCK,   _______,  KC_UP,  _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+            _______,   KC_LEFT,  KC_DOWN,  KC_RIGHT,  _______,  KC_MUTE,  RGB_HUI,  RGB_HUD,  _______,  _______,  _______,  _______,  _______,            _______,
+		    _______,   KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,  RGB_SAI,  RGB_SAD,  _______,  _______,   _______,   _______,  _______,    _______,
 			_______,   _______,  _______,                      _______,                                _______,  _______,  _______,  _______,  _______,  _______
 	)
 };
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index 054b47cca2..488d644c3e 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#define PRODUCT_ID      0x0101
+
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN A8
 #define RGBLED_NUM 16
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
index 1e3cebb145..e69de29bb2 100644
--- a/keyboards/westm/westm68/rev1/rules.mk
+++ b/keyboards/westm/westm68/rev1/rules.mk
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
new file mode 100644
index 0000000000..94ce14d3f9
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/config.h
@@ -0,0 +1,33 @@
+/* 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      0x0102
+
+// 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
diff --git a/keyboards/westm/westm68/rev2/rev2.c b/keyboards/westm/westm68/rev2/rev2.c
new file mode 100644
index 0000000000..ca7efe7860
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/rev2.c
@@ -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 "rev2.h"
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev2/rev2.h b/keyboards/westm/westm68/rev2/rev2.h
new file mode 100644
index 0000000000..e30df949a9
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/rev2.h
@@ -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"
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev2/rules.mk b/keyboards/westm/westm68/rev2/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/westm/westm68/rev2/rules.mk
diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk
index a54cc39924..1f99e378f9 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 = no        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output