From 93548b50250f028b893cdd16fb543b6e8a15a8c2 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Tue, 20 Dec 2022 23:27:06 -0600 Subject: [PATCH 01/14] Added initial firmware files. --- keyboards/adpenrose/mine/config.h | 34 +++++++++++++ keyboards/adpenrose/mine/info.json | 48 +++++++++++++++++++ .../adpenrose/mine/keymaps/default/keymap.c | 21 ++++++++ keyboards/adpenrose/mine/mine.c | 4 ++ keyboards/adpenrose/mine/mine.h | 33 +++++++++++++ keyboards/adpenrose/mine/readme.md | 27 +++++++++++ keyboards/adpenrose/mine/rules.mk | 1 + 7 files changed, 168 insertions(+) create mode 100644 keyboards/adpenrose/mine/config.h create mode 100644 keyboards/adpenrose/mine/info.json create mode 100644 keyboards/adpenrose/mine/keymaps/default/keymap.c create mode 100644 keyboards/adpenrose/mine/mine.c create mode 100644 keyboards/adpenrose/mine/mine.h create mode 100644 keyboards/adpenrose/mine/readme.md create mode 100644 keyboards/adpenrose/mine/rules.mk diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h new file mode 100644 index 000000000000..2874f926a6ee --- /dev/null +++ b/keyboards/adpenrose/mine/config.h @@ -0,0 +1,34 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* Key Matrix size */ +#define MATRIX_ROWS 11 +#define MATRIX_COLS 10 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ + +#define MATRIX_ROW_PINS { A0, A1, A4, A3, C7, B4, B5, B6, A6, A2, A5 } +#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D5, D6, C6, C5 } + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json new file mode 100644 index 000000000000..cbf5f36d660f --- /dev/null +++ b/keyboards/adpenrose/mine/info.json @@ -0,0 +1,48 @@ +{ + "manufacturer": "Arturo Avila", + "keyboard_name": "adpenrose/mine", + "maintainer": "Arturo Avila", + "bootloader": "bootloadhid", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["C2", "C2", "C2", "C2"], + "rows": ["D1", "D1", "D1", "D1"] + }, + "processor": "atmega32a", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT_ortho_4x4": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c new file mode 100644 index 000000000000..26769e0bee95 --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │ 7 │ 8 │ 9 │ / │ + * ├───┼───┼───┼───┤ + * │ 4 │ 5 │ 6 │ * │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ - │ + * ├───┼───┼───┼───┤ + * │ 0 │ . │Ent│ + │ + * └───┴───┴───┴───┘ + */ + [0] = LAYOUT_ortho_4x4( + KC_P7, KC_P8, KC_P9, KC_PSLS, + KC_P4, KC_P5, KC_P6, KC_PAST, + KC_P1, KC_P2, KC_P3, KC_PMNS, + KC_P0, KC_PDOT, KC_PENT, KC_PPLS + ) +}; diff --git a/keyboards/adpenrose/mine/mine.c b/keyboards/adpenrose/mine/mine.c new file mode 100644 index 000000000000..12b77a66db6a --- /dev/null +++ b/keyboards/adpenrose/mine/mine.c @@ -0,0 +1,4 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "mine.h" \ No newline at end of file diff --git a/keyboards/adpenrose/mine/mine.h b/keyboards/adpenrose/mine/mine.h new file mode 100644 index 000000000000..3607d125884a --- /dev/null +++ b/keyboards/adpenrose/mine/mine.h @@ -0,0 +1,33 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define XXX KC_NO + +#define LAYOUT_all( \ + k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ + k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, XXX }, \ + { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ + { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ +} \ No newline at end of file diff --git a/keyboards/adpenrose/mine/readme.md b/keyboards/adpenrose/mine/readme.md new file mode 100644 index 000000000000..4b8640dea9f0 --- /dev/null +++ b/keyboards/adpenrose/mine/readme.md @@ -0,0 +1,27 @@ +# adpenrose/mine + +![adpenrose/mine](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Arturo Avila](https://github.com/Arturo Avila) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make adpenrose/mine:default + +Flashing example for this keyboard: + + make adpenrose/mine: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/adpenrose/mine/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 9ac1d87ebb1d6155d51f8c9f365e42be28a6ce75 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Wed, 21 Dec 2022 16:14:08 -0600 Subject: [PATCH 02/14] Added default keymap. --- keyboards/adpenrose/mine/info.json | 247 +++++++++++++++--- .../adpenrose/mine/keymaps/default/keymap.c | 54 ++-- keyboards/adpenrose/mine/mine.h | 55 +++- keyboards/adpenrose/mine/rules.mk | 22 +- 4 files changed, 320 insertions(+), 58 deletions(-) diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index cbf5f36d660f..c584157f5c35 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -1,48 +1,219 @@ { - "manufacturer": "Arturo Avila", - "keyboard_name": "adpenrose/mine", + "manufacturer": "ADPenrose", + "keyboard_name": "Mine", "maintainer": "Arturo Avila", - "bootloader": "bootloadhid", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["C2", "C2", "C2", "C2"], - "rows": ["D1", "D1", "D1", "D1"] - }, - "processor": "atmega32a", - "url": "", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0x0006", + "vid": "0x4450" }, "layouts": { - "LAYOUT_ortho_4x4": { + "LAYOUT_100_ansi": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 9.5, "y": 0 }, + { "label": "F8", "x": 10.5, "y": 0 }, + { "label": "F9", "x": 11.75, "y": 0 }, + { "label": "F10", "x": 12.75, "y": 0 }, + { "label": "F11", "x": 13.75, "y": 0 }, + { "label": "F12", "x": 14.75, "y": 0 }, + { "label": "M1", "x": 16, "y": 0 }, + { "label": "M2", "x": 17, "y": 0 }, + { "label": "Enc", "x": 22, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 9.5, "y": 1.5 }, + { "label": "*", "x": 10.5, "y": 1.5 }, + { "label": "(", "x": 11.5, "y": 1.5 }, + { "label": ")", "x": 12.5, "y": 1.5 }, + { "label": "_", "x": 13.5, "y": 1.5 }, + { "label": "+", "x": 14.5, "y": 1.5 }, + { "label": "Backspace", "x": 15.5, "y": 1.5, "w": 2 }, + { "label": "Num Lock", "x": 19, "y": 1.5 }, + { "label": "/", "x": 20, "y": 1.5 }, + { "label": "*", "x": 21, "y": 1.5 }, + { "label": "-", "x": 22, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 9, "y": 2.5 }, + { "label": "U", "x": 10, "y": 2.5 }, + { "label": "I", "x": 11, "y": 2.5 }, + { "label": "O", "x": 12, "y": 2.5 }, + { "label": "P", "x": 13, "y": 2.5 }, + { "label": "{", "x": 14, "y": 2.5 }, + { "label": "}", "x": 15, "y": 2.5 }, + { "label": "|", "x": 16, "y": 2.5, "w": 1.5 }, + { "label": "7", "x": 19, "y": 2.5 }, + { "label": "8", "x": 20, "y": 2.5 }, + { "label": "9", "x": 21, "y": 2.5 }, + { "label": "+", "x": 22, "y": 2.5, "h": 2 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 9.25, "y": 3.5 }, + { "label": "J", "x": 10.25, "y": 3.5 }, + { "label": "K", "x": 11.25, "y": 3.5 }, + { "label": "L", "x": 12.25, "y": 3.5 }, + { "label": ":", "x": 13.25, "y": 3.5 }, + { "label": "\"", "x": 14.25, "y": 3.5 }, + { "label": "Enter", "x": 15.25, "y": 3.5, "w": 2.25 }, + { "label": "4", "x": 19, "y": 3.5 }, + { "label": "5", "x": 20, "y": 3.5 }, + { "label": "6", "x": 21, "y": 3.5 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "B", "x": 8.75, "y": 4.5 }, + { "label": "N", "x": 9.75, "y": 4.5 }, + { "label": "M", "x": 10.75, "y": 4.5 }, + { "label": "<", "x": 11.75, "y": 4.5 }, + { "label": ">", "x": 12.75, "y": 4.5 }, + { "label": "?", "x": 13.75, "y": 4.5 }, + { "label": "Shift", "x": 14.75, "y": 4.5, "w": 2.75 }, + { "label": "1", "x": 19, "y": 4.5 }, + { "label": "2", "x": 20, "y": 4.5 }, + { "label": "3", "x": 21, "y": 4.5 }, + { "label": "Enter", "x": 22, "y": 4.5, "h": 2 }, + { "label": "\u2191", "x": 17.75, "y": 4.75 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, + { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 }, + { "label": "Alt", "x": 3.5, "y": 5.5, "w": 1.25 }, + { "x": 4.75, "y": 5.5, "w": 2.75 }, + { "x": 9, "y": 5.5, "w": 2.25 }, + { "label": "Alt", "x": 11.25, "y": 5.5, "w": 1.25 }, + { "label": "Win", "x": 13.5, "y": 5.5, "w": 1.25 }, + { "label": "Ctrl", "x": 14.75, "y": 5.5, "w": 1.25 }, + { "label": "0", "x": 20, "y": 5.5 }, + { "label": ".", "x": 21, "y": 5.5 }, + { "label": "\u2190", "x": 16.75, "y": 5.75 }, + { "label": "\u2193", "x": 17.75, "y": 5.75 }, + { "label": "\u2192", "x": 18.75, "y": 5.75 } + ] + }, + "LAYOUT_100_iso": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3 } + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 9.5, "y": 0 }, + { "label": "F8", "x": 10.5, "y": 0 }, + { "label": "F9", "x": 11.75, "y": 0 }, + { "label": "F10", "x": 12.75, "y": 0 }, + { "label": "F11", "x": 13.75, "y": 0 }, + { "label": "F12", "x": 14.75, "y": 0 }, + { "label": "M1", "x": 16, "y": 0 }, + { "label": "M2", "x": 17, "y": 0 }, + { "label": "Enc", "x": 22, "y": 0 }, + { "label": "~", "x": 0, "y": 1.5 }, + { "label": "!", "x": 1, "y": 1.5 }, + { "label": "@", "x": 2, "y": 1.5 }, + { "label": "#", "x": 3, "y": 1.5 }, + { "label": "$", "x": 4, "y": 1.5 }, + { "label": "%", "x": 5, "y": 1.5 }, + { "label": "^", "x": 6, "y": 1.5 }, + { "label": "&", "x": 9.5, "y": 1.5 }, + { "label": "*", "x": 10.5, "y": 1.5 }, + { "label": "(", "x": 11.5, "y": 1.5 }, + { "label": ")", "x": 12.5, "y": 1.5 }, + { "label": "_", "x": 13.5, "y": 1.5 }, + { "label": "+", "x": 14.5, "y": 1.5 }, + { "label": "Backspace", "x": 15.5, "y": 1.5, "w": 2 }, + { "label": "Num Lock", "x": 19, "y": 1.5 }, + { "label": "/", "x": 20, "y": 1.5 }, + { "label": "*", "x": 21, "y": 1.5 }, + { "label": "-", "x": 22, "y": 1.5 }, + { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 2.5 }, + { "label": "W", "x": 2.5, "y": 2.5 }, + { "label": "E", "x": 3.5, "y": 2.5 }, + { "label": "R", "x": 4.5, "y": 2.5 }, + { "label": "T", "x": 5.5, "y": 2.5 }, + { "label": "Y", "x": 9, "y": 2.5 }, + { "label": "U", "x": 10, "y": 2.5 }, + { "label": "I", "x": 11, "y": 2.5 }, + { "label": "O", "x": 12, "y": 2.5 }, + { "label": "P", "x": 13, "y": 2.5 }, + { "label": "{", "x": 14, "y": 2.5 }, + { "label": "}", "x": 15, "y": 2.5 }, + { "label": "Enter", "x": 16.25, "y": 2.5, "w": 1.25, "h": 2 }, + { "label": "7", "x": 19, "y": 2.5 }, + { "label": "8", "x": 20, "y": 2.5 }, + { "label": "9", "x": 21, "y": 2.5 }, + { "label": "+", "x": 22, "y": 2.5, "h": 2 }, + { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 3.5 }, + { "label": "S", "x": 2.75, "y": 3.5 }, + { "label": "D", "x": 3.75, "y": 3.5 }, + { "label": "F", "x": 4.75, "y": 3.5 }, + { "label": "G", "x": 5.75, "y": 3.5 }, + { "label": "H", "x": 9.25, "y": 3.5 }, + { "label": "J", "x": 10.25, "y": 3.5 }, + { "label": "K", "x": 11.25, "y": 3.5 }, + { "label": "L", "x": 12.25, "y": 3.5 }, + { "label": ":", "x": 13.25, "y": 3.5 }, + { "label": "\"", "x": 14.25, "y": 3.5 }, + { "label": "~", "x": 15.25, "y": 3.5 }, + { "label": "4", "x": 19, "y": 3.5 }, + { "label": "5", "x": 20, "y": 3.5 }, + { "label": "6", "x": 21, "y": 3.5 }, + { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "|", "x": 1.25, "y": 4.5 }, + { "label": "Z", "x": 2.25, "y": 4.5 }, + { "label": "X", "x": 3.25, "y": 4.5 }, + { "label": "C", "x": 4.25, "y": 4.5 }, + { "label": "V", "x": 5.25, "y": 4.5 }, + { "label": "B", "x": 6.25, "y": 4.5 }, + { "label": "B", "x": 8.75, "y": 4.5 }, + { "label": "N", "x": 9.75, "y": 4.5 }, + { "label": "M", "x": 10.75, "y": 4.5 }, + { "label": "<", "x": 11.75, "y": 4.5 }, + { "label": ">", "x": 12.75, "y": 4.5 }, + { "label": "?", "x": 13.75, "y": 4.5 }, + { "label": "Shift", "x": 14.75, "y": 4.5, "w": 2.75 }, + { "label": "1", "x": 19, "y": 4.5 }, + { "label": "2", "x": 20, "y": 4.5 }, + { "label": "3", "x": 21, "y": 4.5 }, + { "label": "Enter", "x": 22, "y": 4.5, "h": 2 }, + { "label": "\u2191", "x": 17.75, "y": 4.75 }, + { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, + { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 }, + { "label": "Alt", "x": 3.5, "y": 5.5, "w": 1.25 }, + { "x": 4.75, "y": 5.5, "w": 2.75 }, + { "x": 9, "y": 5.5, "w": 2.25 }, + { "label": "Alt", "x": 11.25, "y": 5.5, "w": 1.25 }, + { "label": "Win", "x": 13.5, "y": 5.5, "w": 1.25 }, + { "label": "Ctrl", "x": 14.75, "y": 5.5, "w": 1.25 }, + { "label": "0", "x": 20, "y": 5.5 }, + { "label": ".", "x": 21, "y": 5.5 }, + { "label": "\u2190", "x": 16.75, "y": 5.75 }, + { "label": "\u2193", "x": 17.75, "y": 5.75 }, + { "label": "\u2192", "x": 18.75, "y": 5.75 } ] } } -} \ No newline at end of file +} diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index 26769e0bee95..7aa79efcb700 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -1,21 +1,43 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┐ - * │ 7 │ 8 │ 9 │ / │ - * ├───┼───┼───┼───┤ - * │ 4 │ 5 │ 6 │ * │ - * ├───┼───┼───┼───┤ - * │ 1 │ 2 │ 3 │ - │ - * ├───┼───┼───┼───┤ - * │ 0 │ . │Ent│ + │ - * └───┴───┴───┴───┘ - */ - [0] = LAYOUT_ortho_4x4( - KC_P7, KC_P8, KC_P9, KC_PSLS, - KC_P4, KC_P5, KC_P6, KC_PAST, - KC_P1, KC_P2, KC_P3, KC_PMNS, - KC_P0, KC_PDOT, KC_PENT, KC_PPLS + [0] = LAYOUT_100_ansi( + KC_MUTE, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [1] = LAYOUT_100_ansi( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_100_ansi( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_100_ansi( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/adpenrose/mine/mine.h b/keyboards/adpenrose/mine/mine.h index 3607d125884a..2763805b830d 100644 --- a/keyboards/adpenrose/mine/mine.h +++ b/keyboards/adpenrose/mine/mine.h @@ -15,9 +15,58 @@ */ #define XXX KC_NO +#define LAYOUT_100_ansi( \ + k09, \ + k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ + k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ + k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k77, k37, k28, k78, \ + k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k76, k47, k38, k68, k58, \ + k40, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ + k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ + { k60, k61, k62, k63, k64, k65, XXX, k67, k68, XXX }, \ + { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ + { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ +} + +#define LAYOUT_100_iso( \ + k09, \ + k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ + k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ + k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k37, k28, k78, \ + k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k66, k76, k47, k38, k68, k58, \ + k40, k70, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ + k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ + { k60, k61, k62, k63, k64, k65, k66, k67, k68, XXX }, \ + { k70, k71, k72, k73, k74, k75, k76, XXX, k78, XXX }, \ + { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ + { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ + { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ +} + #define LAYOUT_all( \ - k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ - k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ + k09, \ + k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ + k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ + k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k77, k37, k28, k78, \ + k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k66, k76, k47, k38, k68, k58, \ + k40, k70, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ + k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ ) { \ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ @@ -30,4 +79,4 @@ { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ -} \ No newline at end of file +} diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk index 6e7633bfe015..b2eab366e5bb 100644 --- a/keyboards/adpenrose/mine/rules.mk +++ b/keyboards/adpenrose/mine/rules.mk @@ -1 +1,21 @@ -# This file intentionally left blank +# MCU name +MCU = atmega32a + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = usbasploader + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output \ No newline at end of file From c128f2f4e2029fc654561331f4f6857a9ac92503 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Wed, 21 Dec 2022 16:29:00 -0600 Subject: [PATCH 03/14] Added ISO keymap. --- .../adpenrose/mine/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/mine/keymaps/iso/keymap.c | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 keyboards/adpenrose/mine/keymaps/iso/keymap.c diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index 7aa79efcb700..61f9e616ad9c 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), diff --git a/keyboards/adpenrose/mine/keymaps/iso/keymap.c b/keyboards/adpenrose/mine/keymaps/iso/keymap.c new file mode 100644 index 000000000000..22ec0df95521 --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c @@ -0,0 +1,43 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_100_iso( + KC_MUTE, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [1] = LAYOUT_100_iso( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_100_iso( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_100_iso( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; From ccb3329563de19236ba708a15a52525dfa2dd0a4 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Wed, 21 Dec 2022 22:21:40 -0600 Subject: [PATCH 04/14] Added VIA keymap and renamed layouts. --- keyboards/adpenrose/mine/info.json | 4 +- .../adpenrose/mine/keymaps/default/keymap.c | 8 ++-- keyboards/adpenrose/mine/keymaps/iso/keymap.c | 8 ++-- keyboards/adpenrose/mine/keymaps/via/keymap.c | 43 +++++++++++++++++++ keyboards/adpenrose/mine/keymaps/via/rules.mk | 2 + keyboards/adpenrose/mine/mine.h | 4 +- 6 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 keyboards/adpenrose/mine/keymaps/via/keymap.c create mode 100644 keyboards/adpenrose/mine/keymaps/via/rules.mk diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index c584157f5c35..b3926b4b540a 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -8,7 +8,7 @@ "vid": "0x4450" }, "layouts": { - "LAYOUT_100_ansi": { + "LAYOUT_1800_alice_ansi": { "layout": [ { "label": "Esc", "x": 0, "y": 0 }, { "label": "F1", "x": 1.25, "y": 0 }, @@ -111,7 +111,7 @@ { "label": "\u2192", "x": 18.75, "y": 5.75 } ] }, - "LAYOUT_100_iso": { + "LAYOUT_1800_alice_iso": { "layout": [ { "label": "Esc", "x": 0, "y": 0 }, { "label": "F1", "x": 1.25, "y": 0 }, diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index 61f9e616ad9c..cb9a35a1de52 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_100_ansi( + [0] = LAYOUT_1800_alice_ansi( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_100_ansi( + [1] = LAYOUT_1800_alice_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_100_ansi( + [2] = LAYOUT_1800_alice_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_100_ansi( + [3] = LAYOUT_1800_alice_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/mine/keymaps/iso/keymap.c b/keyboards/adpenrose/mine/keymaps/iso/keymap.c index 22ec0df95521..f32db50ee2e0 100644 --- a/keyboards/adpenrose/mine/keymaps/iso/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_100_iso( + [0] = LAYOUT_1800_alice_iso( KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_100_iso( + [1] = LAYOUT_1800_alice_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_100_iso( + [2] = LAYOUT_1800_alice_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_100_iso( + [3] = LAYOUT_1800_alice_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/mine/keymaps/via/keymap.c b/keyboards/adpenrose/mine/keymaps/via/keymap.c new file mode 100644 index 000000000000..d2603e9ef626 --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/via/keymap.c @@ -0,0 +1,43 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_MUTE, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [1] = LAYOUT_all( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_all( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_all( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/adpenrose/mine/keymaps/via/rules.mk b/keyboards/adpenrose/mine/keymaps/via/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/adpenrose/mine/mine.h b/keyboards/adpenrose/mine/mine.h index 2763805b830d..a7573c6cb954 100644 --- a/keyboards/adpenrose/mine/mine.h +++ b/keyboards/adpenrose/mine/mine.h @@ -15,7 +15,7 @@ */ #define XXX KC_NO -#define LAYOUT_100_ansi( \ +#define LAYOUT_1800_alice_ansi( \ k09, \ k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ @@ -37,7 +37,7 @@ { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ } -#define LAYOUT_100_iso( \ +#define LAYOUT_1800_alice_iso( \ k09, \ k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ From e7437ce74645e42ae16dc7ddcc7b2d15bed15685 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Fri, 9 Jun 2023 17:25:43 -0600 Subject: [PATCH 05/14] Added testing comment. --- keyboards/adpenrose/mine/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/adpenrose/mine/readme.md b/keyboards/adpenrose/mine/readme.md index 4b8640dea9f0..f4fc4bd1176f 100644 --- a/keyboards/adpenrose/mine/readme.md +++ b/keyboards/adpenrose/mine/readme.md @@ -1,5 +1,7 @@ # adpenrose/mine +This comment is a test to see if the branch still works. + ![adpenrose/mine](imgur.com image replace me!) *A short description of the keyboard/project* From b61f3d043652c43573c64cb21769a3e8e764fccb Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sat, 10 Jun 2023 10:20:46 -0600 Subject: [PATCH 06/14] Moved keyboard definition to info.json. --- keyboards/adpenrose/mine/config.h | 25 +- keyboards/adpenrose/mine/info.json | 530 +++++++++++------- .../adpenrose/mine/keymaps/solenoid/keymap.c | 30 + .../adpenrose/mine/keymaps/solenoid/rules.mk | 5 + keyboards/adpenrose/mine/keymaps/via/keymap.c | 9 + keyboards/adpenrose/mine/keymaps/via/rules.mk | 3 +- keyboards/adpenrose/mine/mine.c | 4 - keyboards/adpenrose/mine/mine.h | 82 --- keyboards/adpenrose/mine/rules.mk | 6 - 9 files changed, 380 insertions(+), 314 deletions(-) create mode 100644 keyboards/adpenrose/mine/keymaps/solenoid/keymap.c create mode 100644 keyboards/adpenrose/mine/keymaps/solenoid/rules.mk delete mode 100644 keyboards/adpenrose/mine/mine.c delete mode 100644 keyboards/adpenrose/mine/mine.h diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h index 2874f926a6ee..93721ea0b249 100644 --- a/keyboards/adpenrose/mine/config.h +++ b/keyboards/adpenrose/mine/config.h @@ -3,30 +3,11 @@ #pragma once -#include "config_common.h" +/* Solenoid pin */ +#define SOLENOID_PIN A7 -/* Key Matrix size */ -#define MATRIX_ROWS 11 -#define MATRIX_COLS 10 +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define MATRIX_ROW_PINS { A0, A1, A4, A3, C7, B4, B5, B6, A6, A2, A5 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D5, D6, C6, C5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 /* Bootmagic Lite key configuration */ diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index b3926b4b540a..4ed2a9db56ca 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -7,212 +7,344 @@ "pid": "0x0006", "vid": "0x4450" }, + "features": { + "encoder": true + }, + "encoder": { + "rotary": [{ "pin_a": "C4", "pin_b": "C3" }] + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["A0", "A1", "A4", "A3", "C7", "B4", "B5", "B6", "A6", "A2", "A5"], + "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D5", "D6", "C6", "C5"] + }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 1 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 1 }, + { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 1 }, + { "label": "F3", "matrix": [0, 2], "x": 3.25, "y": 1 }, + { "label": "F4", "matrix": [1, 2], "x": 4.25, "y": 1 }, + { "label": "F5", "matrix": [0, 3], "x": 5.25, "y": 1 }, + { "label": "F6", "matrix": [1, 3], "x": 6.25, "y": 1 }, + { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 1 }, + { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 1 }, + { "label": "F9", "matrix": [0, 4], "x": 11.25, "y": 1 }, + { "label": "F10", "matrix": [0, 5], "x": 12.25, "y": 1 }, + { "label": "F11", "matrix": [0, 6], "x": 13.25, "y": 1 }, + { "label": "F12", "matrix": [1, 6], "x": 14.25, "y": 1 }, + { "label": "M1", "matrix": [10, 6], "x": 15.25, "y": 1 }, + { "label": "M2", "matrix": [0, 7], "x": 16.25, "y": 1 }, + { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, + { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, + { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, + { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 2.25 }, + { "label": "!", "matrix": [10, 0], "x": 1, "y": 2.25 }, + { "label": "@", "matrix": [2, 1], "x": 2, "y": 2.25 }, + { "label": "#", "matrix": [10, 1], "x": 3, "y": 2.25 }, + { "label": "$", "matrix": [2, 2], "x": 4, "y": 2.25 }, + { "label": "%", "matrix": [10, 2], "x": 5, "y": 2.25 }, + { "label": "^", "matrix": [2, 3], "x": 6, "y": 2.25 }, + { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 2.25 }, + { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 2.25 }, + { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 2.25 }, + { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 2.25 }, + { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 2.25 }, + { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 2.25 }, + { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 2.25 }, + { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, + { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, + { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, + + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.25 }, + { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 3.25 }, + { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 3.25 }, + { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 3.25 }, + { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 3.25 }, + { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 3.25 }, + { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 3.25 }, + { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 3.25 }, + { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 3.25 }, + { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 3.25 }, + { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 3.25 }, + { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 3.25 }, + { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 3.25 }, + { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 3.25 }, + { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, + { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, + { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, + + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 4.25 }, + { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 4.25 }, + { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 4.25 }, + { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 4.25 }, + { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 4.25 }, + { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 4.25 }, + { "label": "H", "matrix": [6, 3], "x": 9, "y": 4.25 }, + { "label": "J", "matrix": [3, 4], "x": 10, "y": 4.25 }, + { "label": "K", "matrix": [8, 4], "x": 11, "y": 4.25 }, + { "label": "L", "matrix": [3, 5], "x": 12, "y": 4.25 }, + { "label": ":", "matrix": [8, 5], "x": 13, "y": 4.25 }, + { "label": "\\", "matrix": [4, 6], "x": 14, "y": 4.25 }, + { "label": "#", "matrix": [6, 6], "x": 15, "y": 4.25 }, + { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 4.25 }, + { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, + { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, + { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, + + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 5.25 }, + { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 5.25 }, + { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 5.25 }, + { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 5.25 }, + { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 5.25 }, + { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 5.25 }, + { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 5.25 }, + { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 5.25 }, + { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 5.25 }, + { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 5.25 }, + { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 5.25 }, + { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 5.25 }, + { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 5.25 }, + { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, + { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, + + { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 6.25 }, + { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 6.25 }, + { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 6.25 }, + { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 6.25 }, + { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 6.25 }, + { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 6.25 }, + { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 12, "y": 6.25 }, + { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 13.25, "y": 6.25 }, + { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, + { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, + { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } + ] + }, "LAYOUT_1800_alice_ansi": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 9.5, "y": 0 }, - { "label": "F8", "x": 10.5, "y": 0 }, - { "label": "F9", "x": 11.75, "y": 0 }, - { "label": "F10", "x": 12.75, "y": 0 }, - { "label": "F11", "x": 13.75, "y": 0 }, - { "label": "F12", "x": 14.75, "y": 0 }, - { "label": "M1", "x": 16, "y": 0 }, - { "label": "M2", "x": 17, "y": 0 }, - { "label": "Enc", "x": 22, "y": 0 }, - { "label": "~", "x": 0, "y": 1.5 }, - { "label": "!", "x": 1, "y": 1.5 }, - { "label": "@", "x": 2, "y": 1.5 }, - { "label": "#", "x": 3, "y": 1.5 }, - { "label": "$", "x": 4, "y": 1.5 }, - { "label": "%", "x": 5, "y": 1.5 }, - { "label": "^", "x": 6, "y": 1.5 }, - { "label": "&", "x": 9.5, "y": 1.5 }, - { "label": "*", "x": 10.5, "y": 1.5 }, - { "label": "(", "x": 11.5, "y": 1.5 }, - { "label": ")", "x": 12.5, "y": 1.5 }, - { "label": "_", "x": 13.5, "y": 1.5 }, - { "label": "+", "x": 14.5, "y": 1.5 }, - { "label": "Backspace", "x": 15.5, "y": 1.5, "w": 2 }, - { "label": "Num Lock", "x": 19, "y": 1.5 }, - { "label": "/", "x": 20, "y": 1.5 }, - { "label": "*", "x": 21, "y": 1.5 }, - { "label": "-", "x": 22, "y": 1.5 }, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 9, "y": 2.5 }, - { "label": "U", "x": 10, "y": 2.5 }, - { "label": "I", "x": 11, "y": 2.5 }, - { "label": "O", "x": 12, "y": 2.5 }, - { "label": "P", "x": 13, "y": 2.5 }, - { "label": "{", "x": 14, "y": 2.5 }, - { "label": "}", "x": 15, "y": 2.5 }, - { "label": "|", "x": 16, "y": 2.5, "w": 1.5 }, - { "label": "7", "x": 19, "y": 2.5 }, - { "label": "8", "x": 20, "y": 2.5 }, - { "label": "9", "x": 21, "y": 2.5 }, - { "label": "+", "x": 22, "y": 2.5, "h": 2 }, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 9.25, "y": 3.5 }, - { "label": "J", "x": 10.25, "y": 3.5 }, - { "label": "K", "x": 11.25, "y": 3.5 }, - { "label": "L", "x": 12.25, "y": 3.5 }, - { "label": ":", "x": 13.25, "y": 3.5 }, - { "label": "\"", "x": 14.25, "y": 3.5 }, - { "label": "Enter", "x": 15.25, "y": 3.5, "w": 2.25 }, - { "label": "4", "x": 19, "y": 3.5 }, - { "label": "5", "x": 20, "y": 3.5 }, - { "label": "6", "x": 21, "y": 3.5 }, - { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "B", "x": 8.75, "y": 4.5 }, - { "label": "N", "x": 9.75, "y": 4.5 }, - { "label": "M", "x": 10.75, "y": 4.5 }, - { "label": "<", "x": 11.75, "y": 4.5 }, - { "label": ">", "x": 12.75, "y": 4.5 }, - { "label": "?", "x": 13.75, "y": 4.5 }, - { "label": "Shift", "x": 14.75, "y": 4.5, "w": 2.75 }, - { "label": "1", "x": 19, "y": 4.5 }, - { "label": "2", "x": 20, "y": 4.5 }, - { "label": "3", "x": 21, "y": 4.5 }, - { "label": "Enter", "x": 22, "y": 4.5, "h": 2 }, - { "label": "\u2191", "x": 17.75, "y": 4.75 }, - { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 }, - { "label": "Alt", "x": 3.5, "y": 5.5, "w": 1.25 }, - { "x": 4.75, "y": 5.5, "w": 2.75 }, - { "x": 9, "y": 5.5, "w": 2.25 }, - { "label": "Alt", "x": 11.25, "y": 5.5, "w": 1.25 }, - { "label": "Win", "x": 13.5, "y": 5.5, "w": 1.25 }, - { "label": "Ctrl", "x": 14.75, "y": 5.5, "w": 1.25 }, - { "label": "0", "x": 20, "y": 5.5 }, - { "label": ".", "x": 21, "y": 5.5 }, - { "label": "\u2190", "x": 16.75, "y": 5.75 }, - { "label": "\u2193", "x": 17.75, "y": 5.75 }, - { "label": "\u2192", "x": 18.75, "y": 5.75 } + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 }, + { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 }, + { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 }, + { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 }, + { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 }, + { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 }, + { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 }, + { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 }, + { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 }, + { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 }, + { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, + + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 }, + { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 }, + { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 }, + { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 }, + { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 }, + { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 }, + { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 }, + { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, + { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, + { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, + { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, + + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 }, + { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 }, + { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 }, + { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 }, + { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 }, + { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 }, + { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 }, + { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 2.25 }, + { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, + { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, + { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, + + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 }, + { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 }, + { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 }, + { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 }, + { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 }, + { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 }, + { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 3.25 }, + { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, + { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, + { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, + + { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 }, + { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 }, + { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 }, + { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 }, + { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 }, + { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 }, + { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 }, + { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 }, + { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, + { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, + { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, + + { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 }, + { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 }, + { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 }, + { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 }, + { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 }, + { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 }, + { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, + { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, + { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, + { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, + { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } ] }, "LAYOUT_1800_alice_iso": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 9.5, "y": 0 }, - { "label": "F8", "x": 10.5, "y": 0 }, - { "label": "F9", "x": 11.75, "y": 0 }, - { "label": "F10", "x": 12.75, "y": 0 }, - { "label": "F11", "x": 13.75, "y": 0 }, - { "label": "F12", "x": 14.75, "y": 0 }, - { "label": "M1", "x": 16, "y": 0 }, - { "label": "M2", "x": 17, "y": 0 }, - { "label": "Enc", "x": 22, "y": 0 }, - { "label": "~", "x": 0, "y": 1.5 }, - { "label": "!", "x": 1, "y": 1.5 }, - { "label": "@", "x": 2, "y": 1.5 }, - { "label": "#", "x": 3, "y": 1.5 }, - { "label": "$", "x": 4, "y": 1.5 }, - { "label": "%", "x": 5, "y": 1.5 }, - { "label": "^", "x": 6, "y": 1.5 }, - { "label": "&", "x": 9.5, "y": 1.5 }, - { "label": "*", "x": 10.5, "y": 1.5 }, - { "label": "(", "x": 11.5, "y": 1.5 }, - { "label": ")", "x": 12.5, "y": 1.5 }, - { "label": "_", "x": 13.5, "y": 1.5 }, - { "label": "+", "x": 14.5, "y": 1.5 }, - { "label": "Backspace", "x": 15.5, "y": 1.5, "w": 2 }, - { "label": "Num Lock", "x": 19, "y": 1.5 }, - { "label": "/", "x": 20, "y": 1.5 }, - { "label": "*", "x": 21, "y": 1.5 }, - { "label": "-", "x": 22, "y": 1.5 }, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 9, "y": 2.5 }, - { "label": "U", "x": 10, "y": 2.5 }, - { "label": "I", "x": 11, "y": 2.5 }, - { "label": "O", "x": 12, "y": 2.5 }, - { "label": "P", "x": 13, "y": 2.5 }, - { "label": "{", "x": 14, "y": 2.5 }, - { "label": "}", "x": 15, "y": 2.5 }, - { "label": "Enter", "x": 16.25, "y": 2.5, "w": 1.25, "h": 2 }, - { "label": "7", "x": 19, "y": 2.5 }, - { "label": "8", "x": 20, "y": 2.5 }, - { "label": "9", "x": 21, "y": 2.5 }, - { "label": "+", "x": 22, "y": 2.5, "h": 2 }, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 9.25, "y": 3.5 }, - { "label": "J", "x": 10.25, "y": 3.5 }, - { "label": "K", "x": 11.25, "y": 3.5 }, - { "label": "L", "x": 12.25, "y": 3.5 }, - { "label": ":", "x": 13.25, "y": 3.5 }, - { "label": "\"", "x": 14.25, "y": 3.5 }, - { "label": "~", "x": 15.25, "y": 3.5 }, - { "label": "4", "x": 19, "y": 3.5 }, - { "label": "5", "x": 20, "y": 3.5 }, - { "label": "6", "x": 21, "y": 3.5 }, - { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 }, - { "label": "|", "x": 1.25, "y": 4.5 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "B", "x": 8.75, "y": 4.5 }, - { "label": "N", "x": 9.75, "y": 4.5 }, - { "label": "M", "x": 10.75, "y": 4.5 }, - { "label": "<", "x": 11.75, "y": 4.5 }, - { "label": ">", "x": 12.75, "y": 4.5 }, - { "label": "?", "x": 13.75, "y": 4.5 }, - { "label": "Shift", "x": 14.75, "y": 4.5, "w": 2.75 }, - { "label": "1", "x": 19, "y": 4.5 }, - { "label": "2", "x": 20, "y": 4.5 }, - { "label": "3", "x": 21, "y": 4.5 }, - { "label": "Enter", "x": 22, "y": 4.5, "h": 2 }, - { "label": "\u2191", "x": 17.75, "y": 4.75 }, - { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 }, - { "label": "Alt", "x": 3.5, "y": 5.5, "w": 1.25 }, - { "x": 4.75, "y": 5.5, "w": 2.75 }, - { "x": 9, "y": 5.5, "w": 2.25 }, - { "label": "Alt", "x": 11.25, "y": 5.5, "w": 1.25 }, - { "label": "Win", "x": 13.5, "y": 5.5, "w": 1.25 }, - { "label": "Ctrl", "x": 14.75, "y": 5.5, "w": 1.25 }, - { "label": "0", "x": 20, "y": 5.5 }, - { "label": ".", "x": 21, "y": 5.5 }, - { "label": "\u2190", "x": 16.75, "y": 5.75 }, - { "label": "\u2193", "x": 17.75, "y": 5.75 }, - { "label": "\u2192", "x": 18.75, "y": 5.75 } + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 }, + { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 }, + { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 }, + { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 }, + { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 }, + { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 }, + { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 }, + { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 }, + { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 }, + { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 }, + { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, + + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 }, + { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 }, + { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 }, + { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 }, + { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 }, + { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 }, + { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 }, + { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, + { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, + { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, + { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, + + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 }, + { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 }, + { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 }, + { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 }, + { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 }, + { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 }, + { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 }, + { "h": 2, "label": "Enter", "matrix": [7, 6], "w": 1.25, "x": 16, "y": 2.25 }, + { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, + { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, + { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, + + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 }, + { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 }, + { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 }, + { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 }, + { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 }, + { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 }, + { "label": "#", "matrix": [6, 6], "x": 15, "y": 3.25 }, + { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, + { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, + { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, + + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 }, + { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 }, + { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 }, + { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 }, + { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 }, + { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 }, + { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 }, + { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 }, + { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, + { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, + { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, + + { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 }, + { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 }, + { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 }, + { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 }, + { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 }, + { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 }, + { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, + { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, + { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, + { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, + { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } ] } } diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c new file mode 100644 index 000000000000..f3e08739388a --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c @@ -0,0 +1,30 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + HF_TOGG, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [1] = LAYOUT_all( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk new file mode 100644 index 000000000000..01823223a55e --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes +HAPTIC_ENABLE = yes +HAPTIC_DRIVER += SOLENOID \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/via/keymap.c b/keyboards/adpenrose/mine/keymaps/via/keymap.c index d2603e9ef626..3b10518c0fcc 100644 --- a/keyboards/adpenrose/mine/keymaps/via/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/via/keymap.c @@ -41,3 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif diff --git a/keyboards/adpenrose/mine/keymaps/via/rules.mk b/keyboards/adpenrose/mine/keymaps/via/rules.mk index 43061db1dd46..aaf0497be139 100644 --- a/keyboards/adpenrose/mine/keymaps/via/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file +LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/adpenrose/mine/mine.c b/keyboards/adpenrose/mine/mine.c deleted file mode 100644 index 12b77a66db6a..000000000000 --- a/keyboards/adpenrose/mine/mine.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Arturo Avila (@Arturo Avila) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "mine.h" \ No newline at end of file diff --git a/keyboards/adpenrose/mine/mine.h b/keyboards/adpenrose/mine/mine.h deleted file mode 100644 index a7573c6cb954..000000000000 --- a/keyboards/adpenrose/mine/mine.h +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2022 Arturo Avila (@Arturo Avila) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO - -#define LAYOUT_1800_alice_ansi( \ - k09, \ - k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ - k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ - k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k77, k37, k28, k78, \ - k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k76, k47, k38, k68, k58, \ - k40, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ - k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ - { k60, k61, k62, k63, k64, k65, XXX, k67, k68, XXX }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ - { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ -} - -#define LAYOUT_1800_alice_iso( \ - k09, \ - k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ - k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ - k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k37, k28, k78, \ - k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k66, k76, k47, k38, k68, k58, \ - k40, k70, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ - k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, XXX, k78, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ - { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ -} - -#define LAYOUT_all( \ - k09, \ - k00, k01, k11, k02, k12, k03, k13, k93, kA3, k04, k05, k06, k16, kA6, k07, k17, k08, kA8, k19, \ - k10, kA0, k21, kA1, k22, kA2, k23, k83, k14, kA4, k15, kA5, k26, k96, k27, k18, k98, k88, \ - k20, k90, k31, k91, k32, k92, k73, k24, k94, k25, k95, k36, k86, k77, k37, k28, k78, \ - k30, k80, k41, k81, k42, k82, k63, k34, k84, k35, k85, k46, k66, k76, k47, k38, k68, k58, \ - k40, k70, k51, k71, k52, k72, k33, k53, k44, k54, k74, k45, k75, k56, k57, kA7, k48, \ - k50, k60, k61, k62, k43, k64, k55, k65, k67, k87, k97 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, XXX }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, XXX }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, XXX }, \ - { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, XXX } \ -} diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk index b2eab366e5bb..1adbea87c4c2 100644 --- a/keyboards/adpenrose/mine/rules.mk +++ b/keyboards/adpenrose/mine/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # From e3dd2fa1d25fd258721e8276dbc19516bbab12d4 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sat, 10 Jun 2023 11:21:47 -0600 Subject: [PATCH 07/14] Fixed solenoid keymap and data on info.json. 2 layouts pending. --- keyboards/adpenrose/mine/info.json | 2 +- .../adpenrose/mine/keymaps/solenoid/keymap.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index 4ed2a9db56ca..7022c3dc07e4 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -113,9 +113,9 @@ { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 5.25 }, { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 5.25 }, { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 5.25 }, + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, - { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 6.25 }, { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 6.25 }, diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c index f3e08739388a..89d20aa42b7a 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c @@ -3,17 +3,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( HF_TOGG, - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LSFT, MO(1), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_all( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -28,3 +28,13 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, }; #endif + +#ifdef HAPTIC_ENABLE +bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_VOLU ... KC_VOLD: + return false; + } + return true; +} +#endif From 0690f39e6673f492eb829fcb2f4ba61cb0e74931 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sat, 10 Jun 2023 12:06:59 -0600 Subject: [PATCH 08/14] Fixed buggy layouts due to misplacement on info.json. --- keyboards/adpenrose/mine/info.json | 87 ++++++++++--------- .../adpenrose/mine/keymaps/default/keymap.c | 31 ++----- keyboards/adpenrose/mine/keymaps/iso/keymap.c | 33 +++---- .../adpenrose/mine/keymaps/solenoid/keymap.c | 4 +- .../adpenrose/mine/keymaps/solenoid/rules.mk | 1 - keyboards/adpenrose/mine/rules.mk | 3 +- 6 files changed, 67 insertions(+), 92 deletions(-) diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index 7022c3dc07e4..9f4765fed063 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -43,6 +43,7 @@ { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 2.25 }, { "label": "!", "matrix": [10, 0], "x": 1, "y": 2.25 }, { "label": "@", "matrix": [2, 1], "x": 2, "y": 2.25 }, @@ -132,6 +133,7 @@ }, "LAYOUT_1800_alice_ansi": { "layout": [ + { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 }, @@ -147,7 +149,10 @@ { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 }, { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 }, { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 }, - { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, + { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, + { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, + { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, + { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 }, @@ -163,10 +168,10 @@ { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 }, { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 }, { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 }, - { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, - { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, - { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, - { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, + { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, + { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, + { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 }, @@ -182,11 +187,10 @@ { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 }, { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 }, { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 2.25 }, - { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, - { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, - { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, - { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, - + { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, + { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, + { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 }, { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 }, @@ -200,10 +204,11 @@ { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 }, { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 }, { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 3.25 }, - { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, - { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, - { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, - + { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, + { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, + { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 }, { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 }, @@ -217,11 +222,10 @@ { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 }, { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 }, { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 }, - { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, - { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, - { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, - { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, - + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, + { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, + { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, + { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 }, @@ -230,9 +234,6 @@ { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 }, { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 }, { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 }, - { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, - { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, - { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } @@ -240,6 +241,7 @@ }, "LAYOUT_1800_alice_iso": { "layout": [ + { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 }, @@ -255,7 +257,10 @@ { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 }, { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 }, { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 }, - { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, + { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, + { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, + { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, + { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 }, @@ -271,11 +276,11 @@ { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 }, { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 }, { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 }, - { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, - { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, - { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, - { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, - + { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, + { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, + { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, + { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 }, { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 }, @@ -289,11 +294,9 @@ { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 }, { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 }, { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 }, - { "h": 2, "label": "Enter", "matrix": [7, 6], "w": 1.25, "x": 16, "y": 2.25 }, - { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, - { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, - { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, - { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, + { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, + { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, + { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 }, @@ -308,9 +311,11 @@ { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 }, { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 }, { "label": "#", "matrix": [6, 6], "x": 15, "y": 3.25 }, - { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, - { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, - { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, + { "h": 2, "label": "Enter", "matrix": [7, 6], "w": 1.25, "x": 16, "y": 2.25 }, + { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, + { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, + { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, + { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 4.25 }, @@ -326,10 +331,9 @@ { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 }, { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 }, { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 }, - { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, - { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, - { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, - { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, + { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, + { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, + { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, @@ -339,9 +343,6 @@ { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 }, { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 }, { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 }, - { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, - { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, - { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index cb9a35a1de52..b0e6ca0ad136 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -3,7 +3,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_1800_alice_ansi( KC_MUTE, - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, @@ -13,27 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1800_alice_ansi( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_1800_alice_ansi( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_1800_alice_ansi( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -41,3 +21,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/iso/keymap.c b/keyboards/adpenrose/mine/keymaps/iso/keymap.c index f32db50ee2e0..5b21d39a8c5f 100644 --- a/keyboards/adpenrose/mine/keymaps/iso/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c @@ -3,41 +3,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_1800_alice_iso( KC_MUTE, - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, + KC_LSFT, MO(1), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P0, KC_PDOT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), [1] = LAYOUT_1800_alice_iso( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_1800_alice_iso( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_1800_alice_iso( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c index 89d20aa42b7a..1993c8bbb435 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c @@ -13,11 +13,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk index 01823223a55e..e13f2bd03570 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk @@ -1,5 +1,4 @@ VIA_ENABLE = yes LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes HAPTIC_ENABLE = yes HAPTIC_DRIVER += SOLENOID \ No newline at end of file diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk index 1adbea87c4c2..d9d8255dc0d2 100644 --- a/keyboards/adpenrose/mine/rules.mk +++ b/keyboards/adpenrose/mine/rules.mk @@ -12,4 +12,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output \ No newline at end of file +AUDIO_ENABLE = no # Audio output +ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file From c75e85afdea916f405908f5d066ad6fe1979a856 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sat, 10 Jun 2023 23:32:52 -0600 Subject: [PATCH 09/14] Updated README. --- keyboards/adpenrose/mine/readme.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/keyboards/adpenrose/mine/readme.md b/keyboards/adpenrose/mine/readme.md index f4fc4bd1176f..bb68e385a6c8 100644 --- a/keyboards/adpenrose/mine/readme.md +++ b/keyboards/adpenrose/mine/readme.md @@ -1,14 +1,12 @@ -# adpenrose/mine +# Mine -This comment is a test to see if the branch still works. +![mine](https://i.imgur.com/P9s2cI8h.jpg) -![adpenrose/mine](imgur.com image replace me!) +A 1800 alice assembled only with THT components, including a solenoid and a chunky encoder. -*A short description of the keyboard/project* - -* Keyboard Maintainer: [Arturo Avila](https://github.com/Arturo Avila) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [Arturo Avila](https://github.com/ADPenrose) +* Hardware Supported: Mine v1 PCB +* Hardware Availability: [Arturo Avila](https://github.com/ADPenrose) Make example for this keyboard (after setting up your build environment): @@ -25,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the front of the PCB. To exit the bootloader mode, briefly press the button labeled "RESET" once more. * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From e5a0acd8a9fa9962c6342782af53b94c3e0d87c7 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sat, 10 Jun 2023 23:48:17 -0600 Subject: [PATCH 10/14] Added matrix_diagram file. --- keyboards/adpenrose/mine/matrix_diagram.md | 71 ++++++++++++++++++++++ keyboards/adpenrose/mine/readme.md | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 keyboards/adpenrose/mine/matrix_diagram.md diff --git a/keyboards/adpenrose/mine/matrix_diagram.md b/keyboards/adpenrose/mine/matrix_diagram.md new file mode 100644 index 000000000000..afe613074ba4 --- /dev/null +++ b/keyboards/adpenrose/mine/matrix_diagram.md @@ -0,0 +1,71 @@ +# Matrix Diagram for the Mine Keyboard +## Matrix for "LAYOUT_all": + ┌──┐ + │0J│ + └──┘ +┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ +│0A│ │0B││1B││0C││1C││0D││1D│ │9D││AD││0E││0F││0G││1G││AG││0H│ ┌──┐┌──┐┌──┐┌──┐ +└──┘ └──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘ │1H││0I││AI││1J│ + └──┘└──┘└──┘└──┘ +┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐ ┌──┐┌──┐┌──┐┌──┐ +│1A││AA││2B││AB││2C││AC││2D│ │8D││1E││AE││1F││AF││2G││9G │ │2H││1I││9I││8I│ +└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──────┘ └──┘└──┘└──┘│ │ +┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐┌──┐│ │ +│2A ││9A││3B││9B││3C││9C│ │7D││2E││9E││2F││9F││3G││8G││7H │ │3H││2I││7I││ │ +└────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘└──┘└──┘ +┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐ ┌──┐┌──┐┌──┐┌──┐ +│3A ││8A││4B││8B││4C││8C│ │6D││3E││8E││3F││8F││4G││7G │ │4H││3I││6I││5I│ +└─────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└───────┘ └──┘└──┘└──┘│ │ +┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐ ┌──┐┌──┐│ │ +│4A ││7A││5B││7B││5C││7C││3D│ │5D││4E││5E││7E││4F││7F││5G │ ┌──┐ │AH││4I││ │ +└───┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└─────────┘ │5H│ └──┘└──┘└──┘ +┌───┐┌───┐ ┌───┐┌─────────┐ ┌───────┐┌───┐┌───┐┌───┐ └──┘ +│5A ││6A │ │6B ││6C │ │4D ││6E ││5F ││6F │ ┌──┐┌──┐┌──┐ +└───┘└───┘ └───┘└─────────┘ └───────┘└───┘└───┘└───┘ │6H││8H││9H│ + └──┘└──┘└──┘ +## Matrix for "LAYOUT_1800_alice_ansi": +┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐ +│0A│ │0B││1B│ │0C││1C│ │0D││1D│ │9D││AD│ │0E││0F│ │0G││1G│ │AG││0H│ │0J│ +└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘ +┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐ ┌──┐┌──┐┌──┐┌──┐ +│1A││AA││2B││AB││2C││AC││2D│ │8D││1E││AE││1F││AF││2G││9G │ │1H││0I││AI││1J│ +└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──────┘ └──┘└──┘└──┘└──┘ +┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐┌──┐┌──┐ +│2A ││9A││3B││9B││3C││9C│ │7D││2E││9E││2F││9F││3G││8G││7H │ │2H││1I││9I││8I│ +└────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘└──┘│ │ +┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐ ┌──┐┌──┐┌──┐│ │ +│3A ││8A││4B││8B││4C││8C│ │6D││3E││8E││3F││8F││4G││7G │ │3H││2I││7I││ │ +└─────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└───────┘ └──┘└──┘└──┘└──┘ +┌───────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐ ┌──┐┌──┐┌──┐┌──┐ +│4A ││5B││7B││5C││7C││3D│ │5D││4E││5E││7E││4F││7F││5G │ │4H││3I││6I││5I│ +└───────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└─────────┘ └──┘└──┘└──┘│ │ +┌───┐┌───┐ ┌───┐┌─────────┐ ┌───────┐┌───┐ ┌───┐┌───┐ ┌──┐┌──┐│ │ +│5A ││6A │ │6B ││6C │ │4D ││6E │ │5F ││6F │ ┌──┐ │AH││4I││ │ +└───┘└───┘ └───┘└─────────┘ └───────┘└───┘ └───┘└───┘ │5H│ └──┘└──┘└──┘ + └──┘ + ┌──┐┌──┐┌──┐ + │6H││8H││9H│ + └──┘└──┘└──┘ +## Matrix for "LAYOUT_1800_alice_iso": +┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐ +│0A│ │0B││1B│ │0C││1C│ │0D││1D│ │9D││AD│ │0E││0F│ │0G││1G│ │AG││0H│ │0J│ +└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘ +┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐ ┌──┐┌──┐┌──┐┌──┐ +│1A││AA││2B││AB││2C││AC││2D│ │8D││1E││AE││1F││AF││2G││9G │ │1H││0I││AI││1J│ +└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──────┘ └──┘└──┘└──┘└──┘ +┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐┌──┐┌──┐ +│2A ││9A││3B││9B││3C││9C│ │7D││2E││9E││2F││9F││3G││8G││7G │ │2H││1I││9I││8I│ +└────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└┐ │ └──┘└──┘└──┘│ │ +┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐│ │ ┌──┐┌──┐┌──┐│ │ +│3A ││8A││4B││8B││4C││8C│ │6D││3E││8E││3F││8F││4G││6G││ │ │3H││2I││7I││ │ +└─────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└───┘ └──┘└──┘└──┘└──┘ +┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐ ┌──┐┌──┐┌──┐┌──┐ +│4A ││7A││5B││7B││5C││7C││3D│ │5D││4E││5E││7E││4F││7F││5G │ │4H││3I││6I││5I│ +└───┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└─────────┘ └──┘└──┘└──┘│ │ +┌───┐┌───┐ ┌───┐┌─────────┐ ┌───────┐┌───┐ ┌───┐┌───┐ ┌──┐┌──┐│ │ +│5A ││6A │ │6B ││6C │ │4D ││6E │ │5F ││6F │ ┌──┐ │AH││4I││ │ +└───┘└───┘ └───┘└─────────┘ └───────┘└───┘ └───┘└───┘ │5H│ └──┘└──┘└──┘ + └──┘ + ┌──┐┌──┐┌──┐ + │6H││8H││9H│ + └──┘└──┘└──┘ \ No newline at end of file diff --git a/keyboards/adpenrose/mine/readme.md b/keyboards/adpenrose/mine/readme.md index bb68e385a6c8..266fe1ddd5b6 100644 --- a/keyboards/adpenrose/mine/readme.md +++ b/keyboards/adpenrose/mine/readme.md @@ -2,7 +2,7 @@ ![mine](https://i.imgur.com/P9s2cI8h.jpg) -A 1800 alice assembled only with THT components, including a solenoid and a chunky encoder. +A hotswap ISO/ANSI-compatible 1800 alice, assembled only with THT components, including a solenoid and a chunky encoder. * Keyboard Maintainer: [Arturo Avila](https://github.com/ADPenrose) * Hardware Supported: Mine v1 PCB From 1c897304b681e6dd13668e41b295723e0d56a5c9 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sun, 11 Jun 2023 00:12:43 -0600 Subject: [PATCH 11/14] Fixed some bugs on the matrix diagram, the info.json and the default keymap. --- keyboards/adpenrose/mine/info.json | 160 +++++++++--------- .../adpenrose/mine/keymaps/default/keymap.c | 2 +- keyboards/adpenrose/mine/matrix_diagram.md | 51 +++--- 3 files changed, 110 insertions(+), 103 deletions(-) diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index 9f4765fed063..75d52518931e 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -24,108 +24,108 @@ "LAYOUT_all": { "layout": [ { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 }, - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 1 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 1 }, - { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 1 }, - { "label": "F3", "matrix": [0, 2], "x": 3.25, "y": 1 }, - { "label": "F4", "matrix": [1, 2], "x": 4.25, "y": 1 }, - { "label": "F5", "matrix": [0, 3], "x": 5.25, "y": 1 }, - { "label": "F6", "matrix": [1, 3], "x": 6.25, "y": 1 }, - { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 1 }, - { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 1 }, - { "label": "F9", "matrix": [0, 4], "x": 11.25, "y": 1 }, - { "label": "F10", "matrix": [0, 5], "x": 12.25, "y": 1 }, - { "label": "F11", "matrix": [0, 6], "x": 13.25, "y": 1 }, - { "label": "F12", "matrix": [1, 6], "x": 14.25, "y": 1 }, - { "label": "M1", "matrix": [10, 6], "x": 15.25, "y": 1 }, - { "label": "M2", "matrix": [0, 7], "x": 16.25, "y": 1 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 }, + { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 }, + { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 }, + { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 }, + { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 }, + { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 }, + { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 }, + { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 }, + { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 }, + { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 }, { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 }, { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 }, { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 }, { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 }, - { "label": "~", "matrix": [1, 0], "x": 0, "y": 2.25 }, - { "label": "!", "matrix": [10, 0], "x": 1, "y": 2.25 }, - { "label": "@", "matrix": [2, 1], "x": 2, "y": 2.25 }, - { "label": "#", "matrix": [10, 1], "x": 3, "y": 2.25 }, - { "label": "$", "matrix": [2, 2], "x": 4, "y": 2.25 }, - { "label": "%", "matrix": [10, 2], "x": 5, "y": 2.25 }, - { "label": "^", "matrix": [2, 3], "x": 6, "y": 2.25 }, - { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 2.25 }, - { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 2.25 }, - { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 2.25 }, - { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 2.25 }, - { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 2.25 }, - { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 2.25 }, - { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 2.25 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 }, + { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 }, + { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 }, + { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 }, + { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 }, + { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 }, + { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 }, { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 }, { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 }, { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 }, { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 }, - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 3.25 }, - { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 3.25 }, - { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 3.25 }, - { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 3.25 }, - { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 3.25 }, - { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 3.25 }, - { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 3.25 }, - { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 3.25 }, - { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 3.25 }, - { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 3.25 }, - { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 3.25 }, - { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 3.25 }, - { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 3.25 }, - { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 3.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 }, + { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 }, + { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 }, + { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 }, + { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 }, + { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 }, + { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 }, + { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 2.25 }, { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 }, { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 }, { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 }, - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 4.25 }, - { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 4.25 }, - { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 4.25 }, - { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 4.25 }, - { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 4.25 }, - { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 4.25 }, - { "label": "H", "matrix": [6, 3], "x": 9, "y": 4.25 }, - { "label": "J", "matrix": [3, 4], "x": 10, "y": 4.25 }, - { "label": "K", "matrix": [8, 4], "x": 11, "y": 4.25 }, - { "label": "L", "matrix": [3, 5], "x": 12, "y": 4.25 }, - { "label": ":", "matrix": [8, 5], "x": 13, "y": 4.25 }, - { "label": "\\", "matrix": [4, 6], "x": 14, "y": 4.25 }, - { "label": "#", "matrix": [6, 6], "x": 15, "y": 4.25 }, - { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 4.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 }, + { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 }, + { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 }, + { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 }, + { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 }, + { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 }, + { "label": "#", "matrix": [6, 6], "x": 15, "y": 3.25 }, + { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 3.25 }, { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 }, { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 }, { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 }, { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 5.25 }, - { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 5.25 }, - { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 5.25 }, - { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 5.25 }, - { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 5.25 }, - { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 5.25 }, - { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 5.25 }, - { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 5.25 }, - { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 5.25 }, - { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 5.25 }, - { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 5.25 }, - { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 5.25 }, - { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 5.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 }, + { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 }, + { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 }, + { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 }, + { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 }, + { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 }, + { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 }, + { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 }, { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 }, { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 }, { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 }, - - { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 6.25 }, - { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 6.25 }, - { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 6.25 }, - { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 6.25 }, - { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 6.25 }, - { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 6.25 }, - { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 12, "y": 6.25 }, - { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 13.25, "y": 6.25 }, + + { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 }, + { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 }, + { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 }, + { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 }, + { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 }, + { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 }, { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 }, { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 }, { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 } diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index b0e6ca0ad136..c8d3d7e5cee0 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1800_alice_ansi( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/mine/matrix_diagram.md b/keyboards/adpenrose/mine/matrix_diagram.md index afe613074ba4..05d34fb066e7 100644 --- a/keyboards/adpenrose/mine/matrix_diagram.md +++ b/keyboards/adpenrose/mine/matrix_diagram.md @@ -1,29 +1,32 @@ # Matrix Diagram for the Mine Keyboard ## Matrix for "LAYOUT_all": - ┌──┐ - │0J│ - └──┘ -┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ -│0A│ │0B││1B││0C││1C││0D││1D│ │9D││AD││0E││0F││0G││1G││AG││0H│ ┌──┐┌──┐┌──┐┌──┐ -└──┘ └──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘ │1H││0I││AI││1J│ - └──┘└──┘└──┘└──┘ +``` +┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐ +│0A│ │0B││1B│ │0C││1C│ │0D││1D│ │9D││AD│ │0E││0F│ │0G││1G│ │AG││0H│ │0J│ +└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──────┐ ┌──┐┌──┐┌──┐┌──┐ -│1A││AA││2B││AB││2C││AC││2D│ │8D││1E││AE││1F││AF││2G││9G │ │2H││1I││9I││8I│ -└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──────┘ └──┘└──┘└──┘│ │ -┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐┌──┐│ │ -│2A ││9A││3B││9B││3C││9C│ │7D││2E││9E││2F││9F││3G││8G││7H │ │3H││2I││7I││ │ -└────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘└──┘└──┘ -┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐ ┌──┐┌──┐┌──┐┌──┐ -│3A ││8A││4B││8B││4C││8C│ │6D││3E││8E││3F││8F││4G││7G │ │4H││3I││6I││5I│ -└─────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└───────┘ └──┘└──┘└──┘│ │ -┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐ ┌──┐┌──┐│ │ -│4A ││7A││5B││7B││5C││7C││3D│ │5D││4E││5E││7E││4F││7F││5G │ ┌──┐ │AH││4I││ │ -└───┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└─────────┘ │5H│ └──┘└──┘└──┘ -┌───┐┌───┐ ┌───┐┌─────────┐ ┌───────┐┌───┐┌───┐┌───┐ └──┘ -│5A ││6A │ │6B ││6C │ │4D ││6E ││5F ││6F │ ┌──┐┌──┐┌──┐ -└───┘└───┘ └───┘└─────────┘ └───────┘└───┘└───┘└───┘ │6H││8H││9H│ +│1A││AA││2B││AB││2C││AC││2D│ │8D││1E││AE││1F││AF││2G││9G │ │1H││0I││AI││1J│ +└──┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──────┘ └──┘└──┘└──┘└──┘ +┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐ ┌──┐┌──┐┌──┐┌──┐ +│2A ││9A││3B││9B││3C││9C│ │7D││2E││9E││2F││9F││3G││8G││7H │ │2H││1I││9I││8I│ +└────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘ └──┘└──┘└──┘│ │ +┌─────┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌───────┐ ┌──┐┌──┐┌──┐│ │ +│3A ││8A││4B││8B││4C││8C│ │6D││3E││8E││3F││8F││4G││7G │ │3H││2I││7I││ │ +└─────┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└───────┘ └──┘└──┘└──┘└──┘ +┌───┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐ ┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌─────────┐ ┌──┐┌──┐┌──┐┌──┐ +│4A ││7A││5B││7B││5C││7C││3D│ │5D││4E││5E││7E││4F││7F││5G │ │4H││3I││6I││5I│ +└───┘└──┘└──┘└──┘└──┘└──┘└──┘ └──┘└──┘└──┘└──┘└──┘└──┘└─────────┘ └──┘└──┘└──┘│ │ +┌───┐┌───┐ ┌───┐┌─────────┐ ┌───────┐┌───┐ ┌───┐┌───┐ ┌──┐┌──┐│ │ +│5A ││6A │ │6B ││6C │ │4D ││6E │ │5F ││6F │ ┌──┐ │AH││4I││ │ +└───┘└───┘ └───┘└─────────┘ └───────┘└───┘ └───┘└───┘ │5H│ └──┘└──┘└──┘ + └──┘ + ┌──┐┌──┐┌──┐ + │6H││8H││9H│ └──┘└──┘└──┘ +``` + ## Matrix for "LAYOUT_1800_alice_ansi": +``` ┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐ │0A│ │0B││1B│ │0C││1C│ │0D││1D│ │9D││AD│ │0E││0F│ │0G││1G│ │AG││0H│ │0J│ └──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘ @@ -46,7 +49,10 @@ ┌──┐┌──┐┌──┐ │6H││8H││9H│ └──┘└──┘└──┘ +``` + ## Matrix for "LAYOUT_1800_alice_iso": +``` ┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐┌──┐ ┌──┐ │0A│ │0B││1B│ │0C││1C│ │0D││1D│ │9D││AD│ │0E││0F│ │0G││1G│ │AG││0H│ │0J│ └──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘└──┘ └──┘ @@ -68,4 +74,5 @@ └──┘ ┌──┐┌──┐┌──┐ │6H││8H││9H│ - └──┘└──┘└──┘ \ No newline at end of file + └──┘└──┘└──┘ +``` \ No newline at end of file From e08cb3221c5f2d5e8ebbe6e4b0c244e4313b0019 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Sun, 11 Jun 2023 11:12:18 -0600 Subject: [PATCH 12/14] Added requested changes regarding keymaps and migration of data to the info.json file. --- keyboards/adpenrose/mine/config.h | 6 ---- keyboards/adpenrose/mine/info.json | 4 ++- .../adpenrose/mine/keymaps/default/keymap.c | 7 +++-- keyboards/adpenrose/mine/keymaps/iso/keymap.c | 7 +++-- .../adpenrose/mine/keymaps/solenoid/keymap.c | 7 +++-- keyboards/adpenrose/mine/keymaps/via/keymap.c | 31 ++++--------------- keyboards/adpenrose/mine/rules.mk | 9 ------ 7 files changed, 24 insertions(+), 47 deletions(-) diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h index 93721ea0b249..cc05ddf8f17e 100644 --- a/keyboards/adpenrose/mine/config.h +++ b/keyboards/adpenrose/mine/config.h @@ -7,9 +7,3 @@ #define SOLENOID_PIN A7 #define DYNAMIC_KEYMAP_LAYER_COUNT 2 - -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index 75d52518931e..f26d9d5e7dee 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -8,7 +8,9 @@ "vid": "0x4450" }, "features": { - "encoder": true + "encoder": true, + "bootmagic": true, + "extrakey": true }, "encoder": { "rotary": [{ "pin_a": "C4", "pin_b": "C3" }] diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c index c8d3d7e5cee0..3d6cf31bd865 100644 --- a/keyboards/adpenrose/mine/keymaps/default/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -13,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1800_alice_ansi( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -25,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/iso/keymap.c b/keyboards/adpenrose/mine/keymaps/iso/keymap.c index 5b21d39a8c5f..988330c979ff 100644 --- a/keyboards/adpenrose/mine/keymaps/iso/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -13,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1800_alice_iso( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -25,6 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c index 1993c8bbb435..cd9e1768eb6e 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -13,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -25,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif diff --git a/keyboards/adpenrose/mine/keymaps/via/keymap.c b/keyboards/adpenrose/mine/keymaps/via/keymap.c index 3b10518c0fcc..776ed893d54c 100644 --- a/keyboards/adpenrose/mine/keymaps/via/keymap.c +++ b/keyboards/adpenrose/mine/keymaps/via/keymap.c @@ -1,9 +1,12 @@ +// Copyright 2022 Arturo Avila (@Arturo Avila) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( KC_MUTE, - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MO(1), MO(2), KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P4, KC_P5, KC_P6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PENT, @@ -13,27 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_all( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_all( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -45,8 +28,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; #endif diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk index d9d8255dc0d2..43ba76c52c53 100644 --- a/keyboards/adpenrose/mine/rules.mk +++ b/keyboards/adpenrose/mine/rules.mk @@ -4,13 +4,4 @@ F_CPU = 16000000 # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file From 6282581903732af22b08dae3db79149bdc55226f Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Mon, 12 Jun 2023 17:41:29 -0600 Subject: [PATCH 13/14] Moved encoder map enable instruction to keymaps' rules.mk files. --- keyboards/adpenrose/mine/keymaps/default/rules.mk | 1 + keyboards/adpenrose/mine/keymaps/iso/rules.mk | 1 + keyboards/adpenrose/mine/keymaps/solenoid/rules.mk | 3 ++- keyboards/adpenrose/mine/keymaps/via/rules.mk | 3 ++- keyboards/adpenrose/mine/rules.mk | 7 +------ 5 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 keyboards/adpenrose/mine/keymaps/default/rules.mk create mode 100644 keyboards/adpenrose/mine/keymaps/iso/rules.mk diff --git a/keyboards/adpenrose/mine/keymaps/default/rules.mk b/keyboards/adpenrose/mine/keymaps/default/rules.mk new file mode 100644 index 000000000000..4769500eb06f --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/iso/rules.mk b/keyboards/adpenrose/mine/keymaps/iso/rules.mk new file mode 100644 index 000000000000..4769500eb06f --- /dev/null +++ b/keyboards/adpenrose/mine/keymaps/iso/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk index e13f2bd03570..6d4b5957f882 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk @@ -1,4 +1,5 @@ VIA_ENABLE = yes LTO_ENABLE = yes HAPTIC_ENABLE = yes -HAPTIC_DRIVER += SOLENOID \ No newline at end of file +HAPTIC_DRIVER += SOLENOID +ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/via/rules.mk b/keyboards/adpenrose/mine/keymaps/via/rules.mk index aaf0497be139..ecb14c6ba684 100644 --- a/keyboards/adpenrose/mine/keymaps/via/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/via/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes \ No newline at end of file +ENCODER_MAP_ENABLE = yes +ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file diff --git a/keyboards/adpenrose/mine/rules.mk b/keyboards/adpenrose/mine/rules.mk index 43ba76c52c53..93ae8d898f2d 100644 --- a/keyboards/adpenrose/mine/rules.mk +++ b/keyboards/adpenrose/mine/rules.mk @@ -1,7 +1,2 @@ # Processor frequency -F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file +F_CPU = 16000000 \ No newline at end of file From 01e160d8cfec235b7ddafd810f80062636eebb07 Mon Sep 17 00:00:00 2001 From: Arturo Avila Date: Wed, 14 Jun 2023 18:52:58 -0600 Subject: [PATCH 14/14] Added requested changes regarding LTO. --- keyboards/adpenrose/mine/info.json | 3 +++ keyboards/adpenrose/mine/keymaps/solenoid/rules.mk | 1 - keyboards/adpenrose/mine/keymaps/via/rules.mk | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json index f26d9d5e7dee..5010485602d0 100644 --- a/keyboards/adpenrose/mine/info.json +++ b/keyboards/adpenrose/mine/info.json @@ -12,6 +12,9 @@ "bootmagic": true, "extrakey": true }, + "build": { + "lto": true + }, "encoder": { "rotary": [{ "pin_a": "C4", "pin_b": "C3" }] }, diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk index 6d4b5957f882..2a1e874d82f0 100644 --- a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk @@ -1,5 +1,4 @@ VIA_ENABLE = yes -LTO_ENABLE = yes HAPTIC_ENABLE = yes HAPTIC_DRIVER += SOLENOID ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file diff --git a/keyboards/adpenrose/mine/keymaps/via/rules.mk b/keyboards/adpenrose/mine/keymaps/via/rules.mk index ecb14c6ba684..4253f570f0bb 100644 --- a/keyboards/adpenrose/mine/keymaps/via/rules.mk +++ b/keyboards/adpenrose/mine/keymaps/via/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes -LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes -ENCODER_MAP_ENABLE = yes # Encoder mapping functionality \ No newline at end of file +ENCODER_MAP_ENABLE = yes \ No newline at end of file