From 300af1e5bfb887d1dc8528a70dfb599841ffc92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?=
=?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?=
<76888457+filterpaper@users.noreply.github.com>
Date: Sun, 24 Dec 2023 07:45:53 +0800
Subject: [PATCH] Refactor: move keyboards into laneware folder (#22710)
---
data/mappings/keyboard_aliases.hjson | 15 +++++++++++++
keyboards/{ => laneware}/lpad/config.h | 0
keyboards/{ => laneware}/lpad/info.json | 0
.../lpad/keymaps/default/keymap.c | 0
.../{ => laneware}/lpad/keymaps/via/keymap.c | 0
.../{ => laneware}/lpad/keymaps/via/rules.mk | 0
keyboards/{ => laneware}/lpad/readme.md | 4 ++--
keyboards/{ => laneware}/lpad/rules.mk | 0
keyboards/{ => laneware}/lw67/config.h | 0
keyboards/{ => laneware}/lw67/info.json | 0
.../keymaps/ansi_split_backspace/keymap.c | 0
.../lw67/keymaps/default/keymap.c | 17 ++-------------
.../{ => laneware}/lw67/keymaps/iso/keymap.c | 21 ++++---------------
.../lw67/keymaps/iso_split_backspace/keymap.c | 0
.../{ => laneware}/lw67/keymaps/via/keymap.c | 17 ++-------------
.../{ => laneware}/lw67/keymaps/via/rules.mk | 0
keyboards/{ => laneware}/lw67/readme.md | 2 +-
keyboards/{ => laneware}/lw67/rules.mk | 0
keyboards/{ => laneware}/lw75/config.h | 0
keyboards/{ => laneware}/lw75/info.json | 0
.../keymaps/ansi_split_backspace/keymap.c | 0
.../lw75/keymaps/default/keymap.c | 0
.../{ => laneware}/lw75/keymaps/iso/keymap.c | 0
.../lw75/keymaps/iso_split_backspace/keymap.c | 0
.../{ => laneware}/lw75/keymaps/via/keymap.c | 0
.../{ => laneware}/lw75/keymaps/via/rules.mk | 0
keyboards/{ => laneware}/lw75/readme.md | 4 ++--
keyboards/{ => laneware}/lw75/rules.mk | 0
keyboards/{ => laneware}/macro1/config.h | 0
keyboards/{ => laneware}/macro1/info.json | 0
.../macro1/keymaps/default/keymap.c | 17 ++-------------
.../macro1/keymaps/macropad/keymap.c | 0
.../macro1/keymaps/southpaw/keymap.c | 0
.../macro1/keymaps/via/keymap.c | 17 ++-------------
.../macro1/keymaps/via/rules.mk | 0
keyboards/{ => laneware}/macro1/readme.md | 2 +-
keyboards/{ => laneware}/macro1/rules.mk | 0
keyboards/{ => laneware}/raindrop/config.h | 0
keyboards/{ => laneware}/raindrop/info.json | 0
.../raindrop/keymaps/arrows/keymap.c | 0
.../raindrop/keymaps/default/keymap.c | 0
.../raindrop/keymaps/hhkb/keymap.c | 0
.../{ => laneware}/raindrop/matrix_diagram.md | 0
keyboards/{ => laneware}/raindrop/readme.md | 4 ++--
keyboards/{ => laneware}/raindrop/rules.mk | 0
45 files changed, 35 insertions(+), 85 deletions(-)
rename keyboards/{ => laneware}/lpad/config.h (100%)
rename keyboards/{ => laneware}/lpad/info.json (100%)
rename keyboards/{ => laneware}/lpad/keymaps/default/keymap.c (100%)
rename keyboards/{ => laneware}/lpad/keymaps/via/keymap.c (100%)
rename keyboards/{ => laneware}/lpad/keymaps/via/rules.mk (100%)
rename keyboards/{ => laneware}/lpad/readme.md (93%)
rename keyboards/{ => laneware}/lpad/rules.mk (100%)
rename keyboards/{ => laneware}/lw67/config.h (100%)
rename keyboards/{ => laneware}/lw67/info.json (100%)
rename keyboards/{ => laneware}/lw67/keymaps/ansi_split_backspace/keymap.c (100%)
rename keyboards/{ => laneware}/lw67/keymaps/default/keymap.c (73%)
rename keyboards/{ => laneware}/lw67/keymaps/iso/keymap.c (72%)
rename keyboards/{ => laneware}/lw67/keymaps/iso_split_backspace/keymap.c (100%)
rename keyboards/{ => laneware}/lw67/keymaps/via/keymap.c (79%)
rename keyboards/{ => laneware}/lw67/keymaps/via/rules.mk (100%)
rename keyboards/{ => laneware}/lw67/readme.md (96%)
rename keyboards/{ => laneware}/lw67/rules.mk (100%)
rename keyboards/{ => laneware}/lw75/config.h (100%)
rename keyboards/{ => laneware}/lw75/info.json (100%)
rename keyboards/{ => laneware}/lw75/keymaps/ansi_split_backspace/keymap.c (100%)
rename keyboards/{ => laneware}/lw75/keymaps/default/keymap.c (100%)
rename keyboards/{ => laneware}/lw75/keymaps/iso/keymap.c (100%)
rename keyboards/{ => laneware}/lw75/keymaps/iso_split_backspace/keymap.c (100%)
rename keyboards/{ => laneware}/lw75/keymaps/via/keymap.c (100%)
rename keyboards/{ => laneware}/lw75/keymaps/via/rules.mk (100%)
rename keyboards/{ => laneware}/lw75/readme.md (93%)
rename keyboards/{ => laneware}/lw75/rules.mk (100%)
rename keyboards/{ => laneware}/macro1/config.h (100%)
rename keyboards/{ => laneware}/macro1/info.json (100%)
rename keyboards/{ => laneware}/macro1/keymaps/default/keymap.c (61%)
rename keyboards/{ => laneware}/macro1/keymaps/macropad/keymap.c (100%)
rename keyboards/{ => laneware}/macro1/keymaps/southpaw/keymap.c (100%)
rename keyboards/{ => laneware}/macro1/keymaps/via/keymap.c (80%)
rename keyboards/{ => laneware}/macro1/keymaps/via/rules.mk (100%)
rename keyboards/{ => laneware}/macro1/readme.md (96%)
rename keyboards/{ => laneware}/macro1/rules.mk (100%)
rename keyboards/{ => laneware}/raindrop/config.h (100%)
rename keyboards/{ => laneware}/raindrop/info.json (100%)
rename keyboards/{ => laneware}/raindrop/keymaps/arrows/keymap.c (100%)
rename keyboards/{ => laneware}/raindrop/keymaps/default/keymap.c (100%)
rename keyboards/{ => laneware}/raindrop/keymaps/hhkb/keymap.c (100%)
rename keyboards/{ => laneware}/raindrop/matrix_diagram.md (100%)
rename keyboards/{ => laneware}/raindrop/readme.md (95%)
rename keyboards/{ => laneware}/raindrop/rules.mk (100%)
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index fbc90d1606..fed6018b9b 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -975,9 +975,21 @@
"ls_60": {
"target": "weirdo/ls_60"
},
+ "lpad": {
+ "target": "laneware/lpad"
+ },
+ "lw67": {
+ "target": "laneware/lw67"
+ },
+ "lw75": {
+ "target": "laneware/lw75"
+ },
"m3n3van": {
"target": "matthewdias/m3n3van"
},
+ "macro1": {
+ "target": "laneware/macro1"
+ },
"massdrop/thekey": {
"target": "drop/thekey/v1"
},
@@ -1125,6 +1137,9 @@
"rabbit_capture_plan": {
"target": "kakunpc/rabbit_capture_plan"
},
+ "raindrop": {
+ "target": "laneware/raindrop"
+ },
"ramonimbao/aelith": {
"target": "rmi_kb/aelith"
},
diff --git a/keyboards/lpad/config.h b/keyboards/laneware/lpad/config.h
similarity index 100%
rename from keyboards/lpad/config.h
rename to keyboards/laneware/lpad/config.h
diff --git a/keyboards/lpad/info.json b/keyboards/laneware/lpad/info.json
similarity index 100%
rename from keyboards/lpad/info.json
rename to keyboards/laneware/lpad/info.json
diff --git a/keyboards/lpad/keymaps/default/keymap.c b/keyboards/laneware/lpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lpad/keymaps/default/keymap.c
rename to keyboards/laneware/lpad/keymaps/default/keymap.c
diff --git a/keyboards/lpad/keymaps/via/keymap.c b/keyboards/laneware/lpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lpad/keymaps/via/keymap.c
rename to keyboards/laneware/lpad/keymaps/via/keymap.c
diff --git a/keyboards/lpad/keymaps/via/rules.mk b/keyboards/laneware/lpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lpad/keymaps/via/rules.mk
rename to keyboards/laneware/lpad/keymaps/via/rules.mk
diff --git a/keyboards/lpad/readme.md b/keyboards/laneware/lpad/readme.md
similarity index 93%
rename from keyboards/lpad/readme.md
rename to keyboards/laneware/lpad/readme.md
index 864f9569fa..2a2e8b5672 100644
--- a/keyboards/lpad/readme.md
+++ b/keyboards/laneware/lpad/readme.md
@@ -10,11 +10,11 @@ A Macro Keyboard with a RHS rotary encoder, made and sold by Laneware Peripheral
Make example for this keyboard (after setting up your build environment):
- make lpad:default
+ make laneware/lpad:default
Flashing example for this keyboard:
- make lpad:default:flash
+ make laneware/lpad: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/lpad/rules.mk b/keyboards/laneware/lpad/rules.mk
similarity index 100%
rename from keyboards/lpad/rules.mk
rename to keyboards/laneware/lpad/rules.mk
diff --git a/keyboards/lw67/config.h b/keyboards/laneware/lw67/config.h
similarity index 100%
rename from keyboards/lw67/config.h
rename to keyboards/laneware/lw67/config.h
diff --git a/keyboards/lw67/info.json b/keyboards/laneware/lw67/info.json
similarity index 100%
rename from keyboards/lw67/info.json
rename to keyboards/laneware/lw67/info.json
diff --git a/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c b/keyboards/laneware/lw67/keymaps/ansi_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
rename to keyboards/laneware/lw67/keymaps/ansi_split_backspace/keymap.c
diff --git a/keyboards/lw67/keymaps/default/keymap.c b/keyboards/laneware/lw67/keymaps/default/keymap.c
similarity index 73%
rename from keyboards/lw67/keymaps/default/keymap.c
rename to keyboards/laneware/lw67/keymaps/default/keymap.c
index 2ab17a3590..97e947fb01 100644
--- a/keyboards/lw67/keymaps/default/keymap.c
+++ b/keyboards/laneware/lw67/keymaps/default/keymap.c
@@ -1,18 +1,5 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keyboards/lw67/keymaps/iso/keymap.c b/keyboards/laneware/lw67/keymaps/iso/keymap.c
similarity index 72%
rename from keyboards/lw67/keymaps/iso/keymap.c
rename to keyboards/laneware/lw67/keymaps/iso/keymap.c
index 6e05f9b8bd..8e26843868 100644
--- a/keyboards/lw67/keymaps/iso/keymap.c
+++ b/keyboards/laneware/lw67/keymaps/iso/keymap.c
@@ -1,18 +1,5 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
@@ -26,14 +13,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_iso(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[2] = LAYOUT_iso(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/lw67/keymaps/iso_split_backspace/keymap.c b/keyboards/laneware/lw67/keymaps/iso_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw67/keymaps/iso_split_backspace/keymap.c
rename to keyboards/laneware/lw67/keymaps/iso_split_backspace/keymap.c
diff --git a/keyboards/lw67/keymaps/via/keymap.c b/keyboards/laneware/lw67/keymaps/via/keymap.c
similarity index 79%
rename from keyboards/lw67/keymaps/via/keymap.c
rename to keyboards/laneware/lw67/keymaps/via/keymap.c
index a8f4b42084..73d2640f17 100644
--- a/keyboards/lw67/keymaps/via/keymap.c
+++ b/keyboards/laneware/lw67/keymaps/via/keymap.c
@@ -1,18 +1,5 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keyboards/lw67/keymaps/via/rules.mk b/keyboards/laneware/lw67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lw67/keymaps/via/rules.mk
rename to keyboards/laneware/lw67/keymaps/via/rules.mk
diff --git a/keyboards/lw67/readme.md b/keyboards/laneware/lw67/readme.md
similarity index 96%
rename from keyboards/lw67/readme.md
rename to keyboards/laneware/lw67/readme.md
index dacd09b5e0..de59992d43 100644
--- a/keyboards/lw67/readme.md
+++ b/keyboards/laneware/lw67/readme.md
@@ -10,7 +10,7 @@ A 65% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
Make example for this keyboard (after setting up your build environment):
- make lw67:default
+ make laneware/lw67:default
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/lw67/rules.mk b/keyboards/laneware/lw67/rules.mk
similarity index 100%
rename from keyboards/lw67/rules.mk
rename to keyboards/laneware/lw67/rules.mk
diff --git a/keyboards/lw75/config.h b/keyboards/laneware/lw75/config.h
similarity index 100%
rename from keyboards/lw75/config.h
rename to keyboards/laneware/lw75/config.h
diff --git a/keyboards/lw75/info.json b/keyboards/laneware/lw75/info.json
similarity index 100%
rename from keyboards/lw75/info.json
rename to keyboards/laneware/lw75/info.json
diff --git a/keyboards/lw75/keymaps/ansi_split_backspace/keymap.c b/keyboards/laneware/lw75/keymaps/ansi_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/ansi_split_backspace/keymap.c
rename to keyboards/laneware/lw75/keymaps/ansi_split_backspace/keymap.c
diff --git a/keyboards/lw75/keymaps/default/keymap.c b/keyboards/laneware/lw75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/default/keymap.c
rename to keyboards/laneware/lw75/keymaps/default/keymap.c
diff --git a/keyboards/lw75/keymaps/iso/keymap.c b/keyboards/laneware/lw75/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/iso/keymap.c
rename to keyboards/laneware/lw75/keymaps/iso/keymap.c
diff --git a/keyboards/lw75/keymaps/iso_split_backspace/keymap.c b/keyboards/laneware/lw75/keymaps/iso_split_backspace/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/iso_split_backspace/keymap.c
rename to keyboards/laneware/lw75/keymaps/iso_split_backspace/keymap.c
diff --git a/keyboards/lw75/keymaps/via/keymap.c b/keyboards/laneware/lw75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lw75/keymaps/via/keymap.c
rename to keyboards/laneware/lw75/keymaps/via/keymap.c
diff --git a/keyboards/lw75/keymaps/via/rules.mk b/keyboards/laneware/lw75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lw75/keymaps/via/rules.mk
rename to keyboards/laneware/lw75/keymaps/via/rules.mk
diff --git a/keyboards/lw75/readme.md b/keyboards/laneware/lw75/readme.md
similarity index 93%
rename from keyboards/lw75/readme.md
rename to keyboards/laneware/lw75/readme.md
index 9f64108fa5..5b28204ada 100644
--- a/keyboards/lw75/readme.md
+++ b/keyboards/laneware/lw75/readme.md
@@ -10,10 +10,10 @@ A 75% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
Make example for this keyboard (after setting up your build environment):
- make lw75:default
+ make laneware/lw75:default
Flashing example for this keyboard:
- make lw75:default:flash
+ make laneware/lw75: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/lw75/rules.mk b/keyboards/laneware/lw75/rules.mk
similarity index 100%
rename from keyboards/lw75/rules.mk
rename to keyboards/laneware/lw75/rules.mk
diff --git a/keyboards/macro1/config.h b/keyboards/laneware/macro1/config.h
similarity index 100%
rename from keyboards/macro1/config.h
rename to keyboards/laneware/macro1/config.h
diff --git a/keyboards/macro1/info.json b/keyboards/laneware/macro1/info.json
similarity index 100%
rename from keyboards/macro1/info.json
rename to keyboards/laneware/macro1/info.json
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/laneware/macro1/keymaps/default/keymap.c
similarity index 61%
rename from keyboards/macro1/keymaps/default/keymap.c
rename to keyboards/laneware/macro1/keymaps/default/keymap.c
index 047ea69808..bee64a99e5 100644
--- a/keyboards/macro1/keymaps/default/keymap.c
+++ b/keyboards/laneware/macro1/keymaps/default/keymap.c
@@ -1,18 +1,5 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keyboards/macro1/keymaps/macropad/keymap.c b/keyboards/laneware/macro1/keymaps/macropad/keymap.c
similarity index 100%
rename from keyboards/macro1/keymaps/macropad/keymap.c
rename to keyboards/laneware/macro1/keymaps/macropad/keymap.c
diff --git a/keyboards/macro1/keymaps/southpaw/keymap.c b/keyboards/laneware/macro1/keymaps/southpaw/keymap.c
similarity index 100%
rename from keyboards/macro1/keymaps/southpaw/keymap.c
rename to keyboards/laneware/macro1/keymaps/southpaw/keymap.c
diff --git a/keyboards/macro1/keymaps/via/keymap.c b/keyboards/laneware/macro1/keymaps/via/keymap.c
similarity index 80%
rename from keyboards/macro1/keymaps/via/keymap.c
rename to keyboards/laneware/macro1/keymaps/via/keymap.c
index f3e53a78e9..3e18339208 100644
--- a/keyboards/macro1/keymaps/via/keymap.c
+++ b/keyboards/laneware/macro1/keymaps/via/keymap.c
@@ -1,18 +1,5 @@
- /* Copyright 2021 Laneware Peripherals
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 Laneware Peripherals
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
diff --git a/keyboards/macro1/keymaps/via/rules.mk b/keyboards/laneware/macro1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/macro1/keymaps/via/rules.mk
rename to keyboards/laneware/macro1/keymaps/via/rules.mk
diff --git a/keyboards/macro1/readme.md b/keyboards/laneware/macro1/readme.md
similarity index 96%
rename from keyboards/macro1/readme.md
rename to keyboards/laneware/macro1/readme.md
index 578a34e1c7..c89ceb0d88 100644
--- a/keyboards/macro1/readme.md
+++ b/keyboards/laneware/macro1/readme.md
@@ -10,7 +10,7 @@ A versitile numpad/macropad (14x6) with a rotary encoder, made and sold by Lanew
Make example for this keyboard (after setting up your build environment):
- make macro1:default
+ make laneware/macro1:default
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/macro1/rules.mk b/keyboards/laneware/macro1/rules.mk
similarity index 100%
rename from keyboards/macro1/rules.mk
rename to keyboards/laneware/macro1/rules.mk
diff --git a/keyboards/raindrop/config.h b/keyboards/laneware/raindrop/config.h
similarity index 100%
rename from keyboards/raindrop/config.h
rename to keyboards/laneware/raindrop/config.h
diff --git a/keyboards/raindrop/info.json b/keyboards/laneware/raindrop/info.json
similarity index 100%
rename from keyboards/raindrop/info.json
rename to keyboards/laneware/raindrop/info.json
diff --git a/keyboards/raindrop/keymaps/arrows/keymap.c b/keyboards/laneware/raindrop/keymaps/arrows/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/arrows/keymap.c
rename to keyboards/laneware/raindrop/keymaps/arrows/keymap.c
diff --git a/keyboards/raindrop/keymaps/default/keymap.c b/keyboards/laneware/raindrop/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/default/keymap.c
rename to keyboards/laneware/raindrop/keymaps/default/keymap.c
diff --git a/keyboards/raindrop/keymaps/hhkb/keymap.c b/keyboards/laneware/raindrop/keymaps/hhkb/keymap.c
similarity index 100%
rename from keyboards/raindrop/keymaps/hhkb/keymap.c
rename to keyboards/laneware/raindrop/keymaps/hhkb/keymap.c
diff --git a/keyboards/raindrop/matrix_diagram.md b/keyboards/laneware/raindrop/matrix_diagram.md
similarity index 100%
rename from keyboards/raindrop/matrix_diagram.md
rename to keyboards/laneware/raindrop/matrix_diagram.md
diff --git a/keyboards/raindrop/readme.md b/keyboards/laneware/raindrop/readme.md
similarity index 95%
rename from keyboards/raindrop/readme.md
rename to keyboards/laneware/raindrop/readme.md
index 2741cfafa7..f0354d3859 100644
--- a/keyboards/raindrop/readme.md
+++ b/keyboards/laneware/raindrop/readme.md
@@ -21,11 +21,11 @@ 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 laneware/raindrop:default
Flashing example for this keyboard:
- make raindrop:default:flash
+ make laneware/raindrop: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/raindrop/rules.mk b/keyboards/laneware/raindrop/rules.mk
similarity index 100%
rename from keyboards/raindrop/rules.mk
rename to keyboards/laneware/raindrop/rules.mk