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: Refactor: move keyboards into laneware folder (#22710)
---
keyboards/macro1/config.h | 26 -------
keyboards/macro1/info.json | 118 -----------------------------
keyboards/macro1/keymaps/default/keymap.c | 53 -------------
keyboards/macro1/keymaps/macropad/keymap.c | 63 ---------------
keyboards/macro1/keymaps/southpaw/keymap.c | 63 ---------------
keyboards/macro1/keymaps/via/keymap.c | 103 -------------------------
keyboards/macro1/keymaps/via/rules.mk | 1 -
keyboards/macro1/readme.md | 22 ------
keyboards/macro1/rules.mk | 13 ----
9 files changed, 462 deletions(-)
delete mode 100644 keyboards/macro1/config.h
delete mode 100644 keyboards/macro1/info.json
delete mode 100644 keyboards/macro1/keymaps/default/keymap.c
delete mode 100644 keyboards/macro1/keymaps/macropad/keymap.c
delete mode 100644 keyboards/macro1/keymaps/southpaw/keymap.c
delete mode 100644 keyboards/macro1/keymaps/via/keymap.c
delete mode 100644 keyboards/macro1/keymaps/via/rules.mk
delete mode 100644 keyboards/macro1/readme.md
delete mode 100644 keyboards/macro1/rules.mk
(limited to 'keyboards/macro1')
diff --git a/keyboards/macro1/config.h b/keyboards/macro1/config.h
deleted file mode 100644
index 30b3906f0d..0000000000
--- a/keyboards/macro1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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 .
- */
-
-#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
-
-
-
diff --git a/keyboards/macro1/info.json b/keyboards/macro1/info.json
deleted file mode 100644
index dd22627031..0000000000
--- a/keyboards/macro1/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
- "keyboard_name": "MACRO-1",
- "manufacturer": "Laneware Peripherals",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4C50",
- "pid": "0x9999",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D3", "D4", "D6", "D7"],
- "rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "F0", "pin_b": "F1"}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_numpad": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4, "h": 2},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
- {"matrix": [5, 2], "x": 2, "y": 5}
- ]
- },
- "LAYOUT_southpaw": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "h": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
-
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "h": 2},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
-
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5, "w": 2}
- ]
- },
- "LAYOUT_macropad": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5},
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5},
- {"matrix": [5, 3], "x": 3, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/macro1/keymaps/default/keymap.c b/keyboards/macro1/keymaps/default/keymap.c
deleted file mode 100644
index 047ea69808..0000000000
--- a/keyboards/macro1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
- /* 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-/*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤ │
- * │K30│K31│K32│ │
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤ │
- * │K50 │K52│ │
- * └───────┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_numpad(
- KC_MUTE, KC_MPLY, KC_BSPC,
- KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
- KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
- KC_KP_4, KC_KP_5, KC_KP_6,
- KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
- KC_KP_0, KC_KP_DOT)
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
-};
-#endif
-
-
diff --git a/keyboards/macro1/keymaps/macropad/keymap.c b/keyboards/macro1/keymaps/macropad/keymap.c
deleted file mode 100644
index 68566fb53f..0000000000
--- a/keyboards/macro1/keymaps/macropad/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
- /* 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-/*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K01│K02│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_macropad(
- KC_MUTE, 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_F13, KC_F14,
- KC_F15, KC_F16, KC_F17, KC_F18,
- KC_F19, KC_F20, KC_F21, KC_F22),
-
- [1] = LAYOUT_macropad(
- 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_macropad(
- 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/macro1/keymaps/southpaw/keymap.c b/keyboards/macro1/keymaps/southpaw/keymap.c
deleted file mode 100644
index b8c6bfb339..0000000000
--- a/keyboards/macro1/keymaps/southpaw/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
- /* 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-/*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * │ ├───┼───┼───┤
- * │ │K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * │ ├───┼───┴───┤
- * │ │K51│K52 │
- * └───┴───┴───────┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_southpaw(
- KC_MUTE, KC_MPLY, KC_BSPC,
- KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
- KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9,
- KC_KP_4, KC_KP_5, KC_KP_6,
- KC_KP_ENTER, KC_KP_1, KC_KP_2, KC_KP_3,
- KC_KP_DOT, KC_KP_0),
-
- [1] = LAYOUT_southpaw(
- 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_southpaw(
- 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/macro1/keymaps/via/keymap.c b/keyboards/macro1/keymaps/via/keymap.c
deleted file mode 100644
index f3e53a78e9..0000000000
--- a/keyboards/macro1/keymaps/via/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
- /* 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 .
- */
-
-#include QMK_KEYBOARD_H
-
-/*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┤ │
- * │K30│K31│K32│ │
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┴───┼───┤ │
- * │K50 │K52│ │
- * └───────┴───┴───┘
- */
-
- /*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K02│K03│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * │ ├───┼───┼───┤
- * │ │K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * │ ├───┼───┴───┤
- * │ │K51│K52 │
- * └───┴───┴───────┘
- */
-
-/*
- * ┌───┐ ┌───┬───┐
- * │K00│ │K01│K02│
- * └───┘ └───┴───┘
- * ┌───┬───┬───┬───┐
- * │K10│K11│K12│K13│
- * ├───┼───┼───┼───┤
- * │K20│K21│K22│K23│
- * ├───┼───┼───┼───┤
- * │K30│K31│K32│K33│
- * ├───┼───┼───┼───┤
- * │K40│K41│K42│K43│
- * ├───┼───┼───┼───┤
- * │K50│K51│K52│K53│
- * └───┴───┴───┴───┘
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_numpad(
- KC_MUTE, KC_MPLY, KC_BSPC,
- KC_CALC, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
- KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
- KC_KP_4, KC_KP_5, KC_KP_6,
- KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
- KC_KP_0, KC_KP_DOT),
-
- [1] = LAYOUT_numpad(
- 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_numpad(
- 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),
-
- [3] = LAYOUT_numpad(
- 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/macro1/keymaps/via/rules.mk b/keyboards/macro1/keymaps/via/rules.mk
deleted file mode 100644
index 036bd6d1c3..0000000000
--- a/keyboards/macro1/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/macro1/readme.md b/keyboards/macro1/readme.md
deleted file mode 100644
index 578a34e1c7..0000000000
--- a/keyboards/macro1/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Macro-1
-
-
-
-A versitile numpad/macropad (14x6) with a rotary encoder, made and sold by Laneware Peripherals.
-
-* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
-* Hardware Supported: Macro-1
-* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/),
-
-Make example for this keyboard (after setting up your build environment):
-
- make 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).
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the encoder and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/macro1/rules.mk b/keyboards/macro1/rules.mk
deleted file mode 100644
index f0a88209b6..0000000000
--- a/keyboards/macro1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
\ No newline at end of file
--
cgit v1.2.3