Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr committed Aug 21, 2023
2 parents 96d90a5 + 3f19272 commit 892ba2e
Show file tree
Hide file tree
Showing 82 changed files with 3,870 additions and 17 deletions.
20 changes: 20 additions & 0 deletions keyboards/drop/alt/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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_65_ansi_blocker(
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_DEL,
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_HOME,
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_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, 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_MUTE,
_______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
_______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
_______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD,
_______, _______, _______, EE_CLR, KC_APP, _______, KC_HOME, KC_PGDN, KC_END
)
};
5 changes: 5 additions & 0 deletions keyboards/drop/alt/keymaps/via/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Copyright 2023 Massdrop, Inc.
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

#define DYNAMIC_KEYMAP_LAYER_COUNT 8
20 changes: 20 additions & 0 deletions keyboards/drop/alt/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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_65_ansi_blocker(
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_DEL,
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_HOME,
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_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_65_ansi_blocker(
KC_GRV, 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_MUTE,
_______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
_______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
_______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD,
_______, _______, _______, EE_CLR, KC_APP, _______, KC_HOME, KC_PGDN, KC_END
)
};
1 change: 1 addition & 0 deletions keyboards/drop/alt/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
8 changes: 8 additions & 0 deletions keyboards/drop/alt/v2/board.h
Original file line number Diff line number Diff line change
@@ -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
29 changes: 29 additions & 0 deletions keyboards/drop/alt/v2/config.h
Original file line number Diff line number Diff line change
@@ -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_COUNT 2
#define RGB_MATRIX_LED_COUNT 111
#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
#define RGB_MATRIX_CAPS_LOCK_INDEX 30
8 changes: 8 additions & 0 deletions keyboards/drop/alt/v2/halconf.h
Original file line number Diff line number Diff line change
@@ -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>
261 changes: 261 additions & 0 deletions keyboards/drop/alt/v2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
{
"keyboard_name": "ALT v2",
"manufacturer": "Drop Inc.",
"maintainer": "zvecr",
"processor": "STM32F303",
"bootloader": "tinyuf2",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["C0", "C1", "C2", "C3", "B4", "B3", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14"],
"rows": ["A0", "A1", "A2", "A3", "B10"]
},
"usb": {
"vid": "0x359B",
"pid": "0x0006",
"device_version": "2.0.0"
},
"eeprom": {
"driver": "i2c"
},
"features": {
"rgb_matrix": true,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"community_layouts": ["65_ansi_blocker"],
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
"layouts": {
"LAYOUT_65_ansi_blocker": {
"layout": [
{"matrix": [0, 0], "label":"ESCAPE", "x":0, "y":0},
{"matrix": [0, 1], "label":"1", "x":1, "y":0},
{"matrix": [0, 2], "label":"2", "x":2, "y":0},
{"matrix": [0, 3], "label":"3", "x":3, "y":0},
{"matrix": [0, 4], "label":"4", "x":4, "y":0},
{"matrix": [0, 5], "label":"5", "x":5, "y":0},
{"matrix": [0, 6], "label":"6", "x":6, "y":0},
{"matrix": [0, 7], "label":"7", "x":7, "y":0},
{"matrix": [0, 8], "label":"8", "x":8, "y":0},
{"matrix": [0, 9], "label":"9", "x":9, "y":0},
{"matrix": [0, 10], "label":"0", "x":10, "y":0},
{"matrix": [0, 11], "label":"MINUS", "x":11, "y":0},
{"matrix": [0, 12], "label":"EQUALS", "x":12, "y":0},
{"matrix": [0, 13], "label":"BACKSPACE", "x":13, "y":0, "w":2},
{"matrix": [0, 14], "label":"DELETE", "x":15, "y":0},
{"matrix": [1, 0], "label":"TAB", "x":0, "y":1, "w":1.5},
{"matrix": [1, 1], "label":"Q", "x":1.5, "y":1},
{"matrix": [1, 2], "label":"W", "x":2.5, "y":1},
{"matrix": [1, 3], "label":"E", "x":3.5, "y":1},
{"matrix": [1, 4], "label":"R", "x":4.5, "y":1},
{"matrix": [1, 5], "label":"T", "x":5.5, "y":1},
{"matrix": [1, 6], "label":"Y", "x":6.5, "y":1},
{"matrix": [1, 7], "label":"U", "x":7.5, "y":1},
{"matrix": [1, 8], "label":"I", "x":8.5, "y":1},
{"matrix": [1, 9], "label":"O", "x":9.5, "y":1},
{"matrix": [1, 10], "label":"P", "x":10.5, "y":1},
{"matrix": [1, 11], "label":"LEFT BRACKET", "x":11.5, "y":1},
{"matrix": [1, 12], "label":"RIGHT BRACKET", "x":12.5, "y":1},
{"matrix": [1, 13], "label":"BACK SLASH", "x":13.5, "y":1, "w":1.5},
{"matrix": [1, 14], "label":"HOME", "x":15, "y":1},
{"matrix": [2, 0], "label":"CAPS LOCK", "x":0, "y":2, "w":1.75},
{"matrix": [2, 1], "label":"A", "x":1.75, "y":2},
{"matrix": [2, 2], "label":"S", "x":2.75, "y":2},
{"matrix": [2, 3], "label":"D", "x":3.75, "y":2},
{"matrix": [2, 4], "label":"F", "x":4.75, "y":2},
{"matrix": [2, 5], "label":"G", "x":5.75, "y":2},
{"matrix": [2, 6], "label":"H", "x":6.75, "y":2},
{"matrix": [2, 7], "label":"J", "x":7.75, "y":2},
{"matrix": [2, 8], "label":"K", "x":8.75, "y":2},
{"matrix": [2, 9], "label":"L", "x":9.75, "y":2},
{"matrix": [2, 10], "label":"SEMICOLON", "x":10.75, "y":2},
{"matrix": [2, 11], "label":"SINGLE TICK", "x":11.75, "y":2},
{"matrix": [2, 13], "label":"ENTER", "x":12.75, "y":2, "w":2.25},
{"matrix": [2, 14], "label":"PAGE UP", "x":15, "y":2},
{"matrix": [3, 0], "label":"LEFT SHIFT", "x":0, "y":3, "w":2.25},
{"matrix": [3, 2], "label":"Z", "x":2.25, "y":3},
{"matrix": [3, 3], "label":"X", "x":3.25, "y":3},
{"matrix": [3, 4], "label":"C", "x":4.25, "y":3},
{"matrix": [3, 5], "label":"V", "x":5.25, "y":3},
{"matrix": [3, 6], "label":"B", "x":6.25, "y":3},
{"matrix": [3, 7], "label":"N", "x":7.25, "y":3},
{"matrix": [3, 8], "label":"M", "x":8.25, "y":3},
{"matrix": [3, 9], "label":"COMMA", "x":9.25, "y":3},
{"matrix": [3, 10], "label":"PERIOD", "x":10.25, "y":3},
{"matrix": [3, 11], "label":"FORWARD SLASH", "x":11.25, "y":3},
{"matrix": [3, 12], "label":"RIGHT SHIFT", "x":12.25, "y":3, "w":1.75},
{"matrix": [3, 13], "label":"UP ARROW", "x":14, "y":3},
{"matrix": [3, 14], "label":"PAGE DOWN", "x":15, "y":3},
{"matrix": [4, 0], "label":"LEFT CTRL", "x":0, "y":4, "w":1.25},
{"matrix": [4, 1], "label":"LEFT WIN", "x":1.25, "y":4, "w":1.25},
{"matrix": [4, 2], "label":"LEFT ALT", "x":2.5, "y":4, "w":1.25},
{"matrix": [4, 6], "label":"SPACEBAR", "x":3.75, "y":4, "w":6.25},
{"matrix": [4, 10], "label":"RIGHT ALT", "x":10, "y":4, "w":1.25},
{"matrix": [4, 11], "label":"FN", "x":11.25, "y":4, "w":1.25},
{"matrix": [4, 12], "label":"LEFT ARROW", "x":13, "y":4},
{"matrix": [4, 13], "label":"DOWN ARROW", "x":14, "y":4},
{"matrix": [4, 14], "label":"RIGHT ARROW", "x":15, "y":4}
]
}
},
"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": 8, "y": 56 },
{ "flags": 4, "matrix": [0, 1], "x": 22, "y": 56 },
{ "flags": 4, "matrix": [0, 2], "x": 35, "y": 56 },
{ "flags": 4, "matrix": [0, 3], "x": 49, "y": 56 },
{ "flags": 4, "matrix": [0, 4], "x": 63, "y": 56 },
{ "flags": 4, "matrix": [0, 5], "x": 77, "y": 56 },
{ "flags": 4, "matrix": [0, 6], "x": 91, "y": 56 },
{ "flags": 4, "matrix": [0, 7], "x": 105, "y": 56 },
{ "flags": 4, "matrix": [0, 8], "x": 118, "y": 56 },
{ "flags": 4, "matrix": [0, 9], "x": 132, "y": 56 },
{ "flags": 4, "matrix": [0, 10], "x": 146, "y": 56 },
{ "flags": 4, "matrix": [0, 11], "x": 160, "y": 56 },
{ "flags": 4, "matrix": [0, 12], "x": 174, "y": 56 },
{ "flags": 4, "matrix": [0, 13], "x": 195, "y": 56 },
{ "flags": 4, "matrix": [0, 14], "x": 215, "y": 56 },
{ "flags": 4, "matrix": [1, 0], "x": 11, "y": 44 },
{ "flags": 4, "matrix": [1, 1], "x": 28, "y": 44 },
{ "flags": 4, "matrix": [1, 2], "x": 42, "y": 44 },
{ "flags": 4, "matrix": [1, 3], "x": 56, "y": 44 },
{ "flags": 4, "matrix": [1, 4], "x": 70, "y": 44 },
{ "flags": 4, "matrix": [1, 5], "x": 84, "y": 44 },
{ "flags": 4, "matrix": [1, 6], "x": 98, "y": 44 },
{ "flags": 4, "matrix": [1, 7], "x": 112, "y": 44 },
{ "flags": 4, "matrix": [1, 8], "x": 125, "y": 44 },
{ "flags": 4, "matrix": [1, 9], "x": 139, "y": 44 },
{ "flags": 4, "matrix": [1, 10], "x": 153, "y": 44 },
{ "flags": 4, "matrix": [1, 11], "x": 167, "y": 44 },
{ "flags": 4, "matrix": [1, 12], "x": 181, "y": 44 },
{ "flags": 4, "matrix": [1, 13], "x": 198, "y": 44 },
{ "flags": 4, "matrix": [1, 14], "x": 215, "y": 44 },
{ "flags": 4, "matrix": [2, 0], "x": 13, "y": 32 },
{ "flags": 4, "matrix": [2, 1], "x": 32, "y": 32 },
{ "flags": 4, "matrix": [2, 2], "x": 46, "y": 32 },
{ "flags": 4, "matrix": [2, 3], "x": 60, "y": 32 },
{ "flags": 4, "matrix": [2, 4], "x": 73, "y": 32 },
{ "flags": 4, "matrix": [2, 5], "x": 87, "y": 32 },
{ "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
{ "flags": 4, "matrix": [2, 7], "x": 115, "y": 32 },
{ "flags": 4, "matrix": [2, 8], "x": 129, "y": 32 },
{ "flags": 4, "matrix": [2, 9], "x": 143, "y": 32 },
{ "flags": 4, "matrix": [2, 10], "x": 156, "y": 32 },
{ "flags": 4, "matrix": [2, 11], "x": 170, "y": 32 },
{ "flags": 4, "matrix": [2, 13], "x": 193, "y": 32 },
{ "flags": 4, "matrix": [2, 14], "x": 215, "y": 32 },
{ "flags": 4, "matrix": [3, 0], "x": 16, "y": 19 },
{ "flags": 4, "matrix": [3, 2], "x": 39, "y": 19 },
{ "flags": 4, "matrix": [3, 3], "x": 53, "y": 19 },
{ "flags": 4, "matrix": [3, 4], "x": 67, "y": 19 },
{ "flags": 4, "matrix": [3, 5], "x": 80, "y": 19 },
{ "flags": 4, "matrix": [3, 6], "x": 94, "y": 19 },
{ "flags": 4, "matrix": [3, 7], "x": 108, "y": 19 },
{ "flags": 4, "matrix": [3, 8], "x": 122, "y": 19 },
{ "flags": 4, "matrix": [3, 9], "x": 136, "y": 19 },
{ "flags": 4, "matrix": [3, 10], "x": 150, "y": 19 },
{ "flags": 4, "matrix": [3, 11], "x": 163, "y": 19 },
{ "flags": 4, "matrix": [3, 12], "x": 182, "y": 19 },
{ "flags": 4, "matrix": [3, 13], "x": 201, "y": 19 },
{ "flags": 4, "matrix": [3, 14], "x": 215, "y": 19 },
{ "flags": 4, "matrix": [4, 0], "x": 9, "y": 7 },
{ "flags": 4, "matrix": [4, 1], "x": 27, "y": 7 },
{ "flags": 4, "matrix": [4, 2], "x": 44, "y": 7 },
{ "flags": 4, "matrix": [4, 6], "x": 96, "y": 7 },
{ "flags": 4, "matrix": [4, 10], "x": 148, "y": 7 },
{ "flags": 4, "matrix": [4, 11], "x": 165, "y": 7 },
{ "flags": 4, "matrix": [4, 12], "x": 188, "y": 7 },
{ "flags": 4, "matrix": [4, 13], "x": 201, "y": 7 },
{ "flags": 4, "matrix": [4, 14], "x": 215, "y": 7 },
{ "flags": 2, "x": 1, "y": 1 },
{ "flags": 2, "x": 15, "y": 0 },
{ "flags": 2, "x": 31, "y": 0 },
{ "flags": 2, "x": 47, "y": 0 },
{ "flags": 2, "x": 63, "y": 0 },
{ "flags": 2, "x": 79, "y": 0 },
{ "flags": 2, "x": 95, "y": 0 },
{ "flags": 2, "x": 112, "y": 0 },
{ "flags": 2, "x": 128, "y": 0 },
{ "flags": 2, "x": 144, "y": 0 },
{ "flags": 2, "x": 160, "y": 0 },
{ "flags": 2, "x": 176, "y": 0 },
{ "flags": 2, "x": 192, "y": 0 },
{ "flags": 2, "x": 208, "y": 0 },
{ "flags": 2, "x": 222, "y": 1 },
{ "flags": 2, "x": 224, "y": 13 },
{ "flags": 2, "x": 224, "y": 25 },
{ "flags": 2, "x": 224, "y": 38 },
{ "flags": 2, "x": 224, "y": 50 },
{ "flags": 2, "x": 222, "y": 62 },
{ "flags": 2, "x": 191, "y": 64 },
{ "flags": 2, "x": 179, "y": 64 },
{ "flags": 2, "x": 167, "y": 64 },
{ "flags": 2, "x": 153, "y": 64 },
{ "flags": 2, "x": 139, "y": 64 },
{ "flags": 2, "x": 125, "y": 64 },
{ "flags": 2, "x": 112, "y": 64 },
{ "flags": 2, "x": 98, "y": 64 },
{ "flags": 2, "x": 84, "y": 64 },
{ "flags": 2, "x": 70, "y": 64 },
{ "flags": 2, "x": 56, "y": 64 },
{ "flags": 2, "x": 42, "y": 64 },
{ "flags": 2, "x": 28, "y": 64 },
{ "flags": 2, "x": 1, "y": 62 },
{ "flags": 2, "x": 0, "y": 50 },
{ "flags": 2, "x": 0, "y": 38 },
{ "flags": 2, "x": 0, "y": 25 },
{ "flags": 2, "x": 0, "y": 13 }
]
}
}
20 changes: 20 additions & 0 deletions keyboards/drop/alt/v2/mcuconf.h
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 892ba2e

Please sign in to comment.