From e350787497a06b6d0601b78e37b8f127121e32d6 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Sun, 27 Feb 2022 07:43:22 -0500 Subject: [PATCH 01/12] iskar initial commit --- keyboards/drewkeys/iskar/Iskar.c | 17 ++ keyboards/drewkeys/iskar/Iskar.h | 41 +++++ keyboards/drewkeys/iskar/config.h | 152 ++++++++++++++++++ keyboards/drewkeys/iskar/info.json | 19 +++ .../drewkeys/iskar/keymaps/default/keymap.c | 33 ++++ .../drewkeys/iskar/keymaps/default/readme.md | 1 + keyboards/drewkeys/iskar/readme.md | 19 +++ keyboards/drewkeys/iskar/rules.mk | 22 +++ 8 files changed, 304 insertions(+) create mode 100644 keyboards/drewkeys/iskar/Iskar.c create mode 100644 keyboards/drewkeys/iskar/Iskar.h create mode 100644 keyboards/drewkeys/iskar/config.h create mode 100644 keyboards/drewkeys/iskar/info.json create mode 100644 keyboards/drewkeys/iskar/keymaps/default/keymap.c create mode 100644 keyboards/drewkeys/iskar/keymaps/default/readme.md create mode 100644 keyboards/drewkeys/iskar/readme.md create mode 100644 keyboards/drewkeys/iskar/rules.mk diff --git a/keyboards/drewkeys/iskar/Iskar.c b/keyboards/drewkeys/iskar/Iskar.c new file mode 100644 index 000000000000..36dbe311f7e1 --- /dev/null +++ b/keyboards/drewkeys/iskar/Iskar.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Drewkeys + * + * 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 "Iskar.h" diff --git a/keyboards/drewkeys/iskar/Iskar.h b/keyboards/drewkeys/iskar/Iskar.h new file mode 100644 index 000000000000..ad47447e3a5f --- /dev/null +++ b/keyboards/drewkeys/iskar/Iskar.h @@ -0,0 +1,41 @@ +/* Copyright 2021 Drewkeys + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h new file mode 100644 index 000000000000..1ec820e13977 --- /dev/null +++ b/keyboards/drewkeys/iskar/config.h @@ -0,0 +1,152 @@ +/* +Copyright 2021 Drewkeys + +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 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Drewkeys +#define PRODUCT Iskar + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } +#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define LED_NUM_LOCK_PIN B0 +//#define LED_CAPS_LOCK_PIN B1 +//#define LED_SCROLL_LOCK_PIN B2 +//#define LED_COMPOSE_PIN B3 +//#define LED_KANA_PIN B4 + +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING + +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# define RGBLIGHT_HUE_STEP 8 +//# define RGBLIGHT_SAT_STEP 8 +//# define RGBLIGHT_VAL_STEP 8 +//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ +//# define RGBLIGHT_ANIMATIONS +/*== or choose 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 +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif + +/* 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 + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json new file mode 100644 index 000000000000..7657e087566c --- /dev/null +++ b/keyboards/drewkeys/iskar/info.json @@ -0,0 +1,19 @@ +{ + "keyboard_name": "Iskar", + "url": "", + "maintainer": "Drewkeys", + "width": 3, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + + {"label": "k10", "x": 0, "y": 1, "w": 1.5}, + {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + ] + } + } +} diff --git a/keyboards/drewkeys/iskar/keymaps/default/keymap.c b/keyboards/drewkeys/iskar/keymaps/default/keymap.c new file mode 100644 index 000000000000..6c55293e511b --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Drewkeys + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_ESC, 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_DEL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/drewkeys/iskar/keymaps/default/readme.md b/keyboards/drewkeys/iskar/keymaps/default/readme.md new file mode 100644 index 000000000000..7499aba535ee --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md new file mode 100644 index 000000000000..46735c00ee0e --- /dev/null +++ b/keyboards/drewkeys/iskar/readme.md @@ -0,0 +1,19 @@ +# Iskar + +![Iskar](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Drewkeys](https://github.com/yourusername) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make Iskar:default + +Flashing example for this keyboard: + + make Iskar:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk new file mode 100644 index 000000000000..5c0d8f307c54 --- /dev/null +++ b/keyboards/drewkeys/iskar/rules.mk @@ -0,0 +1,22 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # 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 = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From e99cc6a54a92ae50f4c658ca1b907aaf4a98236d Mon Sep 17 00:00:00 2001 From: drewpyun Date: Tue, 1 Mar 2022 03:06:01 -0500 Subject: [PATCH 02/12] testing --- keyboards/drewkeys/iskar/rules.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk index 5c0d8f307c54..fa096b52eca8 100644 --- a/keyboards/drewkeys/iskar/rules.mk +++ b/keyboards/drewkeys/iskar/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +# test to see if it adds From 6d3b9c1a714ff12b550d5a6f379c27bf72e70981 Mon Sep 17 00:00:00 2001 From: drew pyun Date: Sun, 6 Mar 2022 20:42:05 -0500 Subject: [PATCH 03/12] added info.json to iskar --- keyboards/drewkeys/iskar/info.json | 304 +++++++++++++++++- .../drewkeys/iskar/keymaps/split_bs/keymap.c | 33 ++ .../drewkeys/iskar/keymaps/split_bs/readme.md | 1 + .../drewkeys/iskar/keymaps/tsangan/keymap.c | 33 ++ .../drewkeys/iskar/keymaps/tsangan/readme.md | 1 + .../iskar/keymaps/tsangan_split_bs/keymap.c | 33 ++ .../iskar/keymaps/tsangan_split_bs/readme.md | 1 + 7 files changed, 398 insertions(+), 8 deletions(-) create mode 100644 keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c create mode 100644 keyboards/drewkeys/iskar/keymaps/split_bs/readme.md create mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c create mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan/readme.md create mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c create mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json index 7657e087566c..8e3c86c1552b 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/info.json @@ -1,18 +1,306 @@ { "keyboard_name": "Iskar", - "url": "", + "url": "https://bitmapstudio.xyz/collections/iskar", "maintainer": "Drewkeys", - "width": 3, - "height": 2, "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, + {"label": "Esc k00", "x": 0, "y": 0}, + {"label": "1 k01", "x": 1, "y": 0}, + {"label": "2 k02", "x": 2, "y": 0}, + {"label": "3 k10", "x": 3, "y": 0}, + {"label": "4 k10", "x": 4, "y": 0}, + {"label": "5 k12", "x": 5, "y": 0}, + {"label": "6 k12", "x": 6, "y": 0}, + {"label": "7 k12", "x": 7, "y": 0}, + {"label": "8 k12", "x": 8, "y": 0}, + {"label": "9 k12", "x": 9, "y": 0}, + {"label": "0 k12", "x": 10, "y": 0}, + {"label": "- k12", "x": 11, "y": 0}, + {"label": "= k12", "x": 12, "y": 0}, + {"label": "bsp k12", "x": 13, "y": 0}, + {"label": "bsp extra k12", "x": 14, "y": 0}, + {"label": "del k12", "x": 15, "y": 0}, - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k12", "x": 1.5, "y": 1, "w": 1.5} + {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, + {"label": "q k12", "x": 1.5, "y": 1}, + {"label": "w k12", "x": 2.5, "y": 1}, + {"label": "e k12", "x": 3.5, "y": 1}, + {"label": "r k12", "x": 4.5, "y": 1}, + {"label": "t k12", "x": 5.5, "y": 1}, + {"label": "y k12", "x": 6.5, "y": 1}, + {"label": "u k12", "x": 7.5, "y": 1}, + {"label": "i k12", "x": 8.5, "y": 1}, + {"label": "o k12", "x": 9.5, "y": 1}, + {"label": "p k12", "x": 10.5, "y": 1}, + {"label": "[ k12", "x": 11.5, "y": 1}, + {"label": "] k12", "x": 12.5, "y": 1}, + {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home k12", "x": 15, "y": 1}, + + {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, + {"label": "a k12", "x": 1.75, "y": 2}, + {"label": "s k12", "x": 2.75, "y": 2}, + {"label": "d k12", "x": 3.75, "y": 2}, + {"label": "f k12", "x": 4.75, "y": 2}, + {"label": "g k12", "x": 5.75, "y": 2}, + {"label": "h k12", "x": 6.75, "y": 2}, + {"label": "j k12", "x": 7.75, "y": 2}, + {"label": "k k12", "x": 8.75, "y": 2}, + {"label": "l k12", "x": 9.75, "y": 2}, + {"label": "; k12", "x": 10.75, "y": 2}, + {"label": "' k12", "x": 11.75, "y": 2}, + {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up k12", "x": 15, "y": 2}, + + {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z k12", "x": 1.5, "y": 3}, + {"label": "x k12", "x": 1.5, "y": 3}, + {"label": "c k12", "x": 1.5, "y": 3}, + {"label": "v k12", "x": 1.5, "y": 3}, + {"label": "b k12", "x": 1.5, "y": 3}, + {"label": "n k12", "x": 1.5, "y": 3}, + {"label": "m k12", "x": 1.5, "y": 3}, + {"label": ", k12", "x": 1.5, "y": 3}, + {"label": ". k12", "x": 1.5, "y": 3}, + {"label": "/ k12", "x": 1.5, "y": 3}, + {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up k12", "x": 1.5, "y": 3}, + {"label": "pg dn k12", "x": 1.5, "y": 3}, + + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "win k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 6.25}, + {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "down k12", "x": 1.5, "y": 4}, + {"label": "right k12", "x": 1.5, "y": 4} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"label": "Esc k00", "x": 0, "y": 0}, + {"label": "1 k01", "x": 1, "y": 0}, + {"label": "2 k02", "x": 2, "y": 0}, + {"label": "3 k10", "x": 3, "y": 0}, + {"label": "4 k10", "x": 4, "y": 0}, + {"label": "5 k12", "x": 5, "y": 0}, + {"label": "6 k12", "x": 6, "y": 0}, + {"label": "7 k12", "x": 7, "y": 0}, + {"label": "8 k12", "x": 8, "y": 0}, + {"label": "9 k12", "x": 9, "y": 0}, + {"label": "0 k12", "x": 10, "y": 0}, + {"label": "- k12", "x": 11, "y": 0}, + {"label": "= k12", "x": 12, "y": 0}, + {"label": "bsp k12", "x": 13, "y": 0, "w": 2}, + {"label": "del k12", "x": 15, "y": 0}, + + {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, + {"label": "q k12", "x": 1.5, "y": 1}, + {"label": "w k12", "x": 2.5, "y": 1}, + {"label": "e k12", "x": 3.5, "y": 1}, + {"label": "r k12", "x": 4.5, "y": 1}, + {"label": "t k12", "x": 5.5, "y": 1}, + {"label": "y k12", "x": 6.5, "y": 1}, + {"label": "u k12", "x": 7.5, "y": 1}, + {"label": "i k12", "x": 8.5, "y": 1}, + {"label": "o k12", "x": 9.5, "y": 1}, + {"label": "p k12", "x": 10.5, "y": 1}, + {"label": "[ k12", "x": 11.5, "y": 1}, + {"label": "] k12", "x": 12.5, "y": 1}, + {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home k12", "x": 15, "y": 1}, + + {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, + {"label": "a k12", "x": 1.75, "y": 2}, + {"label": "s k12", "x": 2.75, "y": 2}, + {"label": "d k12", "x": 3.75, "y": 2}, + {"label": "f k12", "x": 4.75, "y": 2}, + {"label": "g k12", "x": 5.75, "y": 2}, + {"label": "h k12", "x": 6.75, "y": 2}, + {"label": "j k12", "x": 7.75, "y": 2}, + {"label": "k k12", "x": 8.75, "y": 2}, + {"label": "l k12", "x": 9.75, "y": 2}, + {"label": "; k12", "x": 10.75, "y": 2}, + {"label": "' k12", "x": 11.75, "y": 2}, + {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up k12", "x": 15, "y": 2}, + + {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z k12", "x": 1.5, "y": 3}, + {"label": "x k12", "x": 1.5, "y": 3}, + {"label": "c k12", "x": 1.5, "y": 3}, + {"label": "v k12", "x": 1.5, "y": 3}, + {"label": "b k12", "x": 1.5, "y": 3}, + {"label": "n k12", "x": 1.5, "y": 3}, + {"label": "m k12", "x": 1.5, "y": 3}, + {"label": ", k12", "x": 1.5, "y": 3}, + {"label": ". k12", "x": 1.5, "y": 3}, + {"label": "/ k12", "x": 1.5, "y": 3}, + {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up k12", "x": 1.5, "y": 3}, + {"label": "pg dn k12", "x": 1.5, "y": 3}, + + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "win k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 6.25}, + {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "down k12", "x": 1.5, "y": 4}, + {"label": "right k12", "x": 1.5, "y": 4} + ] + }, + "LAYOUT_tsangan": { + "layout": [ + {"label": "Esc k00", "x": 0, "y": 0}, + {"label": "1 k01", "x": 1, "y": 0}, + {"label": "2 k02", "x": 2, "y": 0}, + {"label": "3 k10", "x": 3, "y": 0}, + {"label": "4 k10", "x": 4, "y": 0}, + {"label": "5 k12", "x": 5, "y": 0}, + {"label": "6 k12", "x": 6, "y": 0}, + {"label": "7 k12", "x": 7, "y": 0}, + {"label": "8 k12", "x": 8, "y": 0}, + {"label": "9 k12", "x": 9, "y": 0}, + {"label": "0 k12", "x": 10, "y": 0}, + {"label": "- k12", "x": 11, "y": 0}, + {"label": "= k12", "x": 12, "y": 0}, + {"label": "bsp k12", "x": 13, "y": 0, "w": 2}, + {"label": "del k12", "x": 15, "y": 0}, + + {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, + {"label": "q k12", "x": 1.5, "y": 1}, + {"label": "w k12", "x": 2.5, "y": 1}, + {"label": "e k12", "x": 3.5, "y": 1}, + {"label": "r k12", "x": 4.5, "y": 1}, + {"label": "t k12", "x": 5.5, "y": 1}, + {"label": "y k12", "x": 6.5, "y": 1}, + {"label": "u k12", "x": 7.5, "y": 1}, + {"label": "i k12", "x": 8.5, "y": 1}, + {"label": "o k12", "x": 9.5, "y": 1}, + {"label": "p k12", "x": 10.5, "y": 1}, + {"label": "[ k12", "x": 11.5, "y": 1}, + {"label": "] k12", "x": 12.5, "y": 1}, + {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home k12", "x": 15, "y": 1}, + + {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, + {"label": "a k12", "x": 1.75, "y": 2}, + {"label": "s k12", "x": 2.75, "y": 2}, + {"label": "d k12", "x": 3.75, "y": 2}, + {"label": "f k12", "x": 4.75, "y": 2}, + {"label": "g k12", "x": 5.75, "y": 2}, + {"label": "h k12", "x": 6.75, "y": 2}, + {"label": "j k12", "x": 7.75, "y": 2}, + {"label": "k k12", "x": 8.75, "y": 2}, + {"label": "l k12", "x": 9.75, "y": 2}, + {"label": "; k12", "x": 10.75, "y": 2}, + {"label": "' k12", "x": 11.75, "y": 2}, + {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up k12", "x": 15, "y": 2}, + + {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z k12", "x": 1.5, "y": 3}, + {"label": "x k12", "x": 1.5, "y": 3}, + {"label": "c k12", "x": 1.5, "y": 3}, + {"label": "v k12", "x": 1.5, "y": 3}, + {"label": "b k12", "x": 1.5, "y": 3}, + {"label": "n k12", "x": 1.5, "y": 3}, + {"label": "m k12", "x": 1.5, "y": 3}, + {"label": ", k12", "x": 1.5, "y": 3}, + {"label": ". k12", "x": 1.5, "y": 3}, + {"label": "/ k12", "x": 1.5, "y": 3}, + {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up k12", "x": 1.5, "y": 3}, + {"label": "pg dn k12", "x": 1.5, "y": 3}, + + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "win k12", "x": 1.5, "y": 4}, + {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 7}, + {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "down k12", "x": 1.5, "y": 4}, + {"label": "right k12", "x": 1.5, "y": 4} + ] + }, + "LAYOUT_tsangan_split_bs": { + "layout": [ + {"label": "Esc k00", "x": 0, "y": 0}, + {"label": "1 k01", "x": 1, "y": 0}, + {"label": "2 k02", "x": 2, "y": 0}, + {"label": "3 k10", "x": 3, "y": 0}, + {"label": "4 k10", "x": 4, "y": 0}, + {"label": "5 k12", "x": 5, "y": 0}, + {"label": "6 k12", "x": 6, "y": 0}, + {"label": "7 k12", "x": 7, "y": 0}, + {"label": "8 k12", "x": 8, "y": 0}, + {"label": "9 k12", "x": 9, "y": 0}, + {"label": "0 k12", "x": 10, "y": 0}, + {"label": "- k12", "x": 11, "y": 0}, + {"label": "= k12", "x": 12, "y": 0}, + {"label": "bsp k12", "x": 13, "y": 0}, + {"label": "bsp extra k12", "x": 14, "y": 0}, + {"label": "del k12", "x": 15, "y": 0}, + + {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, + {"label": "q k12", "x": 1.5, "y": 1}, + {"label": "w k12", "x": 2.5, "y": 1}, + {"label": "e k12", "x": 3.5, "y": 1}, + {"label": "r k12", "x": 4.5, "y": 1}, + {"label": "t k12", "x": 5.5, "y": 1}, + {"label": "y k12", "x": 6.5, "y": 1}, + {"label": "u k12", "x": 7.5, "y": 1}, + {"label": "i k12", "x": 8.5, "y": 1}, + {"label": "o k12", "x": 9.5, "y": 1}, + {"label": "p k12", "x": 10.5, "y": 1}, + {"label": "[ k12", "x": 11.5, "y": 1}, + {"label": "] k12", "x": 12.5, "y": 1}, + {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home k12", "x": 15, "y": 1}, + + {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, + {"label": "a k12", "x": 1.75, "y": 2}, + {"label": "s k12", "x": 2.75, "y": 2}, + {"label": "d k12", "x": 3.75, "y": 2}, + {"label": "f k12", "x": 4.75, "y": 2}, + {"label": "g k12", "x": 5.75, "y": 2}, + {"label": "h k12", "x": 6.75, "y": 2}, + {"label": "j k12", "x": 7.75, "y": 2}, + {"label": "k k12", "x": 8.75, "y": 2}, + {"label": "l k12", "x": 9.75, "y": 2}, + {"label": "; k12", "x": 10.75, "y": 2}, + {"label": "' k12", "x": 11.75, "y": 2}, + {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up k12", "x": 15, "y": 2}, + + {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z k12", "x": 1.5, "y": 3}, + {"label": "x k12", "x": 1.5, "y": 3}, + {"label": "c k12", "x": 1.5, "y": 3}, + {"label": "v k12", "x": 1.5, "y": 3}, + {"label": "b k12", "x": 1.5, "y": 3}, + {"label": "n k12", "x": 1.5, "y": 3}, + {"label": "m k12", "x": 1.5, "y": 3}, + {"label": ", k12", "x": 1.5, "y": 3}, + {"label": ". k12", "x": 1.5, "y": 3}, + {"label": "/ k12", "x": 1.5, "y": 3}, + {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up k12", "x": 1.5, "y": 3}, + {"label": "pg dn k12", "x": 1.5, "y": 3}, + + {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "win k12", "x": 1.5, "y": 4}, + {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 7}, + {"label": "fn k12", "x": 1.5, "y": 4}, + {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "down k12", "x": 1.5, "y": 4}, + {"label": "right k12", "x": 1.5, "y": 4} ] } } diff --git a/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c b/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c new file mode 100644 index 000000000000..6c55293e511b --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Drewkeys + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_ESC, 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_DEL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md b/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md new file mode 100644 index 000000000000..7499aba535ee --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md @@ -0,0 +1 @@ +# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c b/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c new file mode 100644 index 000000000000..6c55293e511b --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Drewkeys + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_ESC, 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_DEL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md b/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md new file mode 100644 index 000000000000..7499aba535ee --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md @@ -0,0 +1 @@ +# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c new file mode 100644 index 000000000000..6c55293e511b --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2021 Drewkeys + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_ESC, 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_DEL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md new file mode 100644 index 000000000000..7499aba535ee --- /dev/null +++ b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md @@ -0,0 +1 @@ +# The default keymap for Iskar From 5bcf69c51c74baa39ee571c486405078b0cd94ff Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Sun, 6 Mar 2022 21:12:54 -0500 Subject: [PATCH 04/12] Updated read.me --- keyboards/drewkeys/iskar/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md index 46735c00ee0e..4f604ad04cc3 100644 --- a/keyboards/drewkeys/iskar/readme.md +++ b/keyboards/drewkeys/iskar/readme.md @@ -1,19 +1,19 @@ # Iskar -![Iskar](imgur.com image replace me!) +![Iskar](https://bitmapstudio.xyz/collections/iskar) -*A short description of the keyboard/project* +*65% PCB for Bitmap studio's Iskar* -* Keyboard Maintainer: [Drewkeys](https://github.com/yourusername) +* Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) * Hardware Supported: *The PCBs, controllers supported* * Hardware Availability: *Links to where you can find this hardware* Make example for this keyboard (after setting up your build environment): - make Iskar:default + make drewkkeys/iskar:default Flashing example for this keyboard: - make Iskar:default:flash + make drewkeys/iskar:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 6c9262990f7a937cb5983aac40fcb05b4670b79a Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 7 Mar 2022 07:12:07 -0500 Subject: [PATCH 05/12] updated info.json removed unnessary keymap folders, fixed rules.mk, added second layer to default layout, added vendor/product id, tested and compiled --- keyboards/drewkeys/iskar/Iskar.c | 2 +- keyboards/drewkeys/iskar/Iskar.h | 79 ++- keyboards/drewkeys/iskar/config.h | 5 +- keyboards/drewkeys/iskar/info.json | 618 ++++++++++-------- .../drewkeys/iskar/keymaps/default/keymap.c | 22 +- .../drewkeys/iskar/keymaps/default/readme.md | 2 +- .../drewkeys/iskar/keymaps/split_bs/keymap.c | 33 - .../drewkeys/iskar/keymaps/split_bs/readme.md | 1 - .../drewkeys/iskar/keymaps/tsangan/keymap.c | 33 - .../drewkeys/iskar/keymaps/tsangan/readme.md | 1 - .../iskar/keymaps/tsangan_split_bs/keymap.c | 33 - .../iskar/keymaps/tsangan_split_bs/readme.md | 1 - keyboards/drewkeys/iskar/readme.md | 2 +- keyboards/drewkeys/iskar/rules.mk | 10 +- 14 files changed, 438 insertions(+), 404 deletions(-) delete mode 100644 keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c delete mode 100644 keyboards/drewkeys/iskar/keymaps/split_bs/readme.md delete mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c delete mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan/readme.md delete mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c delete mode 100644 keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md diff --git a/keyboards/drewkeys/iskar/Iskar.c b/keyboards/drewkeys/iskar/Iskar.c index 36dbe311f7e1..32ea7aa2e428 100644 --- a/keyboards/drewkeys/iskar/Iskar.c +++ b/keyboards/drewkeys/iskar/Iskar.c @@ -14,4 +14,4 @@ * along with this program. If not, see . */ -#include "Iskar.h" +#include "iskar.h" diff --git a/keyboards/drewkeys/iskar/Iskar.h b/keyboards/drewkeys/iskar/Iskar.h index ad47447e3a5f..9784b2be2d95 100644 --- a/keyboards/drewkeys/iskar/Iskar.h +++ b/keyboards/drewkeys/iskar/Iskar.h @@ -17,15 +17,21 @@ #pragma once #include "quantum.h" +// Corresponding changes to the layout names and/or definitions must also be made to info.json -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ +/* Standard arrangement / LAYOUT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │▓│4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ #define LAYOUT( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ @@ -39,3 +45,60 @@ { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ } + +/* Standard arrangement / 65 ANSI + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ + +/* Standard arrangement / 65 ANSI SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ + + +/* Standard arrangement / 65 TSANGAN + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ + +/* Standard arrangement / 65 TSANGAN SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h index 1ec820e13977..b97bd4a6ca9a 100644 --- a/keyboards/drewkeys/iskar/config.h +++ b/keyboards/drewkeys/iskar/config.h @@ -20,8 +20,8 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define VENDOR_ID 0xDE43 +#define PRODUCT_ID 0x1284 #define DEVICE_VER 0x0001 #define MANUFACTURER Drewkeys #define PRODUCT Iskar @@ -40,6 +40,7 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 #define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } #define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } #define UNUSED_PINS diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json index 8e3c86c1552b..59a1974e2c87 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/info.json @@ -5,302 +5,378 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Esc k00", "x": 0, "y": 0}, - {"label": "1 k01", "x": 1, "y": 0}, - {"label": "2 k02", "x": 2, "y": 0}, - {"label": "3 k10", "x": 3, "y": 0}, - {"label": "4 k10", "x": 4, "y": 0}, - {"label": "5 k12", "x": 5, "y": 0}, - {"label": "6 k12", "x": 6, "y": 0}, - {"label": "7 k12", "x": 7, "y": 0}, - {"label": "8 k12", "x": 8, "y": 0}, - {"label": "9 k12", "x": 9, "y": 0}, - {"label": "0 k12", "x": 10, "y": 0}, - {"label": "- k12", "x": 11, "y": 0}, - {"label": "= k12", "x": 12, "y": 0}, - {"label": "bsp k12", "x": 13, "y": 0}, - {"label": "bsp extra k12", "x": 14, "y": 0}, - {"label": "del k12", "x": 15, "y": 0}, + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, - {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, - {"label": "q k12", "x": 1.5, "y": 1}, - {"label": "w k12", "x": 2.5, "y": 1}, - {"label": "e k12", "x": 3.5, "y": 1}, - {"label": "r k12", "x": 4.5, "y": 1}, - {"label": "t k12", "x": 5.5, "y": 1}, - {"label": "y k12", "x": 6.5, "y": 1}, - {"label": "u k12", "x": 7.5, "y": 1}, - {"label": "i k12", "x": 8.5, "y": 1}, - {"label": "o k12", "x": 9.5, "y": 1}, - {"label": "p k12", "x": 10.5, "y": 1}, - {"label": "[ k12", "x": 11.5, "y": 1}, - {"label": "] k12", "x": 12.5, "y": 1}, - {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home k12", "x": 15, "y": 1}, + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, - {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, - {"label": "a k12", "x": 1.75, "y": 2}, - {"label": "s k12", "x": 2.75, "y": 2}, - {"label": "d k12", "x": 3.75, "y": 2}, - {"label": "f k12", "x": 4.75, "y": 2}, - {"label": "g k12", "x": 5.75, "y": 2}, - {"label": "h k12", "x": 6.75, "y": 2}, - {"label": "j k12", "x": 7.75, "y": 2}, - {"label": "k k12", "x": 8.75, "y": 2}, - {"label": "l k12", "x": 9.75, "y": 2}, - {"label": "; k12", "x": 10.75, "y": 2}, - {"label": "' k12", "x": 11.75, "y": 2}, - {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up k12", "x": 15, "y": 2}, + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z k12", "x": 1.5, "y": 3}, - {"label": "x k12", "x": 1.5, "y": 3}, - {"label": "c k12", "x": 1.5, "y": 3}, - {"label": "v k12", "x": 1.5, "y": 3}, - {"label": "b k12", "x": 1.5, "y": 3}, - {"label": "n k12", "x": 1.5, "y": 3}, - {"label": "m k12", "x": 1.5, "y": 3}, - {"label": ", k12", "x": 1.5, "y": 3}, - {"label": ". k12", "x": 1.5, "y": 3}, - {"label": "/ k12", "x": 1.5, "y": 3}, - {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up k12", "x": 1.5, "y": 3}, - {"label": "pg dn k12", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 1.5, "y": 3}, + {"label": "x 3,3", "x": 1.5, "y": 3}, + {"label": "c 3,4", "x": 1.5, "y": 3}, + {"label": "v 3,5", "x": 1.5, "y": 3}, + {"label": "b 3,6", "x": 1.5, "y": 3}, + {"label": "n 3,7", "x": 1.5, "y": 3}, + {"label": "m 3,8", "x": 1.5, "y": 3}, + {"label": ", 3,9", "x": 1.5, "y": 3}, + {"label": ". 3,10", "x": 1.5, "y": 3}, + {"label": "/ 3,11", "x": 1.5, "y": 3}, + {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 1.5, "y": 3}, + {"label": "pg dn 3,15", "x": 1.5, "y": 3}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "win k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 6.25}, - {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "down k12", "x": 1.5, "y": 4}, - {"label": "right k12", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 1.5, "y": 4}, + {"label": "down 4,14", "x": 1.5, "y": 4}, + {"label": "right 4,15", "x": 1.5, "y": 4} ] }, - "LAYOUT_ansi": { + "LAYOUT_65_ansi": { "layout": [ - {"label": "Esc k00", "x": 0, "y": 0}, - {"label": "1 k01", "x": 1, "y": 0}, - {"label": "2 k02", "x": 2, "y": 0}, - {"label": "3 k10", "x": 3, "y": 0}, - {"label": "4 k10", "x": 4, "y": 0}, - {"label": "5 k12", "x": 5, "y": 0}, - {"label": "6 k12", "x": 6, "y": 0}, - {"label": "7 k12", "x": 7, "y": 0}, - {"label": "8 k12", "x": 8, "y": 0}, - {"label": "9 k12", "x": 9, "y": 0}, - {"label": "0 k12", "x": 10, "y": 0}, - {"label": "- k12", "x": 11, "y": 0}, - {"label": "= k12", "x": 12, "y": 0}, - {"label": "bsp k12", "x": 13, "y": 0, "w": 2}, - {"label": "del k12", "x": 15, "y": 0}, + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0, "w": 2}, + {"label": "del 0,15", "x": 15, "y": 0}, - {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, - {"label": "q k12", "x": 1.5, "y": 1}, - {"label": "w k12", "x": 2.5, "y": 1}, - {"label": "e k12", "x": 3.5, "y": 1}, - {"label": "r k12", "x": 4.5, "y": 1}, - {"label": "t k12", "x": 5.5, "y": 1}, - {"label": "y k12", "x": 6.5, "y": 1}, - {"label": "u k12", "x": 7.5, "y": 1}, - {"label": "i k12", "x": 8.5, "y": 1}, - {"label": "o k12", "x": 9.5, "y": 1}, - {"label": "p k12", "x": 10.5, "y": 1}, - {"label": "[ k12", "x": 11.5, "y": 1}, - {"label": "] k12", "x": 12.5, "y": 1}, - {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home k12", "x": 15, "y": 1}, + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, - {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, - {"label": "a k12", "x": 1.75, "y": 2}, - {"label": "s k12", "x": 2.75, "y": 2}, - {"label": "d k12", "x": 3.75, "y": 2}, - {"label": "f k12", "x": 4.75, "y": 2}, - {"label": "g k12", "x": 5.75, "y": 2}, - {"label": "h k12", "x": 6.75, "y": 2}, - {"label": "j k12", "x": 7.75, "y": 2}, - {"label": "k k12", "x": 8.75, "y": 2}, - {"label": "l k12", "x": 9.75, "y": 2}, - {"label": "; k12", "x": 10.75, "y": 2}, - {"label": "' k12", "x": 11.75, "y": 2}, - {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up k12", "x": 15, "y": 2}, + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z k12", "x": 1.5, "y": 3}, - {"label": "x k12", "x": 1.5, "y": 3}, - {"label": "c k12", "x": 1.5, "y": 3}, - {"label": "v k12", "x": 1.5, "y": 3}, - {"label": "b k12", "x": 1.5, "y": 3}, - {"label": "n k12", "x": 1.5, "y": 3}, - {"label": "m k12", "x": 1.5, "y": 3}, - {"label": ", k12", "x": 1.5, "y": 3}, - {"label": ". k12", "x": 1.5, "y": 3}, - {"label": "/ k12", "x": 1.5, "y": 3}, - {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up k12", "x": 1.5, "y": 3}, - {"label": "pg dn k12", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 1.5, "y": 3}, + {"label": "x 3,3", "x": 1.5, "y": 3}, + {"label": "c 3,4", "x": 1.5, "y": 3}, + {"label": "v 3,5", "x": 1.5, "y": 3}, + {"label": "b 3,6", "x": 1.5, "y": 3}, + {"label": "n 3,7", "x": 1.5, "y": 3}, + {"label": "m 3,8", "x": 1.5, "y": 3}, + {"label": ", 3,9", "x": 1.5, "y": 3}, + {"label": ". 3,10", "x": 1.5, "y": 3}, + {"label": "/ 3,11", "x": 1.5, "y": 3}, + {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 1.5, "y": 3}, + {"label": "pg dn 3,15", "x": 1.5, "y": 3}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "win k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 6.25}, - {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "down k12", "x": 1.5, "y": 4}, - {"label": "right k12", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 1.5, "y": 4}, + {"label": "down 4,14", "x": 1.5, "y": 4}, + {"label": "right 4,15", "x": 1.5, "y": 4} ] }, - "LAYOUT_tsangan": { + "LAYOUT_65_ansi_split_bs": { "layout": [ - {"label": "Esc k00", "x": 0, "y": 0}, - {"label": "1 k01", "x": 1, "y": 0}, - {"label": "2 k02", "x": 2, "y": 0}, - {"label": "3 k10", "x": 3, "y": 0}, - {"label": "4 k10", "x": 4, "y": 0}, - {"label": "5 k12", "x": 5, "y": 0}, - {"label": "6 k12", "x": 6, "y": 0}, - {"label": "7 k12", "x": 7, "y": 0}, - {"label": "8 k12", "x": 8, "y": 0}, - {"label": "9 k12", "x": 9, "y": 0}, - {"label": "0 k12", "x": 10, "y": 0}, - {"label": "- k12", "x": 11, "y": 0}, - {"label": "= k12", "x": 12, "y": 0}, - {"label": "bsp k12", "x": 13, "y": 0, "w": 2}, - {"label": "del k12", "x": 15, "y": 0}, + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, - {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, - {"label": "q k12", "x": 1.5, "y": 1}, - {"label": "w k12", "x": 2.5, "y": 1}, - {"label": "e k12", "x": 3.5, "y": 1}, - {"label": "r k12", "x": 4.5, "y": 1}, - {"label": "t k12", "x": 5.5, "y": 1}, - {"label": "y k12", "x": 6.5, "y": 1}, - {"label": "u k12", "x": 7.5, "y": 1}, - {"label": "i k12", "x": 8.5, "y": 1}, - {"label": "o k12", "x": 9.5, "y": 1}, - {"label": "p k12", "x": 10.5, "y": 1}, - {"label": "[ k12", "x": 11.5, "y": 1}, - {"label": "] k12", "x": 12.5, "y": 1}, - {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home k12", "x": 15, "y": 1}, + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, - {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, - {"label": "a k12", "x": 1.75, "y": 2}, - {"label": "s k12", "x": 2.75, "y": 2}, - {"label": "d k12", "x": 3.75, "y": 2}, - {"label": "f k12", "x": 4.75, "y": 2}, - {"label": "g k12", "x": 5.75, "y": 2}, - {"label": "h k12", "x": 6.75, "y": 2}, - {"label": "j k12", "x": 7.75, "y": 2}, - {"label": "k k12", "x": 8.75, "y": 2}, - {"label": "l k12", "x": 9.75, "y": 2}, - {"label": "; k12", "x": 10.75, "y": 2}, - {"label": "' k12", "x": 11.75, "y": 2}, - {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up k12", "x": 15, "y": 2}, + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z k12", "x": 1.5, "y": 3}, - {"label": "x k12", "x": 1.5, "y": 3}, - {"label": "c k12", "x": 1.5, "y": 3}, - {"label": "v k12", "x": 1.5, "y": 3}, - {"label": "b k12", "x": 1.5, "y": 3}, - {"label": "n k12", "x": 1.5, "y": 3}, - {"label": "m k12", "x": 1.5, "y": 3}, - {"label": ", k12", "x": 1.5, "y": 3}, - {"label": ". k12", "x": 1.5, "y": 3}, - {"label": "/ k12", "x": 1.5, "y": 3}, - {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up k12", "x": 1.5, "y": 3}, - {"label": "pg dn k12", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 1.5, "y": 3}, + {"label": "x 3,3", "x": 1.5, "y": 3}, + {"label": "c 3,4", "x": 1.5, "y": 3}, + {"label": "v 3,5", "x": 1.5, "y": 3}, + {"label": "b 3,6", "x": 1.5, "y": 3}, + {"label": "n 3,7", "x": 1.5, "y": 3}, + {"label": "m 3,8", "x": 1.5, "y": 3}, + {"label": ", 3,9", "x": 1.5, "y": 3}, + {"label": ". 3,10", "x": 1.5, "y": 3}, + {"label": "/ 3,11", "x": 1.5, "y": 3}, + {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 1.5, "y": 3}, + {"label": "pg dn 3,15", "x": 1.5, "y": 3}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "win k12", "x": 1.5, "y": 4}, - {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 7}, - {"label": "fn k12", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "down k12", "x": 1.5, "y": 4}, - {"label": "right k12", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 1.5, "y": 4}, + {"label": "down 4,14", "x": 1.5, "y": 4}, + {"label": "right 4,15", "x": 1.5, "y": 4} ] }, - "LAYOUT_tsangan_split_bs": { + "LAYOUT_65_tsangan": { "layout": [ - {"label": "Esc k00", "x": 0, "y": 0}, - {"label": "1 k01", "x": 1, "y": 0}, - {"label": "2 k02", "x": 2, "y": 0}, - {"label": "3 k10", "x": 3, "y": 0}, - {"label": "4 k10", "x": 4, "y": 0}, - {"label": "5 k12", "x": 5, "y": 0}, - {"label": "6 k12", "x": 6, "y": 0}, - {"label": "7 k12", "x": 7, "y": 0}, - {"label": "8 k12", "x": 8, "y": 0}, - {"label": "9 k12", "x": 9, "y": 0}, - {"label": "0 k12", "x": 10, "y": 0}, - {"label": "- k12", "x": 11, "y": 0}, - {"label": "= k12", "x": 12, "y": 0}, - {"label": "bsp k12", "x": 13, "y": 0}, - {"label": "bsp extra k12", "x": 14, "y": 0}, - {"label": "del k12", "x": 15, "y": 0}, + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, + {"label": "del 0,15", "x": 15, "y": 0}, - {"label": "tab k12", "x": 0, "y": 1, "w": 1.5}, - {"label": "q k12", "x": 1.5, "y": 1}, - {"label": "w k12", "x": 2.5, "y": 1}, - {"label": "e k12", "x": 3.5, "y": 1}, - {"label": "r k12", "x": 4.5, "y": 1}, - {"label": "t k12", "x": 5.5, "y": 1}, - {"label": "y k12", "x": 6.5, "y": 1}, - {"label": "u k12", "x": 7.5, "y": 1}, - {"label": "i k12", "x": 8.5, "y": 1}, - {"label": "o k12", "x": 9.5, "y": 1}, - {"label": "p k12", "x": 10.5, "y": 1}, - {"label": "[ k12", "x": 11.5, "y": 1}, - {"label": "] k12", "x": 12.5, "y": 1}, - {"label": "| k12", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "home k12", "x": 15, "y": 1}, + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, - {"label": "caps ", "x": 0, "y": 2, "w": 1.75}, - {"label": "a k12", "x": 1.75, "y": 2}, - {"label": "s k12", "x": 2.75, "y": 2}, - {"label": "d k12", "x": 3.75, "y": 2}, - {"label": "f k12", "x": 4.75, "y": 2}, - {"label": "g k12", "x": 5.75, "y": 2}, - {"label": "h k12", "x": 6.75, "y": 2}, - {"label": "j k12", "x": 7.75, "y": 2}, - {"label": "k k12", "x": 8.75, "y": 2}, - {"label": "l k12", "x": 9.75, "y": 2}, - {"label": "; k12", "x": 10.75, "y": 2}, - {"label": "' k12", "x": 11.75, "y": 2}, - {"label": "enter k12", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "pg up k12", "x": 15, "y": 2}, + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift k12", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z k12", "x": 1.5, "y": 3}, - {"label": "x k12", "x": 1.5, "y": 3}, - {"label": "c k12", "x": 1.5, "y": 3}, - {"label": "v k12", "x": 1.5, "y": 3}, - {"label": "b k12", "x": 1.5, "y": 3}, - {"label": "n k12", "x": 1.5, "y": 3}, - {"label": "m k12", "x": 1.5, "y": 3}, - {"label": ", k12", "x": 1.5, "y": 3}, - {"label": ". k12", "x": 1.5, "y": 3}, - {"label": "/ k12", "x": 1.5, "y": 3}, - {"label": "shift k12", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up k12", "x": 1.5, "y": 3}, - {"label": "pg dn k12", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 1.5, "y": 3}, + {"label": "x 3,3", "x": 1.5, "y": 3}, + {"label": "c 3,4", "x": 1.5, "y": 3}, + {"label": "v 3,5", "x": 1.5, "y": 3}, + {"label": "b 3,6", "x": 1.5, "y": 3}, + {"label": "n 3,7", "x": 1.5, "y": 3}, + {"label": "m 3,8", "x": 1.5, "y": 3}, + {"label": ", 3,9", "x": 1.5, "y": 3}, + {"label": ". 3,10", "x": 1.5, "y": 3}, + {"label": "/ 3,11", "x": 1.5, "y": 3}, + {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 1.5, "y": 3}, + {"label": "pg dn 3,15", "x": 1.5, "y": 3}, - {"label": "ctrl k12", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "win k12", "x": 1.5, "y": 4}, - {"label": "alt k12", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "spacebar k12", "x": 1.5, "y": 4, "w": 7}, - {"label": "fn k12", "x": 1.5, "y": 4}, - {"label": "left k12", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "down k12", "x": 1.5, "y": 4}, - {"label": "right k12", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "win 4,1", "x": 1.5, "y": 4}, + {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 1.5, "y": 4}, + {"label": "down 4,14", "x": 1.5, "y": 4}, + {"label": "right 4,15", "x": 1.5, "y": 4} + ] + }, + "LAYOUT_65_tsangan_split_bs": { + "layout": [ + {"label": "Esc 0,0", "x": 0, "y": 0}, + {"label": "1 0,1", "x": 1, "y": 0}, + {"label": "2 0,2", "x": 2, "y": 0}, + {"label": "3 0,3", "x": 3, "y": 0}, + {"label": "4 0,4", "x": 4, "y": 0}, + {"label": "5 0,5", "x": 5, "y": 0}, + {"label": "6 0,6", "x": 6, "y": 0}, + {"label": "7 0,7", "x": 7, "y": 0}, + {"label": "8 0,8", "x": 8, "y": 0}, + {"label": "9 0,9", "x": 9, "y": 0}, + {"label": "0 0,10", "x": 10, "y": 0}, + {"label": "- 0,11", "x": 11, "y": 0}, + {"label": "= 0,12", "x": 12, "y": 0}, + {"label": "bsp extra 0,13", "x": 13, "y": 0}, + {"label": "bsp 0,14", "x": 14, "y": 0}, + {"label": "del 0,15", "x": 15, "y": 0}, + + {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, + {"label": "q 1,2", "x": 1.5, "y": 1}, + {"label": "w 1,3", "x": 2.5, "y": 1}, + {"label": "e 1,4", "x": 3.5, "y": 1}, + {"label": "r 1,5", "x": 4.5, "y": 1}, + {"label": "t 1,6", "x": 5.5, "y": 1}, + {"label": "y 1,7", "x": 6.5, "y": 1}, + {"label": "u 1,8", "x": 7.5, "y": 1}, + {"label": "i 1,9", "x": 8.5, "y": 1}, + {"label": "o 1,10", "x": 9.5, "y": 1}, + {"label": "p 1,11", "x": 10.5, "y": 1}, + {"label": "[ 1,12", "x": 11.5, "y": 1}, + {"label": "] 1,13", "x": 12.5, "y": 1}, + {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5}, + {"label": "home 1,15", "x": 15, "y": 1}, + + {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75}, + {"label": "a 2,2", "x": 1.75, "y": 2}, + {"label": "s 2,3", "x": 2.75, "y": 2}, + {"label": "d 2,4", "x": 3.75, "y": 2}, + {"label": "f 2,5", "x": 4.75, "y": 2}, + {"label": "g 2,6", "x": 5.75, "y": 2}, + {"label": "h 2,7", "x": 6.75, "y": 2}, + {"label": "j 2,8", "x": 7.75, "y": 2}, + {"label": "k 2,9", "x": 8.75, "y": 2}, + {"label": "l 2,10", "x": 9.75, "y": 2}, + {"label": "; 2,11", "x": 10.75, "y": 2}, + {"label": "' 2,12", "x": 11.75, "y": 2}, + {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, + {"label": "pg up 2,15", "x": 15, "y": 2}, + + {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 1.5, "y": 3}, + {"label": "x 3,3", "x": 1.5, "y": 3}, + {"label": "c 3,4", "x": 1.5, "y": 3}, + {"label": "v 3,5", "x": 1.5, "y": 3}, + {"label": "b 3,6", "x": 1.5, "y": 3}, + {"label": "n 3,7", "x": 1.5, "y": 3}, + {"label": "m 3,8", "x": 1.5, "y": 3}, + {"label": ", 3,9", "x": 1.5, "y": 3}, + {"label": ". 3,10", "x": 1.5, "y": 3}, + {"label": "/ 3,11", "x": 1.5, "y": 3}, + {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 1.5, "y": 3}, + {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + + {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "win 4,1", "x": 1.5, "y": 4}, + {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 1.5, "y": 4}, + {"label": "down 4,14", "x": 1.5, "y": 4}, + {"label": "right 4,15", "x": 1.5, "y": 4} ] } } diff --git a/keyboards/drewkeys/iskar/keymaps/default/keymap.c b/keyboards/drewkeys/iskar/keymaps/default/keymap.c index 6c55293e511b..d97403dfd5e6 100644 --- a/keyboards/drewkeys/iskar/keymaps/default/keymap.c +++ b/keyboards/drewkeys/iskar/keymaps/default/keymap.c @@ -15,19 +15,19 @@ */ #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_ESC, 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_DEL, KC_BSPC, KC_INS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + LAYOUT( + QK_GESC, 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_DEL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT + ), + LAYOUT( + KC_GRAVE, 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_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/drewkeys/iskar/keymaps/default/readme.md b/keyboards/drewkeys/iskar/keymaps/default/readme.md index 7499aba535ee..d7cffe7242cf 100644 --- a/keyboards/drewkeys/iskar/keymaps/default/readme.md +++ b/keyboards/drewkeys/iskar/keymaps/default/readme.md @@ -1 +1 @@ -# The default keymap for Iskar +# The default keymap for iskar -- ansi and split back space diff --git a/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c b/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c deleted file mode 100644 index 6c55293e511b..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/split_bs/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Drewkeys - * - * 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 - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_ESC, 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_DEL, KC_BSPC, KC_INS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; diff --git a/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md b/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md deleted file mode 100644 index 7499aba535ee..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c b/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c deleted file mode 100644 index 6c55293e511b..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/tsangan/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Drewkeys - * - * 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 - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_ESC, 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_DEL, KC_BSPC, KC_INS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md b/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md deleted file mode 100644 index 7499aba535ee..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/tsangan/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c deleted file mode 100644 index 6c55293e511b..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/keymap.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Drewkeys - * - * 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 - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_ESC, 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_DEL, KC_BSPC, KC_INS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; diff --git a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md b/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md deleted file mode 100644 index 7499aba535ee..000000000000 --- a/keyboards/drewkeys/iskar/keymaps/tsangan_split_bs/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Iskar diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md index 4f604ad04cc3..5e0a1932f2ac 100644 --- a/keyboards/drewkeys/iskar/readme.md +++ b/keyboards/drewkeys/iskar/readme.md @@ -6,7 +6,7 @@ * Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) * Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Availability: *https://bitmapstudio.xyz/collections/iskar* Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk index fa096b52eca8..493fd6845197 100644 --- a/keyboards/drewkeys/iskar/rules.mk +++ b/keyboards/drewkeys/iskar/rules.mk @@ -7,18 +7,14 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = no # 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 = no # USB Nkey Rollover +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - -# test to see if it adds +LTO_ENABLE = yes From 101a6de87d0de42b0e9d3bde99e99f139462d98c Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Mon, 7 Mar 2022 07:17:18 -0500 Subject: [PATCH 06/12] Update readme.md --- keyboards/drewkeys/iskar/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md index 5e0a1932f2ac..3d516ab40b9d 100644 --- a/keyboards/drewkeys/iskar/readme.md +++ b/keyboards/drewkeys/iskar/readme.md @@ -5,7 +5,7 @@ *65% PCB for Bitmap studio's Iskar* * Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) -* Hardware Supported: *The PCBs, controllers supported* +* Hardware Supported: *Made specificaly for Iskar, 65% hotswap supported* * Hardware Availability: *https://bitmapstudio.xyz/collections/iskar* Make example for this keyboard (after setting up your build environment): From 0df806d1ed4dc2e7e2a325f8e4e12a00288ac90b Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Mon, 7 Mar 2022 07:40:14 -0500 Subject: [PATCH 07/12] Update readme.md --- keyboards/drewkeys/iskar/readme.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md index 3d516ab40b9d..e2ae5fbf8ae1 100644 --- a/keyboards/drewkeys/iskar/readme.md +++ b/keyboards/drewkeys/iskar/readme.md @@ -1,6 +1,9 @@ # Iskar -![Iskar](https://bitmapstudio.xyz/collections/iskar) +![Iskar](https://i.imgur.com/qBh0gA2.png) + +![Layouts supported](https://i.imgur.com/SB2G7mL.png) +Note: No split backspace for hotswap vers. *65% PCB for Bitmap studio's Iskar* @@ -16,4 +19,6 @@ Flashing example for this keyboard: make drewkeys/iskar:default:flash +Resetting Board: Press the button on the PCB next to the logo to soft reset the board to reflash (bootloader mode). + See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From d645cd4aa45d640bb3373f82da22919741007662 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 7 Mar 2022 07:45:50 -0500 Subject: [PATCH 08/12] updated info.json, formatted files according to PR checklist --- keyboards/drewkeys/iskar/Iskar.h | 57 -------- keyboards/drewkeys/iskar/config.h | 97 ------------- keyboards/drewkeys/iskar/info.json | 224 ++++++++++++++--------------- 3 files changed, 112 insertions(+), 266 deletions(-) diff --git a/keyboards/drewkeys/iskar/Iskar.h b/keyboards/drewkeys/iskar/Iskar.h index 9784b2be2d95..374c8d5ec564 100644 --- a/keyboards/drewkeys/iskar/Iskar.h +++ b/keyboards/drewkeys/iskar/Iskar.h @@ -45,60 +45,3 @@ { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ } - -/* Standard arrangement / 65 ANSI - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ - * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ -*/ - -/* Standard arrangement / 65 ANSI SPLIT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ - * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ -*/ - - -/* Standard arrangement / 65 TSANGAN - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ - * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ -*/ - -/* Standard arrangement / 65 TSANGAN SPLIT - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ - * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ - * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ - * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ - * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ -*/ diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h index b97bd4a6ca9a..e20369fde03f 100644 --- a/keyboards/drewkeys/iskar/config.h +++ b/keyboards/drewkeys/iskar/config.h @@ -30,16 +30,6 @@ along with this program. If not, see . #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 #define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 } #define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 } @@ -53,101 +43,14 @@ along with this program. If not, see . */ #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose 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 -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - /* 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 -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - /* disable these deprecated features by default */ #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json index 59a1974e2c87..0505fece10d3 100644 --- a/keyboards/drewkeys/iskar/info.json +++ b/keyboards/drewkeys/iskar/info.json @@ -53,30 +53,30 @@ {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 1.5, "y": 3}, - {"label": "x 3,3", "x": 1.5, "y": 3}, - {"label": "c 3,4", "x": 1.5, "y": 3}, - {"label": "v 3,5", "x": 1.5, "y": 3}, - {"label": "b 3,6", "x": 1.5, "y": 3}, - {"label": "n 3,7", "x": 1.5, "y": 3}, - {"label": "m 3,8", "x": 1.5, "y": 3}, - {"label": ", 3,9", "x": 1.5, "y": 3}, - {"label": ". 3,10", "x": 1.5, "y": 3}, - {"label": "/ 3,11", "x": 1.5, "y": 3}, - {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 1.5, "y": 3}, - {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, - {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 1.5, "y": 4}, - {"label": "down 4,14", "x": 1.5, "y": 4}, - {"label": "right 4,15", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} ] }, "LAYOUT_65_ansi": { @@ -94,7 +94,7 @@ {"label": "0 0,10", "x": 10, "y": 0}, {"label": "- 0,11", "x": 11, "y": 0}, {"label": "= 0,12", "x": 12, "y": 0}, - {"label": "bsp 0,14", "x": 14, "y": 0, "w": 2}, + {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2}, {"label": "del 0,15", "x": 15, "y": 0}, {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5}, @@ -128,30 +128,30 @@ {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 1.5, "y": 3}, - {"label": "x 3,3", "x": 1.5, "y": 3}, - {"label": "c 3,4", "x": 1.5, "y": 3}, - {"label": "v 3,5", "x": 1.5, "y": 3}, - {"label": "b 3,6", "x": 1.5, "y": 3}, - {"label": "n 3,7", "x": 1.5, "y": 3}, - {"label": "m 3,8", "x": 1.5, "y": 3}, - {"label": ", 3,9", "x": 1.5, "y": 3}, - {"label": ". 3,10", "x": 1.5, "y": 3}, - {"label": "/ 3,11", "x": 1.5, "y": 3}, - {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 1.5, "y": 3}, - {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, - {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 1.5, "y": 4}, - {"label": "down 4,14", "x": 1.5, "y": 4}, - {"label": "right 4,15", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_split_bs": { @@ -204,30 +204,30 @@ {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 1.5, "y": 3}, - {"label": "x 3,3", "x": 1.5, "y": 3}, - {"label": "c 3,4", "x": 1.5, "y": 3}, - {"label": "v 3,5", "x": 1.5, "y": 3}, - {"label": "b 3,6", "x": 1.5, "y": 3}, - {"label": "n 3,7", "x": 1.5, "y": 3}, - {"label": "m 3,8", "x": 1.5, "y": 3}, - {"label": ", 3,9", "x": 1.5, "y": 3}, - {"label": ". 3,10", "x": 1.5, "y": 3}, - {"label": "/ 3,11", "x": 1.5, "y": 3}, - {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 1.5, "y": 3}, - {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, - {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "win 4,1", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 6.25}, - {"label": "fn 4,10", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "left 4,13", "x": 1.5, "y": 4}, - {"label": "down 4,14", "x": 1.5, "y": 4}, - {"label": "right 4,15", "x": 1.5, "y": 4} + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25}, + {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25}, + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25}, + {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25}, + {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25}, + {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} ] }, "LAYOUT_65_tsangan": { @@ -279,29 +279,29 @@ {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 1.5, "y": 3}, - {"label": "x 3,3", "x": 1.5, "y": 3}, - {"label": "c 3,4", "x": 1.5, "y": 3}, - {"label": "v 3,5", "x": 1.5, "y": 3}, - {"label": "b 3,6", "x": 1.5, "y": 3}, - {"label": "n 3,7", "x": 1.5, "y": 3}, - {"label": "m 3,8", "x": 1.5, "y": 3}, - {"label": ", 3,9", "x": 1.5, "y": 3}, - {"label": ". 3,10", "x": 1.5, "y": 3}, - {"label": "/ 3,11", "x": 1.5, "y": 3}, - {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 1.5, "y": 3}, - {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, - {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, {"label": "win 4,1", "x": 1.5, "y": 4}, - {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 7}, - {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "left 4,13", "x": 1.5, "y": 4}, - {"label": "down 4,14", "x": 1.5, "y": 4}, - {"label": "right 4,15", "x": 1.5, "y": 4} + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} ] }, "LAYOUT_65_tsangan_split_bs": { @@ -354,29 +354,29 @@ {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25}, {"label": "pg up 2,15", "x": 15, "y": 2}, - {"label": "shift 3,1", "x": 1.5, "y": 3, "w": 2.25}, - {"label": "z 3,2", "x": 1.5, "y": 3}, - {"label": "x 3,3", "x": 1.5, "y": 3}, - {"label": "c 3,4", "x": 1.5, "y": 3}, - {"label": "v 3,5", "x": 1.5, "y": 3}, - {"label": "b 3,6", "x": 1.5, "y": 3}, - {"label": "n 3,7", "x": 1.5, "y": 3}, - {"label": "m 3,8", "x": 1.5, "y": 3}, - {"label": ", 3,9", "x": 1.5, "y": 3}, - {"label": ". 3,10", "x": 1.5, "y": 3}, - {"label": "/ 3,11", "x": 1.5, "y": 3}, - {"label": "shift 3,13", "x": 1.5, "y":3, "w": 1.75}, - {"label": "up 3,14", "x": 1.5, "y": 3}, - {"label": "pg dn 3,15", "x": 1.5, "y": 3}, + {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25}, + {"label": "z 3,2", "x": 2.25, "y": 3}, + {"label": "x 3,3", "x": 3.25, "y": 3}, + {"label": "c 3,4", "x": 4.25, "y": 3}, + {"label": "v 3,5", "x": 5.25, "y": 3}, + {"label": "b 3,6", "x": 6.25, "y": 3}, + {"label": "n 3,7", "x": 7.25, "y": 3}, + {"label": "m 3,8", "x": 8.25, "y": 3}, + {"label": ", 3,9", "x": 9.25, "y": 3}, + {"label": ". 3,10", "x": 10.25, "y": 3}, + {"label": "/ 3,11", "x": 11.25, "y": 3}, + {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75}, + {"label": "up 3,14", "x": 14, "y": 3}, + {"label": "pg dn 3,15", "x": 15, "y": 3}, - {"label": "ctrl 4,0", "x": 1.5, "y": 4, "w": 1.5}, + {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5}, {"label": "win 4,1", "x": 1.5, "y": 4}, - {"label": "alt 4,2", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "spacebar 4,6", "x": 1.5, "y": 4, "w": 7}, - {"label": "ctrl 4,11", "x": 1.5, "y": 4, "w": 1.5}, - {"label": "left 4,13", "x": 1.5, "y": 4}, - {"label": "down 4,14", "x": 1.5, "y": 4}, - {"label": "right 4,15", "x": 1.5, "y": 4} + {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5}, + {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7}, + {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5}, + {"label": "left 4,13", "x": 13, "y": 4}, + {"label": "down 4,14", "x": 14, "y": 4}, + {"label": "right 4,15", "x": 15, "y": 4} ] } } From c2d11adb963c9aa8f954e9d42110b8572e395650 Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Mon, 7 Mar 2022 21:06:12 -0500 Subject: [PATCH 09/12] Update keyboards/drewkeys/iskar/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/drewkeys/iskar/rules.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk index 493fd6845197..9591f732c49e 100644 --- a/keyboards/drewkeys/iskar/rules.mk +++ b/keyboards/drewkeys/iskar/rules.mk @@ -7,14 +7,13 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover +NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes From b0052c61f8be7b42e86f45a7e91b767b5c128afa Mon Sep 17 00:00:00 2001 From: drewpyun <48503175+drewpyun@users.noreply.github.com> Date: Mon, 7 Mar 2022 21:52:53 -0500 Subject: [PATCH 10/12] Update keyboards/drewkeys/iskar/readme.md Co-authored-by: Ryan --- keyboards/drewkeys/iskar/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md index e2ae5fbf8ae1..152ec5e47eeb 100644 --- a/keyboards/drewkeys/iskar/readme.md +++ b/keyboards/drewkeys/iskar/readme.md @@ -5,11 +5,11 @@ ![Layouts supported](https://i.imgur.com/SB2G7mL.png) Note: No split backspace for hotswap vers. -*65% PCB for Bitmap studio's Iskar* +65% PCB for Bitmap studio's Iskar * Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun) -* Hardware Supported: *Made specificaly for Iskar, 65% hotswap supported* -* Hardware Availability: *https://bitmapstudio.xyz/collections/iskar* +* Hardware Supported: Made specifically for Iskar, 65% hotswap supported +* Hardware Availability: https://bitmapstudio.xyz/collections/iskar Make example for this keyboard (after setting up your build environment): From b0ff5af777f79b1b4e27d326ed74cb1f51257602 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 7 Mar 2022 22:47:35 -0500 Subject: [PATCH 11/12] added keymaps onto iskar.h that was referenced in info.json --- keyboards/drewkeys/iskar/Iskar.h | 108 +++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/keyboards/drewkeys/iskar/Iskar.h b/keyboards/drewkeys/iskar/Iskar.h index 374c8d5ec564..0ad2601d333b 100644 --- a/keyboards/drewkeys/iskar/Iskar.h +++ b/keyboards/drewkeys/iskar/Iskar.h @@ -45,3 +45,111 @@ { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ } + +/* Standard arrangement / 65 ANSI + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 ANSI SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4a │4b │ │4d │4e │4f │ + * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_ansi_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4A, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 TSANGAN + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_tsangan( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, KC_NO, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ +} + +/* Standard arrangement / 65 TSANGAN SPLIT + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │1f │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │2f │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤ + * │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │3f │ + * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤ + * │40 │41 │43 │ 46 │4b │ │4d │4e │4f │ + * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘ +*/ +#define LAYOUT_65_tsangan_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ + k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ + k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ + k40, k41, k42, k46, k4B, k4D, k4E, k4F \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ + { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ + { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F }, \ + { KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E, k3F }, \ + { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F } \ +} From 40e0aae1748f26c5dd06e23862beb9a53429ffb2 Mon Sep 17 00:00:00 2001 From: drewpyun Date: Mon, 7 Mar 2022 22:54:13 -0500 Subject: [PATCH 12/12] changed filename to lowercase to match guidelines --- keyboards/drewkeys/iskar/{Iskar.c => iskar.c} | 0 keyboards/drewkeys/iskar/{Iskar.h => iskar.h} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/drewkeys/iskar/{Iskar.c => iskar.c} (100%) rename keyboards/drewkeys/iskar/{Iskar.h => iskar.h} (100%) diff --git a/keyboards/drewkeys/iskar/Iskar.c b/keyboards/drewkeys/iskar/iskar.c similarity index 100% rename from keyboards/drewkeys/iskar/Iskar.c rename to keyboards/drewkeys/iskar/iskar.c diff --git a/keyboards/drewkeys/iskar/Iskar.h b/keyboards/drewkeys/iskar/iskar.h similarity index 100% rename from keyboards/drewkeys/iskar/Iskar.h rename to keyboards/drewkeys/iskar/iskar.h