diff options
Diffstat (limited to 'keyboards/merge')
55 files changed, 0 insertions, 2205 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h deleted file mode 100644 index f5a82d2df8..0000000000 --- a/keyboards/merge/iso_macro/config.h +++ /dev/null @@ -1,35 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - -#define MATRIX_ROW_PINS { F4, F5, F6} -#define MATRIX_COL_PINS { B4, B5, B6} -#define BACKLIGHT_PIN B7 - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - - -#define ENCODERS_PAD_A { F0, D0 } -#define ENCODERS_PAD_B { F1, D1 } -#define ENCODER_RESOLUTION 4 diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json deleted file mode 100644 index bdade6a712..0000000000 --- a/keyboards/merge/iso_macro/info.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "keyboard_name": "ISO Macro", - "manufacturer": "Merge", - "url": "", - "maintainer": "duoshock", - "usb": { - "vid": "0x4D65", - "pid": "0x1200", - "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.5, "y":0, "w":1.25, "h":2}, - - {"x":0, "y":1}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1} - ] - } - } -} diff --git a/keyboards/merge/iso_macro/iso_macro.c b/keyboards/merge/iso_macro/iso_macro.c deleted file mode 100644 index 6052f9cce9..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "iso_macro.h" diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h deleted file mode 100644 index dfa9386449..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.h +++ /dev/null @@ -1,29 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k21, k00, k01, k02, k20, \ - k22, k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/merge/iso_macro/keymaps/default/keymap.c b/keyboards/merge/iso_macro/keymaps/default/keymap.c deleted file mode 100644 index 16c0deba72..0000000000 --- a/keyboards/merge/iso_macro/keymaps/default/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* LAYER 0 - * ,---------------------------------------------. - * | Encoder A | 4 | 5 | 6 | Enter | - * |------------|-------+-------+-------| | - * | Encoder B | 1 | 2 | 3 | | - * `---------------------------------------------' - */ -[0] = LAYOUT( - KC_HOME, KC_4, KC_5, KC_6, KC_ENT, - KC_MUTE, KC_1, KC_2, KC_3 -), -}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { // Encdoer A - if (clockwise) { - tap_code(KC_UP); - } else { - tap_code(KC_DOWN); - } - } else if (index == 1) { // Encoder B - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} diff --git a/keyboards/merge/iso_macro/keymaps/default/readme.md b/keyboards/merge/iso_macro/keymaps/default/readme.md deleted file mode 100644 index 008d125d4d..0000000000 --- a/keyboards/merge/iso_macro/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# Default ISO Macro Layout - - - -This is the default layout that comes flashed on every ISO Macro. diff --git a/keyboards/merge/iso_macro/keymaps/via/keymap.c b/keyboards/merge/iso_macro/keymaps/via/keymap.c deleted file mode 100644 index b8cf05be39..0000000000 --- a/keyboards/merge/iso_macro/keymaps/via/keymap.c +++ /dev/null @@ -1,65 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* LAYER 0 - * ,---------------------------------------------. - * | Encoder A | 4 | 5 | 6 | Enter | - * |------------|-------+-------+-------| | - * | Encoder B | 1 | 2 | 3 | | - * `---------------------------------------------' - */ -[0] = LAYOUT( - BL_TOGG, KC_4, KC_5, KC_6, KC_ENT, - KC_MUTE, KC_1, KC_2, KC_3 -), - -[1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - -[2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - -[3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), -}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { // Encoder A - if (clockwise) { - backlight_increase(); - } else { - backlight_decrease(); - } - } else if (index == 1) { // Encoder B - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} diff --git a/keyboards/merge/iso_macro/keymaps/via/rules.mk b/keyboards/merge/iso_macro/keymaps/via/rules.mk deleted file mode 100644 index 43061db1dd..0000000000 --- a/keyboards/merge/iso_macro/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/merge/iso_macro/readme.md b/keyboards/merge/iso_macro/readme.md deleted file mode 100644 index 654ede4fd5..0000000000 --- a/keyboards/merge/iso_macro/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# ISO Macro - - - -A 7 keys macro pad with 2 encoders made and sold by Merge. [Product page](https://mergedesign.store/products/iso-macro) - -* Keyboard Maintainer: [duoshock](https://github.com/duoshock) -* Hardware Availability: [Merge Store](https://mergedesign.store/products/iso-macro) - -Make example for this keyboard (after setting up your build environment): - - make merge/isomacro: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).
\ No newline at end of file diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk deleted file mode 100644 index a220ff6f85..0000000000 --- a/keyboards/merge/iso_macro/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # 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 diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h deleted file mode 100644 index 3d89ba0a57..0000000000 --- a/keyboards/merge/uc1/config.h +++ /dev/null @@ -1,40 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { B1, B2 } -#define MATRIX_COL_PINS { B3, B4 } - -#define RGB_DI_PIN B5 -#define RGBLED_NUM 12 -#define RGBLIGHT_ANIMATIONS -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_LIMIT_VAL 255 -#define RGBLIGHT_SLEEP - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { F5 } -#define ENCODERS_PAD_B { F6 } -#define ENCODER_RESOLUTION 4 diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json deleted file mode 100644 index ed4beff454..0000000000 --- a/keyboards/merge/uc1/info.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "keyboard_name": "UC-1", - "manufacturer": "Merge", - "url": "https://mergedesign.store/products/uc-1", - "maintainer": "duoshock", - "usb": { - "vid": "0x4D65", - "pid": "0x5543", - "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"0", "x":0, "y":0}, - {"label":"1", "x":1.25, "y":0}, - {"label":"2", "x":2.25, "y":0}, - {"label":"3", "x":3.25, "y":0} - ] - } - } -} diff --git a/keyboards/merge/uc1/keymaps/default/keymap.c b/keyboards/merge/uc1/keymaps/default/keymap.c deleted file mode 100644 index a4556a3f4a..0000000000 --- a/keyboards/merge/uc1/keymaps/default/keymap.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* LAYER 0 - * ,---------------------------------. - * | Encoder | 1 | 2 | 3 | - * `---------------------------------' - */ -[0] = LAYOUT( - KC_MUTE, KC_1, KC_2, KC_3 -), -}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} diff --git a/keyboards/merge/uc1/keymaps/default/readme.md b/keyboards/merge/uc1/keymaps/default/readme.md deleted file mode 100644 index 38145e2aad..0000000000 --- a/keyboards/merge/uc1/keymaps/default/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# Default UC-1 Layout - - - -This is the default layout that comes flashed on every UC-1. diff --git a/keyboards/merge/uc1/keymaps/via/keymap.c b/keyboards/merge/uc1/keymaps/via/keymap.c deleted file mode 100644 index 97f55f87f2..0000000000 --- a/keyboards/merge/uc1/keymaps/via/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* LAYER 0 - * ,---------------------------------. - * | Encoder | 1 | 2 | 3 | - * `---------------------------------' - */ -[0] = LAYOUT( - KC_MUTE, KC_1, KC_2, KC_3 -), - -[1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - -[2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), - -[3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -) - -}; - - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} diff --git a/keyboards/merge/uc1/keymaps/via/rules.mk b/keyboards/merge/uc1/keymaps/via/rules.mk deleted file mode 100644 index 43061db1dd..0000000000 --- a/keyboards/merge/uc1/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/merge/uc1/readme.md b/keyboards/merge/uc1/readme.md deleted file mode 100644 index 730b97516f..0000000000 --- a/keyboards/merge/uc1/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -# UC-1 - - - -A 3 keys macro pad with 1 encoders made and sold by Merge. [Product page](https://mergedesign.store/products/uc-1) - -* Keyboard Maintainer: [duoshock](https://github.com/duoshock) -* Hardware Availability: [Merge Store](https://mergedesign.store/products/uc-1) - -Make example for this keyboard (after setting up your build environment): - - make merge/uc1: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).
\ No newline at end of file diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk deleted file mode 100644 index a3f7ea0f8d..0000000000 --- a/keyboards/merge/uc1/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/merge/uc1/uc1.c b/keyboards/merge/uc1/uc1.c deleted file mode 100644 index d23e7426d8..0000000000 --- a/keyboards/merge/uc1/uc1.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 |