From 8c67ee80fc9b2d67b8267b47b87f1368dbf3e27e Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 13:44:39 -0500 Subject: [PATCH 01/67] Add KeyDeck8 to handwired --- .../handwired/maverick0197/keydeck8/config.h | 23 +++++++ .../handwired/maverick0197/keydeck8/info.json | 29 ++++++++ .../keydeck8/keymaps/default/keymap.c | 49 ++++++++++++++ .../keydeck8/keymaps/via/keyboard.json | 15 +++++ .../keydeck8/keymaps/via/keymap.c | 67 +++++++++++++++++++ .../keydeck8/keymaps/via/rules.mk | 2 + .../handwired/maverick0197/keydeck8/readme.md | 37 ++++++++++ .../handwired/maverick0197/keydeck8/rules.mk | 17 +++++ 8 files changed, 239 insertions(+) create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md create mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h new file mode 100644 index 000000000000..4dd8c1a76b54 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h @@ -0,0 +1,23 @@ + /* Copyright 2023 Maverick0197 + * + * 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 + +/* Encoder Configuration */ +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D3 } +#define ENCODER_RESOLUTION 4 +#define ENCODER_DIRECTION_FLIP +//#define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json new file mode 100644 index 000000000000..1ae8f994743f --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json @@ -0,0 +1,29 @@ +{ + "keyboard_name": "KeyDeck8 ProMicro", + "manufacturer": "Maverick0197", + "maintainer": "Maverick0197", + "bootloader": "atmel-dfu", + "features": {}, + "matrix_pins": { + "direct": [ + ["D0", "D1", "D4"], + ["C6", "D7", "E6"], + ["B4", "B5", "B6"] + ] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "0.0.1", + "pid": "0x2320", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"D0", "matrix": [0, 0], "x":0, "y":5}, {"label":"D1", "matrix": [0, 1], "x":0, "y":0}, {"label":"D4", "matrix": [0, 2], "x":0, "y":6}, + {"label":"C6", "matrix": [1, 0], "x":0, "y":7}, {"label":"D7", "matrix": [1, 1], "x":0, "y":8}, {"label":"E6", "matrix": [1, 2], "x":0, "y":9}, + {"label":"B4", "matrix": [2, 0], "x":0, "y":10}, {"label":"B5", "matrix": [2, 1], "x":0, "y":11}, {"label":"B6", "matrix": [2, 2], "x":2, "y":11} + ] + } + } +} diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c new file mode 100644 index 000000000000..ebaee9f822a7 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -0,0 +1,49 @@ + /* Copyright 2023 Maverick0197 + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌────┬────┬────┐ + * │ D0 │ D1 │ D4 │ + * ├────┼────┼────┤ + * │ C6 │ D7 │ E6 │ + * ├────┼────┼────┤ + * │ B4 │ B5 │ B6 │ + * └────┴────┴────┘ + */ + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) +}; +#if defined(ENCODER_MAP_ENABLE) + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + }; +#else +bool encoder_update_user(uint8_t index, bool clockwise) { + //if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + //} + return false; +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json new file mode 100644 index 000000000000..9ad2a0bbfa45 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json @@ -0,0 +1,15 @@ +{ + "name": "KeyDeck8 ProMicro", + "vendorId": "0x2584", + "productId": "0x2320", + "lighting": "none", + "matrix": {"rows": 3,"cols": 3}, + "layouts": { + "keymap": + [ + ["0,0","0,0\n\n\n\n\n\n\n\n\ne0","0,2"], + ["1,0","1,1","1,2"], + ["2,0","2,1","2,2"] + ] + } +} diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c new file mode 100644 index 000000000000..1513f7b601ae --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -0,0 +1,67 @@ + /* Copyright 2023 Maverick0197 + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌────┬────┬────┐ + * │ D0 │ D1 │ D4 │ + * ├────┼────┼────┤ + * │ C6 │ D7 │ E6 │ + * ├────┼────┼────┤ + * │ B4 │ B5 │ B6 │ + * └────┴────┴────┘ + */ + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ), + [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 + ) +}; +#if defined(ENCODER_MAP_ENABLE) + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + }; +#else +bool encoder_update_user(uint8_t index, bool clockwise) { + //if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + //} + return false; +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk new file mode 100644 index 000000000000..16d33cd89fe4 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes + diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md new file mode 100644 index 000000000000..09f96ee24382 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -0,0 +1,37 @@ +# KeyDeck8 + + + +Firmware for obscuresausage's Multimedia Key Deck. + +8 keys and and encoder powered by a Pro Micro. + +[Multimedia Key Deck model Files](https://www.printables.com/model/389352-multimedia-key-deck) + + +![KeyDeck8](https://i.imgur.com/6G2LPLz.jpg) + + +Wiring Diagram: + +![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRU.jpg) + + +Pinouts for Pro Micro: + +![Promicro Pinout Guide](https://i.imgur.com/LZ194Hf.jpg) + + + +* Keyboard Maintainer: [Maverick0197](https://github.com/Maverick0197) +* Hardware Supported: Pro Micro +* Printed enclosure +* Handwired +* Requires a Pro Micro, 8 key switches and 1 KY040 encoder + + +Make example for this keyboard (after setting up your build environment): + + make handwired/maverick0197/keydeck8: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/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk new file mode 100644 index 000000000000..0d4b4cfa8160 --- /dev/null +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk @@ -0,0 +1,17 @@ +# 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 # Enables encoder use +ENCODER_MAP_ENABLE = no + +DEFAULT_FOLDER = handwired/maverick0197/keydeck8 + From 01f5a93162e4ba9ae48a5eaf1401be029fa87431 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:07:34 -0500 Subject: [PATCH 02/67] Rename keyboard.json to keyboard_via.json --- .../keydeck8/keymaps/via/{keyboard.json => keyboard_via.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/{keyboard.json => keyboard_via.json} (100%) diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json similarity index 100% rename from keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json rename to keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json From da15a2962b444d2b603ec729b6859f3340ff41bc Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:24:22 -0500 Subject: [PATCH 03/67] add missing files --- .../maverick0197/keydeck8/keydeck8.c | 16 +++++++++++ .../maverick0197/keydeck8/keydeck8.h | 28 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 keyboards/handwired/maverick0197/keydeck8/keydeck8.c create mode 100644 keyboards/handwired/maverick0197/keydeck8/keydeck8.h diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c new file mode 100644 index 000000000000..2346a8fbd791 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c @@ -0,0 +1,16 @@ + /* Copyright 2023 Maverick0197 + * + * 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 "keydeck8.h" \ No newline at end of file diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h new file mode 100644 index 000000000000..dfe3720c0e70 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h @@ -0,0 +1,28 @@ + /* Copyright 2023 Maverick0197 + * + * 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 + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, \ + K03, K04, K05, \ + K06, K07, K08 \ +) { \ + {K00, K01, K02}, \ + {K03, K04, K05}, \ + {K06, K07, K08} \ +} \ No newline at end of file From 89e9b36294818a38a223c19ef3d97426a762e8a2 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:24:54 -0500 Subject: [PATCH 04/67] Update keydeck8.c --- keyboards/handwired/maverick0197/keydeck8/keydeck8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c index 2346a8fbd791..ed646d210dd3 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c @@ -13,4 +13,4 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "keydeck8.h" \ No newline at end of file +#include "keydeck8.h" From 564745b49bb91c1fe0efd76ce14338f9fd3ed2d4 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 14:25:21 -0500 Subject: [PATCH 05/67] Update keydeck8.h --- keyboards/handwired/maverick0197/keydeck8/keydeck8.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h index dfe3720c0e70..0047c9f8b9a6 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h @@ -25,4 +25,4 @@ {K00, K01, K02}, \ {K03, K04, K05}, \ {K06, K07, K08} \ -} \ No newline at end of file +} From bc1ac39302c4fe25a5e7f7d8ecb73b91f202e7da Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:47:41 -0500 Subject: [PATCH 06/67] Update config.h --- .../keyboards/handwired/maverick0197/keydeck8/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h index 4dd8c1a76b54..663364d06519 100644 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h @@ -1,4 +1,5 @@ - /* Copyright 2023 Maverick0197 +/* +Copyright 2023 Maverick0197 <> * * 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 From 00f837086fedbaa55df37893cf4c36367c4cb891 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:48:10 -0500 Subject: [PATCH 07/67] License fix --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index ebaee9f822a7..c7f24389bee8 100644 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,5 @@ - /* Copyright 2023 Maverick0197 +/* +Copyright 2023 Maverick0197 <> * * 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 From bfd3dc18169c848e74ec5708b01d6f67522462e7 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:48:36 -0500 Subject: [PATCH 08/67] License fix --- .../handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 1513f7b601ae..ad13dc4d236c 100644 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,4 +1,5 @@ - /* Copyright 2023 Maverick0197 +/* +Copyright 2023 Maverick0197 <> * * 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 From 09ac8d0d463cf2f7c25993cd2d92709a084ef32e Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:49:24 -0500 Subject: [PATCH 09/67] license fix --- keyboards/handwired/maverick0197/keydeck8/keydeck8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c index ed646d210dd3..9c84022a8a71 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c @@ -1,4 +1,5 @@ - /* Copyright 2023 Maverick0197 +/* +Copyright 2023 Maverick0197 <> * * 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 From 72bf62adc08a82988ca075b1d7a959cc5d232eb9 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:49:39 -0500 Subject: [PATCH 10/67] license fix --- keyboards/handwired/maverick0197/keydeck8/keydeck8.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h index 0047c9f8b9a6..5cf5efee7c4a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h @@ -1,4 +1,5 @@ - /* Copyright 2023 Maverick0197 +/* +Copyright 2023 Maverick0197 <> * * 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 From 279e8b0cb2de6bf6eb6208cd7338ce1ce31ce3b6 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:08:26 -0500 Subject: [PATCH 11/67] Previous files uploaded to wrong location --- .../handwired/maverick0197/keydeck8/config.h | 24 +++++++ .../handwired/maverick0197/keydeck8/info.json | 29 ++++++++ .../maverick0197/keydeck8/keydeck8.h | 3 +- .../keydeck8/keymaps/default/keymap.c | 50 ++++++++++++++ .../keydeck8/keymaps/via/keymap.c | 68 +++++++++++++++++++ .../keydeck8/keymaps/via/rules.mk | 1 + .../handwired/maverick0197/keydeck8/readme.md | 37 ++++++++++ .../handwired/maverick0197/keydeck8/rules.mk | 16 +++++ 8 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 keyboards/handwired/maverick0197/keydeck8/config.h create mode 100644 keyboards/handwired/maverick0197/keydeck8/info.json create mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c create mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c create mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk create mode 100644 keyboards/handwired/maverick0197/keydeck8/readme.md create mode 100644 keyboards/handwired/maverick0197/keydeck8/rules.mk diff --git a/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/maverick0197/keydeck8/config.h new file mode 100644 index 000000000000..0cb0e97a8db4 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/config.h @@ -0,0 +1,24 @@ +/* +Copyright 2023 Maverick0197 <> + + * 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 + +/* Encoder Configuration */ +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D3 } +#define ENCODER_RESOLUTION 4 +#define ENCODER_DIRECTION_FLIP +//#define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json new file mode 100644 index 000000000000..fae3b9b54bbf --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -0,0 +1,29 @@ +{ + "keyboard_name": "KeyDeck8 ProMicro", + "manufacturer": "Maverick0197", + "maintainer": "Maverick0197", + "bootloader": "atmel-dfu", + "features": {}, + "matrix_pins": { + "direct": [ + ["D0", "D1", "D4"], + ["C6", "D7", "E6"], + ["B4", "B5", "B6"] + ] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "0.0.1", + "pid": "0x2320", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"D0", "matrix": [0, 0], "x":0, "y":5}, {"label":"D1", "matrix": [0, 1], "x":0, "y":0}, {"label":"D4", "matrix": [0, 2], "x":0, "y":6}, + {"label":"C6", "matrix": [1, 0], "x":0, "y":7}, {"label":"D7", "matrix": [1, 1], "x":0, "y":8}, {"label":"E6", "matrix": [1, 2], "x":0, "y":9}, + {"label":"B4", "matrix": [2, 0], "x":0, "y":10}, {"label":"B5", "matrix": [2, 1], "x":0, "y":11}, {"label":"B6", "matrix": [2, 2], "x":2, "y":11} + ] + } + } +} diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h index 5cf5efee7c4a..6e3a9e3b0437 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h @@ -22,7 +22,8 @@ Copyright 2023 Maverick0197 <> K00, K01, K02, \ K03, K04, K05, \ K06, K07, K08 \ -) { \ +) \ +{ \ {K00, K01, K02}, \ {K03, K04, K05}, \ {K06, K07, K08} \ diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c new file mode 100644 index 000000000000..c7f24389bee8 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* +Copyright 2023 Maverick0197 <> + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌────┬────┬────┐ + * │ D0 │ D1 │ D4 │ + * ├────┼────┼────┤ + * │ C6 │ D7 │ E6 │ + * ├────┼────┼────┤ + * │ B4 │ B5 │ B6 │ + * └────┴────┴────┘ + */ + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) +}; +#if defined(ENCODER_MAP_ENABLE) + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + }; +#else +bool encoder_update_user(uint8_t index, bool clockwise) { + //if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + //} + return false; +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c new file mode 100644 index 000000000000..ad13dc4d236c --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -0,0 +1,68 @@ +/* +Copyright 2023 Maverick0197 <> + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌────┬────┬────┐ + * │ D0 │ D1 │ D4 │ + * ├────┼────┼────┤ + * │ C6 │ D7 │ E6 │ + * ├────┼────┼────┤ + * │ B4 │ B5 │ B6 │ + * └────┴────┴────┘ + */ + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ), + [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 + ) +}; +#if defined(ENCODER_MAP_ENABLE) + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + }; +#else +bool encoder_update_user(uint8_t index, bool clockwise) { + //if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + //} + return false; +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/maverick0197/keydeck8/readme.md new file mode 100644 index 000000000000..09f96ee24382 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -0,0 +1,37 @@ +# KeyDeck8 + + + +Firmware for obscuresausage's Multimedia Key Deck. + +8 keys and and encoder powered by a Pro Micro. + +[Multimedia Key Deck model Files](https://www.printables.com/model/389352-multimedia-key-deck) + + +![KeyDeck8](https://i.imgur.com/6G2LPLz.jpg) + + +Wiring Diagram: + +![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRU.jpg) + + +Pinouts for Pro Micro: + +![Promicro Pinout Guide](https://i.imgur.com/LZ194Hf.jpg) + + + +* Keyboard Maintainer: [Maverick0197](https://github.com/Maverick0197) +* Hardware Supported: Pro Micro +* Printed enclosure +* Handwired +* Requires a Pro Micro, 8 key switches and 1 KY040 encoder + + +Make example for this keyboard (after setting up your build environment): + + make handwired/maverick0197/keydeck8: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/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/maverick0197/keydeck8/rules.mk new file mode 100644 index 000000000000..3fd5cbc2a398 --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/rules.mk @@ -0,0 +1,16 @@ +# 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 # Enables encoder use +ENCODER_MAP_ENABLE = no + +DEFAULT_FOLDER = handwired/maverick0197/keydeck8 From 72d43951695f0a11f40269d0ef1f1d8742bb7933 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:09:37 -0500 Subject: [PATCH 12/67] Delete keyboards/handwired/keyboards directory --- .../handwired/maverick0197/keydeck8/config.h | 24 ------- .../handwired/maverick0197/keydeck8/info.json | 29 -------- .../keydeck8/keymaps/default/keymap.c | 50 -------------- .../keydeck8/keymaps/via/keyboard_via.json | 15 ---- .../keydeck8/keymaps/via/keymap.c | 68 ------------------- .../keydeck8/keymaps/via/rules.mk | 2 - .../handwired/maverick0197/keydeck8/readme.md | 37 ---------- .../handwired/maverick0197/keydeck8/rules.mk | 17 ----- 8 files changed, 242 deletions(-) delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md delete mode 100644 keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h deleted file mode 100644 index 663364d06519..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - * - * 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 - -/* Encoder Configuration */ -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D3 } -#define ENCODER_RESOLUTION 4 -#define ENCODER_DIRECTION_FLIP -//#define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json deleted file mode 100644 index 1ae8f994743f..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/info.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "keyboard_name": "KeyDeck8 ProMicro", - "manufacturer": "Maverick0197", - "maintainer": "Maverick0197", - "bootloader": "atmel-dfu", - "features": {}, - "matrix_pins": { - "direct": [ - ["D0", "D1", "D4"], - ["C6", "D7", "E6"], - ["B4", "B5", "B6"] - ] - }, - "processor": "atmega32u4", - "usb": { - "device_version": "0.0.1", - "pid": "0x2320", - "vid": "0xFEED" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"D0", "matrix": [0, 0], "x":0, "y":5}, {"label":"D1", "matrix": [0, 1], "x":0, "y":0}, {"label":"D4", "matrix": [0, 2], "x":0, "y":6}, - {"label":"C6", "matrix": [1, 0], "x":0, "y":7}, {"label":"D7", "matrix": [1, 1], "x":0, "y":8}, {"label":"E6", "matrix": [1, 2], "x":0, "y":9}, - {"label":"B4", "matrix": [2, 0], "x":0, "y":10}, {"label":"B5", "matrix": [2, 1], "x":0, "y":11}, {"label":"B6", "matrix": [2, 2], "x":2, "y":11} - ] - } - } -} diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c deleted file mode 100644 index c7f24389bee8..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌────┬────┬────┐ - * │ D0 │ D1 │ D4 │ - * ├────┼────┼────┤ - * │ C6 │ D7 │ E6 │ - * ├────┼────┼────┤ - * │ B4 │ B5 │ B6 │ - * └────┴────┴────┘ - */ - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ) -}; -#if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - }; -#else -bool encoder_update_user(uint8_t index, bool clockwise) { - //if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - //} - return false; -}; -#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json deleted file mode 100644 index 9ad2a0bbfa45..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard_via.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "KeyDeck8 ProMicro", - "vendorId": "0x2584", - "productId": "0x2320", - "lighting": "none", - "matrix": {"rows": 3,"cols": 3}, - "layouts": { - "keymap": - [ - ["0,0","0,0\n\n\n\n\n\n\n\n\ne0","0,2"], - ["1,0","1,1","1,2"], - ["2,0","2,1","2,2"] - ] - } -} diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c deleted file mode 100644 index ad13dc4d236c..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌────┬────┬────┐ - * │ D0 │ D1 │ D4 │ - * ├────┼────┼────┤ - * │ C6 │ D7 │ E6 │ - * ├────┼────┼────┤ - * │ B4 │ B5 │ B6 │ - * └────┴────┴────┘ - */ - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ), - [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 - ) -}; -#if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - }; -#else -bool encoder_update_user(uint8_t index, bool clockwise) { - //if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - //} - return false; -}; -#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk deleted file mode 100644 index 16d33cd89fe4..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes - diff --git a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md deleted file mode 100644 index 09f96ee24382..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/readme.md +++ /dev/null @@ -1,37 +0,0 @@ -# KeyDeck8 - - - -Firmware for obscuresausage's Multimedia Key Deck. - -8 keys and and encoder powered by a Pro Micro. - -[Multimedia Key Deck model Files](https://www.printables.com/model/389352-multimedia-key-deck) - - -![KeyDeck8](https://i.imgur.com/6G2LPLz.jpg) - - -Wiring Diagram: - -![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRU.jpg) - - -Pinouts for Pro Micro: - -![Promicro Pinout Guide](https://i.imgur.com/LZ194Hf.jpg) - - - -* Keyboard Maintainer: [Maverick0197](https://github.com/Maverick0197) -* Hardware Supported: Pro Micro -* Printed enclosure -* Handwired -* Requires a Pro Micro, 8 key switches and 1 KY040 encoder - - -Make example for this keyboard (after setting up your build environment): - - make handwired/maverick0197/keydeck8: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/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk deleted file mode 100644 index 0d4b4cfa8160..000000000000 --- a/keyboards/handwired/keyboards/handwired/maverick0197/keydeck8/rules.mk +++ /dev/null @@ -1,17 +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 # Enables encoder use -ENCODER_MAP_ENABLE = no - -DEFAULT_FOLDER = handwired/maverick0197/keydeck8 - From af86ba41867a1a314d2bbaad8d8aaeddef822a82 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:21:18 -0500 Subject: [PATCH 13/67] trying to format the file --- keyboards/handwired/maverick0197/keydeck8/config.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/maverick0197/keydeck8/config.h index 0cb0e97a8db4..228f5e784f9a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/config.h +++ b/keyboards/handwired/maverick0197/keydeck8/config.h @@ -17,8 +17,12 @@ Copyright 2023 Maverick0197 <> #pragma once /* Encoder Configuration */ -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D3 } +#define ENCODERS_PAD_A { + D2 +} +#define ENCODERS_PAD_B { + D3 +} #define ENCODER_RESOLUTION 4 #define ENCODER_DIRECTION_FLIP //#define ENCODER_DEFAULT_POS 0x3 From b9c2417aa9d8e9971ed8a7bb266c6ec86e50fbd8 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:30:39 -0500 Subject: [PATCH 14/67] previous changes only made it worse --- keyboards/handwired/maverick0197/keydeck8/config.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/maverick0197/keydeck8/config.h index 228f5e784f9a..0cb0e97a8db4 100644 --- a/keyboards/handwired/maverick0197/keydeck8/config.h +++ b/keyboards/handwired/maverick0197/keydeck8/config.h @@ -17,12 +17,8 @@ Copyright 2023 Maverick0197 <> #pragma once /* Encoder Configuration */ -#define ENCODERS_PAD_A { - D2 -} -#define ENCODERS_PAD_B { - D3 -} +#define ENCODERS_PAD_A { D2 } +#define ENCODERS_PAD_B { D3 } #define ENCODER_RESOLUTION 4 #define ENCODER_DIRECTION_FLIP //#define ENCODER_DEFAULT_POS 0x3 From 4ae6f635e7c15e45803e9a2060ff8625ab400004 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:33:36 -0500 Subject: [PATCH 15/67] Update keyboards/handwired/maverick0197/keydeck8/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/handwired/maverick0197/keydeck8/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/maverick0197/keydeck8/readme.md index 09f96ee24382..2555a256967a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/readme.md +++ b/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -34,4 +34,8 @@ Make example for this keyboard (after setting up your build environment): make handwired/maverick0197/keydeck8:default +Flashing example for this keyboard: + + make handwired/maverick0197/keydeck8: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). \ No newline at end of file From 6b30c1832fcdd3691901b5d68acb36555c77cb6c Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:35:01 -0500 Subject: [PATCH 16/67] Update keyboards/handwired/maverick0197/keydeck8/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/handwired/maverick0197/keydeck8/info.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index fae3b9b54bbf..9ccbe78d04fa 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -3,7 +3,17 @@ "manufacturer": "Maverick0197", "maintainer": "Maverick0197", "bootloader": "atmel-dfu", - "features": {}, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { "pin_a": "D3", "pin_b": "D2", "resolution": 4 } + ] + }, "matrix_pins": { "direct": [ ["D0", "D1", "D4"], From 3d5e0b17b39746b4ba82acd9597182a0668c8430 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:36:17 -0500 Subject: [PATCH 17/67] Delete keydeck8.c --- .../handwired/maverick0197/keydeck8/keydeck8.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/handwired/maverick0197/keydeck8/keydeck8.c diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c deleted file mode 100644 index 9c84022a8a71..000000000000 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - * - * 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 "keydeck8.h" From e8bdfa129b4e0e09cb476c919331f1c636a27eca Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:36:32 -0500 Subject: [PATCH 18/67] Delete keydeck8.h --- .../maverick0197/keydeck8/keydeck8.h | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 keyboards/handwired/maverick0197/keydeck8/keydeck8.h diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h b/keyboards/handwired/maverick0197/keydeck8/keydeck8.h deleted file mode 100644 index 6e3a9e3b0437..000000000000 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - * - * 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 - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K03, K04, K05, \ - K06, K07, K08 \ -) \ -{ \ - {K00, K01, K02}, \ - {K03, K04, K05}, \ - {K06, K07, K08} \ -} From 93ff4e83a0dcab145db7520775f5f72eb7097186 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:39:50 -0500 Subject: [PATCH 19/67] Update keyboards/handwired/maverick0197/keydeck8/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- .../handwired/maverick0197/keydeck8/rules.mk | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/maverick0197/keydeck8/rules.mk index 3fd5cbc2a398..6e7633bfe015 100644 --- a/keyboards/handwired/maverick0197/keydeck8/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/rules.mk @@ -1,16 +1 @@ -# 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 # Enables encoder use -ENCODER_MAP_ENABLE = no - -DEFAULT_FOLDER = handwired/maverick0197/keydeck8 +# This file intentionally left blank From 3d84e3b1cdcb51fa929c2e559a3c2af5b6ade034 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:40:25 -0500 Subject: [PATCH 20/67] Update rules.mk --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk index 1e5b99807cb7..eea5e1e2a265 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk @@ -1 +1,2 @@ +ENCODER_ENABLE = yes VIA_ENABLE = yes From 8cce0de3232b3c5786e34110e58642d685dfc25b Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Sun, 12 Mar 2023 23:46:42 -0500 Subject: [PATCH 21/67] Delete config.h --- .../handwired/maverick0197/keydeck8/config.h | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 keyboards/handwired/maverick0197/keydeck8/config.h diff --git a/keyboards/handwired/maverick0197/keydeck8/config.h b/keyboards/handwired/maverick0197/keydeck8/config.h deleted file mode 100644 index 0cb0e97a8db4..000000000000 --- a/keyboards/handwired/maverick0197/keydeck8/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2023 Maverick0197 <> - - * 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 - -/* Encoder Configuration */ -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D3 } -#define ENCODER_RESOLUTION 4 -#define ENCODER_DIRECTION_FLIP -//#define ENCODER_DEFAULT_POS 0x3 From 1c5e8912bc33d91cd9770cbad0e993f70a4c5a17 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:09:06 -0500 Subject: [PATCH 22/67] Update keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk index eea5e1e2a265..fff4877354ec 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk @@ -1,2 +1,3 @@ ENCODER_ENABLE = yes VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes From c9fda7c12d07f4389f53a91e2b1c5e067130fb6e Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:09:15 -0500 Subject: [PATCH 23/67] Update keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../keydeck8/keymaps/via/keymap.c | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index ad13dc4d236c..2242b323ed97 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -48,21 +48,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - }; -#else -bool encoder_update_user(uint8_t index, bool clockwise) { - //if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - //} - return false; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; -#endif // ENCODER_MAP_ENABLE +#endif From 1af62ffe88ac348e65b02f0ff438cea9b6203be9 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:09:26 -0500 Subject: [PATCH 24/67] Update keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- .../keydeck8/keymaps/default/keymap.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index c7f24389bee8..259dae58b29d 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -33,18 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - }; -#else -bool encoder_update_user(uint8_t index, bool clockwise) { - //if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - //} - return false; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; -#endif // ENCODER_MAP_ENABLE +#endif From d02ebb7a2967a4a43d82eed3343d1c881640a0c1 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:13:38 -0500 Subject: [PATCH 25/67] add rules to default --- .../handwired/maverick0197/keydeck8/keymaps/default/rules.mk | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk new file mode 100644 index 000000000000..2f4f54e74b0e --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file From b72101a4a6c97206bfdd467bc56cac8680612598 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 20:18:57 -0500 Subject: [PATCH 26/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 259dae58b29d..a341bf5f5745 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -34,6 +34,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif From 8ad33c988a70b5de4cf755cc0adf1d9e70cc0bf0 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 20:19:12 -0500 Subject: [PATCH 27/67] Update keymap.c --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 2242b323ed97..e968a8312ae5 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -52,6 +52,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif From 467e0e861a75489d99f2ec81f315c09628418248 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:08:19 -0500 Subject: [PATCH 28/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index a341bf5f5745..1db21b389d8c 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,5 +1,4 @@ -/* -Copyright 2023 Maverick0197 <> +/*Copyright 2023 Maverick0197 <> * * 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 @@ -27,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┘ */ [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 ) From aa3534a1118fe6b35b87985b578ced6c702ca9fb Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:08:32 -0500 Subject: [PATCH 29/67] Update rules.mk --- .../handwired/maverick0197/keydeck8/keymaps/default/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk index 2f4f54e74b0e..376fe3d8dcd8 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk @@ -1,2 +1,2 @@ ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes \ No newline at end of file +ENCODER_MAP_ENABLE = yes From 4fc5892fbff13258c28955cdc55e878d47f3273d Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:09:06 -0500 Subject: [PATCH 30/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index e968a8312ae5..10c8bbe784ec 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,5 +1,4 @@ -/* -Copyright 2023 Maverick0197 <> +/*Copyright 2023 Maverick0197 <> * * 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 @@ -27,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┘ */ [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 ), From c5bc16b7fe55f80d7761cf69cac43e6fb923312b Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:42:28 -0500 Subject: [PATCH 31/67] Update keymap.c --- .../keydeck8/keymaps/via/keymap.c | 64 ++++++------------- 1 file changed, 21 insertions(+), 43 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 10c8bbe784ec..dfb297863278 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,22 +1,22 @@ /*Copyright 2023 Maverick0197 <> - * - * 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 . - */ + * + * 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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* + /* * ┌────┬────┬────┐ * │ D0 │ D1 │ D4 │ * ├────┼────┼────┤ @@ -25,32 +25,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ B4 │ B5 │ B6 │ * └────┴────┴────┘ */ - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ), - [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 - ) -}; + [0] = LAYOUT(KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6), + [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)}; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } -}; -#endif +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {[0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [2] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [3] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}}; +#endif // ENCODER_MAP_ENABLE From 49b41d8f7949a6aa66b3c546495d68146f53377e Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 22:34:38 -0500 Subject: [PATCH 32/67] Update keymap.c --- .../keydeck8/keymaps/default/keymap.c | 50 ++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 1db21b389d8c..8bc0ac6ac7fe 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,18 +1,18 @@ -/*Copyright 2023 Maverick0197 <> - * - * 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 Maverick0197 + * + * 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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -28,11 +28,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ) + KC_4, KC_5, KC_6), + [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), }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif From 73f0dabb86239bb28b4bea9edf168a96743ee21e Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 22:50:49 -0500 Subject: [PATCH 33/67] Update keymap.c --- .../keydeck8/keymaps/default/keymap.c | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 8bc0ac6ac7fe..abe7b9e11e89 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 +/* Copyright 2023 Maverick0197 <> * * 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 @@ -15,6 +15,13 @@ */ #include QMK_KEYBOARD_H +enum layer_names { + _HOME = 0, + _FN1, + _FN2, + _FN3 +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* * ┌────┬────┬────┐ @@ -25,28 +32,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ B4 │ B5 │ B6 │ * └────┴────┴────┘ */ - [0] = LAYOUT( + [_HOME] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6), - [1] = LAYOUT( + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6), + [_FN1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [2] = LAYOUT( + [_FN2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [3] = LAYOUT( + [_FN3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, KC_TRNS) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_HOME] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif From b8192547e2e36f39de26ede484d454a2fb8a2756 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 23:17:45 -0500 Subject: [PATCH 34/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index abe7b9e11e89..a58a261a8d96 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 <> +/* Copyright 2023 Maverick0197 * * 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 From 8f63941a07a6a6020917da80eef67edab1ff84e4 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 23:18:22 -0500 Subject: [PATCH 35/67] Update keymap.c --- .../keydeck8/keymaps/default/keymap.c | 76 ++++++------------- 1 file changed, 23 insertions(+), 53 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index a58a261a8d96..0b9492473c68 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,59 +1,29 @@ -/* Copyright 2023 Maverick0197 - * - * 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 Maverick0197 + * + * 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 -enum layer_names { - _HOME = 0, - _FN1, - _FN2, - _FN3 -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌────┬────┬────┐ - * │ D0 │ D1 │ D4 │ - * ├────┼────┼────┤ - * │ C6 │ D7 │ E6 │ - * ├────┼────┼────┤ - * │ B4 │ B5 │ B6 │ - * └────┴────┴────┘ - */ - [_HOME] = LAYOUT( + [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6), - [_FN1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), - [_FN2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), - [_FN3] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS) + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_HOME] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } -}; -#endif + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + }; +#endif // ENCODER_MAP_ENABLE From 6b279a32d3b4563cfbceb4b532049223b63ec433 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 13 Mar 2023 23:18:51 -0500 Subject: [PATCH 36/67] Update keymap.c --- .../keydeck8/keymaps/via/keymap.c | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index dfb297863278..6d8de988797e 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/*Copyright 2023 Maverick0197 <> +/* Copyright 2023 Maverick0197 * * 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 @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* + /* * ┌────┬────┬────┐ * │ D0 │ D1 │ D4 │ * ├────┼────┼────┤ @@ -25,10 +25,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ B4 │ B5 │ B6 │ * └────┴────┴────┘ */ - [0] = LAYOUT(KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6), - [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)}; + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6), + [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), +}; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {[0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [2] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [3] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}}; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, +}; #endif // ENCODER_MAP_ENABLE From ef97087677a392deede17384b4fc3737296e6bf9 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 20:23:11 -0500 Subject: [PATCH 37/67] Update keymap.c --- .../keydeck8/keymaps/default/keymap.c | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 0b9492473c68..c51e7de4bdf7 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,29 +1,30 @@ -/*Copyright 2023 Maverick0197 - * - * 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 Maverick0197 + * + * 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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ) + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) }; #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } - }; +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; #endif // ENCODER_MAP_ENABLE From 5801b8f878602ffc9e0000e3a264ef876b9e17a6 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 21:10:13 -0500 Subject: [PATCH 38/67] Update info.json --- keyboards/handwired/maverick0197/keydeck8/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 9ccbe78d04fa..a492b7c2cf63 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "KeyDeck8 ProMicro", + "keyboard_name": "keydeck8", "manufacturer": "Maverick0197", "maintainer": "Maverick0197", "bootloader": "atmel-dfu", From cb04eff278ceac2efae0d99c73e71c0cb86aa05c Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 21:10:35 -0500 Subject: [PATCH 39/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index c51e7de4bdf7..e9c2d88cb26e 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 + /* Copyright 2023 Maverick0197 * * 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 From 0faa3c31eb873351f2c04cd6e766d667ac34d927 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 21:46:13 -0500 Subject: [PATCH 40/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index e9c2d88cb26e..c51e7de4bdf7 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ - /* Copyright 2023 Maverick0197 +/* Copyright 2023 Maverick0197 * * 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 From 2ff7ca6745592afba25c634e3ebd5ef180346446 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 23:06:45 -0500 Subject: [PATCH 41/67] Update keymap.c --- .../keydeck8/keymaps/via/keymap.c | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 6d8de988797e..68a7e2ba3be8 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -16,19 +16,10 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌────┬────┬────┐ - * │ D0 │ D1 │ D4 │ - * ├────┼────┼────┤ - * │ C6 │ D7 │ E6 │ - * ├────┼────┼────┤ - * │ B4 │ B5 │ B6 │ - * └────┴────┴────┘ - */ - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6), + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6), [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -40,13 +31,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, KC_TRNS) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} }; #endif // ENCODER_MAP_ENABLE From 95e3e71cca9d26cfcd4976220d3000f677886c28 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 23:08:01 -0500 Subject: [PATCH 42/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index c51e7de4bdf7..a3ffd21dda7b 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 - ) + ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { From 0220294fb84f112a6c987d5ba1b50b45e57b7704 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 23:45:11 -0500 Subject: [PATCH 43/67] Update rules.mk --- .../handwired/maverick0197/keydeck8/keymaps/default/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk index 376fe3d8dcd8..ee325681483f 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/rules.mk @@ -1,2 +1 @@ -ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes From e12fb1124e663aac2dc6be4f19dfbfa27f48c23f Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 14 Mar 2023 23:45:30 -0500 Subject: [PATCH 44/67] Update rules.mk --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk index fff4877354ec..f1adcab005e8 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/rules.mk @@ -1,3 +1,2 @@ -ENCODER_ENABLE = yes VIA_ENABLE = yes ENCODER_MAP_ENABLE = yes From e0110f8874bec4fde2bcd860d6c969e08fd0850a Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:15:29 -0500 Subject: [PATCH 45/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index a3ffd21dda7b..809affa737a2 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -16,12 +16,14 @@ #include QMK_KEYBOARD_H +// clang-format off + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6 - ) + ), }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { From a10a116e64286e70b56945af4adccabe0cdfd1f2 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:15:51 -0500 Subject: [PATCH 46/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 809affa737a2..0e4c21c38272 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -22,8 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ), + KC_4, KC_5, KC_6), }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { From 4acaa48dcfe02ab0e83b35a0183efcf0ee6fd1c8 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:16:28 -0500 Subject: [PATCH 47/67] Update keymap.c --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 68a7e2ba3be8..6b7d18cd7399 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; -#if defined(ENCODER_MAP_ENABLE) +#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, From 89bfa8d24afca61e4aff930fc050db13d9cbaab5 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 12:54:20 -0500 Subject: [PATCH 48/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 0e4c21c38272..014322e01c42 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 +/* Copyright 2023 Maverick0197 <> * * 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 From 84638543116a5690e8421759e8724a8b9419e9d0 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 12:55:18 -0500 Subject: [PATCH 49/67] Update keymap.c --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 6b7d18cd7399..b40f12d83f35 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 +/* Copyright 2023 Maverick0197 () * * 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 From ba240526e8feca68d1bbfcae8d68613faf293418 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:57:04 -0500 Subject: [PATCH 50/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 014322e01c42..a0ec8133184c 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 <> +/* Copyright 2023 Maverick0197 * * 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 @@ -29,3 +29,5 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif // ENCODER_MAP_ENABLE + +// clang-format on From 6c4f5b02d30277dabcaec136789c2e23ae274e03 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 15:43:52 -0500 Subject: [PATCH 51/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index b40f12d83f35..c17e97eb7a0d 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -15,6 +15,8 @@ */ #include QMK_KEYBOARD_H +// clang-format off + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, @@ -41,3 +43,5 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} }; #endif // ENCODER_MAP_ENABLE + +// clang-format on From 5f5982569b76c3f296e362386dfaca7e94312c3a Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:12:11 -0500 Subject: [PATCH 52/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index a0ec8133184c..446ca3190c0b 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 +/* Copyright 2023 @ Maverick0197 * * 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 From a3469f5a4604889dfa0c18d9651264ffa13b9248 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 16:12:25 -0500 Subject: [PATCH 53/67] Update keymap.c --- keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index c17e97eb7a0d..2a8950307f63 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 Maverick0197 () +/* Copyright 2023 @ Maverick0197 () * * 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 From c11dd563ab2cf876ddbf45c50a868fd0be2c40cb Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 18:12:04 -0500 Subject: [PATCH 54/67] reupload files in hopes it fixes errors --- .../handwired/maverick0197/keydeck8/info.json | 2 +- .../keydeck8/keymaps/default/keymap.c | 10 +++--- .../keydeck8/keymaps/via/keymap.c | 31 +++++++++++-------- .../handwired/maverick0197/keydeck8/readme.md | 4 --- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index a492b7c2cf63..6fb2b70c3164 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -4,7 +4,7 @@ "maintainer": "Maverick0197", "bootloader": "atmel-dfu", "features": { - "bootmagic": true, + "bootmagic": true, "extrakey": true, "mousekey": true, "encoder": true diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 446ca3190c0b..4e6e21add8a1 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 @ Maverick0197 +/* Copyright 2023 Maverick0197 * * 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 @@ -21,12 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6), + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) + } }; #endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 2a8950307f63..2570d3047b82 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2023 @ Maverick0197 () +/* Copyright 2023 Maverick0197 * * 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 @@ -13,34 +13,39 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include QMK_KEYBOARD_H // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6), + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ), [1] = LAYOUT( 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( 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( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, KC_TRNS, KC_TRNS + ), }; -#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) +#if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} }; #endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/maverick0197/keydeck8/readme.md index 2555a256967a..588b16b520c9 100644 --- a/keyboards/handwired/maverick0197/keydeck8/readme.md +++ b/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -32,10 +32,6 @@ Pinouts for Pro Micro: Make example for this keyboard (after setting up your build environment): - make handwired/maverick0197/keydeck8:default - -Flashing example for this keyboard: - make handwired/maverick0197/keydeck8: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). \ No newline at end of file From f0eab4b390c805d5649549880be08d65e7bb2546 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 18:25:40 -0500 Subject: [PATCH 55/67] Update info.json --- keyboards/handwired/maverick0197/keydeck8/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 6fb2b70c3164..634a7dbf3a92 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -30,9 +30,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"D0", "matrix": [0, 0], "x":0, "y":5}, {"label":"D1", "matrix": [0, 1], "x":0, "y":0}, {"label":"D4", "matrix": [0, 2], "x":0, "y":6}, - {"label":"C6", "matrix": [1, 0], "x":0, "y":7}, {"label":"D7", "matrix": [1, 1], "x":0, "y":8}, {"label":"E6", "matrix": [1, 2], "x":0, "y":9}, - {"label":"B4", "matrix": [2, 0], "x":0, "y":10}, {"label":"B5", "matrix": [2, 1], "x":0, "y":11}, {"label":"B6", "matrix": [2, 2], "x":2, "y":11} + {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0}, + {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1}, + {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2} ] } } From 43f1d7651924f04bc3b561bd8aa65ca3c3dd5d88 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 18:46:04 -0500 Subject: [PATCH 56/67] Update keymap.c --- .../handwired/maverick0197/keydeck8/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 4e6e21add8a1..28df2444da34 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -27,8 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) - } + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif // ENCODER_MAP_ENABLE From 362b42840d7545b5d048858d08de79934c6c574b Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 19:12:33 -0500 Subject: [PATCH 57/67] Update info.json --- keyboards/handwired/maverick0197/keydeck8/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 634a7dbf3a92..6b0cc7b5b647 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -2,7 +2,7 @@ "keyboard_name": "keydeck8", "manufacturer": "Maverick0197", "maintainer": "Maverick0197", - "bootloader": "atmel-dfu", + "bootloader": "caterina", "features": { "bootmagic": true, "extrakey": true, From 851cea0c5ff1af362d2b428e67f86e8ac75f6a54 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 20:54:26 -0500 Subject: [PATCH 58/67] Update info.json From 393c23e63c5b497bb1500b3387612ef1c4168b31 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Wed, 15 Mar 2023 21:12:02 -0500 Subject: [PATCH 59/67] changed EOL on keymaps to LF --- .../keydeck8/keymaps/default/keymap.c | 67 ++++++----- .../keydeck8/keymaps/via/keymap.c | 104 +++++++++--------- 2 files changed, 85 insertions(+), 86 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 28df2444da34..2d4b4eb8c545 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -1,34 +1,33 @@ -/* Copyright 2023 Maverick0197 - * - * 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 - -// clang-format off - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ) -}; -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } -}; -#endif // ENCODER_MAP_ENABLE - -// clang-format on +/* Copyright 2023 Maverick0197 + * + * 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 + +// clang-format off + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6) +}; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif // ENCODER_MAP_ENABLE + +// clang-format on diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index 2570d3047b82..d9e409a1a923 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -1,52 +1,52 @@ -/* Copyright 2023 Maverick0197 - * - * 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 - -// clang-format off - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, - KC_1, KC_2, KC_3, - KC_4, KC_5, KC_6 - ), - [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 - ), -}; -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)} -}; -#endif // ENCODER_MAP_ENABLE - -// clang-format on +/* Copyright 2023 Maverick0197 + * + * 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 + +// clang-format off + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, + KC_1, KC_2, KC_3, + KC_4, KC_5, KC_6 + ), + [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 + ), +}; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [3] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif // ENCODER_MAP_ENABLE + +// clang-format on From 6ef6bf89ab46527c11bfbad709b23b985471d426 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 20 Mar 2023 10:16:17 -0500 Subject: [PATCH 60/67] Update PID and VID --- keyboards/handwired/maverick0197/keydeck8/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 6b0cc7b5b647..2ccb642f9e3e 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -24,8 +24,8 @@ "processor": "atmega32u4", "usb": { "device_version": "0.0.1", - "pid": "0x2320", - "vid": "0xFEED" + "pid": "0x3031", + "vid": "0x4D76" }, "layouts": { "LAYOUT": { From b7913a0fb0f075fbd885ad4da70ed63de297cd18 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 20 Mar 2023 18:04:38 -0500 Subject: [PATCH 61/67] Add keydeck8.c for VIA functionality Add keydeck8.c and update VID to 0x4D76 and PID to 0x3031 --- .../maverick0197/keydeck8/keydeck8.c | 30 +++++++++++++++++++ .../keydeck8/keymaps/via/keyboard.json | 14 +++++++++ 2 files changed, 44 insertions(+) create mode 100644 keyboards/handwired/maverick0197/keydeck8/keydeck8.c create mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c new file mode 100644 index 000000000000..fa0c5113d85e --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c @@ -0,0 +1,30 @@ +/* Copyright 2023 Maverick0197 + * + * 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 "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_user(uint8_t index, bool clockwise) { + //if (index == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + //} + return false; +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json new file mode 100644 index 000000000000..88e72615088b --- /dev/null +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json @@ -0,0 +1,14 @@ +{ + "name": "KeyDeck8", + "vendorId": "0x4D76", + "productId": "0x3031", + "matrix": {"rows": 3,"cols": 3}, + "layouts": { + "keymap": + [ + ["0,0","0,1","0,2"], + ["1,0","1,1","1,2"], + ["2,0","2,1","2,2"] + ] + } +} From 8d72ae8d9f16deb521531102d7002b6a15ee65f0 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Mon, 20 Mar 2023 23:03:06 -0500 Subject: [PATCH 62/67] Update keyboards/handwired/maverick0197/keydeck8/keydeck8.c Co-authored-by: Drashna Jaelre --- keyboards/handwired/maverick0197/keydeck8/keydeck8.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c index fa0c5113d85e..663306a9bb2a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c +++ b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c @@ -17,7 +17,10 @@ #include "quantum.h" #ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } //if (index == 0) { if (clockwise) { tap_code_delay(KC_VOLU, 10); From 66a301482f68376359042a62d00dc59156df7d85 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 21 Mar 2023 07:38:51 -0500 Subject: [PATCH 63/67] add "l" to the end of imgur links "l" shrinks the size of imgur links to 640x640 --- keyboards/handwired/maverick0197/keydeck8/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/maverick0197/keydeck8/readme.md index 588b16b520c9..969833a96d8d 100644 --- a/keyboards/handwired/maverick0197/keydeck8/readme.md +++ b/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -9,17 +9,17 @@ Firmware for obscuresausage's Multimedia Key Deck. [Multimedia Key Deck model Files](https://www.printables.com/model/389352-multimedia-key-deck) -![KeyDeck8](https://i.imgur.com/6G2LPLz.jpg) +![KeyDeck8](https://i.imgur.com/6G2LPLzl.jpg) Wiring Diagram: -![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRU.jpg) +![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRUl.jpg) Pinouts for Pro Micro: -![Promicro Pinout Guide](https://i.imgur.com/LZ194Hf.jpg) +![Promicro Pinout Guide](https://i.imgur.com/LZ194Hfl.jpg) @@ -34,4 +34,4 @@ Make example for this keyboard (after setting up your build environment): make handwired/maverick0197/keydeck8: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). \ No newline at end of file +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 30ba15da22e80bdea0e833a6bdd307bd321757d2 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 21 Mar 2023 07:40:28 -0500 Subject: [PATCH 64/67] Update keyboards/handwired/maverick0197/keydeck8/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/maverick0197/keydeck8/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index 2ccb642f9e3e..c1514e04532a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -2,7 +2,7 @@ "keyboard_name": "keydeck8", "manufacturer": "Maverick0197", "maintainer": "Maverick0197", - "bootloader": "caterina", + "development_board": "promicro", "features": { "bootmagic": true, "extrakey": true, From de302717e3edd2ed62bb1f0c04836aec0e64c38c Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 21 Mar 2023 07:40:55 -0500 Subject: [PATCH 65/67] Update keyboards/handwired/maverick0197/keydeck8/info.json Co-authored-by: Drashna Jaelre --- keyboards/handwired/maverick0197/keydeck8/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index c1514e04532a..d70b262c04eb 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -21,7 +21,6 @@ ["B4", "B5", "B6"] ] }, - "processor": "atmega32u4", "usb": { "device_version": "0.0.1", "pid": "0x3031", From be782b522faa3460e23a9ba6c6b9b15b1fcb49f0 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Tue, 21 Mar 2023 09:55:33 -0500 Subject: [PATCH 66/67] Reformat and add hardware Reformatted the readme a little, I think it is easier to read now. Added a link to the github repo with build details and useful files. Added revisions to the bottom. --- .../handwired/maverick0197/keydeck8/readme.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/keyboards/handwired/maverick0197/keydeck8/readme.md b/keyboards/handwired/maverick0197/keydeck8/readme.md index 969833a96d8d..d72caa9cc985 100644 --- a/keyboards/handwired/maverick0197/keydeck8/readme.md +++ b/keyboards/handwired/maverick0197/keydeck8/readme.md @@ -1,7 +1,5 @@ # KeyDeck8 - - Firmware for obscuresausage's Multimedia Key Deck. 8 keys and and encoder powered by a Pro Micro. @@ -11,7 +9,7 @@ Firmware for obscuresausage's Multimedia Key Deck. ![KeyDeck8](https://i.imgur.com/6G2LPLzl.jpg) - +--- Wiring Diagram: ![KeyDeck8 Wiring Diagram](https://i.imgur.com/1sOvYRUl.jpg) @@ -21,17 +19,22 @@ Pinouts for Pro Micro: ![Promicro Pinout Guide](https://i.imgur.com/LZ194Hfl.jpg) - - +--- * Keyboard Maintainer: [Maverick0197](https://github.com/Maverick0197) * Hardware Supported: Pro Micro * Printed enclosure * Handwired * Requires a Pro Micro, 8 key switches and 1 KY040 encoder +* Hardware Availability: [Make it yourself](https://github.com/Maverick0197/KeyDeck8) - +--- Make example for this keyboard (after setting up your build environment): make handwired/maverick0197/keydeck8: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). + +--- +Revision 0.0.1: +- +Initial release. From f86eebbb4ad239dbeb1d6eebb5509f57e7ce7fa9 Mon Sep 17 00:00:00 2001 From: Maverick0197 <123402474+Maverick0197@users.noreply.github.com> Date: Thu, 23 Mar 2023 08:41:57 -0500 Subject: [PATCH 67/67] Delete keyboard.json --- .../keydeck8/keymaps/via/keyboard.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json deleted file mode 100644 index 88e72615088b..000000000000 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keyboard.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "KeyDeck8", - "vendorId": "0x4D76", - "productId": "0x3031", - "matrix": {"rows": 3,"cols": 3}, - "layouts": { - "keymap": - [ - ["0,0","0,1","0,2"], - ["1,0","1,1","1,2"], - ["2,0","2,1","2,2"] - ] - } -}