Merge remote-tracking branch 'origin/master' into develop

12 files changed, 682 insertions, 0 deletions

diff --git a/keyboards/drop/shift/keymaps/default/keymap.c b/keyboards/drop/shift/keymaps/default/keymap.c
new file mode 100644
index 0000000000..371908bb48
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_1800_ansi(
+        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_END,  KC_PGUP, KC_PGDN,
+        KC_GRV,  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_NUM,  KC_PSLS, KC_PAST, KC_PSCR,
+        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_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT_1800_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,           KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                   EE_CLR,                             KC_APP,  _______,          _______, _______, _______,          _______, _______
+    )
+};
diff --git a/keyboards/drop/shift/keymaps/via/config.h b/keyboards/drop/shift/keymaps/via/config.h
new file mode 100644
index 0000000000..616f8e3291
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/shift/keymaps/via/keymap.c b/keyboards/drop/shift/keymaps/via/keymap.c
new file mode 100644
index 0000000000..371908bb48
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_1800_ansi(
+        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_END,  KC_PGUP, KC_PGDN,
+        KC_GRV,  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_NUM,  KC_PSLS, KC_PAST, KC_PSCR,
+        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_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT_1800_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,           KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL,
+        _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                   EE_CLR,                             KC_APP,  _______,          _______, _______, _______,          _______, _______
+    )
+};
diff --git a/keyboards/drop/shift/keymaps/via/rules.mk b/keyboards/drop/shift/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/drop/shift/v2/board.h b/keyboards/drop/shift/v2/board.h
new file mode 100644
index 0000000000..ed3ea4b1f7
--- /dev/null
+++ b/keyboards/drop/shift/v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/shift/v2/config.h b/keyboards/drop/shift/v2/config.h
new file mode 100644
index 0000000000..6c651d1f83
--- /dev/null
+++ b/keyboards/drop/shift/v2/config.h
@@ -0,0 +1,29 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ADC_BUFFER_DEPTH 4
+#define ADC_SAMPLING_RATE ADC_SMPR_SMP_601P5
+#define ADC_RESOLUTION ADC_CFGR_RES_12BITS
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN A9
+#define I2C1_SDA_PIN A10
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B5
+#define EEPROM_I2C_24LC256
+
+#define DRIVER_ADDR_1 0b1010011
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_ADDR_3 0b1010000
+#define DRIVER_COUNT 3
+#define RGB_MATRIX_LED_COUNT 166
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_DEFAULT_VAL 100
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/drop/shift/v2/halconf.h b/keyboards/drop/shift/v2/halconf.h
new file mode 100644
index 0000000000..77495ecfa0
--- /dev/null
+++ b/keyboards/drop/shift/v2/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/info.json
new file mode 100644
index 0000000000..f58b76e9d1
--- /dev/null
+++ b/keyboards/drop/shift/v2/info.json
@@ -0,0 +1,350 @@
+{
+    "keyboard_name": "SHIFT v2", 
+    "manufacturer": "Drop Inc.",
+    "maintainer": "zvecr",
+    "processor": "STM32F303",
+    "bootloader": "tinyuf2",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C0", "C1", "C2", "C3", "C6", "C7", "C8", "C9", "B3", "B4", "C13", "C14", "C15"],
+        "rows": ["A0", "A1", "A2", "A3", "B10", "C10", "C11", "C12"]
+    },
+    "usb": {
+        "vid": "0x359B",
+        "pid": "0x000C",
+        "device_version": "2.0.0"
+    },
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "features": {
+        "rgb_matrix": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT_1800_ansi": {
+            "layout": [
+              {"matrix": [0,  0], "x":0, "y":0},
+              {"matrix": [0,  1], "x":1.25, "y":0},
+              {"matrix": [0,  2], "x":2.25, "y":0},
+              {"matrix": [1,  2], "x":3.25, "y":0},
+              {"matrix": [0,  3], "x":4.25, "y":0},
+              {"matrix": [0,  4], "x":5.5, "y":0},
+              {"matrix": [0,  5], "x":6.5, "y":0},
+              {"matrix": [0,  6], "x":7.5, "y":0},
+              {"matrix": [1,  6], "x":8.5, "y":0},
+              {"matrix": [0,  7], "x":9.75, "y":0},
+              {"matrix": [1,  7], "x":10.75, "y":0},
+              {"matrix": [0,  8], "x":11.75, "y":0},
+              {"matrix": [1,  8], "x":12.75, "y":0},
+              {"matrix": [1,  9], "x":14, "y":0},
+              {"matrix": [0, 10], "x":15.5, "y":0},
+              {"matrix": [1, 10], "x":16.5, "y":0},
+              {"matrix": [0, 11], "x":17.5, "y":0},
+              {"matrix": [1, 11], "x":18.5, "y":0},
+              {"matrix": [1,  0], "x":0, "y":1.25},
+              {"matrix": [1,  1], "x":1, "y":1.25},
+              {"matrix": [2,  1], "x":2, "y":1.25},
+              {"matrix": [2,  2], "x":3, "y":1.25},
+              {"matrix": [3,  2], "x":4, "y":1.25},
+              {"matrix": [1,  3], "x":5, "y":1.25},
+              {"matrix": [2,  3], "x":6, "y":1.25},
+              {"matrix": [1,  4], "x":7, "y":1.25},
+              {"matrix": [1,  5], "x":8, "y":1.25},
+              {"matrix": [2,  5], "x":9, "y":1.25},
+              {"matrix": [2,  6], "x":10, "y":1.25},
+              {"matrix": [3,  6], "x":11, "y":1.25},
+              {"matrix": [2,  7], "x":12, "y":1.25},
+              {"matrix": [2,  8], "x":13, "y":1.25, "w":2},
+              {"matrix": [2,  9], "x":15.5, "y":1.25},
+              {"matrix": [2, 10], "x":16.5, "y":1.25},
+              {"matrix": [2, 11], "x":17.5, "y":1.25},
+              {"matrix": [2, 12], "x":18.5, "y":1.25},
+              {"matrix": [2,  0], "x":0, "y":2.25, "w":1.5},
+              {"matrix": [3,  1], "x":1.5, "y":2.25},
+              {"matrix": [4,  1], "x":2.5, "y":2.25},
+              {"matrix": [4,  2], "x":3.5, "y":2.25},
+              {"matrix": [3,  3], "x":4.5, "y":2.25},
+              {"matrix": [4,  3], "x":5.5, "y":2.25},
+              {"matrix": [2,  4], "x":6.5, "y":2.25},
+              {"matrix": [3,  4], "x":7.5, "y":2.25},
+              {"matrix": [3,  5], "x":8.5, "y":2.25},
+              {"matrix": [4,  5], "x":9.5, "y":2.25},
+              {"matrix": [4,  6], "x":10.5, "y":2.25},
+              {"matrix": [3,  7], "x":11.5, "y":2.25},
+              {"matrix": [3,  8], "x":12.5, "y":2.25},
+              {"matrix": [4,  8], "x":13.5, "y":2.25, "w":1.5},
+              {"matrix": [3,  9], "x":15.5, "y":2.25},
+              {"matrix": [3, 10], "x":16.5, "y":2.25},
+              {"matrix": [3, 11], "x":17.5, "y":2.25},
+              {"matrix": [3, 12], "x":18.5, "y":2.25},
+              {"matrix": [3,  0], "x":0, "y":3.25, "w":1.75},
+              {"matrix": [5,  1], "x":1.75, "y":3.25},
+              {"matrix": [6,  1], "x":2.75, "y":3.25},
+              {"matrix": [5,  2], "x":3.75, "y":3.25},
+              {"matrix": [5,  3], "x":4.75, "y":3.25},
+              {"matrix": [6,  3], "x":5.75, "y":3.25},
+              {"matrix": [4,  4], "x":6.75, "y":3.25},
+              {"matrix": [5,  4], "x":7.75, "y":3.25},
+              {"matrix": [5,  5], "x":8.75, "y":3.25},
+              {"matrix": [5,  6], "x":9.75, "y":3.25},
+              {"matrix": [4,  7], "x":10.75, "y":3.25},
+              {"matrix": [5,  8], "x":11.75, "y":3.25},
+              {"matrix": [6,  8], "x":12.75, "y":3.25, "w":2.25},
+              {"matrix": [4,  9], "x":15.5, "y":3.25},
+              {"matrix": [4, 10], "x":16.5, "y":3.25},
+              {"matrix": [4, 11], "x":17.5, "y":3.25},
+              {"matrix": [4, 12], "x":18.5, "y":3.25},
+              {"matrix": [4,  0], "x":0, "y":4.25, "w":2.25},
+              {"matrix": [7,  1], "x":2.25, "y":4.25},
+              {"matrix": [6,  2], "x":3.25, "y":4.25},
+              {"matrix": [7,  2], "x":4.25, "y":4.25},
+              {"matrix": [7,  3], "x":5.25, "y":4.25},
+              {"matrix": [6,  4], "x":6.25, "y":4.25},
+              {"matrix": [7,  5], "x":7.25, "y":4.25},
+              {"matrix": [6,  5], "x":8.25, "y":4.25},
+              {"matrix": [6,  6], "x":9.25, "y":4.25},
+              {"matrix": [5,  7], "x":10.25, "y":4.25},
+              {"matrix": [6,  7], "x":11.25, "y":4.25},
+              {"matrix": [7,  8], "x":12.25, "y":4.25, "w":1.75},
+              {"matrix": [6,  9], "x":14.25, "y":4.5},
+              {"matrix": [5,  9], "x":15.5, "y":4.25},
+              {"matrix": [5, 10], "x":16.5, "y":4.25},
+              {"matrix": [5, 11], "x":17.5, "y":4.25},
+              {"matrix": [5, 12], "x":18.5, "y":4.25, "h":2},
+              {"matrix": [5,  0], "x":0, "y":5.25, "w":1.25},
+              {"matrix": [6,  0], "x":1.25, "y":5.25, "w":1.25},
+              {"matrix": [7,  0], "x":2.5, "y":5.25, "w":1.25},
+              {"matrix": [7,  4], "x":3.75, "y":5.25, "w":6.25},
+              {"matrix": [7,  6], "x":10, "y":5.25, "w":1.5},
+              {"matrix": [7,  7], "x":11.5, "y":5.25, "w":1.5},
+              {"matrix": [7,  9], "x":13.25, "y":5.5},
+              {"matrix": [7, 10], "x":14.25, "y":5.5},
+              {"matrix": [6, 10], "x":15.25, "y":5.5},
+              {"matrix": [6, 11], "x":16.5, "y":5.25},
+              {"matrix": [6, 12], "x":17.5, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "driver": "IS31FL3733",
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "layout": [
+            { "flags": 4, "matrix": [0,  0], "x": 6,   "y":  7 },
+            { "flags": 4, "matrix": [0,  1], "x": 20,  "y":  7 },
+            { "flags": 4, "matrix": [0,  2], "x": 31,  "y":  7 },
+            { "flags": 4, "matrix": [1,  2], "x": 43,  "y":  7 },
+            { "flags": 4, "matrix": [0,  3], "x": 54,  "y":  7 },
+            { "flags": 4, "matrix": [0,  4], "x": 69,  "y":  7 },
+            { "flags": 4, "matrix": [0,  5], "x": 80,  "y":  7 },
+            { "flags": 4, "matrix": [0,  6], "x": 91,  "y":  7 },
+            { "flags": 4, "matrix": [1,  6], "x": 103, "y":  7 },
+            { "flags": 4, "matrix": [0,  7], "x": 117, "y":  7 },
+            { "flags": 4, "matrix": [1,  7], "x": 129, "y":  7 },
+            { "flags": 4, "matrix": [0,  8], "x": 140, "y":  7 },
+            { "flags": 4, "matrix": [1,  8], "x": 152, "y":  7 },
+            { "flags": 4, "matrix": [1,  9], "x": 166, "y":  7 },
+            { "flags": 4, "matrix": [0, 10], "x": 183, "y":  7 },
+            { "flags": 4, "matrix": [1, 10], "x": 194, "y":  7 },
+            { "flags": 4, "matrix": [0, 11], "x": 206, "y":  7 },
+            { "flags": 4, "matrix": [1, 11], "x": 217, "y":  7 },
+            { "flags": 4, "matrix": [1,  0], "x": 6,   "y": 18 },
+            { "flags": 4, "matrix": [1,  1], "x": 17,  "y": 18 },
+            { "flags": 4, "matrix": [2,  1], "x": 29,  "y": 18 },
+            { "flags": 4, "matrix": [2,  2], "x": 40,  "y": 18 },
+            { "flags": 4, "matrix": [3,  2], "x": 51,  "y": 18 },
+            { "flags": 4, "matrix": [1,  3], "x": 63,  "y": 18 },
+            { "flags": 4, "matrix": [2,  3], "x": 74,  "y": 18 },
+            { "flags": 4, "matrix": [1,  4], "x": 86,  "y": 18 },
+            { "flags": 4, "matrix": [1,  5], "x": 97,  "y": 18 },
+            { "flags": 4, "matrix": [2,  5], "x": 109, "y": 18 },
+            { "flags": 4, "matrix": [2,  6], "x": 120, "y": 18 },
+            { "flags": 4, "matrix": [3,  6], "x": 132, "y": 18 },
+            { "flags": 4, "matrix": [2,  7], "x": 143, "y": 18 },
+            { "flags": 4, "matrix": [2,  8], "x": 160, "y": 18 },
+            { "flags": 4, "matrix": [2,  9], "x": 183, "y": 18 },
+            { "flags": 4, "matrix": [2, 10], "x": 194, "y": 18 },
+            { "flags": 4, "matrix": [2, 11], "x": 206, "y": 18 },
+            { "flags": 4, "matrix": [2, 12], "x": 217, "y": 18 },
+            { "flags": 4, "matrix": [2,  0], "x": 9,   "y": 27 },
+            { "flags": 4, "matrix": [3,  1], "x": 23,  "y": 27 },
+            { "flags": 4, "matrix": [4,  1], "x": 34,  "y": 27 },
+            { "flags": 4, "matrix": [4,  2], "x": 46,  "y": 27 },
+            { "flags": 4, "matrix": [3,  3], "x": 57,  "y": 27 },
+            { "flags": 4, "matrix": [4,  3], "x": 69,  "y": 27 },
+            { "flags": 4, "matrix": [2,  4], "x": 80,  "y": 27 },
+            { "flags": 4, "matrix": [3,  4], "x": 91,  "y": 27 },
+            { "flags": 4, "matrix": [3,  5], "x": 103, "y": 27 },
+            { "flags": 4, "matrix": [4,  5], "x": 114, "y": 27 },
+            { "flags": 4, "matrix": [4,  6], "x": 126, "y": 27 },
+            { "flags": 4, "matrix": [3,  7], "x": 137, "y": 27 },
+            { "flags": 4, "matrix": [3,  8], "x": 149, "y": 27 },
+            { "flags": 4, "matrix": [4,  8], "x": 163, "y": 27 },
+            { "flags": 4, "matrix": [3,  9], "x": 183, "y": 27 },
+            { "flags": 4, "matrix": [3, 10], "x": 194, "y": 27 },
+            { "flags": 4, "matrix": [3, 11], "x": 206, "y": 27 },
+            { "flags": 4, "matrix": [3, 12], "x": 217, "y": 27 },
+            { "flags": 4, "matrix": [3,  0], "x": 10,  "y": 36 },
+            { "flags": 4, "matrix": [5,  1], "x": 26,  "y": 36 },
+            { "flags": 4, "matrix": [6,  1], "x": 37,  "y": 36 },
+            { "flags": 4, "matrix": [5,  2], "x": 49,  "y": 36 },
+            { "flags": 4, "matrix": [5,  3], "x": 60,  "y": 36 },
+            { "flags": 4, "matrix": [6,  3], "x": 71,  "y": 36 },
+            { "flags": 4, "matrix": [4,  4], "x": 83,  "y": 36 },
+            { "flags": 4, "matrix": [5,  4], "x": 94,  "y": 36 },
+            { "flags": 4, "matrix": [5,  5], "x": 106, "y": 36 },
+            { "flags": 4, "matrix": [5,  6], "x": 117, "y": 36 },
+            { "flags": 4, "matrix": [4,  7], "x": 129, "y": 36 },
+            { "flags": 4, "matrix": [5,  8], "x": 140, "y": 36 },
+            { "flags": 4, "matrix": [6,  8], "x": 159, "y": 36 },
+            { "flags": 4, "matrix": [4,  9], "x": 183, "y": 36 },
+            { "flags": 4, "matrix": [4, 10], "x": 194, "y": 36 },
+            { "flags": 4, "matrix": [4, 11], "x": 206, "y": 36 },
+            { "flags": 4, "matrix": [4, 12], "x": 217, "y": 36 },
+            { "flags": 4, "matrix": [4,  0], "x": 13,  "y": 46 },
+            { "flags": 4, "matrix": [7,  1], "x": 31,  "y": 46 },
+            { "flags": 4, "matrix": [6,  2], "x": 43,  "y": 46 },
+            { "flags": 4, "matrix": [7,  2], "x": 54,  "y": 46 },
+            { "flags": 4, "matrix": [7,  3], "x": 66,  "y": 46 },
+            { "flags": 4, "matrix": [6,  4], "x": 77,  "y": 46 },
+            { "flags": 4, "matrix": [7,  5], "x": 89,  "y": 46 },
+            { "flags": 4, "matrix": [6,  5], "x": 100, "y": 46 },
+            { "flags": 4, "matrix": [6,  6], "x": 112, "y": 46 },
+            { "flags": 4, "matrix": [5,  7], "x": 123, "y": 46 },
+            { "flags": 4, "matrix": [6,  7], "x": 134, "y": 46 },
+            { "flags": 4, "matrix": [7,  8], "x": 150, "y": 46 },
+            { "flags": 4, "matrix": [6,  9], "x": 169, "y": 48 },
+            { "flags": 4, "matrix": [5,  9], "x": 183, "y": 46 },
+            { "flags": 4, "matrix": [5, 10], "x": 194, "y": 46 },
+            { "flags": 4, "matrix": [5, 11], "x": 206, "y": 46 },
+            { "flags": 4, "matrix": [5, 12], "x": 214, "y": 50 },
+            { "flags": 4, "matrix": [5,  0], "x":   7, "y": 55 },
+            { "flags": 4, "matrix": [6,  0], "x":  21, "y": 55 },
+            { "flags": 4, "matrix": [7,  0], "x":  36, "y": 55 },
+            { "flags": 4, "matrix": [7,  4], "x":  79, "y": 55 },
+            { "flags": 4, "matrix": [7,  6], "x": 123, "y": 55 },
+            { "flags": 4, "matrix": [7,  7], "x": 140, "y": 55 },
+            { "flags": 4, "matrix": [7,  9], "x": 157, "y": 58 },
+            { "flags": 4, "matrix": [7, 10], "x": 169, "y": 58 },
+            { "flags": 4, "matrix": [6, 10], "x": 180, "y": 58 },
+            { "flags": 4, "matrix": [6, 11], "x": 194, "y": 55 },
+            { "flags": 4, "matrix": [6, 12], "x": 206, "y": 55 },
+            { "flags": 2, "x":   1, "y":  1 },
+            { "flags": 2, "x":   6, "y":  0 },
+            { "flags": 2, "x":  26, "y":  0 },
+            { "flags": 2, "x":  35, "y":  0 },
+            { "flags": 2, "x":  45, "y":  0 },
+            { "flags": 2, "x":  54, "y":  0 },
+            { "flags": 2, "x":  64, "y":  0 },
+            { "flags": 2, "x":  74, "y":  0 },
+            { "flags": 2, "x":  83, "y":  0 },
+            { "flags": 2, "x":  93, "y":  0 },
+            { "flags": 2, "x": 102, "y":  0 },
+            { "flags": 2, "x": 112, "y":  0 },
+            { "flags": 2, "x": 122, "y":  0 },
+            { "flags": 2, "x": 131, "y":  0 },
+            { "flags": 2, "x": 141, "y":  0 },
+            { "flags": 2, "x": 150, "y":  0 },
+            { "flags": 2, "x": 160, "y":  0 },
+            { "flags": 2, "x": 170, "y":  0 },
+            { "flags": 2, "x": 179, "y":  0 },
+            { "flags": 2, "x": 189, "y":  0 },
+            { "flags": 2, "x": 198, "y":  0 },
+            { "flags": 2, "x": 218, "y":  0 },
+            { "flags": 2, "x": 222, "y":  1 },
+            { "flags": 2, "x": 224, "y":  5 },
+            { "flags": 2, "x": 224, "y": 12 },
+            { "flags": 2, "x": 224, "y": 20 },
+            { "flags": 2, "x": 224, "y": 28 },
+            { "flags": 2, "x": 224, "y": 35 },
+            { "flags": 2, "x": 224, "y": 43 },
+            { "flags": 2, "x": 224, "y": 51 },
+            { "flags": 2, "x": 224, "y": 58 },
+            { "flags": 2, "x": 222, "y": 64 },
+            { "flags": 2, "x": 218, "y": 64 },
+            { "flags": 2, "x": 208, "y": 64 },
+            { "flags": 2, "x": 198, "y": 64 },
+            { "flags": 2, "x": 189, "y": 64 },
+            { "flags": 2, "x": 179, "y": 64 },
+            { "flags": 2, "x": 170, "y": 64 },
+            { "flags": 2, "x": 160, "y": 64 },
+            { "flags": 2, "x": 150, "y": 64 },
+            { "flags": 2, "x": 141, "y": 64 },
+            { "flags": 2, "x": 131, "y": 64 },
+            { "flags": 2, "x": 122, "y": 64 },
+            { "flags": 2, "x": 112, "y": 64 },
+            { "flags": 2, "x": 102, "y": 64 },
+            { "flags": 2, "x":  93, "y": 64 },
+            { "flags": 2, "x":  83, "y": 64 },
+            { "flags": 2, "x":  74, "y": 64 },
+            { "flags": 2, "x":  64, "y": 64 },
+            { "flags": 2, "x":  54, "y": 64 },
+            { "flags": 2, "x":  45, "y": 64 },
+            { "flags": 2, "x":  35, "y": 64 },
+            { "flags": 2, "x":  26, "y": 64 },
+            { "flags": 2, "x":  16, "y": 64 },
+            { "flags": 2, "x":   6, "y": 64 },
+            { "flags": 2, "x":   1, "y": 64 },
+            { "flags": 2, "x":   0, "y": 58 },
+            { "flags": 2, "x":   0, "y": 51 },
+            { "flags": 2, "x":   0, "y": 43 },
+            { "flags": 2, "x":   0, "y": 35 },
+            { "flags": 2, "x":   0, "y": 28 },
+            { "flags": 2, "x":   0, "y": 20 },
+            { "flags": 2, "x":   0, "y": 12 },
+            { "flags": 2, "x":   0, "y": 5  },
+            { "flags": 8, "x": 174, "y": 5 },
+            { "flags": 8, "x": 174, "y": 10 },
+            { "flags": 8, "x": 174, "y": 15 }
+        ]
+    }
+}
diff --git a/keyboards/drop/shift/v2/mcuconf.h b/keyboards/drop/shift/v2/mcuconf.h
new file mode 100644
index 0000000000..dc3e45dac0
--- /dev/null
+++ b/keyboards/drop/shift/v2/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_ADC_USE_ADC2
+#define STM32_ADC_USE_ADC2 TRUE
+
+#undef STM32_ADC_USE_ADC3
+#define STM32_ADC_USE_ADC3 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/drop/shift/v2/readme.md b/keyboards/drop/shift/v2/readme.md
new file mode 100644
index 0000000000..c9ebc63468
--- /dev/null
+++ b/keyboards/drop/shift/v2/readme.md
@@ -0,0 +1,24 @@
+# SHIFT v2
+
+The Drop SHIFT v2 is a compact 1800 layout mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: [Drop SHIFT Mechanical Keyboard](https://drop.com/buy/drop-shift-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make drop/shift/v2:default
+
+Flashing example for this keyboard:
+
+    make drop/shift/v2: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 key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Quickly double tap the button located under the spacebar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/shift/v2/rules.mk b/keyboards/drop/shift/v2/rules.mk
new file mode 100644
index 0000000000..aec83326d0
--- /dev/null
+++ b/keyboards/drop/shift/v2/rules.mk
@@ -0,0 +1,4 @@
+UF2_DEVICE_TYPE_ID = 0x9bc1e968
+UF2CONV_ARGS = --device-type $(UF2_DEVICE_TYPE_ID)
+
+SRC += analog.c lib/common.c lib/mux.c
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
new file mode 100644
index 0000000000..3d96cdf7cb
--- /dev/null
+++ b/keyboards/drop/shift/v2/v2.c
@@ -0,0 +1,189 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix.h"
+
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+     { 0, K_1,  J_1,  L_1  },// LED1
+     { 0, K_2,  J_2,  L_2  },
+     { 0, K_3,  J_3,  L_3  },
+     { 0, K_4,  J_4,  L_4  },
+     { 0, K_5,  J_5,  L_5  },
+     { 0, K_7,  J_7,  L_7  },
+     { 0, K_8,  J_8,  L_8  },
+     { 0, K_9,  J_9,  L_9  },
+     { 0, K_10, J_10, L_10 },// LED9
+     { 1, K_1,  J_1,  L_1  },// LED10
+     { 1, K_2,  J_2,  L_2  },// LED11
+     { 1, K_3,  J_3,  L_3  },// LED12
+     { 1, K_4,  J_4,  L_4  },// LED13
+     { 1, K_9,  J_9,  L_9  },// LED18
+     { 1, K_5,  J_5,  L_5  },// LED15
+     { 1, K_6,  J_6,  L_6  },// LED19
+     { 1, K_7,  J_7,  L_7  },// LED16
+     { 1, K_8,  J_8,  L_8  },// LED20
+     { 0, H_1,  G_1,  I_1  },//start2
+     { 0, H_11, G_11, I_11 },
+     { 0, H_2,  G_2,  I_2  },
+     { 0, H_3,  G_3,  I_3  },
+     { 0, H_4,  G_4,  I_4  },
+     { 0, H_5,  G_5,  I_5  },
+     { 0, H_6,  G_6,  I_6  },
+     { 0, H_7,  G_7,  I_7  },
+     { 0, H_8,  G_8,  I_8  },
+     { 0, H_9,  G_9,  I_9  },
+     { 0, H_10, G_10, I_10 },
+     { 1, E_1,  D_1,  F_1  },
+     { 1, E_2,  D_2,  F_2  },
+     { 1, E_4,  D_4,  F_4  },
+     { 1, E_5,  D_5,  F_5  },
+     { 1, E_6,  D_6,  F_6  },
+     { 1, E_7,  D_7,  F_7  },
+     { 1, E_8,  D_8,  F_8  },
+     { 0, E_1,  D_1,  F_1  },
+     { 0, E_2,  D_2,  F_2  },
+     { 0, E_3,  D_3,  F_3  },
+     { 0, E_4,  D_4,  F_4  },
+     { 0, E_5,  D_5,  F_5  },
+     { 0, E_6,  D_6,  F_6  },
+     { 0, E_7,  D_7,  F_7  },
+     { 0, E_8,  D_8,  F_8  },
+     { 0, E_9,  D_9,  F_9  },
+     { 0, E_10, D_10, F_10 },
+     { 1, B_1,  A_1,  C_1  },
+     { 1, B_2,  A_2,  C_2  },
+     { 1, B_3,  A_3,  C_3  },
+     { 1, B_4,  A_4,  C_4  },
+     { 1, B_5,  A_5,  C_5  },
+     { 1, B_6,  A_6,  C_6  },
+     { 1, B_7,  A_7,  C_7  },
+     { 1, B_8,  A_8,  C_8  },
+     { 0, B_1,  A_1,  C_1  },
+     { 0, B_2,  A_2,  C_2  },
+     { 0, B_3,  A_3,  C_3  },
+     { 0, B_4,  A_4,  C_4  },
+     { 0, B_5,  A_5,  C_5  },
+     { 0, B_6,  A_6,  C_6  },
+     { 0, B_7,  A_7,  C_7  },
+     { 0, B_8,  A_8,  C_8  },
+     { 0, B_9,  A_9,  C_9  },
+     { 0, B_10, A_10, C_10 },
+     { 1, B_9,  A_9,  C_9  },
+     { 1, B_10, A_10, C_10 },
+     { 1, B_11, A_11, C_11 },
+     { 1, B_13, A_13, C_13 },
+     { 1, B_14, A_14, C_14 },
+     { 1, B_15, A_15, C_15 },
+     { 1, B_16, A_16, C_16 },
+     { 0, B_11, A_11, C_11 },
+     { 0, B_12, A_12, C_12 },
+     { 0, B_13, A_13, C_13 },
+     { 0, H_13, G_13, I_13 },
+     { 0, H_14, G_14, I_14 },
+     { 0, B_14, A_14, C_14 },
+     { 0, E_15, D_15, F_15 },
+     { 0, B_15, A_15, C_15 },
+     { 0, B_16, A_16, C_16 },
+     { 1, E_9,  D_9,  F_9  },
+     { 1, E_10, D_10, F_10 },
+     { 1, E_11, D_11, F_11 },
+     { 1, E_12, D_12, F_12 },
+     { 1, E_13, D_13, F_13 },
+     { 1, E_14, D_14, F_14 },
+     { 1, E_15, D_15, F_15 },
+     { 1, H_16, G_16, I_16 },
+     { 0, E_11, D_11, F_11 },//start6
+     { 0, E_12, D_12, F_12 },
+     { 0, E_13, D_13, F_13 },
+     { 0, E_14, D_14, F_14 },
+     { 1, H_9,  G_9,  I_9  },
+     { 1, H_10, G_10, I_10 },
+     { 1, H_11, G_11, I_11 },
+     { 1, H_12, G_12, I_12 },
+     { 1, H_13, G_13, I_13 },
+     { 1, H_14, G_14, I_14 },
+     { 1, H_15, G_15, I_15 },
+     { 2, H_1,  G_1,  I_1  },//start underglow
+     { 2, K_1,  J_1,  L_1  },
+     { 2, B_1,  A_1,  C_1  },
+     { 2, E_1,  D_1,  F_1  },
+     { 2, E_2,  D_2,  F_2  },
+     { 2, B_2,  A_2,  C_2  },
+     { 2, B_3,  A_3,  C_3  },
+     { 2, E_3,  D_3,  F_3  },
+     { 2, E_4,  D_4,  F_4  },
+     { 2, B_4,  A_4,  C_4  },
+     { 2, B_5,  A_5,  C_5  },
+     { 2, E_5,  D_5,  F_5  },
+     { 2, E_6,  D_6,  F_6  },
+     { 2, B_6,  A_6,  C_6  },
+     { 2, B_7,  A_7,  C_7  },
+     { 2, E_7,  D_7,  F_7  },
+     { 2, E_8,  D_8,  F_8  },
+     { 2, B_8,  A_8,  C_8  },
+     { 2, B_9,  A_9,  C_9  },
+     { 2, E_9,  D_9,  F_9  },
+     { 2, E_10, D_10, F_10 },
+     { 2, B_10, A_10, C_10 },
+     { 2, B_11, A_11, C_11 },//125
+     { 2, E_11, D_11, F_11 },
+     { 2, E_12, D_12, F_12 },
+     { 2, B_12, A_12, C_12 },
+     { 2, B_13, A_13, C_13 },
+     { 2, E_13, D_13, F_13 },
+     { 2, E_14, D_14, F_14 },
+     { 2, B_14, A_14, C_14 },
+     { 2, B_15, A_15, C_15 },
+     { 2, E_15, D_15, F_15 },
+     { 2, E_16, D_16, F_16 },
+     { 2, B_16, A_16, C_16 },
+     { 2, H_16, G_16, I_16 },
+     { 2, K_16, J_16, L_16 },
+     { 2, K_15, J_15, L_15 },
+     { 2, H_15, G_15, I_15 },
+     { 2, H_14, G_14, I_14 },
+     { 2, K_14, J_14, L_14 },
+     { 2, K_13, J_13, L_13 },
+     { 2, H_13, G_13, I_13 },
+     { 2, H_12, G_12, I_12 },
+     { 2, K_12, J_12, L_12 },
+     { 2, K_11, J_11, L_11 },
+     { 2, H_11, G_11, I_11 },
+     { 2, H_10, G_10, I_10 },
+     { 2, K_10, J_10, L_10 },
+     { 2, K_9,  J_9,  L_9  },
+     { 2, H_9,  G_9,  I_9  },
+     { 2, H_8,  G_8,  I_8  },
+     { 2, K_8,  J_8,  L_8  },
+     { 2, K_7,  J_7,  L_7  },
+     { 2, H_7,  G_7,  I_7  },
+     { 2, H_6,  G_6,  I_6  },
+     { 2, K_6,  J_6,  L_6  },
+     { 2, K_5,  J_5,  L_5  },
+     { 2, H_5,  G_5,  I_5  },
+     { 2, H_4,  G_4,  I_4  },
+     { 2, K_4,  J_4,  L_4  },
+     { 2, K_3,  J_3,  L_3  },
+     { 2, H_3,  G_3,  I_3  },
+     { 2, H_2,  G_2,  I_2  },
+     { 2, K_2,  J_2,  L_2  },
+     { 1, K_10, J_10, L_10 },
+     { 1, K_11, J_11, L_11 },
+     { 1, E_3,  D_3,  F_3  },
+};
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    uint8_t num_state = host_keyboard_led_state().num_lock ? 0xFF : 0;
+    uint8_t caps_state = host_keyboard_led_state().caps_lock ? 0xFF : 0;
+    uint8_t scroll_state = host_keyboard_led_state().scroll_lock ? 0xFF : 0;
+
+    rgb_matrix_set_color(163, num_state, num_state, num_state);
+    rgb_matrix_set_color(164, caps_state, caps_state, caps_state);
+    rgb_matrix_set_color(165, scroll_state, scroll_state, scroll_state);
+    return true;
+}
+
+#endif