From 0e534ff0ac1c9dff941fcc4e867f32cf96adb939 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Eriksen Date: Fri, 1 May 2020 16:38:40 +0200 Subject: [PATCH 01/26] My first keyboard, the Index Tab --- keyboards/minimon/README.md | 9 ++++ keyboards/minimon/index_tab/README.md | 31 +++++++++++ keyboards/minimon/index_tab/config.h | 54 +++++++++++++++++++ keyboards/minimon/index_tab/index_tab.c | 13 +++++ keyboards/minimon/index_tab/index_tab.h | 36 +++++++++++++ keyboards/minimon/index_tab/info.json | 12 +++++ .../index_tab/keymaps/default/README.md | 6 +++ .../index_tab/keymaps/default/keymap.c | 31 +++++++++++ keyboards/minimon/index_tab/rules.mk | 33 ++++++++++++ keyboards/minimon/info.json | 4 ++ 10 files changed, 229 insertions(+) create mode 100644 keyboards/minimon/README.md create mode 100644 keyboards/minimon/index_tab/README.md create mode 100644 keyboards/minimon/index_tab/config.h create mode 100644 keyboards/minimon/index_tab/index_tab.c create mode 100644 keyboards/minimon/index_tab/index_tab.h create mode 100644 keyboards/minimon/index_tab/info.json create mode 100644 keyboards/minimon/index_tab/keymaps/default/README.md create mode 100644 keyboards/minimon/index_tab/keymaps/default/keymap.c create mode 100644 keyboards/minimon/index_tab/rules.mk create mode 100644 keyboards/minimon/info.json diff --git a/keyboards/minimon/README.md b/keyboards/minimon/README.md new file mode 100644 index 000000000000..5bd0c4d2ca7d --- /dev/null +++ b/keyboards/minimon/README.md @@ -0,0 +1,9 @@ +![Minimon logo](https://i.imgur.com/4SWEH5K.png) + +Having fun making keyboards for the northern marked, as we need an extra column for our extended alphabets. + +Maintained by [Kyrremann](https://github.com/Kyrremann). + +## Keyboards + +* [Index Tab](index_tab/) - 13x6 ortho keyboard diff --git a/keyboards/minimon/index_tab/README.md b/keyboards/minimon/index_tab/README.md new file mode 100644 index 000000000000..1f41b807efcb --- /dev/null +++ b/keyboards/minimon/index_tab/README.md @@ -0,0 +1,31 @@ +Index Tab +========= + +Not just another ortho-keyboard. but one catering to the northern marked. with our extra letters. This is a 13x6 ortho +keyboard; giving you enough space for all the numbers, all the F-keys, and our precious extra ordinary letters. + +![Picture of the keyboard in the wild](https://i.imgur.com/xqJjbky.jpg) + +Keyboard Maintainer: [Kyrremann](https://github.com/Kyrremann) + +The keyboard files can be found here: https://github.com/Kyrremann/index-tab + + +## Instructions + +To create a hex file for the Index Tab, run: + + make minimon/index_tab:default + +Flash the keyboard with QMK Toolbox or run: + + make minimon/index_tab:default:flash + + +## Layout + +Go to the [default layout](keymaps/default/readme.md) for more information. + +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 +the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h new file mode 100644 index 000000000000..57f65f6a227e --- /dev/null +++ b/keyboards/minimon/index_tab/config.h @@ -0,0 +1,54 @@ +/* +Copyright 2020 Kyrre Havik Eriksen + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x1306 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Minimon +#define PRODUCT Index Tab +#define DESCRIPTION A Norwegian supported 13x6 ortho keyboard + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 13 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { D4, B7, B3, B2, B1, B0 } +#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } +#define UNUSED_PINS { F0, F1, F4, F5, F6 } + + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +#define RGB_DI_PIN E6 +#define RGBLED_NUM 10 diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c new file mode 100644 index 000000000000..5f6004b79b4f --- /dev/null +++ b/keyboards/minimon/index_tab/index_tab.c @@ -0,0 +1,13 @@ +#include "index_tab.h" + +void matrix_init_kb(void) { + // Keyboard start-up code goes here + // Runs once when the firmware starts up + matrix_init_user(); +}; + +void matrix_scan_kb(void) { + // Looping keyboard code goes here + // This runs every cycle (a lot) + matrix_scan_user(); +}; diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h new file mode 100644 index 000000000000..0a673b27447b --- /dev/null +++ b/keyboards/minimon/index_tab/index_tab.h @@ -0,0 +1,36 @@ +/* Copyright 2020 Kyrre Havik Eriksen + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \ + K50, K51, K52, K53, K54, K55, K57, K58, K59, K5a, K5b \ +) \ + { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \ + { K50, K51, K52, K53, K54, KC_NO, K55, KC_NO, K57, K58, K59, K5a, K5b } \ + } diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json new file mode 100644 index 000000000000..7c8329cd56a4 --- /dev/null +++ b/keyboards/minimon/index_tab/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Index Tab", + "url": "", + "width": 13, + "height": 6, + "layouts": { + "LAYOUT": { + "key_count": 76, + "layout": [] + } + } +} diff --git a/keyboards/minimon/index_tab/keymaps/default/README.md b/keyboards/minimon/index_tab/keymaps/default/README.md new file mode 100644 index 000000000000..2f169423a9cb --- /dev/null +++ b/keyboards/minimon/index_tab/keymaps/default/README.md @@ -0,0 +1,6 @@ +Index Tab default keymap +======================== + +![Index Tab layout image](https://i.imgur.com/YQVZ0Jh.png) + +[Keyboard layout editor](http://www.keyboard-layout-editor.com/##@_backcolor=%23ededed&name=index%20tab&switchMount=cherry%3B&@_a:7%3B&=TAB&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12%3B&@=%C2%A7&=1&=2&=3&=4&=5&=6&=7&=8&=9&=0&=+&=%C2%B4%3B&@=TAB&=q&=w&=e&=r&=t&=y&=u&=i&=o&=p&=%C3%A5&=BKSP%3B&@=CTRL&=a&=s&=d&=f&=g&=h&=j&=k&=l&=%C3%B8&=%C3%A6&_a:5%3B&=%0A%C2%A8%0A%0A%0A%0A%0A%5E%3B&@_a:7%3B&=SHIFT&=z&=x&=c&=v&=b&=n&=m&=,&=.&=-&=%E2%86%91&=%E2%86%B2%0A%0A%0A%0ASHIFT%3B&@=ESC&_a:5%3B&=%0A%3E%0A%0A%0A%0A%0A%3C&_a:7%3B&=ALT&=SPR&_w:2%3B&=&=FN&_w:2%3B&=&_a:5%3B&=%0A'%0A%0A%0A%0A%0A*&_a:7%3B&=%E2%86%90&=%E2%86%93&=%E2%86%92) diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c new file mode 100644 index 000000000000..1513f5250f19 --- /dev/null +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -0,0 +1,31 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT( + KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_SFTENT, \ + KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, TG(1), KC_SPC, KC_NUHS, KC_LEFT, KC_DOWN, KC_RGHT + ), + +[1] = LAYOUT( + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PEQL, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_PDOT, KC_PENT + ), + +[2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT + ) +}; diff --git a/keyboards/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk new file mode 100644 index 000000000000..e6e44dc9b0ae --- /dev/null +++ b/keyboards/minimon/index_tab/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +RGBLIGHT_ENABLE = yes +TAP_DANCE_ENABLE = no # Enable tap dance feature diff --git a/keyboards/minimon/info.json b/keyboards/minimon/info.json new file mode 100644 index 000000000000..6740fa750ff7 --- /dev/null +++ b/keyboards/minimon/info.json @@ -0,0 +1,4 @@ +{ + "maintainer": "Kyrremann", + "manufacturer": "Minimon" +} From 0d8631160fee69105805f1a08f9b6476eb02c029 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Eriksen Date: Sun, 3 May 2020 21:50:48 +0200 Subject: [PATCH 02/26] switched places for two key codes --- keyboards/minimon/index_tab/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c index 1513f5250f19..bc7fa867a1a1 100644 --- a/keyboards/minimon/index_tab/keymaps/default/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -16,8 +16,8 @@ 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_PSLS, KC_PAST, KC_PMNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PEQL, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_PDOT, KC_PENT + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_MPLY, KC_P0, KC_P0, KC_PDOT, KC_PEQL ), [2] = LAYOUT( From 15225e050df5301a18301da6e9001d6bdafd796a Mon Sep 17 00:00:00 2001 From: Kyrre Havik Eriksen Date: Sun, 3 May 2020 21:51:17 +0200 Subject: [PATCH 03/26] added animation and sleep for rgb --- keyboards/minimon/index_tab/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 57f65f6a227e..956c22fdc2c0 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -52,3 +52,5 @@ along with this program. If not, see . #define RGB_DI_PIN E6 #define RGBLED_NUM 10 +#define RGBLIGHT_SLEEP +#define RGBLIGHT_ANIMATIONS From 55f557e440380cb17711a3c4bb276ae4ba14f680 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Eriksen Date: Sun, 3 May 2020 22:15:14 +0200 Subject: [PATCH 04/26] added layout for qmk site --- keyboards/minimon/index_tab/info.json | 79 ++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 7c8329cd56a4..8c1e4de6b7d1 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -6,7 +6,84 @@ "layouts": { "LAYOUT": { "key_count": 76, - "layout": [] + "layout": [ + { "x": 0, "y": 0 }, + { "x": 1, "y": 0 }, + { "x": 2, "y": 0 }, + { "x": 3, "y": 0 }, + { "x": 4, "y": 0 }, + { "x": 5, "y": 0 }, + { "x": 6, "y": 0 }, + { "x": 7, "y": 0 }, + { "x": 8, "y": 0 }, + { "x": 9, "y": 0 }, + { "x": 10, "y": 0 }, + { "x": 11, "y": 0 }, + { "x": 12, "y": 0 }, + { "x": 0, "y": 1 }, + { "x": 1, "y": 1 }, + { "x": 2, "y": 1 }, + { "x": 3, "y": 1 }, + { "x": 4, "y": 1 }, + { "x": 5, "y": 1 }, + { "x": 6, "y": 1 }, + { "x": 7, "y": 1 }, + { "x": 8, "y": 1 }, + { "x": 9, "y": 1 }, + { "x": 10, "y": 1 }, + { "x": 11, "y": 1 }, + { "x": 12, "y": 1 }, + { "x": 0, "y": 2 }, + { "x": 1, "y": 2 }, + { "x": 2, "y": 2 }, + { "x": 3, "y": 2 }, + { "x": 4, "y": 2 }, + { "x": 5, "y": 2 }, + { "x": 6, "y": 2 }, + { "x": 7, "y": 2 }, + { "x": 8, "y": 2 }, + { "x": 9, "y": 2 }, + { "x": 10, "y": 2 }, + { "x": 11, "y": 2 }, + { "x": 12, "y": 2 }, + { "x": 0, "y": 3 }, + { "x": 1, "y": 3 }, + { "x": 2, "y": 3 }, + { "x": 3, "y": 3 }, + { "x": 4, "y": 3 }, + { "x": 5, "y": 3 }, + { "x": 6, "y": 3 }, + { "x": 7, "y": 3 }, + { "x": 8, "y": 3 }, + { "x": 9, "y": 3 }, + { "x": 10, "y": 3 }, + { "x": 11, "y": 3 }, + { "x": 12, "y": 3 }, + { "x": 0, "y": 4 }, + { "x": 1, "y": 4 }, + { "x": 2, "y": 4 }, + { "x": 3, "y": 4 }, + { "x": 4, "y": 4 }, + { "x": 5, "y": 4 }, + { "x": 6, "y": 4 }, + { "x": 7, "y": 4 }, + { "x": 8, "y": 4 }, + { "x": 9, "y": 4 }, + { "x": 10, "y": 4 }, + { "x": 11, "y": 4 }, + { "x": 12, "y": 4 }, + { "x": 0, "y": 5 }, + { "x": 1, "y": 5 }, + { "x": 2, "y": 5 }, + { "x": 3, "y": 5 }, + { "x": 4, "y": 5, "w": 2 }, + { "x": 6, "y": 5 }, + { "x": 7, "y": 5, "w": 2 }, + { "x": 9, "y": 5 }, + { "x": 10, "y": 5 }, + { "x": 11, "y": 5 }, + { "x": 12, "y": 5 } + ] } } } From ec51ce6b9b734f1d182e9b04e5bf559deb2d48e4 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Mon, 8 Mar 2021 11:48:36 +0100 Subject: [PATCH 05/26] minimon/index-tab: updated keymap to rev5 --- keyboards/minimon/index_tab/config.h | 6 +++--- keyboards/minimon/index_tab/index_tab.h | 14 +++++++------- .../minimon/index_tab/keymaps/default/keymap.c | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 956c22fdc2c0..e1ea46f74823 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -31,9 +31,9 @@ along with this program. If not, see . #define MATRIX_COLS 13 /* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } -#define UNUSED_PINS { F0, F1, F4, F5, F6 } +#define MATRIX_ROW_PINS { D3, B7, B3, B2, B1, B0 } +#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D2, F1, F0 } +#define UNUSED_PINS { F4, F5, F6, D1, D0 } /* COL2ROW, ROW2COL*/ diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h index 0a673b27447b..da38c87872cd 100644 --- a/keyboards/minimon/index_tab/index_tab.h +++ b/keyboards/minimon/index_tab/index_tab.h @@ -24,13 +24,13 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, \ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, \ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c, \ - K50, K51, K52, K53, K54, K55, K57, K58, K59, K5a, K5b \ + K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5a, K5b, K5c \ ) \ { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \ - { K50, K51, K52, K53, K54, KC_NO, K55, KC_NO, K57, K58, K59, K5a, K5b } \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4a, K4b, K4c }, \ + { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5a, K5b, K5c } \ } diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c index bc7fa867a1a1..378dd465c2eb 100644 --- a/keyboards/minimon/index_tab/keymaps/default/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_SFTENT, \ - KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, TG(1), KC_SPC, KC_NUHS, KC_LEFT, KC_DOWN, KC_RGHT + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUHS, KC_SFTENT, \ + KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [1] = LAYOUT( @@ -17,7 +17,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_P7, KC_P8, KC_P9, KC_PPLS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_MPLY, KC_P0, KC_P0, KC_PDOT, KC_PEQL + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PEQL ), [2] = LAYOUT( @@ -26,6 +26,6 @@ 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, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGHT + KC_TRNS, 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 ed9ddef4bd37a051cbae54ee4575f6294d1af59f Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Tue, 30 Mar 2021 20:12:28 +0200 Subject: [PATCH 06/26] index-tab: added my own vendorId for minimon --- keyboards/minimon/index_tab/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index e1ea46f74823..664935374489 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x4B49 #define PRODUCT_ID 0x1306 #define DEVICE_VER 0x0001 #define MANUFACTURER Minimon From 81cfa02d9a3b16740e74bf906c56aec06df98589 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Tue, 30 Mar 2021 20:12:51 +0200 Subject: [PATCH 07/26] index-tab: added VIA support --- keyboards/minimon/index_tab/info.json | 105 ++++-------------- .../minimon/index_tab/keymaps/via/keymap.c | 40 +++++++ .../minimon/index_tab/keymaps/via/rules.mk | 1 + 3 files changed, 62 insertions(+), 84 deletions(-) create mode 100644 keyboards/minimon/index_tab/keymaps/via/keymap.c create mode 100644 keyboards/minimon/index_tab/keymaps/via/rules.mk diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 8c1e4de6b7d1..cb5976024b32 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,89 +1,26 @@ { - "keyboard_name": "Index Tab", + "name": "Index Tab", + "vendorId": "0x4B49", + "productId": "0x1306", + "lighting": "qmk_rgblight", "url": "", - "width": 13, - "height": 6, + "matrix": { + "rows": 6, + "cols": 13 + }, "layouts": { - "LAYOUT": { - "key_count": 76, - "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 0, "y": 4 }, - { "x": 1, "y": 4 }, - { "x": 2, "y": 4 }, - { "x": 3, "y": 4 }, - { "x": 4, "y": 4 }, - { "x": 5, "y": 4 }, - { "x": 6, "y": 4 }, - { "x": 7, "y": 4 }, - { "x": 8, "y": 4 }, - { "x": 9, "y": 4 }, - { "x": 10, "y": 4 }, - { "x": 11, "y": 4 }, - { "x": 12, "y": 4 }, - { "x": 0, "y": 5 }, - { "x": 1, "y": 5 }, - { "x": 2, "y": 5 }, - { "x": 3, "y": 5 }, - { "x": 4, "y": 5, "w": 2 }, - { "x": 6, "y": 5 }, - { "x": 7, "y": 5, "w": 2 }, - { "x": 9, "y": 5 }, - { "x": 10, "y": 5 }, - { "x": 11, "y": 5 }, - { "x": 12, "y": 5 } - ] - } + "labels": [ + ["Bottom row", "2x2u", "7u", "Full ortho"] + ], + "keymap": [ + ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12"], + ["1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12"], + ["2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12"], + ["3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12"], + ["4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11","4,12"], + [{"p":"2x2u"},"5,0","5,1","5,2","5,3\n\n\n0,0",{"w":2},"5,5\n\n\n0,0",{"w":2},"5,7\n\n\n0,0","5,8\n\n\n0,0","5,9\n\n\n0,0","5,10","5,11","5,12"], + [{"p":"7u"},{"w":7},"5,9\n\n\n0,1"], + [{"p":"Full ortho"},"5,3\n\n\n0,2","5,4\n\n\n0,2","5,5\n\n\n0,2","5,6\n\n\n0,2","5,7\n\n\n0,2","5,8\n\n\n0,2","5,9\n\n\n0,2"] + ] } } diff --git a/keyboards/minimon/index_tab/keymaps/via/keymap.c b/keyboards/minimon/index_tab/keymaps/via/keymap.c new file mode 100644 index 000000000000..d6cf02262749 --- /dev/null +++ b/keyboards/minimon/index_tab/keymaps/via/keymap.c @@ -0,0 +1,40 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT( + KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUHS, KC_SFTENT, \ + KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + ), + +[1] = LAYOUT( + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PEQL + ), + +[2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +[4] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, 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/minimon/index_tab/keymaps/via/rules.mk b/keyboards/minimon/index_tab/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/minimon/index_tab/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 04d8df7e5f9b78f3d6674cef9eaa61f4155b87f5 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Tue, 30 Mar 2021 20:17:59 +0200 Subject: [PATCH 08/26] index-tab: updated doc to latest build --- keyboards/minimon/index_tab/README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/keyboards/minimon/index_tab/README.md b/keyboards/minimon/index_tab/README.md index 1f41b807efcb..7de4c87b08e6 100644 --- a/keyboards/minimon/index_tab/README.md +++ b/keyboards/minimon/index_tab/README.md @@ -1,8 +1,8 @@ Index Tab ========= -Not just another ortho-keyboard. but one catering to the northern marked. with our extra letters. This is a 13x6 ortho -keyboard; giving you enough space for all the numbers, all the F-keys, and our precious extra ordinary letters. +Not just another ortho-keyboard. but one catering to the northern marked with our extra letters. +This is a 13x6 ortho keyboard; giving you enough space for all the numbers, all the F-keys, and our precious extraordinary letters. ![Picture of the keyboard in the wild](https://i.imgur.com/xqJjbky.jpg) @@ -21,11 +21,12 @@ Flash the keyboard with QMK Toolbox or run: make minimon/index_tab: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 the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). -## Layout -Go to the [default layout](keymaps/default/readme.md) for more information. +## Default layout -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 -the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). +![Index Tab layout image](https://raw.githubusercontent.com/Kyrremann/index-tab/master/images/index-tab.png) + +[Keyboard layout editor](http://www.keyboard-layout-editor.com/#/gists/2577189f7cf19d980fff8177d14dc3ec) From 1129ed2864c58f64da00c318ef5c395897fbdc3f Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sat, 9 Oct 2021 15:46:41 +0200 Subject: [PATCH 09/26] fix: updated keyboard image to rev5 --- keyboards/minimon/index_tab/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/minimon/index_tab/README.md b/keyboards/minimon/index_tab/README.md index 7de4c87b08e6..e2dea3dbd726 100644 --- a/keyboards/minimon/index_tab/README.md +++ b/keyboards/minimon/index_tab/README.md @@ -4,7 +4,7 @@ Index Tab Not just another ortho-keyboard. but one catering to the northern marked with our extra letters. This is a 13x6 ortho keyboard; giving you enough space for all the numbers, all the F-keys, and our precious extraordinary letters. -![Picture of the keyboard in the wild](https://i.imgur.com/xqJjbky.jpg) +![Picture of the keyboard in the wild](https://raw.githubusercontent.com/Kyrremann/index-tab/master/images/rev5-dsa-vilebloom.JPG) Keyboard Maintainer: [Kyrremann](https://github.com/Kyrremann) From 898bb3a6fee303f28b449fe4a2b02bbe51e28531 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sat, 9 Oct 2021 16:01:37 +0200 Subject: [PATCH 10/26] fix: updates after pr checklist --- keyboards/minimon/index_tab/config.h | 1 - keyboards/minimon/index_tab/index_tab.c | 2 +- keyboards/minimon/index_tab/index_tab.h | 2 +- keyboards/minimon/index_tab/info.json | 2 +- keyboards/minimon/index_tab/rules.mk | 11 ----------- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 664935374489..5977222a6b7d 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -24,7 +24,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Minimon #define PRODUCT Index Tab -#define DESCRIPTION A Norwegian supported 13x6 ortho keyboard /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c index 5f6004b79b4f..9acc642070e2 100644 --- a/keyboards/minimon/index_tab/index_tab.c +++ b/keyboards/minimon/index_tab/index_tab.c @@ -1,6 +1,6 @@ #include "index_tab.h" -void matrix_init_kb(void) { +void keyboard_pre__init_kb(void) { // Keyboard start-up code goes here // Runs once when the firmware starts up matrix_init_user(); diff --git a/keyboards/minimon/index_tab/index_tab.h b/keyboards/minimon/index_tab/index_tab.h index da38c87872cd..cb9d3c5ae6b6 100644 --- a/keyboards/minimon/index_tab/index_tab.h +++ b/keyboards/minimon/index_tab/index_tab.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ - #pragma once +#pragma once #include "quantum.h" diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index cb5976024b32..0350b32a0a40 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -3,7 +3,7 @@ "vendorId": "0x4B49", "productId": "0x1306", "lighting": "qmk_rgblight", - "url": "", + "url": "https://github.com/Kyrremann/index-tab", "matrix": { "rows": 6, "cols": 13 diff --git a/keyboards/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk index e6e44dc9b0ae..384fbeca2c21 100644 --- a/keyboards/minimon/index_tab/rules.mk +++ b/keyboards/minimon/index_tab/rules.mk @@ -1,14 +1,5 @@ # MCU name MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options @@ -24,10 +15,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches RGBLIGHT_ENABLE = yes TAP_DANCE_ENABLE = no # Enable tap dance feature From f013d7e7591012356dbca6085ae4dd89d19563a7 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sat, 9 Oct 2021 16:06:28 +0200 Subject: [PATCH 11/26] fix: how to reset --- keyboards/minimon/index_tab/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/minimon/index_tab/README.md b/keyboards/minimon/index_tab/README.md index e2dea3dbd726..23a9cc647858 100644 --- a/keyboards/minimon/index_tab/README.md +++ b/keyboards/minimon/index_tab/README.md @@ -20,6 +20,10 @@ To create a hex file for the Index Tab, run: Flash the keyboard with QMK Toolbox or run: make minimon/index_tab:default:flash + +How to enter bootloader (DFU): + +Press the reset button on the underside of the board, near the USB port. 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 the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 64e4c9a0b10bd157a81354c89ca493645dcf511b Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sat, 9 Oct 2021 16:07:28 +0200 Subject: [PATCH 12/26] fix: switched matrick_pre to keyboar_pre also removed a underscore to much --- keyboards/minimon/index_tab/index_tab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c index 9acc642070e2..d4154cc9371b 100644 --- a/keyboards/minimon/index_tab/index_tab.c +++ b/keyboards/minimon/index_tab/index_tab.c @@ -1,9 +1,9 @@ #include "index_tab.h" -void keyboard_pre__init_kb(void) { +void keyboard_pre_init_kb(void) { // Keyboard start-up code goes here // Runs once when the firmware starts up - matrix_init_user(); + keyboard_pre_init_user(); }; void matrix_scan_kb(void) { From 99d2cacc341907fc72181e49ca1306b013a76ea5 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 10 Oct 2021 10:06:04 +0200 Subject: [PATCH 13/26] Fix: added license to all files Co-authored-by: Joel Challis --- keyboards/minimon/index_tab/index_tab.c | 25 ++++++++++--------- .../index_tab/keymaps/default/keymap.c | 13 ++++++++++ .../minimon/index_tab/keymaps/via/keymap.c | 13 ++++++++++ 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/keyboards/minimon/index_tab/index_tab.c b/keyboards/minimon/index_tab/index_tab.c index d4154cc9371b..a0d8377e9723 100644 --- a/keyboards/minimon/index_tab/index_tab.c +++ b/keyboards/minimon/index_tab/index_tab.c @@ -1,13 +1,14 @@ +/* +Copyright 2020 Kyrre Havik Eriksen +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ #include "index_tab.h" - -void keyboard_pre_init_kb(void) { - // Keyboard start-up code goes here - // Runs once when the firmware starts up - keyboard_pre_init_user(); -}; - -void matrix_scan_kb(void) { - // Looping keyboard code goes here - // This runs every cycle (a lot) - matrix_scan_user(); -}; diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c index 378dd465c2eb..9001f8cee5d1 100644 --- a/keyboards/minimon/index_tab/keymaps/default/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -1,3 +1,16 @@ +/* +Copyright 2020 Kyrre Havik Eriksen +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/minimon/index_tab/keymaps/via/keymap.c b/keyboards/minimon/index_tab/keymaps/via/keymap.c index d6cf02262749..9764e1a36cf3 100644 --- a/keyboards/minimon/index_tab/keymaps/via/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/via/keymap.c @@ -1,3 +1,16 @@ +/* +Copyright 2020 Kyrre Havik Eriksen +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 9a24e026a29fe66f223509bbd5be9eac3134bf41 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 10 Oct 2021 10:27:22 +0200 Subject: [PATCH 14/26] fix: qmk info.json format --- keyboards/minimon/index_tab/info.json | 1142 ++++++++++++++++++++++++- lib/chibios | 2 +- lib/chibios-contrib | 2 +- lib/googletest | 2 +- lib/lufa | 2 +- 5 files changed, 1128 insertions(+), 22 deletions(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 0350b32a0a40..9b105a6b7b30 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,26 +1,1132 @@ { - "name": "Index Tab", - "vendorId": "0x4B49", - "productId": "0x1306", - "lighting": "qmk_rgblight", + "keyboard_name": "Index Tab", + "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", - "matrix": { - "rows": 6, - "cols": 13 + "rgblight": { + "led_count": 10, + "pin": "E6" + }, + "usb": { + "vid": "0x4B49", + "pid": "0x1306", + "device_ver": "0x0001" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D3", "B7", "B3", "B2", "B1", "B0"], + "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"] }, "layouts": { - "labels": [ - ["Bottom row", "2x2u", "7u", "Full ortho"] + "LAYOUT_2u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "label": "ESC", + "x": 0, + "y": 5.75 + }, + { + "label": "'", + "x": 1, + "y": 5.75 + }, + { + "label": "ALT", + "x": 2, + "y": 5.75 + }, + { + "label": "WIN", + "x": 3, + "y": 5.75 + }, + { + "x": 4, + "y": 5.75, + "w": 2 + }, + { + "x": 6, + "y": 5.75, + "w": 2 + }, + { + "label": "RSE", + "x": 8, + "y": 5.75 + }, + { + "label": "←", + "x": 9, + "y": 5.75 + }, + { + "label": "↑", + "x": 10, + "y": 5.75 + }, + { + "label": "↓", + "x": 11, + "y": 5.75 + }, + { + "label": "→", + "x": 12, + "y": 5.75 + } + ], + "LAYOUT_7u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "x": 0, + "y": 5.75 + }, + { + "x": 1, + "y": 5.75 + }, + { + "x": 2, + "y": 5.75 + }, + { + "x": 3, + "y": 5.75, + "w": 7 + }, + { + "x": 10, + "y": 5.75 + }, + { + "x": 11, + "y": 5.75 + }, + { + "x": 12, + "y": 5.75 + } ], - "keymap": [ - ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12"], - ["1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12"], - ["2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12"], - ["3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12"], - ["4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11","4,12"], - [{"p":"2x2u"},"5,0","5,1","5,2","5,3\n\n\n0,0",{"w":2},"5,5\n\n\n0,0",{"w":2},"5,7\n\n\n0,0","5,8\n\n\n0,0","5,9\n\n\n0,0","5,10","5,11","5,12"], - [{"p":"7u"},{"w":7},"5,9\n\n\n0,1"], - [{"p":"Full ortho"},"5,3\n\n\n0,2","5,4\n\n\n0,2","5,5\n\n\n0,2","5,6\n\n\n0,2","5,7\n\n\n0,2","5,8\n\n\n0,2","5,9\n\n\n0,2"] + "LAYOUT_ortho": [ + { + "label": "CAPS", + "x": 0, + "y": 2 + }, + { + "label": "F1", + "x": 1, + "y": 2 + }, + { + "label": "F2", + "x": 2, + "y": 2 + }, + { + "label": "F3", + "x": 3, + "y": 2 + }, + { + "label": "F4", + "x": 4, + "y": 2 + }, + { + "label": "F5", + "x": 5, + "y": 2 + }, + { + "label": "F6", + "x": 6, + "y": 2 + }, + { + "label": "F7", + "x": 7, + "y": 2 + }, + { + "label": "F8", + "x": 8, + "y": 2 + }, + { + "label": "F9", + "x": 9, + "y": 2 + }, + { + "label": "F10", + "x": 10, + "y": 2 + }, + { + "label": "F11", + "x": 11, + "y": 2 + }, + { + "label": "F12", + "x": 12, + "y": 2 + }, + { + "label": "§", + "x": 0, + "y": 3 + }, + { + "label": "1", + "x": 1, + "y": 3 + }, + { + "label": "2", + "x": 2, + "y": 3 + }, + { + "label": "3", + "x": 3, + "y": 3 + }, + { + "label": "4", + "x": 4, + "y": 3 + }, + { + "label": "5", + "x": 5, + "y": 3 + }, + { + "label": "6", + "x": 6, + "y": 3 + }, + { + "label": "7", + "x": 7, + "y": 3 + }, + { + "label": "8", + "x": 8, + "y": 3 + }, + { + "label": "9", + "x": 9, + "y": 3 + }, + { + "label": "0", + "x": 10, + "y": 3 + }, + { + "x": 11, + "y": 3 + }, + { + "x": 12, + "y": 3 + }, + { + "label": "TAB", + "x": 0, + "y": 4 + }, + { + "label": "q", + "x": 1, + "y": 4 + }, + { + "label": "w", + "x": 2, + "y": 4 + }, + { + "label": "e", + "x": 3, + "y": 4 + }, + { + "label": "r", + "x": 4, + "y": 4 + }, + { + "label": "t", + "x": 5, + "y": 4 + }, + { + "label": "y", + "x": 6, + "y": 4 + }, + { + "label": "u", + "x": 7, + "y": 4 + }, + { + "label": "i", + "x": 8, + "y": 4 + }, + { + "label": "o", + "x": 9, + "y": 4 + }, + { + "label": "p", + "x": 10, + "y": 4 + }, + { + "label": "å", + "x": 11, + "y": 4 + }, + { + "label": "BKSP", + "x": 12, + "y": 4 + }, + { + "label": "CTRL", + "x": 0, + "y": 5 + }, + { + "label": "a", + "x": 1, + "y": 5 + }, + { + "label": "s", + "x": 2, + "y": 5 + }, + { + "label": "d", + "x": 3, + "y": 5 + }, + { + "label": "f", + "x": 4, + "y": 5 + }, + { + "label": "g", + "x": 5, + "y": 5 + }, + { + "label": "h", + "x": 6, + "y": 5 + }, + { + "label": "j", + "x": 7, + "y": 5 + }, + { + "label": "k", + "x": 8, + "y": 5 + }, + { + "label": "l", + "x": 9, + "y": 5 + }, + { + "label": "ø", + "x": 10, + "y": 5 + }, + { + "label": "æ", + "x": 11, + "y": 5 + }, + { + "label": "↲", + "x": 12, + "y": 5 + }, + { + "label": "SHIFT", + "x": 0, + "y": 6 + }, + { + "label": "z", + "x": 1, + "y": 6 + }, + { + "label": "x", + "x": 2, + "y": 6 + }, + { + "label": "c", + "x": 3, + "y": 6 + }, + { + "label": "v", + "x": 4, + "y": 6 + }, + { + "label": "b", + "x": 5, + "y": 6 + }, + { + "label": "n", + "x": 6, + "y": 6 + }, + { + "label": "m", + "x": 7, + "y": 6 + }, + { + "label": ",", + "x": 8, + "y": 6 + }, + { + "label": ".", + "x": 9, + "y": 6 + }, + { + "label": "-", + "x": 10, + "y": 6 + }, + { + "label": "SHIFT", + "x": 11, + "y": 6 + }, + { + "label": "SHIFT", + "x": 12, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 1, + "y": 7 + }, + { + "x": 2, + "y": 7 + }, + { + "x": 3, + "y": 7 + }, + { + "x": 4, + "y": 7 + }, + { + "x": 5, + "y": 7 + }, + { + "x": 6, + "y": 7 + }, + { + "x": 7, + "y": 7 + }, + { + "x": 8, + "y": 7 + }, + { + "x": 9, + "y": 7 + }, + { + "x": 10, + "y": 7 + }, + { + "x": 11, + "y": 7 + }, + { + "x": 12, + "y": 7 + } ] } } diff --git a/lib/chibios b/lib/chibios index 413e39c5681d..313416b8fda9 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 413e39c5681d181720440f2a8b7391f581788d7b +Subproject commit 313416b8fda90d9973a749a0a35970956852c286 diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 4568901a91e9..e3a3a2404771 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 4568901a91e9bef78ea96a7a83e8150fe1f7353a +Subproject commit e3a3a24047717af33b098266e11c2e4e5102206a diff --git a/lib/googletest b/lib/googletest index e2239ee6043f..ec44c6c1675c 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 +Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 diff --git a/lib/lufa b/lib/lufa index 19a5d533f02a..ce10f7642b04 160000 --- a/lib/lufa +++ b/lib/lufa @@ -1 +1 @@ -Subproject commit 19a5d533f02a7b46eeadca99cc9699659cef7a60 +Subproject commit ce10f7642b0459e409839b23cc91498945119b4d From dda6f6c858bc1af29639f660f1c81e9ea4c90e79 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 10 Oct 2021 10:28:06 +0200 Subject: [PATCH 15/26] Revert "fix: qmk info.json format" This reverts commit 9a24e026a29fe66f223509bbd5be9eac3134bf41. --- keyboards/minimon/index_tab/info.json | 1142 +------------------------ lib/chibios | 2 +- lib/chibios-contrib | 2 +- lib/googletest | 2 +- lib/lufa | 2 +- 5 files changed, 22 insertions(+), 1128 deletions(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 9b105a6b7b30..0350b32a0a40 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,1132 +1,26 @@ { - "keyboard_name": "Index Tab", - "maintainer": "kyrremann", + "name": "Index Tab", + "vendorId": "0x4B49", + "productId": "0x1306", + "lighting": "qmk_rgblight", "url": "https://github.com/Kyrremann/index-tab", - "rgblight": { - "led_count": 10, - "pin": "E6" - }, - "usb": { - "vid": "0x4B49", - "pid": "0x1306", - "device_ver": "0x0001" - }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["D3", "B7", "B3", "B2", "B1", "B0"], - "cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "F1", "F0"] + "matrix": { + "rows": 6, + "cols": 13 }, "layouts": { - "LAYOUT_2u": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "label": "ESC", - "x": 0, - "y": 5.75 - }, - { - "label": "'", - "x": 1, - "y": 5.75 - }, - { - "label": "ALT", - "x": 2, - "y": 5.75 - }, - { - "label": "WIN", - "x": 3, - "y": 5.75 - }, - { - "x": 4, - "y": 5.75, - "w": 2 - }, - { - "x": 6, - "y": 5.75, - "w": 2 - }, - { - "label": "RSE", - "x": 8, - "y": 5.75 - }, - { - "label": "←", - "x": 9, - "y": 5.75 - }, - { - "label": "↑", - "x": 10, - "y": 5.75 - }, - { - "label": "↓", - "x": 11, - "y": 5.75 - }, - { - "label": "→", - "x": 12, - "y": 5.75 - } - ], - "LAYOUT_7u": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "x": 0, - "y": 5.75 - }, - { - "x": 1, - "y": 5.75 - }, - { - "x": 2, - "y": 5.75 - }, - { - "x": 3, - "y": 5.75, - "w": 7 - }, - { - "x": 10, - "y": 5.75 - }, - { - "x": 11, - "y": 5.75 - }, - { - "x": 12, - "y": 5.75 - } + "labels": [ + ["Bottom row", "2x2u", "7u", "Full ortho"] ], - "LAYOUT_ortho": [ - { - "label": "CAPS", - "x": 0, - "y": 2 - }, - { - "label": "F1", - "x": 1, - "y": 2 - }, - { - "label": "F2", - "x": 2, - "y": 2 - }, - { - "label": "F3", - "x": 3, - "y": 2 - }, - { - "label": "F4", - "x": 4, - "y": 2 - }, - { - "label": "F5", - "x": 5, - "y": 2 - }, - { - "label": "F6", - "x": 6, - "y": 2 - }, - { - "label": "F7", - "x": 7, - "y": 2 - }, - { - "label": "F8", - "x": 8, - "y": 2 - }, - { - "label": "F9", - "x": 9, - "y": 2 - }, - { - "label": "F10", - "x": 10, - "y": 2 - }, - { - "label": "F11", - "x": 11, - "y": 2 - }, - { - "label": "F12", - "x": 12, - "y": 2 - }, - { - "label": "§", - "x": 0, - "y": 3 - }, - { - "label": "1", - "x": 1, - "y": 3 - }, - { - "label": "2", - "x": 2, - "y": 3 - }, - { - "label": "3", - "x": 3, - "y": 3 - }, - { - "label": "4", - "x": 4, - "y": 3 - }, - { - "label": "5", - "x": 5, - "y": 3 - }, - { - "label": "6", - "x": 6, - "y": 3 - }, - { - "label": "7", - "x": 7, - "y": 3 - }, - { - "label": "8", - "x": 8, - "y": 3 - }, - { - "label": "9", - "x": 9, - "y": 3 - }, - { - "label": "0", - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "label": "TAB", - "x": 0, - "y": 4 - }, - { - "label": "q", - "x": 1, - "y": 4 - }, - { - "label": "w", - "x": 2, - "y": 4 - }, - { - "label": "e", - "x": 3, - "y": 4 - }, - { - "label": "r", - "x": 4, - "y": 4 - }, - { - "label": "t", - "x": 5, - "y": 4 - }, - { - "label": "y", - "x": 6, - "y": 4 - }, - { - "label": "u", - "x": 7, - "y": 4 - }, - { - "label": "i", - "x": 8, - "y": 4 - }, - { - "label": "o", - "x": 9, - "y": 4 - }, - { - "label": "p", - "x": 10, - "y": 4 - }, - { - "label": "å", - "x": 11, - "y": 4 - }, - { - "label": "BKSP", - "x": 12, - "y": 4 - }, - { - "label": "CTRL", - "x": 0, - "y": 5 - }, - { - "label": "a", - "x": 1, - "y": 5 - }, - { - "label": "s", - "x": 2, - "y": 5 - }, - { - "label": "d", - "x": 3, - "y": 5 - }, - { - "label": "f", - "x": 4, - "y": 5 - }, - { - "label": "g", - "x": 5, - "y": 5 - }, - { - "label": "h", - "x": 6, - "y": 5 - }, - { - "label": "j", - "x": 7, - "y": 5 - }, - { - "label": "k", - "x": 8, - "y": 5 - }, - { - "label": "l", - "x": 9, - "y": 5 - }, - { - "label": "ø", - "x": 10, - "y": 5 - }, - { - "label": "æ", - "x": 11, - "y": 5 - }, - { - "label": "↲", - "x": 12, - "y": 5 - }, - { - "label": "SHIFT", - "x": 0, - "y": 6 - }, - { - "label": "z", - "x": 1, - "y": 6 - }, - { - "label": "x", - "x": 2, - "y": 6 - }, - { - "label": "c", - "x": 3, - "y": 6 - }, - { - "label": "v", - "x": 4, - "y": 6 - }, - { - "label": "b", - "x": 5, - "y": 6 - }, - { - "label": "n", - "x": 6, - "y": 6 - }, - { - "label": "m", - "x": 7, - "y": 6 - }, - { - "label": ",", - "x": 8, - "y": 6 - }, - { - "label": ".", - "x": 9, - "y": 6 - }, - { - "label": "-", - "x": 10, - "y": 6 - }, - { - "label": "SHIFT", - "x": 11, - "y": 6 - }, - { - "label": "SHIFT", - "x": 12, - "y": 6 - }, - { - "x": 0, - "y": 7 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 2, - "y": 7 - }, - { - "x": 3, - "y": 7 - }, - { - "x": 4, - "y": 7 - }, - { - "x": 5, - "y": 7 - }, - { - "x": 6, - "y": 7 - }, - { - "x": 7, - "y": 7 - }, - { - "x": 8, - "y": 7 - }, - { - "x": 9, - "y": 7 - }, - { - "x": 10, - "y": 7 - }, - { - "x": 11, - "y": 7 - }, - { - "x": 12, - "y": 7 - } + "keymap": [ + ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12"], + ["1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12"], + ["2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12"], + ["3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12"], + ["4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11","4,12"], + [{"p":"2x2u"},"5,0","5,1","5,2","5,3\n\n\n0,0",{"w":2},"5,5\n\n\n0,0",{"w":2},"5,7\n\n\n0,0","5,8\n\n\n0,0","5,9\n\n\n0,0","5,10","5,11","5,12"], + [{"p":"7u"},{"w":7},"5,9\n\n\n0,1"], + [{"p":"Full ortho"},"5,3\n\n\n0,2","5,4\n\n\n0,2","5,5\n\n\n0,2","5,6\n\n\n0,2","5,7\n\n\n0,2","5,8\n\n\n0,2","5,9\n\n\n0,2"] ] } } diff --git a/lib/chibios b/lib/chibios index 313416b8fda9..413e39c5681d 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 313416b8fda90d9973a749a0a35970956852c286 +Subproject commit 413e39c5681d181720440f2a8b7391f581788d7b diff --git a/lib/chibios-contrib b/lib/chibios-contrib index e3a3a2404771..4568901a91e9 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit e3a3a24047717af33b098266e11c2e4e5102206a +Subproject commit 4568901a91e9bef78ea96a7a83e8150fe1f7353a diff --git a/lib/googletest b/lib/googletest index ec44c6c1675c..e2239ee6043f 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 +Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 diff --git a/lib/lufa b/lib/lufa index ce10f7642b04..19a5d533f02a 160000 --- a/lib/lufa +++ b/lib/lufa @@ -1 +1 @@ -Subproject commit ce10f7642b0459e409839b23cc91498945119b4d +Subproject commit 19a5d533f02a7b46eeadca99cc9699659cef7a60 From 44ddf4b2ced388e3b75bf6db275226b6d5ac48be Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 10 Oct 2021 10:29:22 +0200 Subject: [PATCH 16/26] fix: qmk info.json format --- keyboards/minimon/index_tab/info.json | 1163 ++++++++++++++++++++++++- 1 file changed, 1145 insertions(+), 18 deletions(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 0350b32a0a40..59977a7544db 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -1,26 +1,1153 @@ { - "name": "Index Tab", - "vendorId": "0x4B49", - "productId": "0x1306", - "lighting": "qmk_rgblight", + "keyboard_name": "Index Tab", + "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", - "matrix": { - "rows": 6, - "cols": 13 + "rgblight": { + "led_count": 10, + "pin": "E6" + }, + "usb": { + "vid": "0x4B49", + "pid": "0x1306", + "device_ver": "0x0001" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": [ + "D3", + "B7", + "B3", + "B2", + "B1", + "B0" + ], + "cols": [ + "F7", + "C7", + "C6", + "B6", + "B5", + "B4", + "D7", + "D6", + "D4", + "D5", + "D2", + "F1", + "F0" + ] }, "layouts": { - "labels": [ - ["Bottom row", "2x2u", "7u", "Full ortho"] + "LAYOUT_2u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "label": "ESC", + "x": 0, + "y": 5.75 + }, + { + "label": "'", + "x": 1, + "y": 5.75 + }, + { + "label": "ALT", + "x": 2, + "y": 5.75 + }, + { + "label": "WIN", + "x": 3, + "y": 5.75 + }, + { + "x": 4, + "y": 5.75, + "w": 2 + }, + { + "x": 6, + "y": 5.75, + "w": 2 + }, + { + "label": "RSE", + "x": 8, + "y": 5.75 + }, + { + "label": "←", + "x": 9, + "y": 5.75 + }, + { + "label": "↑", + "x": 10, + "y": 5.75 + }, + { + "label": "↓", + "x": 11, + "y": 5.75 + }, + { + "label": "→", + "x": 12, + "y": 5.75 + } + ], + "LAYOUT_7u": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "x": 0, + "y": 5.75 + }, + { + "x": 1, + "y": 5.75 + }, + { + "x": 2, + "y": 5.75 + }, + { + "x": 3, + "y": 5.75, + "w": 7 + }, + { + "x": 10, + "y": 5.75 + }, + { + "x": 11, + "y": 5.75 + }, + { + "x": 12, + "y": 5.75 + } ], - "keymap": [ - ["0,0","0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12"], - ["1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12"], - ["2,0","2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12"], - ["3,0","3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11","3,12"], - ["4,0","4,1","4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11","4,12"], - [{"p":"2x2u"},"5,0","5,1","5,2","5,3\n\n\n0,0",{"w":2},"5,5\n\n\n0,0",{"w":2},"5,7\n\n\n0,0","5,8\n\n\n0,0","5,9\n\n\n0,0","5,10","5,11","5,12"], - [{"p":"7u"},{"w":7},"5,9\n\n\n0,1"], - [{"p":"Full ortho"},"5,3\n\n\n0,2","5,4\n\n\n0,2","5,5\n\n\n0,2","5,6\n\n\n0,2","5,7\n\n\n0,2","5,8\n\n\n0,2","5,9\n\n\n0,2"] + "LAYOUT_ortho": [ + { + "label": "CAPS", + "x": 0, + "y": 2 + }, + { + "label": "F1", + "x": 1, + "y": 2 + }, + { + "label": "F2", + "x": 2, + "y": 2 + }, + { + "label": "F3", + "x": 3, + "y": 2 + }, + { + "label": "F4", + "x": 4, + "y": 2 + }, + { + "label": "F5", + "x": 5, + "y": 2 + }, + { + "label": "F6", + "x": 6, + "y": 2 + }, + { + "label": "F7", + "x": 7, + "y": 2 + }, + { + "label": "F8", + "x": 8, + "y": 2 + }, + { + "label": "F9", + "x": 9, + "y": 2 + }, + { + "label": "F10", + "x": 10, + "y": 2 + }, + { + "label": "F11", + "x": 11, + "y": 2 + }, + { + "label": "F12", + "x": 12, + "y": 2 + }, + { + "label": "§", + "x": 0, + "y": 3 + }, + { + "label": "1", + "x": 1, + "y": 3 + }, + { + "label": "2", + "x": 2, + "y": 3 + }, + { + "label": "3", + "x": 3, + "y": 3 + }, + { + "label": "4", + "x": 4, + "y": 3 + }, + { + "label": "5", + "x": 5, + "y": 3 + }, + { + "label": "6", + "x": 6, + "y": 3 + }, + { + "label": "7", + "x": 7, + "y": 3 + }, + { + "label": "8", + "x": 8, + "y": 3 + }, + { + "label": "9", + "x": 9, + "y": 3 + }, + { + "label": "0", + "x": 10, + "y": 3 + }, + { + "x": 11, + "y": 3 + }, + { + "x": 12, + "y": 3 + }, + { + "label": "TAB", + "x": 0, + "y": 4 + }, + { + "label": "q", + "x": 1, + "y": 4 + }, + { + "label": "w", + "x": 2, + "y": 4 + }, + { + "label": "e", + "x": 3, + "y": 4 + }, + { + "label": "r", + "x": 4, + "y": 4 + }, + { + "label": "t", + "x": 5, + "y": 4 + }, + { + "label": "y", + "x": 6, + "y": 4 + }, + { + "label": "u", + "x": 7, + "y": 4 + }, + { + "label": "i", + "x": 8, + "y": 4 + }, + { + "label": "o", + "x": 9, + "y": 4 + }, + { + "label": "p", + "x": 10, + "y": 4 + }, + { + "label": "å", + "x": 11, + "y": 4 + }, + { + "label": "BKSP", + "x": 12, + "y": 4 + }, + { + "label": "CTRL", + "x": 0, + "y": 5 + }, + { + "label": "a", + "x": 1, + "y": 5 + }, + { + "label": "s", + "x": 2, + "y": 5 + }, + { + "label": "d", + "x": 3, + "y": 5 + }, + { + "label": "f", + "x": 4, + "y": 5 + }, + { + "label": "g", + "x": 5, + "y": 5 + }, + { + "label": "h", + "x": 6, + "y": 5 + }, + { + "label": "j", + "x": 7, + "y": 5 + }, + { + "label": "k", + "x": 8, + "y": 5 + }, + { + "label": "l", + "x": 9, + "y": 5 + }, + { + "label": "ø", + "x": 10, + "y": 5 + }, + { + "label": "æ", + "x": 11, + "y": 5 + }, + { + "label": "↲", + "x": 12, + "y": 5 + }, + { + "label": "SHIFT", + "x": 0, + "y": 6 + }, + { + "label": "z", + "x": 1, + "y": 6 + }, + { + "label": "x", + "x": 2, + "y": 6 + }, + { + "label": "c", + "x": 3, + "y": 6 + }, + { + "label": "v", + "x": 4, + "y": 6 + }, + { + "label": "b", + "x": 5, + "y": 6 + }, + { + "label": "n", + "x": 6, + "y": 6 + }, + { + "label": "m", + "x": 7, + "y": 6 + }, + { + "label": ",", + "x": 8, + "y": 6 + }, + { + "label": ".", + "x": 9, + "y": 6 + }, + { + "label": "-", + "x": 10, + "y": 6 + }, + { + "label": "SHIFT", + "x": 11, + "y": 6 + }, + { + "label": "SHIFT", + "x": 12, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 1, + "y": 7 + }, + { + "x": 2, + "y": 7 + }, + { + "x": 3, + "y": 7 + }, + { + "x": 4, + "y": 7 + }, + { + "x": 5, + "y": 7 + }, + { + "x": 6, + "y": 7 + }, + { + "x": 7, + "y": 7 + }, + { + "x": 8, + "y": 7 + }, + { + "x": 9, + "y": 7 + }, + { + "x": 10, + "y": 7 + }, + { + "x": 11, + "y": 7 + }, + { + "x": 12, + "y": 7 + } ] } } From bc6bcec94f2dbef584ec55b4684818f4c092e6a2 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Fri, 15 Oct 2021 07:46:15 +0200 Subject: [PATCH 17/26] fix: incorrect descriptions of features Co-authored-by: Drashna Jaelre --- keyboards/minimon/index_tab/rules.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk index 384fbeca2c21..160559bde5e8 100644 --- a/keyboards/minimon/index_tab/rules.mk +++ b/keyboards/minimon/index_tab/rules.mk @@ -5,7 +5,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -14,9 +14,7 @@ COMMAND_ENABLE = no # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes -TAP_DANCE_ENABLE = no # Enable tap dance feature From afc6fba91815bff15506d74f6992d3477d7e361a Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Fri, 15 Oct 2021 08:44:51 +0200 Subject: [PATCH 18/26] fix: rename to lower case --- .../minimon/index_tab/keymaps/default/{README.md => readme.md} | 0 keyboards/minimon/index_tab/{README.md => readme.md} | 0 keyboards/minimon/{README.md => readme.md} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/minimon/index_tab/keymaps/default/{README.md => readme.md} (100%) rename keyboards/minimon/index_tab/{README.md => readme.md} (100%) rename keyboards/minimon/{README.md => readme.md} (100%) diff --git a/keyboards/minimon/index_tab/keymaps/default/README.md b/keyboards/minimon/index_tab/keymaps/default/readme.md similarity index 100% rename from keyboards/minimon/index_tab/keymaps/default/README.md rename to keyboards/minimon/index_tab/keymaps/default/readme.md diff --git a/keyboards/minimon/index_tab/README.md b/keyboards/minimon/index_tab/readme.md similarity index 100% rename from keyboards/minimon/index_tab/README.md rename to keyboards/minimon/index_tab/readme.md diff --git a/keyboards/minimon/README.md b/keyboards/minimon/readme.md similarity index 100% rename from keyboards/minimon/README.md rename to keyboards/minimon/readme.md From 198be33153488fd8f7b12091510297c330e90c43 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Fri, 15 Oct 2021 08:45:37 +0200 Subject: [PATCH 19/26] fix: explicitly define animations Co-authored-by: Drashna Jaelre --- keyboards/minimon/index_tab/config.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 5977222a6b7d..5d56e0c3c6d2 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -52,4 +52,13 @@ along with this program. If not, see . #define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_SLEEP -#define RGBLIGHT_ANIMATIONS +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE From 7c7164be47ee3416bb4228dbe944146b289d197d Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 17 Oct 2021 22:29:23 +0200 Subject: [PATCH 20/26] fix: proper info.json and no overwrites --- keyboards/minimon/index_tab/config.h | 2 +- keyboards/minimon/index_tab/info.json | 2263 ++++++++++++------------- 2 files changed, 1118 insertions(+), 1147 deletions(-) diff --git a/keyboards/minimon/index_tab/config.h b/keyboards/minimon/index_tab/config.h index 5d56e0c3c6d2..fc02185545d3 100644 --- a/keyboards/minimon/index_tab/config.h +++ b/keyboards/minimon/index_tab/config.h @@ -22,7 +22,6 @@ along with this program. If not, see . #define VENDOR_ID 0x4B49 #define PRODUCT_ID 0x1306 #define DEVICE_VER 0x0001 -#define MANUFACTURER Minimon #define PRODUCT Index Tab /* key matrix size */ @@ -52,6 +51,7 @@ along with this program. If not, see . #define RGB_DI_PIN E6 #define RGBLED_NUM 10 #define RGBLIGHT_SLEEP + #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index 59977a7544db..c6870e6b620f 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -2,1152 +2,1123 @@ "keyboard_name": "Index Tab", "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", - "rgblight": { - "led_count": 10, - "pin": "E6" - }, - "usb": { - "vid": "0x4B49", - "pid": "0x1306", - "device_ver": "0x0001" - }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": [ - "D3", - "B7", - "B3", - "B2", - "B1", - "B0" - ], - "cols": [ - "F7", - "C7", - "C6", - "B6", - "B5", - "B4", - "D7", - "D6", - "D4", - "D5", - "D2", - "F1", - "F0" - ] - }, "layouts": { - "LAYOUT_2u": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "label": "ESC", - "x": 0, - "y": 5.75 - }, - { - "label": "'", - "x": 1, - "y": 5.75 - }, - { - "label": "ALT", - "x": 2, - "y": 5.75 - }, - { - "label": "WIN", - "x": 3, - "y": 5.75 - }, - { - "x": 4, - "y": 5.75, - "w": 2 - }, - { - "x": 6, - "y": 5.75, - "w": 2 - }, - { - "label": "RSE", - "x": 8, - "y": 5.75 - }, - { - "label": "←", - "x": 9, - "y": 5.75 - }, - { - "label": "↑", - "x": 10, - "y": 5.75 - }, - { - "label": "↓", - "x": 11, - "y": 5.75 - }, - { - "label": "→", - "x": 12, - "y": 5.75 - } - ], - "LAYOUT_7u": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "x": 0, - "y": 5.75 - }, - { - "x": 1, - "y": 5.75 - }, - { - "x": 2, - "y": 5.75 - }, - { - "x": 3, - "y": 5.75, - "w": 7 - }, - { - "x": 10, - "y": 5.75 - }, - { - "x": 11, - "y": 5.75 - }, - { - "x": 12, - "y": 5.75 - } - ], - "LAYOUT_ortho": [ - { - "label": "CAPS", - "x": 0, - "y": 2 - }, - { - "label": "F1", - "x": 1, - "y": 2 - }, - { - "label": "F2", - "x": 2, - "y": 2 - }, - { - "label": "F3", - "x": 3, - "y": 2 - }, - { - "label": "F4", - "x": 4, - "y": 2 - }, - { - "label": "F5", - "x": 5, - "y": 2 - }, - { - "label": "F6", - "x": 6, - "y": 2 - }, - { - "label": "F7", - "x": 7, - "y": 2 - }, - { - "label": "F8", - "x": 8, - "y": 2 - }, - { - "label": "F9", - "x": 9, - "y": 2 - }, - { - "label": "F10", - "x": 10, - "y": 2 - }, - { - "label": "F11", - "x": 11, - "y": 2 - }, - { - "label": "F12", - "x": 12, - "y": 2 - }, - { - "label": "§", - "x": 0, - "y": 3 - }, - { - "label": "1", - "x": 1, - "y": 3 - }, - { - "label": "2", - "x": 2, - "y": 3 - }, - { - "label": "3", - "x": 3, - "y": 3 - }, - { - "label": "4", - "x": 4, - "y": 3 - }, - { - "label": "5", - "x": 5, - "y": 3 - }, - { - "label": "6", - "x": 6, - "y": 3 - }, - { - "label": "7", - "x": 7, - "y": 3 - }, - { - "label": "8", - "x": 8, - "y": 3 - }, - { - "label": "9", - "x": 9, - "y": 3 - }, - { - "label": "0", - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "label": "TAB", - "x": 0, - "y": 4 - }, - { - "label": "q", - "x": 1, - "y": 4 - }, - { - "label": "w", - "x": 2, - "y": 4 - }, - { - "label": "e", - "x": 3, - "y": 4 - }, - { - "label": "r", - "x": 4, - "y": 4 - }, - { - "label": "t", - "x": 5, - "y": 4 - }, - { - "label": "y", - "x": 6, - "y": 4 - }, - { - "label": "u", - "x": 7, - "y": 4 - }, - { - "label": "i", - "x": 8, - "y": 4 - }, - { - "label": "o", - "x": 9, - "y": 4 - }, - { - "label": "p", - "x": 10, - "y": 4 - }, - { - "label": "å", - "x": 11, - "y": 4 - }, - { - "label": "BKSP", - "x": 12, - "y": 4 - }, - { - "label": "CTRL", - "x": 0, - "y": 5 - }, - { - "label": "a", - "x": 1, - "y": 5 - }, - { - "label": "s", - "x": 2, - "y": 5 - }, - { - "label": "d", - "x": 3, - "y": 5 - }, - { - "label": "f", - "x": 4, - "y": 5 - }, - { - "label": "g", - "x": 5, - "y": 5 - }, - { - "label": "h", - "x": 6, - "y": 5 - }, - { - "label": "j", - "x": 7, - "y": 5 - }, - { - "label": "k", - "x": 8, - "y": 5 - }, - { - "label": "l", - "x": 9, - "y": 5 - }, - { - "label": "ø", - "x": 10, - "y": 5 - }, - { - "label": "æ", - "x": 11, - "y": 5 - }, - { - "label": "↲", - "x": 12, - "y": 5 - }, - { - "label": "SHIFT", - "x": 0, - "y": 6 - }, - { - "label": "z", - "x": 1, - "y": 6 - }, - { - "label": "x", - "x": 2, - "y": 6 - }, - { - "label": "c", - "x": 3, - "y": 6 - }, - { - "label": "v", - "x": 4, - "y": 6 - }, - { - "label": "b", - "x": 5, - "y": 6 - }, - { - "label": "n", - "x": 6, - "y": 6 - }, - { - "label": "m", - "x": 7, - "y": 6 - }, - { - "label": ",", - "x": 8, - "y": 6 - }, - { - "label": ".", - "x": 9, - "y": 6 - }, - { - "label": "-", - "x": 10, - "y": 6 - }, - { - "label": "SHIFT", - "x": 11, - "y": 6 - }, - { - "label": "SHIFT", - "x": 12, - "y": 6 - }, - { - "x": 0, - "y": 7 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 2, - "y": 7 - }, - { - "x": 3, - "y": 7 - }, - { - "x": 4, - "y": 7 - }, - { - "x": 5, - "y": 7 - }, - { - "x": 6, - "y": 7 - }, - { - "x": 7, - "y": 7 - }, - { - "x": 8, - "y": 7 - }, - { - "x": 9, - "y": 7 - }, - { - "x": 10, - "y": 7 - }, - { - "x": 11, - "y": 7 - }, - { - "x": 12, - "y": 7 - } - ] + "LAYOUT_2u": { + "layout": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "label": "ESC", + "x": 0, + "y": 5.75 + }, + { + "label": "'", + "x": 1, + "y": 5.75 + }, + { + "label": "ALT", + "x": 2, + "y": 5.75 + }, + { + "label": "WIN", + "x": 3, + "y": 5.75 + }, + { + "x": 4, + "y": 5.75, + "w": 2 + }, + { + "x": 6, + "y": 5.75, + "w": 2 + }, + { + "label": "RSE", + "x": 8, + "y": 5.75 + }, + { + "label": "←", + "x": 9, + "y": 5.75 + }, + { + "label": "↑", + "x": 10, + "y": 5.75 + }, + { + "label": "↓", + "x": 11, + "y": 5.75 + }, + { + "label": "→", + "x": 12, + "y": 5.75 + } + ] + }, + "LAYOUT_7u": { + "layout": [ + { + "label": "CAPS", + "x": 0, + "y": 0.75 + }, + { + "label": "F1", + "x": 1, + "y": 0.75 + }, + { + "label": "F2", + "x": 2, + "y": 0.75 + }, + { + "label": "F3", + "x": 3, + "y": 0.75 + }, + { + "label": "F4", + "x": 4, + "y": 0.75 + }, + { + "label": "F5", + "x": 5, + "y": 0.75 + }, + { + "label": "F6", + "x": 6, + "y": 0.75 + }, + { + "label": "F7", + "x": 7, + "y": 0.75 + }, + { + "label": "F8", + "x": 8, + "y": 0.75 + }, + { + "label": "F9", + "x": 9, + "y": 0.75 + }, + { + "label": "F10", + "x": 10, + "y": 0.75 + }, + { + "label": "F11", + "x": 11, + "y": 0.75 + }, + { + "label": "F12", + "x": 12, + "y": 0.75 + }, + { + "label": "§", + "x": 0, + "y": 1.75 + }, + { + "label": "1", + "x": 1, + "y": 1.75 + }, + { + "label": "2", + "x": 2, + "y": 1.75 + }, + { + "label": "3", + "x": 3, + "y": 1.75 + }, + { + "label": "4", + "x": 4, + "y": 1.75 + }, + { + "label": "5", + "x": 5, + "y": 1.75 + }, + { + "label": "6", + "x": 6, + "y": 1.75 + }, + { + "label": "7", + "x": 7, + "y": 1.75 + }, + { + "label": "8", + "x": 8, + "y": 1.75 + }, + { + "label": "9", + "x": 9, + "y": 1.75 + }, + { + "label": "0", + "x": 10, + "y": 1.75 + }, + { + "x": 11, + "y": 1.75 + }, + { + "x": 12, + "y": 1.75 + }, + { + "label": "TAB", + "x": 0, + "y": 2.75 + }, + { + "label": "q", + "x": 1, + "y": 2.75 + }, + { + "label": "w", + "x": 2, + "y": 2.75 + }, + { + "label": "e", + "x": 3, + "y": 2.75 + }, + { + "label": "r", + "x": 4, + "y": 2.75 + }, + { + "label": "t", + "x": 5, + "y": 2.75 + }, + { + "label": "y", + "x": 6, + "y": 2.75 + }, + { + "label": "u", + "x": 7, + "y": 2.75 + }, + { + "label": "i", + "x": 8, + "y": 2.75 + }, + { + "label": "o", + "x": 9, + "y": 2.75 + }, + { + "label": "p", + "x": 10, + "y": 2.75 + }, + { + "label": "å", + "x": 11, + "y": 2.75 + }, + { + "label": "BKSP", + "x": 12, + "y": 2.75 + }, + { + "label": "CTRL", + "x": 0, + "y": 3.75 + }, + { + "label": "a", + "x": 1, + "y": 3.75 + }, + { + "label": "s", + "x": 2, + "y": 3.75 + }, + { + "label": "d", + "x": 3, + "y": 3.75 + }, + { + "label": "f", + "x": 4, + "y": 3.75 + }, + { + "label": "g", + "x": 5, + "y": 3.75 + }, + { + "label": "h", + "x": 6, + "y": 3.75 + }, + { + "label": "j", + "x": 7, + "y": 3.75 + }, + { + "label": "k", + "x": 8, + "y": 3.75 + }, + { + "label": "l", + "x": 9, + "y": 3.75 + }, + { + "label": "ø", + "x": 10, + "y": 3.75 + }, + { + "label": "æ", + "x": 11, + "y": 3.75 + }, + { + "label": "↲", + "x": 12, + "y": 3.75 + }, + { + "label": "SHIFT", + "x": 0, + "y": 4.75 + }, + { + "label": "z", + "x": 1, + "y": 4.75 + }, + { + "label": "x", + "x": 2, + "y": 4.75 + }, + { + "label": "c", + "x": 3, + "y": 4.75 + }, + { + "label": "v", + "x": 4, + "y": 4.75 + }, + { + "label": "b", + "x": 5, + "y": 4.75 + }, + { + "label": "n", + "x": 6, + "y": 4.75 + }, + { + "label": "m", + "x": 7, + "y": 4.75 + }, + { + "label": ",", + "x": 8, + "y": 4.75 + }, + { + "label": ".", + "x": 9, + "y": 4.75 + }, + { + "label": "-", + "x": 10, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 11, + "y": 4.75 + }, + { + "label": "SHIFT", + "x": 12, + "y": 4.75 + }, + { + "x": 0, + "y": 5.75 + }, + { + "x": 1, + "y": 5.75 + }, + { + "x": 2, + "y": 5.75 + }, + { + "x": 3, + "y": 5.75, + "w": 7 + }, + { + "x": 10, + "y": 5.75 + }, + { + "x": 11, + "y": 5.75 + }, + { + "x": 12, + "y": 5.75 + } + ] + }, + "LAYOUT_ortho": { + "layout": [ + { + "label": "CAPS", + "x": 0, + "y": 2 + }, + { + "label": "F1", + "x": 1, + "y": 2 + }, + { + "label": "F2", + "x": 2, + "y": 2 + }, + { + "label": "F3", + "x": 3, + "y": 2 + }, + { + "label": "F4", + "x": 4, + "y": 2 + }, + { + "label": "F5", + "x": 5, + "y": 2 + }, + { + "label": "F6", + "x": 6, + "y": 2 + }, + { + "label": "F7", + "x": 7, + "y": 2 + }, + { + "label": "F8", + "x": 8, + "y": 2 + }, + { + "label": "F9", + "x": 9, + "y": 2 + }, + { + "label": "F10", + "x": 10, + "y": 2 + }, + { + "label": "F11", + "x": 11, + "y": 2 + }, + { + "label": "F12", + "x": 12, + "y": 2 + }, + { + "label": "§", + "x": 0, + "y": 3 + }, + { + "label": "1", + "x": 1, + "y": 3 + }, + { + "label": "2", + "x": 2, + "y": 3 + }, + { + "label": "3", + "x": 3, + "y": 3 + }, + { + "label": "4", + "x": 4, + "y": 3 + }, + { + "label": "5", + "x": 5, + "y": 3 + }, + { + "label": "6", + "x": 6, + "y": 3 + }, + { + "label": "7", + "x": 7, + "y": 3 + }, + { + "label": "8", + "x": 8, + "y": 3 + }, + { + "label": "9", + "x": 9, + "y": 3 + }, + { + "label": "0", + "x": 10, + "y": 3 + }, + { + "x": 11, + "y": 3 + }, + { + "x": 12, + "y": 3 + }, + { + "label": "TAB", + "x": 0, + "y": 4 + }, + { + "label": "q", + "x": 1, + "y": 4 + }, + { + "label": "w", + "x": 2, + "y": 4 + }, + { + "label": "e", + "x": 3, + "y": 4 + }, + { + "label": "r", + "x": 4, + "y": 4 + }, + { + "label": "t", + "x": 5, + "y": 4 + }, + { + "label": "y", + "x": 6, + "y": 4 + }, + { + "label": "u", + "x": 7, + "y": 4 + }, + { + "label": "i", + "x": 8, + "y": 4 + }, + { + "label": "o", + "x": 9, + "y": 4 + }, + { + "label": "p", + "x": 10, + "y": 4 + }, + { + "label": "å", + "x": 11, + "y": 4 + }, + { + "label": "BKSP", + "x": 12, + "y": 4 + }, + { + "label": "CTRL", + "x": 0, + "y": 5 + }, + { + "label": "a", + "x": 1, + "y": 5 + }, + { + "label": "s", + "x": 2, + "y": 5 + }, + { + "label": "d", + "x": 3, + "y": 5 + }, + { + "label": "f", + "x": 4, + "y": 5 + }, + { + "label": "g", + "x": 5, + "y": 5 + }, + { + "label": "h", + "x": 6, + "y": 5 + }, + { + "label": "j", + "x": 7, + "y": 5 + }, + { + "label": "k", + "x": 8, + "y": 5 + }, + { + "label": "l", + "x": 9, + "y": 5 + }, + { + "label": "ø", + "x": 10, + "y": 5 + }, + { + "label": "æ", + "x": 11, + "y": 5 + }, + { + "label": "↲", + "x": 12, + "y": 5 + }, + { + "label": "SHIFT", + "x": 0, + "y": 6 + }, + { + "label": "z", + "x": 1, + "y": 6 + }, + { + "label": "x", + "x": 2, + "y": 6 + }, + { + "label": "c", + "x": 3, + "y": 6 + }, + { + "label": "v", + "x": 4, + "y": 6 + }, + { + "label": "b", + "x": 5, + "y": 6 + }, + { + "label": "n", + "x": 6, + "y": 6 + }, + { + "label": "m", + "x": 7, + "y": 6 + }, + { + "label": ",", + "x": 8, + "y": 6 + }, + { + "label": ".", + "x": 9, + "y": 6 + }, + { + "label": "-", + "x": 10, + "y": 6 + }, + { + "label": "SHIFT", + "x": 11, + "y": 6 + }, + { + "label": "SHIFT", + "x": 12, + "y": 6 + }, + { + "x": 0, + "y": 7 + }, + { + "x": 1, + "y": 7 + }, + { + "x": 2, + "y": 7 + }, + { + "x": 3, + "y": 7 + }, + { + "x": 4, + "y": 7 + }, + { + "x": 5, + "y": 7 + }, + { + "x": 6, + "y": 7 + }, + { + "x": 7, + "y": 7 + }, + { + "x": 8, + "y": 7 + }, + { + "x": 9, + "y": 7 + }, + { + "x": 10, + "y": 7 + }, + { + "x": 11, + "y": 7 + }, + { + "x": 12, + "y": 7 + } + ] + } } } From c2d0785e67b81039872ebac5f86e07e25bded05a Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Mon, 18 Oct 2021 10:11:04 +0200 Subject: [PATCH 21/26] fix: don't use alternativ header markdown Co-authored-by: Drashna Jaelre --- keyboards/minimon/index_tab/readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/minimon/index_tab/readme.md b/keyboards/minimon/index_tab/readme.md index 23a9cc647858..31ad51aa5529 100644 --- a/keyboards/minimon/index_tab/readme.md +++ b/keyboards/minimon/index_tab/readme.md @@ -1,5 +1,4 @@ -Index Tab -========= +# Index Tab Not just another ortho-keyboard. but one catering to the northern marked with our extra letters. This is a 13x6 ortho keyboard; giving you enough space for all the numbers, all the F-keys, and our precious extraordinary letters. From 312451efa9154c7ea214b7d74a38286a3e2dbd52 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Tue, 19 Oct 2021 14:02:53 +0200 Subject: [PATCH 22/26] fix: updated keymap Is now the same in info.json and keymap.c --- keyboards/minimon/index_tab/info.json | 1121 +---------------- .../index_tab/keymaps/default/keymap.c | 12 +- 2 files changed, 13 insertions(+), 1120 deletions(-) diff --git a/keyboards/minimon/index_tab/info.json b/keyboards/minimon/index_tab/info.json index c6870e6b620f..21ff5a3cde12 100644 --- a/keyboards/minimon/index_tab/info.json +++ b/keyboards/minimon/index_tab/info.json @@ -3,1121 +3,14 @@ "maintainer": "kyrremann", "url": "https://github.com/Kyrremann/index-tab", "layouts": { - "LAYOUT_2u": { + "LAYOUT_all": { "layout": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "label": "ESC", - "x": 0, - "y": 5.75 - }, - { - "label": "'", - "x": 1, - "y": 5.75 - }, - { - "label": "ALT", - "x": 2, - "y": 5.75 - }, - { - "label": "WIN", - "x": 3, - "y": 5.75 - }, - { - "x": 4, - "y": 5.75, - "w": 2 - }, - { - "x": 6, - "y": 5.75, - "w": 2 - }, - { - "label": "RSE", - "x": 8, - "y": 5.75 - }, - { - "label": "←", - "x": 9, - "y": 5.75 - }, - { - "label": "↑", - "x": 10, - "y": 5.75 - }, - { - "label": "↓", - "x": 11, - "y": 5.75 - }, - { - "label": "→", - "x": 12, - "y": 5.75 - } - ] - }, - "LAYOUT_7u": { - "layout": [ - { - "label": "CAPS", - "x": 0, - "y": 0.75 - }, - { - "label": "F1", - "x": 1, - "y": 0.75 - }, - { - "label": "F2", - "x": 2, - "y": 0.75 - }, - { - "label": "F3", - "x": 3, - "y": 0.75 - }, - { - "label": "F4", - "x": 4, - "y": 0.75 - }, - { - "label": "F5", - "x": 5, - "y": 0.75 - }, - { - "label": "F6", - "x": 6, - "y": 0.75 - }, - { - "label": "F7", - "x": 7, - "y": 0.75 - }, - { - "label": "F8", - "x": 8, - "y": 0.75 - }, - { - "label": "F9", - "x": 9, - "y": 0.75 - }, - { - "label": "F10", - "x": 10, - "y": 0.75 - }, - { - "label": "F11", - "x": 11, - "y": 0.75 - }, - { - "label": "F12", - "x": 12, - "y": 0.75 - }, - { - "label": "§", - "x": 0, - "y": 1.75 - }, - { - "label": "1", - "x": 1, - "y": 1.75 - }, - { - "label": "2", - "x": 2, - "y": 1.75 - }, - { - "label": "3", - "x": 3, - "y": 1.75 - }, - { - "label": "4", - "x": 4, - "y": 1.75 - }, - { - "label": "5", - "x": 5, - "y": 1.75 - }, - { - "label": "6", - "x": 6, - "y": 1.75 - }, - { - "label": "7", - "x": 7, - "y": 1.75 - }, - { - "label": "8", - "x": 8, - "y": 1.75 - }, - { - "label": "9", - "x": 9, - "y": 1.75 - }, - { - "label": "0", - "x": 10, - "y": 1.75 - }, - { - "x": 11, - "y": 1.75 - }, - { - "x": 12, - "y": 1.75 - }, - { - "label": "TAB", - "x": 0, - "y": 2.75 - }, - { - "label": "q", - "x": 1, - "y": 2.75 - }, - { - "label": "w", - "x": 2, - "y": 2.75 - }, - { - "label": "e", - "x": 3, - "y": 2.75 - }, - { - "label": "r", - "x": 4, - "y": 2.75 - }, - { - "label": "t", - "x": 5, - "y": 2.75 - }, - { - "label": "y", - "x": 6, - "y": 2.75 - }, - { - "label": "u", - "x": 7, - "y": 2.75 - }, - { - "label": "i", - "x": 8, - "y": 2.75 - }, - { - "label": "o", - "x": 9, - "y": 2.75 - }, - { - "label": "p", - "x": 10, - "y": 2.75 - }, - { - "label": "å", - "x": 11, - "y": 2.75 - }, - { - "label": "BKSP", - "x": 12, - "y": 2.75 - }, - { - "label": "CTRL", - "x": 0, - "y": 3.75 - }, - { - "label": "a", - "x": 1, - "y": 3.75 - }, - { - "label": "s", - "x": 2, - "y": 3.75 - }, - { - "label": "d", - "x": 3, - "y": 3.75 - }, - { - "label": "f", - "x": 4, - "y": 3.75 - }, - { - "label": "g", - "x": 5, - "y": 3.75 - }, - { - "label": "h", - "x": 6, - "y": 3.75 - }, - { - "label": "j", - "x": 7, - "y": 3.75 - }, - { - "label": "k", - "x": 8, - "y": 3.75 - }, - { - "label": "l", - "x": 9, - "y": 3.75 - }, - { - "label": "ø", - "x": 10, - "y": 3.75 - }, - { - "label": "æ", - "x": 11, - "y": 3.75 - }, - { - "label": "↲", - "x": 12, - "y": 3.75 - }, - { - "label": "SHIFT", - "x": 0, - "y": 4.75 - }, - { - "label": "z", - "x": 1, - "y": 4.75 - }, - { - "label": "x", - "x": 2, - "y": 4.75 - }, - { - "label": "c", - "x": 3, - "y": 4.75 - }, - { - "label": "v", - "x": 4, - "y": 4.75 - }, - { - "label": "b", - "x": 5, - "y": 4.75 - }, - { - "label": "n", - "x": 6, - "y": 4.75 - }, - { - "label": "m", - "x": 7, - "y": 4.75 - }, - { - "label": ",", - "x": 8, - "y": 4.75 - }, - { - "label": ".", - "x": 9, - "y": 4.75 - }, - { - "label": "-", - "x": 10, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 11, - "y": 4.75 - }, - { - "label": "SHIFT", - "x": 12, - "y": 4.75 - }, - { - "x": 0, - "y": 5.75 - }, - { - "x": 1, - "y": 5.75 - }, - { - "x": 2, - "y": 5.75 - }, - { - "x": 3, - "y": 5.75, - "w": 7 - }, - { - "x": 10, - "y": 5.75 - }, - { - "x": 11, - "y": 5.75 - }, - { - "x": 12, - "y": 5.75 - } - ] - }, - "LAYOUT_ortho": { - "layout": [ - { - "label": "CAPS", - "x": 0, - "y": 2 - }, - { - "label": "F1", - "x": 1, - "y": 2 - }, - { - "label": "F2", - "x": 2, - "y": 2 - }, - { - "label": "F3", - "x": 3, - "y": 2 - }, - { - "label": "F4", - "x": 4, - "y": 2 - }, - { - "label": "F5", - "x": 5, - "y": 2 - }, - { - "label": "F6", - "x": 6, - "y": 2 - }, - { - "label": "F7", - "x": 7, - "y": 2 - }, - { - "label": "F8", - "x": 8, - "y": 2 - }, - { - "label": "F9", - "x": 9, - "y": 2 - }, - { - "label": "F10", - "x": 10, - "y": 2 - }, - { - "label": "F11", - "x": 11, - "y": 2 - }, - { - "label": "F12", - "x": 12, - "y": 2 - }, - { - "label": "§", - "x": 0, - "y": 3 - }, - { - "label": "1", - "x": 1, - "y": 3 - }, - { - "label": "2", - "x": 2, - "y": 3 - }, - { - "label": "3", - "x": 3, - "y": 3 - }, - { - "label": "4", - "x": 4, - "y": 3 - }, - { - "label": "5", - "x": 5, - "y": 3 - }, - { - "label": "6", - "x": 6, - "y": 3 - }, - { - "label": "7", - "x": 7, - "y": 3 - }, - { - "label": "8", - "x": 8, - "y": 3 - }, - { - "label": "9", - "x": 9, - "y": 3 - }, - { - "label": "0", - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "label": "TAB", - "x": 0, - "y": 4 - }, - { - "label": "q", - "x": 1, - "y": 4 - }, - { - "label": "w", - "x": 2, - "y": 4 - }, - { - "label": "e", - "x": 3, - "y": 4 - }, - { - "label": "r", - "x": 4, - "y": 4 - }, - { - "label": "t", - "x": 5, - "y": 4 - }, - { - "label": "y", - "x": 6, - "y": 4 - }, - { - "label": "u", - "x": 7, - "y": 4 - }, - { - "label": "i", - "x": 8, - "y": 4 - }, - { - "label": "o", - "x": 9, - "y": 4 - }, - { - "label": "p", - "x": 10, - "y": 4 - }, - { - "label": "å", - "x": 11, - "y": 4 - }, - { - "label": "BKSP", - "x": 12, - "y": 4 - }, - { - "label": "CTRL", - "x": 0, - "y": 5 - }, - { - "label": "a", - "x": 1, - "y": 5 - }, - { - "label": "s", - "x": 2, - "y": 5 - }, - { - "label": "d", - "x": 3, - "y": 5 - }, - { - "label": "f", - "x": 4, - "y": 5 - }, - { - "label": "g", - "x": 5, - "y": 5 - }, - { - "label": "h", - "x": 6, - "y": 5 - }, - { - "label": "j", - "x": 7, - "y": 5 - }, - { - "label": "k", - "x": 8, - "y": 5 - }, - { - "label": "l", - "x": 9, - "y": 5 - }, - { - "label": "ø", - "x": 10, - "y": 5 - }, - { - "label": "æ", - "x": 11, - "y": 5 - }, - { - "label": "↲", - "x": 12, - "y": 5 - }, - { - "label": "SHIFT", - "x": 0, - "y": 6 - }, - { - "label": "z", - "x": 1, - "y": 6 - }, - { - "label": "x", - "x": 2, - "y": 6 - }, - { - "label": "c", - "x": 3, - "y": 6 - }, - { - "label": "v", - "x": 4, - "y": 6 - }, - { - "label": "b", - "x": 5, - "y": 6 - }, - { - "label": "n", - "x": 6, - "y": 6 - }, - { - "label": "m", - "x": 7, - "y": 6 - }, - { - "label": ",", - "x": 8, - "y": 6 - }, - { - "label": ".", - "x": 9, - "y": 6 - }, - { - "label": "-", - "x": 10, - "y": 6 - }, - { - "label": "SHIFT", - "x": 11, - "y": 6 - }, - { - "label": "SHIFT", - "x": 12, - "y": 6 - }, - { - "x": 0, - "y": 7 - }, - { - "x": 1, - "y": 7 - }, - { - "x": 2, - "y": 7 - }, - { - "x": 3, - "y": 7 - }, - { - "x": 4, - "y": 7 - }, - { - "x": 5, - "y": 7 - }, - { - "x": 6, - "y": 7 - }, - { - "x": 7, - "y": 7 - }, - { - "x": 8, - "y": 7 - }, - { - "x": 9, - "y": 7 - }, - { - "x": 10, - "y": 7 - }, - { - "x": 11, - "y": 7 - }, - { - "x": 12, - "y": 7 - } + {"label":"CAPS", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, + {"label":"<", "x":0, "y":1}, {"label":"1", "x":1, "y":1}, {"label":"2", "x":2, "y":1}, {"label":"3", "x":3, "y":1}, {"label":"4", "x":4, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"label":"0", "x":10, "y":1}, {"label":"+", "x":11, "y":1}, {"label":"\u00b4", "x":12, "y":1}, + {"label":"TAB", "x":0, "y":2}, {"label":"q", "x":1, "y":2}, {"label":"w", "x":2, "y":2}, {"label":"e", "x":3, "y":2}, {"label":"r", "x":4, "y":2}, {"label":"t", "x":5, "y":2}, {"label":"y", "x":6, "y":2}, {"label":"u", "x":7, "y":2}, {"label":"i", "x":8, "y":2}, {"label":"o", "x":9, "y":2}, {"label":"p", "x":10, "y":2}, {"label":"\u00e5", "x":11, "y":2}, {"label":"BKSP", "x":12, "y":2}, + {"label":"CTRL", "x":0, "y":3}, {"label":"a", "x":1, "y":3}, {"label":"s", "x":2, "y":3}, {"label":"d", "x":3, "y":3}, {"label":"f", "x":4, "y":3}, {"label":"g", "x":5, "y":3}, {"label":"h", "x":6, "y":3}, {"label":"j", "x":7, "y":3}, {"label":"k", "x":8, "y":3}, {"label":"l", "x":9, "y":3}, {"label":"\u00f8", "x":10, "y":3}, {"label":"\u00e6", "x":11, "y":3}, {"label":"\u00a8", "x":12, "y":3}, + {"label":"SHIFT", "x":0, "y":4}, {"label":"z", "x":1, "y":4}, {"label":"x", "x":2, "y":4}, {"label":"c", "x":3, "y":4}, {"label":"v", "x":4, "y":4}, {"label":"b", "x":5, "y":4}, {"label":"n", "x":6, "y":4}, {"label":"m", "x":7, "y":4}, {"label":",", "x":8, "y":4}, {"label":".", "x":9, "y":4}, {"label":"-", "x":10, "y":4}, {"label":"\u2191", "x":11, "y":4}, {"label":"\u21b2", "x":12, "y":4}, + {"label":"ESC", "x":0, "y":5}, {"label":"\u00a7", "x":1, "y":5}, {"label":"WIN", "x":2, "y":5}, {"label":"LALT", "x":3, "y":5}, {"x":4, "y":5, "w":2}, {"x":6, "y":5, "w":2}, {"label":"FN", "x":8, "y":5}, {"label":"@", "x":9, "y":5}, {"label":"\u2190", "x":10, "y":5}, {"label":"\u2193", "x":11, "y":5}, {"label":"\u2192", "x":12, "y":5} ] } } diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c index 9001f8cee5d1..1efeec2e14ea 100644 --- a/keyboards/minimon/index_tab/keymaps/default/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -20,17 +20,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUHS, KC_SFTENT, \ - KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT, \ + KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_BSLS, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PEQL + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PEQL, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPLY, KC_MPLY, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PENT ), [2] = LAYOUT( From 80ae45f03aa38f56cb078e9b75c0a842a27164d2 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Tue, 19 Oct 2021 14:29:48 +0200 Subject: [PATCH 23/26] fix: kle/pictures matches keymap --- keyboards/minimon/index_tab/keymaps/default/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/minimon/index_tab/keymaps/default/readme.md b/keyboards/minimon/index_tab/keymaps/default/readme.md index 2f169423a9cb..79723e619f7e 100644 --- a/keyboards/minimon/index_tab/keymaps/default/readme.md +++ b/keyboards/minimon/index_tab/keymaps/default/readme.md @@ -1,6 +1,6 @@ Index Tab default keymap ======================== -![Index Tab layout image](https://i.imgur.com/YQVZ0Jh.png) +![Index Tab layout image](https://imgur.com/a/xmogHTC) -[Keyboard layout editor](http://www.keyboard-layout-editor.com/##@_backcolor=%23ededed&name=index%20tab&switchMount=cherry%3B&@_a:7%3B&=TAB&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12%3B&@=%C2%A7&=1&=2&=3&=4&=5&=6&=7&=8&=9&=0&=+&=%C2%B4%3B&@=TAB&=q&=w&=e&=r&=t&=y&=u&=i&=o&=p&=%C3%A5&=BKSP%3B&@=CTRL&=a&=s&=d&=f&=g&=h&=j&=k&=l&=%C3%B8&=%C3%A6&_a:5%3B&=%0A%C2%A8%0A%0A%0A%0A%0A%5E%3B&@_a:7%3B&=SHIFT&=z&=x&=c&=v&=b&=n&=m&=,&=.&=-&=%E2%86%91&=%E2%86%B2%0A%0A%0A%0ASHIFT%3B&@=ESC&_a:5%3B&=%0A%3E%0A%0A%0A%0A%0A%3C&_a:7%3B&=ALT&=SPR&_w:2%3B&=&=FN&_w:2%3B&=&_a:5%3B&=%0A'%0A%0A%0A%0A%0A*&_a:7%3B&=%E2%86%90&=%E2%86%93&=%E2%86%92) +[Keyboard layout editor](http://www.keyboard-layout-editor.com/##@@_a:7%3B&=CAPS&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12%3B&@=%3C&=1&=2&=3&=4&=5&=6&=7&=8&=9&=0&=+&=%C2%B4%3B&@=TAB&=q&=w&=e&=r&=t&=y&=u&=i&=o&=p&=%C3%A5&=BKSP%3B&@=CTRL&=a&=s&=d&=f&=g&=h&=j&=k&=l&=%C3%B8&=%C3%A6&=%C2%A8%3B&@=SHIFT&=z&=x&=c&=v&=b&=n&=m&=,&=.&=-&=%E2%86%91&=%E2%86%B2%3B&@=ESC&=%C2%A7&=WIN&=LALT&_w:2%3B&=&_w:2%3B&=&=FN&=%2F@&=%E2%86%90&=%E2%86%93&=%E2%86%92) From 7eee2dddbc119b7c26434376212a21fdf23d118c Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sat, 23 Oct 2021 18:54:11 +0200 Subject: [PATCH 24/26] Apply suggestions from code review Co-authored-by: Ryan --- .../index_tab/keymaps/default/keymap.c | 30 ++++++------- .../minimon/index_tab/keymaps/via/keymap.c | 42 +++++++++---------- keyboards/minimon/index_tab/rules.mk | 7 ++-- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/keyboards/minimon/index_tab/keymaps/default/keymap.c b/keyboards/minimon/index_tab/keymaps/default/keymap.c index 1efeec2e14ea..9f2a3d1320ec 100644 --- a/keyboards/minimon/index_tab/keymaps/default/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/default/keymap.c @@ -16,29 +16,29 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT, \ + KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT, KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_BSLS, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PEQL, \ + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PCMM, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPLY, KC_MPLY, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PENT ), [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/minimon/index_tab/keymaps/via/keymap.c b/keyboards/minimon/index_tab/keymaps/via/keymap.c index 9764e1a36cf3..f6f0e0da1ef3 100644 --- a/keyboards/minimon/index_tab/keymaps/via/keymap.c +++ b/keyboards/minimon/index_tab/keymaps/via/keymap.c @@ -16,38 +16,38 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, \ - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUHS, KC_SFTENT, \ + KC_CAPS, 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_NUBS, 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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_RBRC, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NUHS, KC_SFTENT, KC_ESC, KC_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, TG(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), [1] = LAYOUT( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, \ + KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MRWD, KC_TRNS, KC_MSTP, KC_TRNS, KC_MFFD, KC_P4, KC_P5, KC_P6, KC_PCMM, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_P0, KC_P0, KC_PDOT, KC_PEQL ), [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -[4] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ +[3] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/minimon/index_tab/rules.mk b/keyboards/minimon/index_tab/rules.mk index 160559bde5e8..dcc5fd8be862 100644 --- a/keyboards/minimon/index_tab/rules.mk +++ b/keyboards/minimon/index_tab/rules.mk @@ -1,5 +1,7 @@ # MCU name MCU = atmega32u4 + +# Bootloader selection BOOTLOADER = atmel-dfu # Build Options @@ -14,7 +16,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -UNICODE_ENABLE = no # Unicode +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes From ea9f977800fc734bfb46b1fc0b6771e018d7f099 Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 24 Oct 2021 09:21:58 +0200 Subject: [PATCH 25/26] fix: direct link to image --- keyboards/minimon/index_tab/keymaps/default/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/minimon/index_tab/keymaps/default/readme.md b/keyboards/minimon/index_tab/keymaps/default/readme.md index 79723e619f7e..3633ffcd08d4 100644 --- a/keyboards/minimon/index_tab/keymaps/default/readme.md +++ b/keyboards/minimon/index_tab/keymaps/default/readme.md @@ -1,6 +1,6 @@ Index Tab default keymap ======================== -![Index Tab layout image](https://imgur.com/a/xmogHTC) +![Index Tab layout image](https://i.imgur.com/BSsNGL9.png) [Keyboard layout editor](http://www.keyboard-layout-editor.com/##@@_a:7%3B&=CAPS&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F10&=F11&=F12%3B&@=%3C&=1&=2&=3&=4&=5&=6&=7&=8&=9&=0&=+&=%C2%B4%3B&@=TAB&=q&=w&=e&=r&=t&=y&=u&=i&=o&=p&=%C3%A5&=BKSP%3B&@=CTRL&=a&=s&=d&=f&=g&=h&=j&=k&=l&=%C3%B8&=%C3%A6&=%C2%A8%3B&@=SHIFT&=z&=x&=c&=v&=b&=n&=m&=,&=.&=-&=%E2%86%91&=%E2%86%B2%3B&@=ESC&=%C2%A7&=WIN&=LALT&_w:2%3B&=&_w:2%3B&=&=FN&=%2F@&=%E2%86%90&=%E2%86%93&=%E2%86%92) From c01dda288581c45c4bfcc09be6a7a066285cc4ba Mon Sep 17 00:00:00 2001 From: Kyrre Havik Date: Sun, 24 Oct 2021 09:22:44 +0200 Subject: [PATCH 26/26] fix: remove white background from image Co-authored-by: Ryan --- keyboards/minimon/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/minimon/readme.md b/keyboards/minimon/readme.md index 5bd0c4d2ca7d..cd020a11108d 100644 --- a/keyboards/minimon/readme.md +++ b/keyboards/minimon/readme.md @@ -1,4 +1,4 @@ -![Minimon logo](https://i.imgur.com/4SWEH5K.png) +![Minimon logo](https://i.imgur.com/4SWEH5Kh.png) Having fun making keyboards for the northern marked, as we need an extra column for our extended alphabets.