From 39778ebb510015a195656fae8b504c68d3428a3f Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 20:02:01 +0100 Subject: [PATCH 01/21] add `laneware/raindrop/hhkb` keyboard --- keyboards/laneware/info.json | 4 + keyboards/laneware/raindrop/hhkb/config.h | 15 ++++ keyboards/laneware/raindrop/hhkb/info.json | 15 ++++ .../raindrop/hhkb/keymaps/default/keymap.c | 21 +++++ .../raindrop/hhkb/keymaps/via/keymap.c | 21 +++++ .../raindrop/hhkb/keymaps/via/rules.mk | 1 + keyboards/laneware/raindrop/hhkb/readme.md | 13 +++ keyboards/laneware/raindrop/hhkb/rules.mk | 0 keyboards/laneware/raindrop/info.json | 89 +++++++++++++++++++ keyboards/laneware/raindrop/readme.md | 29 ++++++ 10 files changed, 208 insertions(+) create mode 100644 keyboards/laneware/info.json create mode 100644 keyboards/laneware/raindrop/hhkb/config.h create mode 100644 keyboards/laneware/raindrop/hhkb/info.json create mode 100644 keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c create mode 100644 keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c create mode 100644 keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk create mode 100644 keyboards/laneware/raindrop/hhkb/readme.md create mode 100644 keyboards/laneware/raindrop/hhkb/rules.mk create mode 100644 keyboards/laneware/raindrop/info.json create mode 100644 keyboards/laneware/raindrop/readme.md diff --git a/keyboards/laneware/info.json b/keyboards/laneware/info.json new file mode 100644 index 000000000000..754d99fa67e5 --- /dev/null +++ b/keyboards/laneware/info.json @@ -0,0 +1,4 @@ +{ + "manufacturer": "Laneware Peripherals", + "maintainer": "Laneware" +} diff --git a/keyboards/laneware/raindrop/hhkb/config.h b/keyboards/laneware/raindrop/hhkb/config.h new file mode 100644 index 000000000000..057dfbcf784e --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/config.h @@ -0,0 +1,15 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) diff --git a/keyboards/laneware/raindrop/hhkb/info.json b/keyboards/laneware/raindrop/hhkb/info.json new file mode 100644 index 000000000000..c7e94b136127 --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "Raindrop HHKB Rows 1-4", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "audio": false, + "rgblight": false, + "sleep_led": false + } +} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c new file mode 100644 index 000000000000..9a26aff10785 --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_split_bs_rshift( + 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_GRV, + 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + [1] = LAYOUT_60_ansi_split_bs_rshift( + QK_BOOT, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c new file mode 100644 index 000000000000..9a26aff10785 --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_split_bs_rshift( + 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_GRV, + 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + [1] = LAYOUT_60_ansi_split_bs_rshift( + QK_BOOT, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk b/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/hhkb/readme.md b/keyboards/laneware/raindrop/hhkb/readme.md new file mode 100644 index 000000000000..73e0e85a44e7 --- /dev/null +++ b/keyboards/laneware/raindrop/hhkb/readme.md @@ -0,0 +1,13 @@ +# Raindrop HHKB + +![layout](https://i.imgur.com/FPLmClah.png) + +This directory is for the 'HHKB Rows 1-4' layout. + +Make example for this keyboard (after setting up your build environment): + + make laneware/raindrop/hhkb:default + +Flashing example for this keyboard: + + make laneware/raindrop/hhkb:default:flash diff --git a/keyboards/laneware/raindrop/hhkb/rules.mk b/keyboards/laneware/raindrop/hhkb/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json new file mode 100644 index 000000000000..3ef67ce672af --- /dev/null +++ b/keyboards/laneware/raindrop/info.json @@ -0,0 +1,89 @@ +{ + "usb": { + "vid": "0x4C50", + "pid": "0x9999", + "device_version": "0.0.1" + }, + "url": "https://lanewareperipherals.com/collections/raindrop-60", + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "lufa-dfu", + "matrix_pins": { + "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], + "rows": ["E6", "B7", "D0", "D1", "D2"] + }, + "community_layouts": ["60_ansi_split_bs_rshift"], + "layouts": { + "LAYOUT_60_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x":0, "y":0}, + {"matrix": [0, 1], "x":1, "y":0}, + {"matrix": [0, 2], "x":2, "y":0}, + {"matrix": [0, 3], "x":3, "y":0}, + {"matrix": [0, 4], "x":4, "y":0}, + {"matrix": [0, 5], "x":5, "y":0}, + {"matrix": [0, 6], "x":6, "y":0}, + {"matrix": [0, 7], "x":7, "y":0}, + {"matrix": [0, 8], "x":8, "y":0}, + {"matrix": [0, 9], "x":9, "y":0}, + {"matrix": [0, 10], "x":10, "y":0}, + {"matrix": [0, 11], "x":11, "y":0}, + {"matrix": [0, 12], "x":12, "y":0}, + {"matrix": [0, 13], "x":13, "y":0}, + {"matrix": [0, 14], "x":14, "y":0}, + + {"matrix": [1, 0], "x":0, "y":1, "w":1.5}, + {"matrix": [1, 1], "x":1.5, "y":1}, + {"matrix": [1, 2], "x":2.5, "y":1}, + {"matrix": [1, 3], "x":3.5, "y":1}, + {"matrix": [1, 4], "x":4.5, "y":1}, + {"matrix": [1, 5], "x":5.5, "y":1}, + {"matrix": [1, 6], "x":6.5, "y":1}, + {"matrix": [1, 7], "x":7.5, "y":1}, + {"matrix": [1, 8], "x":8.5, "y":1}, + {"matrix": [1, 9], "x":9.5, "y":1}, + {"matrix": [1, 10], "x":10.5, "y":1}, + {"matrix": [1, 11], "x":11.5, "y":1}, + {"matrix": [1, 12], "x":12.5, "y":1}, + {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5}, + + {"matrix": [2, 0], "x":0, "y":2, "w":1.75}, + {"matrix": [2, 1], "x":1.75, "y":2}, + {"matrix": [2, 2], "x":2.75, "y":2}, + {"matrix": [2, 3], "x":3.75, "y":2}, + {"matrix": [2, 4], "x":4.75, "y":2}, + {"matrix": [2, 5], "x":5.75, "y":2}, + {"matrix": [2, 6], "x":6.75, "y":2}, + {"matrix": [2, 7], "x":7.75, "y":2}, + {"matrix": [2, 8], "x":8.75, "y":2}, + {"matrix": [2, 9], "x":9.75, "y":2}, + {"matrix": [2, 10], "x":10.75, "y":2}, + {"matrix": [2, 11], "x":11.75, "y":2}, + {"matrix": [2, 12], "x":12.75, "y":2, "w":2.25}, + + {"matrix": [3, 0], "x":0, "y":3, "w":2.25}, + {"matrix": [3, 1], "x":2.25, "y":3}, + {"matrix": [3, 2], "x":3.25, "y":3}, + {"matrix": [3, 3], "x":4.25, "y":3}, + {"matrix": [3, 4], "x":5.25, "y":3}, + {"matrix": [3, 5], "x":6.25, "y":3}, + {"matrix": [3, 6], "x":7.25, "y":3}, + {"matrix": [3, 7], "x":8.25, "y":3}, + {"matrix": [3, 8], "x":9.25, "y":3}, + {"matrix": [3, 9], "x":10.25, "y":3}, + {"matrix": [3, 10], "x":11.25, "y":3}, + {"matrix": [3, 11], "x":12.25, "y":3, "w":1.75}, + {"matrix": [3, 13], "x":14, "y":3}, + + {"matrix": [4, 0], "x":0, "y":4, "w":1.25}, + {"matrix": [4, 1], "x":1.25, "y":4, "w":1.25}, + {"matrix": [4, 2], "x":2.5, "y":4, "w":1.25}, + {"matrix": [4, 3], "x":3.75, "y":4, "w":6.25}, + {"matrix": [4, 4], "x":10, "y":4, "w":1.25}, + {"matrix": [4, 5], "x":11.25, "y":4, "w":1.25}, + {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25}, + {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md new file mode 100644 index 000000000000..aea661eeab43 --- /dev/null +++ b/keyboards/laneware/raindrop/readme.md @@ -0,0 +1,29 @@ +# Raindrop + +60% sized keyboard with a gasket mounted plate and aluminium case. + +* Keyboard Maintainer: [Laneware Peripherals Support](mailto:support@lanewareperipherals.zendesk.com) +* Hardware Supported: Raindrop PCB +* Hardware Availability: Group Buy + +## Layouts +The Raindrop PCB can be configured in the following layouts: + +* HHKB Rows 1-4 +![hhkb](https://i.imgur.com/FPLmClah.png) + +Each layout has it's own directory + +| Layout | Directory | +| :---: | :---: | +| HHKB Rows 1-4 | [hhkb](/keyboards/laneware/raindrop/hhkb/) | + +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**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 87670b206a4a964e22a39f0e1b521a3253074fb9 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 21:06:10 +0100 Subject: [PATCH 02/21] update readme.md --- keyboards/laneware/raindrop/hhkb/readme.md | 4 +++- keyboards/laneware/raindrop/readme.md | 26 +++++++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/keyboards/laneware/raindrop/hhkb/readme.md b/keyboards/laneware/raindrop/hhkb/readme.md index 73e0e85a44e7..e4e7474af169 100644 --- a/keyboards/laneware/raindrop/hhkb/readme.md +++ b/keyboards/laneware/raindrop/hhkb/readme.md @@ -2,7 +2,7 @@ ![layout](https://i.imgur.com/FPLmClah.png) -This directory is for the 'HHKB Rows 1-4' layout. +This directory is for the 'HHKB Rows 1-4' key layout. Make example for this keyboard (after setting up your build environment): @@ -11,3 +11,5 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: make laneware/raindrop/hhkb: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). diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index aea661eeab43..89f32f528295 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -1,5 +1,7 @@ # Raindrop +![stacked](https://i.imgur.com/R2iPqjIh.png) + 60% sized keyboard with a gasket mounted plate and aluminium case. * Keyboard Maintainer: [Laneware Peripherals Support](mailto:support@lanewareperipherals.zendesk.com) @@ -7,18 +9,20 @@ * Hardware Availability: Group Buy ## Layouts -The Raindrop PCB can be configured in the following layouts: - -* HHKB Rows 1-4 -![hhkb](https://i.imgur.com/FPLmClah.png) - -Each layout has it's own directory - -| Layout | Directory | +The Raindrop PCB can be configured in the following key layouts: +* **Standard 60%** +![diagram_ansi](https://i.imgur.com/nSO4CwYh.png) +* **2u Left Shift with Arrow Keys** +![diagram_arrows](https://i.imgur.com/7yPCNCoh.png) +* **HHKB Rows 1-4** +![diagram_hhkb](https://i.imgur.com/FPLmClah.png) +* **Standard ISO** +![diagram_iso](https://i.imgur.com/8oyAuTWh.png) + +Each layout has it's own QMK keyboard directory: +| Key Layout | Directory | | :---: | :---: | -| HHKB Rows 1-4 | [hhkb](/keyboards/laneware/raindrop/hhkb/) | - -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). +| HHKB Rows 1-4 | [hhkb](/keyboards/laneware/raindrop/hhkb) | ## Bootloader From 6fb357b90ca99f3e05c17fdc447caf57d1234fdb Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 21:45:27 +0100 Subject: [PATCH 03/21] add raindrop/ansi --- keyboards/laneware/info.json | 5 +- keyboards/laneware/raindrop/ansi/config.h | 15 ++++ keyboards/laneware/raindrop/ansi/info.json | 15 ++++ .../raindrop/ansi/keymaps/default/keymap.c | 21 ++++++ .../raindrop/ansi/keymaps/via/keymap.c | 21 ++++++ .../raindrop/ansi/keymaps/via/rules.mk | 1 + keyboards/laneware/raindrop/ansi/readme.md | 15 ++++ keyboards/laneware/raindrop/ansi/rules.mk | 0 .../raindrop/hhkb/keymaps/default/keymap.c | 8 +-- keyboards/laneware/raindrop/info.json | 72 ++++++++++++++++++- 10 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 keyboards/laneware/raindrop/ansi/config.h create mode 100644 keyboards/laneware/raindrop/ansi/info.json create mode 100644 keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c create mode 100644 keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c create mode 100644 keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk create mode 100644 keyboards/laneware/raindrop/ansi/readme.md create mode 100644 keyboards/laneware/raindrop/ansi/rules.mk diff --git a/keyboards/laneware/info.json b/keyboards/laneware/info.json index 754d99fa67e5..f03d092fa29e 100644 --- a/keyboards/laneware/info.json +++ b/keyboards/laneware/info.json @@ -1,4 +1,7 @@ { "manufacturer": "Laneware Peripherals", - "maintainer": "Laneware" + "maintainer": "Laneware", + "usb": { + "vid": "0x4C50" + } } diff --git a/keyboards/laneware/raindrop/ansi/config.h b/keyboards/laneware/raindrop/ansi/config.h new file mode 100644 index 000000000000..057dfbcf784e --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/config.h @@ -0,0 +1,15 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) diff --git a/keyboards/laneware/raindrop/ansi/info.json b/keyboards/laneware/raindrop/ansi/info.json new file mode 100644 index 000000000000..4d7afacd6b19 --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "Raindrop Standard 60%", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "audio": false, + "rgblight": false, + "sleep_led": false + } +} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c b/keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c new file mode 100644 index 000000000000..8456863bb0d4 --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + [1] = LAYOUT_60_ansi( + QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c b/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c new file mode 100644 index 000000000000..8456863bb0d4 --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c @@ -0,0 +1,21 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + [1] = LAYOUT_60_ansi( + QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk b/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/ansi/readme.md b/keyboards/laneware/raindrop/ansi/readme.md new file mode 100644 index 000000000000..e0c7b107c132 --- /dev/null +++ b/keyboards/laneware/raindrop/ansi/readme.md @@ -0,0 +1,15 @@ +# Raindrop HHKB + +![layout](https://i.imgur.com/nSO4CwYh.png) + +This directory is for the 'Standard 60%' key layout. + +Make example for this keyboard (after setting up your build environment): + + make laneware/raindrop/ansi:default + +Flashing example for this keyboard: + + make laneware/raindrop/ansi: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). diff --git a/keyboards/laneware/raindrop/ansi/rules.mk b/keyboards/laneware/raindrop/ansi/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c index 9a26aff10785..93e8845966d8 100644 --- a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c +++ b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c @@ -12,10 +12,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, + QK_BOOT, 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_NO, KC_NO, + KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 3ef67ce672af..8e28a348c962 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -1,6 +1,5 @@ { "usb": { - "vid": "0x4C50", "pid": "0x9999", "device_version": "0.0.1" }, @@ -12,8 +11,77 @@ "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], "rows": ["E6", "B7", "D0", "D1", "D2"] }, - "community_layouts": ["60_ansi_split_bs_rshift"], + "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi"], "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x":0, "y":0}, + {"matrix": [0, 1], "x":1, "y":0}, + {"matrix": [0, 2], "x":2, "y":0}, + {"matrix": [0, 3], "x":3, "y":0}, + {"matrix": [0, 4], "x":4, "y":0}, + {"matrix": [0, 5], "x":5, "y":0}, + {"matrix": [0, 6], "x":6, "y":0}, + {"matrix": [0, 7], "x":7, "y":0}, + {"matrix": [0, 8], "x":8, "y":0}, + {"matrix": [0, 9], "x":9, "y":0}, + {"matrix": [0, 10], "x":10, "y":0}, + {"matrix": [0, 11], "x":11, "y":0}, + {"matrix": [0, 12], "x":12, "y":0}, + {"matrix": [0, 13], "x":13, "y":0, "w":2}, + + {"matrix": [1, 0], "x":0, "y":1, "w":1.5}, + {"matrix": [1, 1], "x":1.5, "y":1}, + {"matrix": [1, 2], "x":2.5, "y":1}, + {"matrix": [1, 3], "x":3.5, "y":1}, + {"matrix": [1, 4], "x":4.5, "y":1}, + {"matrix": [1, 5], "x":5.5, "y":1}, + {"matrix": [1, 6], "x":6.5, "y":1}, + {"matrix": [1, 7], "x":7.5, "y":1}, + {"matrix": [1, 8], "x":8.5, "y":1}, + {"matrix": [1, 9], "x":9.5, "y":1}, + {"matrix": [1, 10], "x":10.5, "y":1}, + {"matrix": [1, 11], "x":11.5, "y":1}, + {"matrix": [1, 12], "x":12.5, "y":1}, + {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5}, + + {"matrix": [2, 0], "x":0, "y":2, "w":1.75}, + {"matrix": [2, 1], "x":1.75, "y":2}, + {"matrix": [2, 2], "x":2.75, "y":2}, + {"matrix": [2, 3], "x":3.75, "y":2}, + {"matrix": [2, 4], "x":4.75, "y":2}, + {"matrix": [2, 5], "x":5.75, "y":2}, + {"matrix": [2, 6], "x":6.75, "y":2}, + {"matrix": [2, 7], "x":7.75, "y":2}, + {"matrix": [2, 8], "x":8.75, "y":2}, + {"matrix": [2, 9], "x":9.75, "y":2}, + {"matrix": [2, 10], "x":10.75, "y":2}, + {"matrix": [2, 11], "x":11.75, "y":2}, + {"matrix": [2, 12], "x":12.75, "y":2, "w":2.25}, + + {"matrix": [3, 0], "x":0, "y":3, "w":2.25}, + {"matrix": [3, 1], "x":2.25, "y":3}, + {"matrix": [3, 2], "x":3.25, "y":3}, + {"matrix": [3, 3], "x":4.25, "y":3}, + {"matrix": [3, 4], "x":5.25, "y":3}, + {"matrix": [3, 5], "x":6.25, "y":3}, + {"matrix": [3, 6], "x":7.25, "y":3}, + {"matrix": [3, 7], "x":8.25, "y":3}, + {"matrix": [3, 8], "x":9.25, "y":3}, + {"matrix": [3, 9], "x":10.25, "y":3}, + {"matrix": [3, 10], "x":11.25, "y":3}, + {"matrix": [3, 11], "x":12.25, "y":3, "w":2.75}, + + {"matrix": [4, 0], "x":0, "y":4, "w":1.25}, + {"matrix": [4, 1], "x":1.25, "y":4, "w":1.25}, + {"matrix": [4, 2], "x":2.5, "y":4, "w":1.25}, + {"matrix": [4, 3], "x":3.75, "y":4, "w":6.25}, + {"matrix": [4, 4], "x":10, "y":4, "w":1.25}, + {"matrix": [4, 5], "x":11.25, "y":4, "w":1.25}, + {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25}, + {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25} + ] + }, "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ {"matrix": [0, 0], "x":0, "y":0}, From 2e3e3bdda8ea76eadc58f6fccca22bc221cde830 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 22:36:57 +0100 Subject: [PATCH 04/21] add arrows --- keyboards/laneware/raindrop/ansi/readme.md | 2 +- keyboards/laneware/raindrop/arrows/config.h | 15 ++++ keyboards/laneware/raindrop/arrows/info.json | 15 ++++ .../raindrop/arrows/keymaps/default/keymap.c | 24 ++++++ .../raindrop/arrows/keymaps/via/keymap.c | 24 ++++++ .../raindrop/arrows/keymaps/via/rules.mk | 1 + keyboards/laneware/raindrop/arrows/readme.md | 15 ++++ keyboards/laneware/raindrop/arrows/rules.mk | 0 keyboards/laneware/raindrop/info.json | 74 ++++++++++++++++++- keyboards/laneware/raindrop/readme.md | 4 +- 10 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 keyboards/laneware/raindrop/arrows/config.h create mode 100644 keyboards/laneware/raindrop/arrows/info.json create mode 100644 keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c create mode 100644 keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c create mode 100644 keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk create mode 100644 keyboards/laneware/raindrop/arrows/readme.md create mode 100644 keyboards/laneware/raindrop/arrows/rules.mk diff --git a/keyboards/laneware/raindrop/ansi/readme.md b/keyboards/laneware/raindrop/ansi/readme.md index e0c7b107c132..e9c48765b1d7 100644 --- a/keyboards/laneware/raindrop/ansi/readme.md +++ b/keyboards/laneware/raindrop/ansi/readme.md @@ -1,4 +1,4 @@ -# Raindrop HHKB +# Raindrop ansi ![layout](https://i.imgur.com/nSO4CwYh.png) diff --git a/keyboards/laneware/raindrop/arrows/config.h b/keyboards/laneware/raindrop/arrows/config.h new file mode 100644 index 000000000000..057dfbcf784e --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/config.h @@ -0,0 +1,15 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) diff --git a/keyboards/laneware/raindrop/arrows/info.json b/keyboards/laneware/raindrop/arrows/info.json new file mode 100644 index 000000000000..2b84d40feff2 --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "Raindrop 2u Left Shift with Arrow Keys", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "audio": false, + "rgblight": false, + "sleep_led": false + } +} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c b/keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c new file mode 100644 index 000000000000..3f1bc02d75ce --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#define RS_GRV RSFT_T(KC_GRV) +#define RG_DEL RGUI_T(KC_DEL) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_arrows( + 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_60_ansi_arrows( + QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_NO, KC_RGUI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ) +}; diff --git a/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c b/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c new file mode 100644 index 000000000000..3f1bc02d75ce --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +#define RS_GRV RSFT_T(KC_GRV) +#define RG_DEL RGUI_T(KC_DEL) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi_arrows( + 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, + KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_60_ansi_arrows( + QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_NO, KC_RGUI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ) +}; diff --git a/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk b/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/arrows/readme.md b/keyboards/laneware/raindrop/arrows/readme.md new file mode 100644 index 000000000000..34df923ef629 --- /dev/null +++ b/keyboards/laneware/raindrop/arrows/readme.md @@ -0,0 +1,15 @@ +# Raindrop arrows + +![layout](https://i.imgur.com/7yPCNCoh.png) + +This directory is for the '2u Left Shift with Arrow Keys' key layout. + +Make example for this keyboard (after setting up your build environment): + + make laneware/raindrop/arrows:default + +Flashing example for this keyboard: + + make laneware/raindrop/arrows: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). diff --git a/keyboards/laneware/raindrop/arrows/rules.mk b/keyboards/laneware/raindrop/arrows/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 8e28a348c962..00a8cd835f66 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -6,7 +6,7 @@ "url": "https://lanewareperipherals.com/collections/raindrop-60", "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "lufa-dfu", + "bootloader": "atmel-dfu", "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], "rows": ["E6", "B7", "D0", "D1", "D2"] @@ -152,6 +152,78 @@ {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25}, {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25} ] + }, + "LAYOUT_60_ansi_arrows": { + "layout" : [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 4], "x": 10, "y": 4}, + {"matrix": [4, 5], "x": 11, "y": 4}, + {"matrix": [4, 6], "x": 12, "y": 4}, + {"matrix": [4, 7], "x": 13, "y": 4}, + {"matrix": [4, 8], "x": 14, "y": 4} + ] } } } \ No newline at end of file diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index 89f32f528295..e597b0f2cc24 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -22,7 +22,9 @@ The Raindrop PCB can be configured in the following key layouts: Each layout has it's own QMK keyboard directory: | Key Layout | Directory | | :---: | :---: | -| HHKB Rows 1-4 | [hhkb](/keyboards/laneware/raindrop/hhkb) | +| Standard 60% | [raindrop/ansi](/keyboards/laneware/raindrop/ansi) | +| 2u Left Shift with Arrow Keys | [raindrop/arrows](/keyboards/laneware/raindrop/arrows) | +| HHKB Rows 1-4 | [raindrop/hhkb](/keyboards/laneware/raindrop/hhkb) | ## Bootloader From 13f23bae63e951e30c521af59f60f25e7287eeca Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 22:47:41 +0100 Subject: [PATCH 05/21] remove 'Standard ISO' references --- keyboards/laneware/raindrop/info.json | 2 +- keyboards/laneware/raindrop/readme.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 00a8cd835f66..7137fae72e07 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -226,4 +226,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index e597b0f2cc24..2ffa71d34f71 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -16,8 +16,6 @@ The Raindrop PCB can be configured in the following key layouts: ![diagram_arrows](https://i.imgur.com/7yPCNCoh.png) * **HHKB Rows 1-4** ![diagram_hhkb](https://i.imgur.com/FPLmClah.png) -* **Standard ISO** -![diagram_iso](https://i.imgur.com/8oyAuTWh.png) Each layout has it's own QMK keyboard directory: | Key Layout | Directory | From 6a518e07cb266184b6952b707035b8aa179fe2d9 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 23:21:00 +0100 Subject: [PATCH 06/21] amend `hhkb` based on geekhack.org information --- keyboards/laneware/raindrop/ansi/readme.md | 2 +- keyboards/laneware/raindrop/arrows/readme.md | 2 +- .../raindrop/hhkb/keymaps/default/keymap.c | 16 +++++++------- .../raindrop/hhkb/keymaps/via/keymap.c | 22 +++++++++---------- keyboards/laneware/raindrop/hhkb/readme.md | 6 ++--- keyboards/laneware/raindrop/info.json | 17 ++++++-------- keyboards/laneware/raindrop/readme.md | 8 +++---- 7 files changed, 35 insertions(+), 38 deletions(-) diff --git a/keyboards/laneware/raindrop/ansi/readme.md b/keyboards/laneware/raindrop/ansi/readme.md index e9c48765b1d7..70d89e4b392c 100644 --- a/keyboards/laneware/raindrop/ansi/readme.md +++ b/keyboards/laneware/raindrop/ansi/readme.md @@ -1,6 +1,6 @@ # Raindrop ansi -![layout](https://i.imgur.com/nSO4CwYh.png) +![layout](https://i.imgur.com/oibG44o.png) This directory is for the 'Standard 60%' key layout. diff --git a/keyboards/laneware/raindrop/arrows/readme.md b/keyboards/laneware/raindrop/arrows/readme.md index 34df923ef629..d53e81fbc98b 100644 --- a/keyboards/laneware/raindrop/arrows/readme.md +++ b/keyboards/laneware/raindrop/arrows/readme.md @@ -1,6 +1,6 @@ # Raindrop arrows -![layout](https://i.imgur.com/7yPCNCoh.png) +![layout](https://i.imgur.com/cQ4Kwb5h.png) This directory is for the '2u Left Shift with Arrow Keys' key layout. diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c index 93e8845966d8..b08984c9aa75 100644 --- a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c +++ b/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c @@ -4,18 +4,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_split_bs_rshift( + [0] = LAYOUT_60_hhkb( 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_GRV, - 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + 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_LSFT, 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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI ), - [1] = LAYOUT_60_ansi_split_bs_rshift( + [1] = LAYOUT_60_hhkb( QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c index 9a26aff10785..b08984c9aa75 100644 --- a/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c +++ b/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c @@ -4,18 +4,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_split_bs_rshift( + [0] = LAYOUT_60_hhkb( 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_GRV, - 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + 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_LSFT, 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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI ), - [1] = LAYOUT_60_ansi_split_bs_rshift( - QK_BOOT, 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_BSLS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + [1] = LAYOUT_60_hhkb( + QK_BOOT, 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_NO, KC_NO, + KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/laneware/raindrop/hhkb/readme.md b/keyboards/laneware/raindrop/hhkb/readme.md index e4e7474af169..32a0791b3980 100644 --- a/keyboards/laneware/raindrop/hhkb/readme.md +++ b/keyboards/laneware/raindrop/hhkb/readme.md @@ -1,8 +1,8 @@ -# Raindrop HHKB +# Raindrop with 6.25 Spacebar -![layout](https://i.imgur.com/FPLmClah.png) +![layout](https://i.imgur.com/WU6gb1Qh.png) -This directory is for the 'HHKB Rows 1-4' key layout. +This directory is for the 'HHKB with 6.25 Spacebar' key layout. Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 7137fae72e07..25d063669d50 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -11,7 +11,7 @@ "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], "rows": ["E6", "B7", "D0", "D1", "D2"] }, - "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi"], + "community_layouts": ["60_hhkb", "60_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [ @@ -82,7 +82,7 @@ {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25} ] }, - "LAYOUT_60_ansi_split_bs_rshift": { + "LAYOUT_60_hhkb": { "layout": [ {"matrix": [0, 0], "x":0, "y":0}, {"matrix": [0, 1], "x":1, "y":0}, @@ -143,14 +143,11 @@ {"matrix": [3, 11], "x":12.25, "y":3, "w":1.75}, {"matrix": [3, 13], "x":14, "y":3}, - {"matrix": [4, 0], "x":0, "y":4, "w":1.25}, - {"matrix": [4, 1], "x":1.25, "y":4, "w":1.25}, - {"matrix": [4, 2], "x":2.5, "y":4, "w":1.25}, - {"matrix": [4, 3], "x":3.75, "y":4, "w":6.25}, - {"matrix": [4, 4], "x":10, "y":4, "w":1.25}, - {"matrix": [4, 5], "x":11.25, "y":4, "w":1.25}, - {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25}, - {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25} + {"matrix": [4, 1], "x": 1.75, "y": 4}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 6.25}, + {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 12, "y": 4} ] }, "LAYOUT_60_ansi_arrows": { diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index 2ffa71d34f71..0bc547d82e59 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -11,11 +11,11 @@ ## Layouts The Raindrop PCB can be configured in the following key layouts: * **Standard 60%** -![diagram_ansi](https://i.imgur.com/nSO4CwYh.png) +![diagram_ansi](https://i.imgur.com/oibG44o.png) * **2u Left Shift with Arrow Keys** -![diagram_arrows](https://i.imgur.com/7yPCNCoh.png) -* **HHKB Rows 1-4** -![diagram_hhkb](https://i.imgur.com/FPLmClah.png) +![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) +* **HHKB with 6.25 Spacebar** +![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) Each layout has it's own QMK keyboard directory: | Key Layout | Directory | From 3addb9a12fa9a23c0802c602e773ac050c49d17c Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 23:22:20 +0100 Subject: [PATCH 07/21] update info.json --- keyboards/laneware/raindrop/hhkb/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/laneware/raindrop/hhkb/info.json b/keyboards/laneware/raindrop/hhkb/info.json index c7e94b136127..a2c052a4fe04 100644 --- a/keyboards/laneware/raindrop/hhkb/info.json +++ b/keyboards/laneware/raindrop/hhkb/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Raindrop HHKB Rows 1-4", + "keyboard_name": "Raindrop HHKB with 6.25 Spacebar", "features": { "bootmagic": true, "mousekey": true, From 818f3fbfd8137f75a01fd4f403210c7677e3fe2b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 23:24:07 +0100 Subject: [PATCH 08/21] Update readme.md --- keyboards/laneware/raindrop/hhkb/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/laneware/raindrop/hhkb/readme.md b/keyboards/laneware/raindrop/hhkb/readme.md index 32a0791b3980..b84da7487899 100644 --- a/keyboards/laneware/raindrop/hhkb/readme.md +++ b/keyboards/laneware/raindrop/hhkb/readme.md @@ -1,4 +1,4 @@ -# Raindrop with 6.25 Spacebar +# Raindrop HHKB with 6.25 Spacebar ![layout](https://i.imgur.com/WU6gb1Qh.png) From 79e575d725d07ed59600d037b8fb337e9cdd5e84 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 23:36:51 +0100 Subject: [PATCH 09/21] update readme.md --- keyboards/laneware/raindrop/readme.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index 0bc547d82e59..c96afbc323c6 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -1,6 +1,9 @@ # Raindrop -![stacked](https://i.imgur.com/R2iPqjIh.png) +![stacked](https://i.imgur.com/R2iPqjIh.png) +*Casing* +![PCB Front](https://i.imgur.com/00TpL3nh.png) +*PCB Front* 60% sized keyboard with a gasket mounted plate and aluminium case. From 2c1483e3c8ee739613903b2a2958b0cc78a0316e Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 17 Jun 2023 23:45:29 +0100 Subject: [PATCH 10/21] update info.json --- keyboards/laneware/raindrop/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 25d063669d50..35f3198093fc 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -146,8 +146,8 @@ {"matrix": [4, 1], "x": 1.75, "y": 4}, {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 6.25}, - {"matrix": [4, 4], "x": 10.5, "y": 4, "w": 1.5}, - {"matrix": [4, 5], "x": 12, "y": 4} + {"matrix": [4, 5], "x": 10.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 12, "y": 4} ] }, "LAYOUT_60_ansi_arrows": { From 165adf801fc4fe9b9ab8ec1becc7b9b1dcb67a6e Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 00:01:57 +0100 Subject: [PATCH 11/21] directory hiearchy restructured --- keyboards/laneware/raindrop/ansi/info.json | 15 -------- .../raindrop/ansi/keymaps/via/keymap.c | 21 ------------ .../raindrop/ansi/keymaps/via/rules.mk | 1 - keyboards/laneware/raindrop/ansi/readme.md | 15 -------- keyboards/laneware/raindrop/arrows/config.h | 15 -------- keyboards/laneware/raindrop/arrows/info.json | 15 -------- .../raindrop/arrows/keymaps/via/keymap.c | 24 ------------- .../raindrop/arrows/keymaps/via/rules.mk | 1 - keyboards/laneware/raindrop/arrows/readme.md | 15 -------- keyboards/laneware/raindrop/arrows/rules.mk | 0 .../laneware/raindrop/{ansi => }/config.h | 5 --- keyboards/laneware/raindrop/hhkb/config.h | 15 -------- keyboards/laneware/raindrop/hhkb/info.json | 15 -------- .../raindrop/hhkb/keymaps/via/keymap.c | 21 ------------ .../raindrop/hhkb/keymaps/via/rules.mk | 1 - keyboards/laneware/raindrop/hhkb/readme.md | 15 -------- keyboards/laneware/raindrop/hhkb/rules.mk | 0 keyboards/laneware/raindrop/info.json | 15 +++++++- .../{ansi => }/keymaps/default/keymap.c | 0 .../default_arrows}/keymap.c | 4 +-- .../default => keymaps/default_hhkb}/keymap.c | 0 keyboards/laneware/raindrop/readme.md | 34 +++++++++++-------- .../laneware/raindrop/{ansi => }/rules.mk | 0 23 files changed, 36 insertions(+), 211 deletions(-) delete mode 100644 keyboards/laneware/raindrop/ansi/info.json delete mode 100644 keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c delete mode 100644 keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk delete mode 100644 keyboards/laneware/raindrop/ansi/readme.md delete mode 100644 keyboards/laneware/raindrop/arrows/config.h delete mode 100644 keyboards/laneware/raindrop/arrows/info.json delete mode 100644 keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c delete mode 100644 keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk delete mode 100644 keyboards/laneware/raindrop/arrows/readme.md delete mode 100644 keyboards/laneware/raindrop/arrows/rules.mk rename keyboards/laneware/raindrop/{ansi => }/config.h (65%) delete mode 100644 keyboards/laneware/raindrop/hhkb/config.h delete mode 100644 keyboards/laneware/raindrop/hhkb/info.json delete mode 100644 keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c delete mode 100644 keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk delete mode 100644 keyboards/laneware/raindrop/hhkb/readme.md delete mode 100644 keyboards/laneware/raindrop/hhkb/rules.mk rename keyboards/laneware/raindrop/{ansi => }/keymaps/default/keymap.c (100%) rename keyboards/laneware/raindrop/{arrows/keymaps/default => keymaps/default_arrows}/keymap.c (95%) rename keyboards/laneware/raindrop/{hhkb/keymaps/default => keymaps/default_hhkb}/keymap.c (100%) rename keyboards/laneware/raindrop/{ansi => }/rules.mk (100%) diff --git a/keyboards/laneware/raindrop/ansi/info.json b/keyboards/laneware/raindrop/ansi/info.json deleted file mode 100644 index 4d7afacd6b19..000000000000 --- a/keyboards/laneware/raindrop/ansi/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "keyboard_name": "Raindrop Standard 60%", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "audio": false, - "rgblight": false, - "sleep_led": false - } -} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c b/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c deleted file mode 100644 index 8456863bb0d4..000000000000 --- a/keyboards/laneware/raindrop/ansi/keymaps/via/keymap.c +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( - 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - [1] = LAYOUT_60_ansi( - QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk b/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/laneware/raindrop/ansi/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/ansi/readme.md b/keyboards/laneware/raindrop/ansi/readme.md deleted file mode 100644 index 70d89e4b392c..000000000000 --- a/keyboards/laneware/raindrop/ansi/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Raindrop ansi - -![layout](https://i.imgur.com/oibG44o.png) - -This directory is for the 'Standard 60%' key layout. - -Make example for this keyboard (after setting up your build environment): - - make laneware/raindrop/ansi:default - -Flashing example for this keyboard: - - make laneware/raindrop/ansi: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). diff --git a/keyboards/laneware/raindrop/arrows/config.h b/keyboards/laneware/raindrop/arrows/config.h deleted file mode 100644 index 057dfbcf784e..000000000000 --- a/keyboards/laneware/raindrop/arrows/config.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) diff --git a/keyboards/laneware/raindrop/arrows/info.json b/keyboards/laneware/raindrop/arrows/info.json deleted file mode 100644 index 2b84d40feff2..000000000000 --- a/keyboards/laneware/raindrop/arrows/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "keyboard_name": "Raindrop 2u Left Shift with Arrow Keys", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "audio": false, - "rgblight": false, - "sleep_led": false - } -} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c b/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c deleted file mode 100644 index 3f1bc02d75ce..000000000000 --- a/keyboards/laneware/raindrop/arrows/keymaps/via/keymap.c +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -#define RS_GRV RSFT_T(KC_GRV) -#define RG_DEL RGUI_T(KC_DEL) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_arrows( - 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, - KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_60_ansi_arrows( - QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_NO, KC_RGUI, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO - ) -}; diff --git a/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk b/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/laneware/raindrop/arrows/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/arrows/readme.md b/keyboards/laneware/raindrop/arrows/readme.md deleted file mode 100644 index d53e81fbc98b..000000000000 --- a/keyboards/laneware/raindrop/arrows/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Raindrop arrows - -![layout](https://i.imgur.com/cQ4Kwb5h.png) - -This directory is for the '2u Left Shift with Arrow Keys' key layout. - -Make example for this keyboard (after setting up your build environment): - - make laneware/raindrop/arrows:default - -Flashing example for this keyboard: - - make laneware/raindrop/arrows: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). diff --git a/keyboards/laneware/raindrop/arrows/rules.mk b/keyboards/laneware/raindrop/arrows/rules.mk deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/laneware/raindrop/ansi/config.h b/keyboards/laneware/raindrop/config.h similarity index 65% rename from keyboards/laneware/raindrop/ansi/config.h rename to keyboards/laneware/raindrop/config.h index 057dfbcf784e..1f083ec616b7 100644 --- a/keyboards/laneware/raindrop/ansi/config.h +++ b/keyboards/laneware/raindrop/config.h @@ -8,8 +8,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) diff --git a/keyboards/laneware/raindrop/hhkb/config.h b/keyboards/laneware/raindrop/hhkb/config.h deleted file mode 100644 index 057dfbcf784e..000000000000 --- a/keyboards/laneware/raindrop/hhkb/config.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) diff --git a/keyboards/laneware/raindrop/hhkb/info.json b/keyboards/laneware/raindrop/hhkb/info.json deleted file mode 100644 index a2c052a4fe04..000000000000 --- a/keyboards/laneware/raindrop/hhkb/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "keyboard_name": "Raindrop HHKB with 6.25 Spacebar", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "backlight": false, - "audio": false, - "rgblight": false, - "sleep_led": false - } -} \ No newline at end of file diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c b/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c deleted file mode 100644 index b08984c9aa75..000000000000 --- a/keyboards/laneware/raindrop/hhkb/keymaps/via/keymap.c +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_hhkb( - 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_GRV, - 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_LSFT, 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_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI - ), - [1] = LAYOUT_60_hhkb( - QK_BOOT, 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_NO, KC_NO, - KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk b/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807cb7..000000000000 --- a/keyboards/laneware/raindrop/hhkb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/laneware/raindrop/hhkb/readme.md b/keyboards/laneware/raindrop/hhkb/readme.md deleted file mode 100644 index b84da7487899..000000000000 --- a/keyboards/laneware/raindrop/hhkb/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# Raindrop HHKB with 6.25 Spacebar - -![layout](https://i.imgur.com/WU6gb1Qh.png) - -This directory is for the 'HHKB with 6.25 Spacebar' key layout. - -Make example for this keyboard (after setting up your build environment): - - make laneware/raindrop/hhkb:default - -Flashing example for this keyboard: - - make laneware/raindrop/hhkb: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). diff --git a/keyboards/laneware/raindrop/hhkb/rules.mk b/keyboards/laneware/raindrop/hhkb/rules.mk deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index 35f3198093fc..bd4e8b41c57a 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -1,4 +1,5 @@ { + "keyboard_name": "Raindrop", "usb": { "pid": "0x9999", "device_version": "0.0.1" @@ -11,6 +12,18 @@ "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], "rows": ["E6", "B7", "D0", "D1", "D2"] }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": false, + "audio": false, + "rgblight": false, + "sleep_led": false + }, "community_layouts": ["60_hhkb", "60_ansi"], "layouts": { "LAYOUT_60_ansi": { @@ -150,7 +163,7 @@ {"matrix": [4, 6], "x": 12, "y": 4} ] }, - "LAYOUT_60_ansi_arrows": { + "LAYOUT_60_ansi_2uLS_arrows": { "layout" : [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c b/keyboards/laneware/raindrop/keymaps/default/keymap.c similarity index 100% rename from keyboards/laneware/raindrop/ansi/keymaps/default/keymap.c rename to keyboards/laneware/raindrop/keymaps/default/keymap.c diff --git a/keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c b/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c similarity index 95% rename from keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c rename to keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c index 3f1bc02d75ce..b09d097b3eaf 100644 --- a/keyboards/laneware/raindrop/arrows/keymaps/default/keymap.c +++ b/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c @@ -7,14 +7,14 @@ #define RG_DEL RGUI_T(KC_DEL) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_arrows( + [0] = LAYOUT_60_ansi_2uLS_arrows( 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_60_ansi_arrows( + [1] = LAYOUT_60_ansi_2uLS_arrows( QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, diff --git a/keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c b/keyboards/laneware/raindrop/keymaps/default_hhkb/keymap.c similarity index 100% rename from keyboards/laneware/raindrop/hhkb/keymaps/default/keymap.c rename to keyboards/laneware/raindrop/keymaps/default_hhkb/keymap.c diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md index c96afbc323c6..acca99de39cf 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/laneware/raindrop/readme.md @@ -12,20 +12,26 @@ * Hardware Availability: Group Buy ## Layouts -The Raindrop PCB can be configured in the following key layouts: -* **Standard 60%** -![diagram_ansi](https://i.imgur.com/oibG44o.png) -* **2u Left Shift with Arrow Keys** -![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) -* **HHKB with 6.25 Spacebar** -![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) - -Each layout has it's own QMK keyboard directory: -| Key Layout | Directory | -| :---: | :---: | -| Standard 60% | [raindrop/ansi](/keyboards/laneware/raindrop/ansi) | -| 2u Left Shift with Arrow Keys | [raindrop/arrows](/keyboards/laneware/raindrop/arrows) | -| HHKB Rows 1-4 | [raindrop/hhkb](/keyboards/laneware/raindrop/hhkb) | +The Raindrop PCB can be configured in the following key layouts: +| Key Layout | Keymap | Diagram | +| :---: | :---: | :---: | +| Standard 60% | default | ![diagram_ansi](https://i.imgur.com/oibG44o.png) | +| 2u Left Shift with Arrow Keys | default_arrows | ![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) | +| HHKB with 6.25 Spacebar | default_hhkb | ![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) | + +Make example for this keyboard (after setting up your build environment): + + make laneware/raindrop:default + make laneware/raindrop:default_arrows + make laneware/raindrop:default_hhkb + +Flashing example for this keyboard: + + make laneware/raindrop:default:flash + make laneware/raindrop:default_arrows:flash + make laneware/raindrop:default_hhkb: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 diff --git a/keyboards/laneware/raindrop/ansi/rules.mk b/keyboards/laneware/raindrop/rules.mk similarity index 100% rename from keyboards/laneware/raindrop/ansi/rules.mk rename to keyboards/laneware/raindrop/rules.mk From 9ba88d996c334efca03ca619fa0a7a1ad1609e35 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 00:08:34 +0100 Subject: [PATCH 12/21] correct custom layout macro --- keyboards/laneware/raindrop/info.json | 2 +- keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json index bd4e8b41c57a..0893b3feecb6 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/laneware/raindrop/info.json @@ -163,7 +163,7 @@ {"matrix": [4, 6], "x": 12, "y": 4} ] }, - "LAYOUT_60_ansi_2uLS_arrows": { + "LAYOUT_60_ansi_2u_lshift_arrows": { "layout" : [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c b/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c index b09d097b3eaf..c05ec76c5eb7 100644 --- a/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c +++ b/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c @@ -7,14 +7,14 @@ #define RG_DEL RGUI_T(KC_DEL) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_2uLS_arrows( + [0] = LAYOUT_60_ansi_2u_lshift_arrows( 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_60_ansi_2uLS_arrows( + [1] = LAYOUT_60_ansi_2u_lshift_arrows( QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, From 8c4a2eec31a6264c6b3bc16a70f18e3d96591b40 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 08:34:09 +0100 Subject: [PATCH 13/21] changed to be uniform with other laneware products --- keyboards/laneware/info.json | 7 ------- keyboards/{laneware => }/raindrop/config.h | 0 keyboards/{laneware => }/raindrop/info.json | 11 +++++++---- .../keymaps/arrows}/keymap.c | 0 .../{laneware => }/raindrop/keymaps/default/keymap.c | 0 .../default_hhkb => raindrop/keymaps/hhkb}/keymap.c | 0 keyboards/{laneware => }/raindrop/readme.md | 12 ++++++------ keyboards/{laneware => }/raindrop/rules.mk | 0 8 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 keyboards/laneware/info.json rename keyboards/{laneware => }/raindrop/config.h (100%) rename keyboards/{laneware => }/raindrop/info.json (99%) rename keyboards/{laneware/raindrop/keymaps/default_arrows => raindrop/keymaps/arrows}/keymap.c (100%) rename keyboards/{laneware => }/raindrop/keymaps/default/keymap.c (100%) rename keyboards/{laneware/raindrop/keymaps/default_hhkb => raindrop/keymaps/hhkb}/keymap.c (100%) rename keyboards/{laneware => }/raindrop/readme.md (79%) rename keyboards/{laneware => }/raindrop/rules.mk (100%) diff --git a/keyboards/laneware/info.json b/keyboards/laneware/info.json deleted file mode 100644 index f03d092fa29e..000000000000 --- a/keyboards/laneware/info.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "manufacturer": "Laneware Peripherals", - "maintainer": "Laneware", - "usb": { - "vid": "0x4C50" - } -} diff --git a/keyboards/laneware/raindrop/config.h b/keyboards/raindrop/config.h similarity index 100% rename from keyboards/laneware/raindrop/config.h rename to keyboards/raindrop/config.h diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/raindrop/info.json similarity index 99% rename from keyboards/laneware/raindrop/info.json rename to keyboards/raindrop/info.json index 0893b3feecb6..6d6392c87253 100644 --- a/keyboards/laneware/raindrop/info.json +++ b/keyboards/raindrop/info.json @@ -1,17 +1,20 @@ { "keyboard_name": "Raindrop", + "manufacturer": "Laneware Peripherals", + "url": "https://lanewareperipherals.com/collections/raindrop-60", + "maintainer": "qmk", "usb": { + "vid": "0x4C50", "pid": "0x9999", "device_version": "0.0.1" }, - "url": "https://lanewareperipherals.com/collections/raindrop-60", - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "matrix_pins": { "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"], "rows": ["E6", "B7", "D0", "D1", "D2"] }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "features": { "bootmagic": true, "mousekey": true, diff --git a/keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c b/keyboards/raindrop/keymaps/arrows/keymap.c similarity index 100% rename from keyboards/laneware/raindrop/keymaps/default_arrows/keymap.c rename to keyboards/raindrop/keymaps/arrows/keymap.c diff --git a/keyboards/laneware/raindrop/keymaps/default/keymap.c b/keyboards/raindrop/keymaps/default/keymap.c similarity index 100% rename from keyboards/laneware/raindrop/keymaps/default/keymap.c rename to keyboards/raindrop/keymaps/default/keymap.c diff --git a/keyboards/laneware/raindrop/keymaps/default_hhkb/keymap.c b/keyboards/raindrop/keymaps/hhkb/keymap.c similarity index 100% rename from keyboards/laneware/raindrop/keymaps/default_hhkb/keymap.c rename to keyboards/raindrop/keymaps/hhkb/keymap.c diff --git a/keyboards/laneware/raindrop/readme.md b/keyboards/raindrop/readme.md similarity index 79% rename from keyboards/laneware/raindrop/readme.md rename to keyboards/raindrop/readme.md index acca99de39cf..4dfd320c058e 100644 --- a/keyboards/laneware/raindrop/readme.md +++ b/keyboards/raindrop/readme.md @@ -16,20 +16,20 @@ The Raindrop PCB can be configured in the following key layouts: | Key Layout | Keymap | Diagram | | :---: | :---: | :---: | | Standard 60% | default | ![diagram_ansi](https://i.imgur.com/oibG44o.png) | -| 2u Left Shift with Arrow Keys | default_arrows | ![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) | -| HHKB with 6.25 Spacebar | default_hhkb | ![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) | +| 2u Left Shift with Arrow Keys | arrows | ![diagram_arrows](https://i.imgur.com/cQ4Kwb5h.png) | +| HHKB with 6.25 Spacebar | hhkb | ![diagram_hhkb](https://i.imgur.com/WU6gb1Qh.png) | Make example for this keyboard (after setting up your build environment): make laneware/raindrop:default - make laneware/raindrop:default_arrows - make laneware/raindrop:default_hhkb + make laneware/raindrop:arrows + make laneware/raindrop:hhkb Flashing example for this keyboard: make laneware/raindrop:default:flash - make laneware/raindrop:default_arrows:flash - make laneware/raindrop:default_hhkb:flash + make laneware/raindrop:arrows:flash + make laneware/raindrop:hhkb: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). diff --git a/keyboards/laneware/raindrop/rules.mk b/keyboards/raindrop/rules.mk similarity index 100% rename from keyboards/laneware/raindrop/rules.mk rename to keyboards/raindrop/rules.mk From fbaad26358a49302a6b92db31fe4b1d074856a74 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 09:13:36 +0100 Subject: [PATCH 14/21] update readme.md --- keyboards/raindrop/readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/raindrop/readme.md b/keyboards/raindrop/readme.md index 4dfd320c058e..410c177a4414 100644 --- a/keyboards/raindrop/readme.md +++ b/keyboards/raindrop/readme.md @@ -21,15 +21,15 @@ The Raindrop PCB can be configured in the following key layouts: Make example for this keyboard (after setting up your build environment): - make laneware/raindrop:default - make laneware/raindrop:arrows - make laneware/raindrop:hhkb + make raindrop:default + make raindrop:arrows + make raindrop:hhkb Flashing example for this keyboard: - make laneware/raindrop:default:flash - make laneware/raindrop:arrows:flash - make laneware/raindrop:hhkb:flash + make raindrop:default:flash + make raindrop:arrows:flash + make raindrop:hhkb: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). From 926152a02b7e93bedd45f4458aaac9addb510968 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 09:22:33 +0100 Subject: [PATCH 15/21] update readme.md --- keyboards/raindrop/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/raindrop/readme.md b/keyboards/raindrop/readme.md index 410c177a4414..56b3cbc87f91 100644 --- a/keyboards/raindrop/readme.md +++ b/keyboards/raindrop/readme.md @@ -5,9 +5,9 @@ ![PCB Front](https://i.imgur.com/00TpL3nh.png) *PCB Front* -60% sized keyboard with a gasket mounted plate and aluminium case. +60% sized keyboard with a gasket mounted plate and aluminium case, made by Laneware Peripherals. -* Keyboard Maintainer: [Laneware Peripherals Support](mailto:support@lanewareperipherals.zendesk.com) +* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware) * Hardware Supported: Raindrop PCB * Hardware Availability: Group Buy From f046e979b5d5b1d9afe04e629828b8b00f16e22b Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 10:47:24 +0100 Subject: [PATCH 16/21] Update keyboards/raindrop/info.json Co-authored-by: Sergey Vlasov --- keyboards/raindrop/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json index 6d6392c87253..059221f65de1 100644 --- a/keyboards/raindrop/info.json +++ b/keyboards/raindrop/info.json @@ -166,7 +166,7 @@ {"matrix": [4, 6], "x": 12, "y": 4} ] }, - "LAYOUT_60_ansi_2u_lshift_arrows": { + "LAYOUT_64_ansi": { "layout" : [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From e4e8877b94a7c5fd20d4d49f2d6e2c3b4a085a72 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 10:47:30 +0100 Subject: [PATCH 17/21] Update keyboards/raindrop/info.json Co-authored-by: Sergey Vlasov --- keyboards/raindrop/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json index 059221f65de1..34071c512a54 100644 --- a/keyboards/raindrop/info.json +++ b/keyboards/raindrop/info.json @@ -27,7 +27,7 @@ "rgblight": false, "sleep_led": false }, - "community_layouts": ["60_hhkb", "60_ansi"], + "community_layouts": ["60_hhkb", "60_ansi", "64_ansi"], "layouts": { "LAYOUT_60_ansi": { "layout": [ From e3f2fd6d1f075a3ca89ad60dffdbf5a6fbb3a71d Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 10:48:51 +0100 Subject: [PATCH 18/21] update to LAYOUT_64_ansi --- keyboards/raindrop/keymaps/arrows/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/raindrop/keymaps/arrows/keymap.c b/keyboards/raindrop/keymaps/arrows/keymap.c index c05ec76c5eb7..a13614f75118 100644 --- a/keyboards/raindrop/keymaps/arrows/keymap.c +++ b/keyboards/raindrop/keymaps/arrows/keymap.c @@ -7,14 +7,14 @@ #define RG_DEL RGUI_T(KC_DEL) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi_2u_lshift_arrows( + [0] = LAYOUT_64_ansi( 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL, KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_60_ansi_2u_lshift_arrows( + [1] = LAYOUT_64_ansi( QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO, From 531384e16bd87d4584635eb8f265537bc7429ecd Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sun, 18 Jun 2023 11:13:14 +0100 Subject: [PATCH 19/21] add LAYOUT_all --- keyboards/raindrop/info.json | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json index 34071c512a54..39d1a0628756 100644 --- a/keyboards/raindrop/info.json +++ b/keyboards/raindrop/info.json @@ -227,6 +227,79 @@ {"matrix": [3, 12], "x": 13, "y": 3}, {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 4], "x": 10, "y": 4}, + {"matrix": [4, 5], "x": 11, "y": 4}, + {"matrix": [4, 6], "x": 12, "y": 4}, + {"matrix": [4, 7], "x": 13, "y": 4}, + {"matrix": [4, 8], "x": 14, "y": 4} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x":0, "y":0}, + {"matrix": [0, 1], "x":1, "y":0}, + {"matrix": [0, 2], "x":2, "y":0}, + {"matrix": [0, 3], "x":3, "y":0}, + {"matrix": [0, 4], "x":4, "y":0}, + {"matrix": [0, 5], "x":5, "y":0}, + {"matrix": [0, 6], "x":6, "y":0}, + {"matrix": [0, 7], "x":7, "y":0}, + {"matrix": [0, 8], "x":8, "y":0}, + {"matrix": [0, 9], "x":9, "y":0}, + {"matrix": [0, 10], "x":10, "y":0}, + {"matrix": [0, 11], "x":11, "y":0}, + {"matrix": [0, 12], "x":12, "y":0}, + {"matrix": [0, 13], "x":13, "y":0}, + {"matrix": [0, 14], "x":14, "y":0}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [1, 0], "x":0, "y":1, "w":1.5}, + {"matrix": [1, 1], "x":1.5, "y":1}, + {"matrix": [1, 2], "x":2.5, "y":1}, + {"matrix": [1, 3], "x":3.5, "y":1}, + {"matrix": [1, 4], "x":4.5, "y":1}, + {"matrix": [1, 5], "x":5.5, "y":1}, + {"matrix": [1, 6], "x":6.5, "y":1}, + {"matrix": [1, 7], "x":7.5, "y":1}, + {"matrix": [1, 8], "x":8.5, "y":1}, + {"matrix": [1, 9], "x":9.5, "y":1}, + {"matrix": [1, 10], "x":10.5, "y":1}, + {"matrix": [1, 11], "x":11.5, "y":1}, + {"matrix": [1, 12], "x":12.5, "y":1}, + {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, From 1f0265f56b3ecdaa30fd849c698cfada13949149 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 25 Jul 2023 20:45:11 +0100 Subject: [PATCH 20/21] Update info.json change `usb.pid` --- keyboards/raindrop/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json index 39d1a0628756..738e1719ea97 100644 --- a/keyboards/raindrop/info.json +++ b/keyboards/raindrop/info.json @@ -5,7 +5,7 @@ "maintainer": "qmk", "usb": { "vid": "0x4C50", - "pid": "0x9999", + "pid": "0x3333", "device_version": "0.0.1" }, "matrix_pins": { From 33e1596842efb707bb24f258014b47846001b235 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Tue, 25 Jul 2023 23:04:49 +0100 Subject: [PATCH 21/21] Update keyboards/raindrop/readme.md Co-authored-by: Ryan --- keyboards/raindrop/readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/raindrop/readme.md b/keyboards/raindrop/readme.md index 56b3cbc87f91..2741cfafa75f 100644 --- a/keyboards/raindrop/readme.md +++ b/keyboards/raindrop/readme.md @@ -22,14 +22,10 @@ The Raindrop PCB can be configured in the following key layouts: Make example for this keyboard (after setting up your build environment): make raindrop:default - make raindrop:arrows - make raindrop:hhkb Flashing example for this keyboard: make raindrop:default:flash - make raindrop:arrows:flash - make raindrop:hhkb: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).