diff --git a/keyboards/3by2/keymaps/via/keymap.c b/keyboards/3by2/keymaps/vial/keymap.c similarity index 100% rename from keyboards/3by2/keymaps/via/keymap.c rename to keyboards/3by2/keymaps/vial/keymap.c diff --git a/keyboards/3by2/keymaps/via/rules.mk b/keyboards/3by2/keymaps/vial/rules.mk similarity index 100% rename from keyboards/3by2/keymaps/via/rules.mk rename to keyboards/3by2/keymaps/vial/rules.mk diff --git a/keyboards/3by2/keymaps/via/vial.json b/keyboards/3by2/keymaps/vial/vial.json similarity index 100% rename from keyboards/3by2/keymaps/via/vial.json rename to keyboards/3by2/keymaps/vial/vial.json diff --git a/keyboards/bakeneko65/rev2/keymaps/via/rules.mk b/keyboards/bakeneko65/rev2/keymaps/via/rules.mk index 57da7154e7..1e5b99807c 100644 --- a/keyboards/bakeneko65/rev2/keymaps/via/rules.mk +++ b/keyboards/bakeneko65/rev2/keymaps/via/rules.mk @@ -1,3 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h index 8effc4132f..ff9c253ded 100644 --- a/keyboards/boston/config.h +++ b/keyboards/boston/config.h @@ -57,7 +57,7 @@ #define RGBLIGHT_ANIMATIONS #define RGBLIGHT_LAYERS -/*The 3D-printed version of Boston uses APA106 LEDs, which are reversed */ +//The 3D-printed version of Boston uses APA106 LEDs, which are reversed #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB /* Define encoder */ @@ -73,19 +73,6 @@ #define LED_CAPS_LOCK_PIN A1 #define LED_SCROLL_LOCK_PIN A2 -/*Vial stuff*/ - -#define DYNAMIC_KEYMAP_LAYER_COUNT 3 - -#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} - -#define VIAL_ENCODER_KEYCODE_DELAY 10 - -#define VIAL_KEYBOARD_UID {0xB3, 0x30, 0xE4, 0x75, 0xF9, 0x3A, 0x9B, 0x18} - -#define VIAL_UNLOCK_COMBO_ROWS {1, 4} -#define VIAL_UNLOCK_COMBO_COLS {0, 13} - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/boston/keymaps/vial/config.h b/keyboards/boston/keymaps/vial/config.h new file mode 100644 index 0000000000..38445628c5 --- /dev/null +++ b/keyboards/boston/keymaps/vial/config.h @@ -0,0 +1,12 @@ +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 + +#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} + +#define VIAL_ENCODER_KEYCODE_DELAY 10 + +#define VIAL_KEYBOARD_UID {0xB3, 0x30, 0xE4, 0x75, 0xF9, 0x3A, 0x9B, 0x18} + +#define VIAL_UNLOCK_COMBO_ROWS {1, 4} +#define VIAL_UNLOCK_COMBO_COLS {0, 13} diff --git a/keyboards/boston/rules.mk b/keyboards/boston/rules.mk index 0bb2115e79..5a00322c46 100644 --- a/keyboards/boston/rules.mk +++ b/keyboards/boston/rules.mk @@ -17,7 +17,6 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -MOUSEKEY_ENABLE = no # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index 8f766f428e..1a337b111f 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h @@ -14,7 +14,6 @@ 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 . */ -#define VIAL_KEYBOARD_UID {0x13, 0xBB, 0x91, 0xC2, 0x05, 0x96, 0xF0, 0x30} #pragma once @@ -94,8 +93,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -#define DYNAMIC_KEYMAP_LAYER_COUNT 3 - -// Unlock Combo -#define VIAL_UNLOCK_COMBO_ROWS { 9, 1 } -#define VIAL_UNLOCK_COMBO_COLS { 6, 1 } diff --git a/keyboards/bpiphany/frosty_flake/keymaps/vial/config.h b/keyboards/bpiphany/frosty_flake/keymaps/vial/config.h new file mode 100644 index 0000000000..632a73fc33 --- /dev/null +++ b/keyboards/bpiphany/frosty_flake/keymaps/vial/config.h @@ -0,0 +1,9 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0x13, 0xBB, 0x91, 0xC2, 0x05, 0x96, 0xF0, 0x30} + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 + +// Unlock Combo +#define VIAL_UNLOCK_COMBO_ROWS { 9, 1 } +#define VIAL_UNLOCK_COMBO_COLS { 6, 1 } diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/vial/keymap.c similarity index 100% rename from keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c rename to keyboards/bpiphany/frosty_flake/keymaps/vial/keymap.c diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/vial/rules.mk similarity index 100% rename from keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk rename to keyboards/bpiphany/frosty_flake/keymaps/vial/rules.mk diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/vial.json b/keyboards/bpiphany/frosty_flake/keymaps/vial/vial.json similarity index 100% rename from keyboards/bpiphany/frosty_flake/keymaps/via/vial.json rename to keyboards/bpiphany/frosty_flake/keymaps/vial/vial.json diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h index 6ec5b5be5f..cc22be0f02 100644 --- a/keyboards/capsunlocked/cu7/config.h +++ b/keyboards/capsunlocked/cu7/config.h @@ -25,10 +25,6 @@ along with this program. If not, see . #define MANUFACTURER CapsUnlocked #define PRODUCT CU7 -#define VIAL_KEYBOARD_UID {0x19, 0xFF, 0xE1, 0x15, 0x74, 0x04, 0x69, 0x00} -#define VIAL_UNLOCK_COMBO_ROWS { 1, 1 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 @@ -49,7 +45,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { D6 } #define ENCODERS_PAD_B { D4 } - #define MATRIX_ROW_PINS { D7, F0, F6 } #define MATRIX_COL_PINS { F5, F7, F4 } #define UNUSED_PINS diff --git a/keyboards/capsunlocked/cu7/cu7.h b/keyboards/capsunlocked/cu7/cu7.h index cd4db371fa..2f30dbb2d5 100644 --- a/keyboards/capsunlocked/cu7/cu7.h +++ b/keyboards/capsunlocked/cu7/cu7.h @@ -33,3 +33,4 @@ along with this program. If not, see . { K10, K11, K12 }, \ { K20, K21, K22 } \ } + diff --git a/keyboards/capsunlocked/cu7/keymaps/vial/config.h b/keyboards/capsunlocked/cu7/keymaps/vial/config.h new file mode 100644 index 0000000000..cfbed26e74 --- /dev/null +++ b/keyboards/capsunlocked/cu7/keymaps/vial/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0x19, 0xFF, 0xE1, 0x15, 0x74, 0x04, 0x69, 0x00} +#define VIAL_UNLOCK_COMBO_ROWS { 1, 1 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 2 } diff --git a/keyboards/capsunlocked/cu7/keymaps/via/keymap.c b/keyboards/capsunlocked/cu7/keymaps/vial/keymap.c similarity index 100% rename from keyboards/capsunlocked/cu7/keymaps/via/keymap.c rename to keyboards/capsunlocked/cu7/keymaps/vial/keymap.c diff --git a/keyboards/capsunlocked/cu7/keymaps/via/rules.mk b/keyboards/capsunlocked/cu7/keymaps/vial/rules.mk similarity index 100% rename from keyboards/capsunlocked/cu7/keymaps/via/rules.mk rename to keyboards/capsunlocked/cu7/keymaps/vial/rules.mk diff --git a/keyboards/capsunlocked/cu7/keymaps/via/vial.json b/keyboards/capsunlocked/cu7/keymaps/vial/vial.json similarity index 100% rename from keyboards/capsunlocked/cu7/keymaps/via/vial.json rename to keyboards/capsunlocked/cu7/keymaps/vial/vial.json diff --git a/keyboards/crbn/config.h b/keyboards/crbn/config.h index 08d35ad71f..8873022269 100644 --- a/keyboards/crbn/config.h +++ b/keyboards/crbn/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Harry Herring, Ivan Organista +/* Copyright 2020 Harry Herring * * 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 @@ -52,14 +52,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* VIAL Keyboard UID */ -#define VIAL_KEYBOARD_UID {0xC1, 0x9B, 0x8E, 0x7B, 0x43, 0xD7, 0x61, 0xEE} - -/* VIAL Unlock combo keys */ -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 11 } - -/* Encoder default values and delay */ -#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS } -#define VIAL_ENCODER_KEYCODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/crbn/keymaps/via/rules.mk b/keyboards/crbn/keymaps/via/rules.mk index 461a60f9c1..43061db1dd 100644 --- a/keyboards/crbn/keymaps/via/rules.mk +++ b/keyboards/crbn/keymaps/via/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/crbn/keymaps/vial/config.h b/keyboards/crbn/keymaps/vial/config.h new file mode 100644 index 0000000000..13d6a8ab12 --- /dev/null +++ b/keyboards/crbn/keymaps/vial/config.h @@ -0,0 +1,12 @@ +#pragma once + +/* VIAL Keyboard UID */ +#define VIAL_KEYBOARD_UID {0xC1, 0x9B, 0x8E, 0x7B, 0x43, 0xD7, 0x61, 0xEE} + +/* VIAL Unlock combo keys */ +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 11 } + +/* Encoder default values and delay */ +#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS } +#define VIAL_ENCODER_KEYCODE_DELAY 10 diff --git a/keyboards/crbn/keymaps/vial/keymap.c b/keyboards/crbn/keymaps/vial/keymap.c new file mode 100644 index 0000000000..91880d93e8 --- /dev/null +++ b/keyboards/crbn/keymaps/vial/keymap.c @@ -0,0 +1,45 @@ +/* Copyright 2021 Ivan Organista + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT_crbn_1x2u( + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, + MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT), + + LAYOUT_crbn_1x2u( + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, LSFT(KC_NUHS), LSFT(KC_NUBS), KC_HOME, KC_END, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + + LAYOUT_crbn_1x2u( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY), + + LAYOUT_crbn_1x2u( + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/crbn/keymaps/vial/rules.mk b/keyboards/crbn/keymaps/vial/rules.mk new file mode 100644 index 0000000000..461a60f9c1 --- /dev/null +++ b/keyboards/crbn/keymaps/vial/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIAL_ENCODERS_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/crbn/keymaps/via/vial.json b/keyboards/crbn/keymaps/vial/vial.json similarity index 100% rename from keyboards/crbn/keymaps/via/vial.json rename to keyboards/crbn/keymaps/vial/vial.json diff --git a/keyboards/cx60/config.h b/keyboards/cx60/config.h index 9f9f20adf3..5ff4865a77 100644 --- a/keyboards/cx60/config.h +++ b/keyboards/cx60/config.h @@ -56,10 +56,3 @@ along with this program. If not, see . #define LED_CAPS_LOCK_PIN B5 #define LED_PIN_ON_STATE 0 - -/* Vial setup */ -#ifdef VIAL_ENABLE -#define VIAL_KEYBOARD_UID {0xB2, 0x57, 0x48, 0xED, 0x67, 0x80, 0x12, 0x18} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } -#endif diff --git a/keyboards/cx60/keymaps/vial/config.h b/keyboards/cx60/keymaps/vial/config.h index a5e12261b6..f2e3de495c 100644 --- a/keyboards/cx60/keymaps/vial/config.h +++ b/keyboards/cx60/keymaps/vial/config.h @@ -19,3 +19,8 @@ along with this program. If not, see . /* this is for rgb underglow capslock indicator */ #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF + +/* Vial setup */ +#define VIAL_KEYBOARD_UID {0xB2, 0x57, 0x48, 0xED, 0x67, 0x80, 0x12, 0x18} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } diff --git a/keyboards/cx60/keymaps/vial_caps/config.h b/keyboards/cx60/keymaps/vial_caps/config.h index a5e12261b6..f2e3de495c 100644 --- a/keyboards/cx60/keymaps/vial_caps/config.h +++ b/keyboards/cx60/keymaps/vial_caps/config.h @@ -19,3 +19,8 @@ along with this program. If not, see . /* this is for rgb underglow capslock indicator */ #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF + +/* Vial setup */ +#define VIAL_KEYBOARD_UID {0xB2, 0x57, 0x48, 0xED, 0x67, 0x80, 0x12, 0x18} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } diff --git a/keyboards/gmmk/pro/ansi/config.h b/keyboards/gmmk/pro/ansi/config.h index 023d943ea2..7c68375b2f 100644 --- a/keyboards/gmmk/pro/ansi/config.h +++ b/keyboards/gmmk/pro/ansi/config.h @@ -21,4 +21,3 @@ #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 32 #define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) - diff --git a/keyboards/gmmk/pro/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/ansi/keymaps/vial/config.h index 5281fda104..0a8130d96a 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/ansi/keymaps/vial/config.h @@ -29,3 +29,6 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0x03, 0x75, 0x3D, 0xEC, 0x97, 0xC2, 0xE9, 0x9A} +#define VIAL_UNLOCK_COMBO_ROWS { 1, 10 } +#define VIAL_UNLOCK_COMBO_COLS { 3, 4 } +#define VIAL_ENCODER_KEYCODE_DELAY 25 diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index d8090167b6..bb2cca1921 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -52,11 +52,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -//#define VIAL_KEYBOARD_UID {0x81, 0xD2, 0x8A, 0x89, 0x17, 0x36, 0x53, 0x4B} -#define VIAL_UNLOCK_COMBO_ROWS { 1, 10 } -#define VIAL_UNLOCK_COMBO_COLS { 3, 4 } -#define VIAL_ENCODER_KEYCODE_DELAY 25 - /* SPI Config for LED Driver */ #define SPI_DRIVER SPID1 #define SPI_SCK_PIN A5 diff --git a/keyboards/gmmk/pro/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/iso/keymaps/vial/config.h index d823da72b3..aec3990df3 100644 --- a/keyboards/gmmk/pro/iso/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/iso/keymaps/vial/config.h @@ -29,3 +29,6 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0xEC, 0xFE, 0x5D, 0x44, 0x1A, 0x9C, 0x70, 0xCC} +#define VIAL_UNLOCK_COMBO_ROWS { 1, 10 } +#define VIAL_UNLOCK_COMBO_COLS { 3, 4 } +#define VIAL_ENCODER_KEYCODE_DELAY 25 diff --git a/keyboards/gray_studio/think65/solder/config.h b/keyboards/gray_studio/think65/solder/config.h index 2d0d1a57b9..32a1769a6b 100644 --- a/keyboards/gray_studio/think65/solder/config.h +++ b/keyboards/gray_studio/think65/solder/config.h @@ -25,8 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER Graystudio #define PRODUCT Think6.5° -#define VIAL_KEYBOARD_UID {0xC2, 0x84, 0x88, 0x70, 0x67, 0xE8, 0xC9, 0x7C} - /* key matrix size */ #define MATRIX_ROWS 5 @@ -72,7 +70,3 @@ along with this program. If not, see . // generated by KBFirmware JSON to QMK Parser // https://noroadsleft.github.io/kbf_qmk_converter/ -// -// Define Vial Unlock Combo -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk index 35a4c68336..44a2bc49cc 100644 --- a/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk +++ b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk @@ -1,6 +1,4 @@ VIA_ENABLE = yes LTO_ENABLE = yes -VIAL_ENABLE = yes CONSOLE_ENABLE = no -QMK_SETTINGS = no diff --git a/keyboards/gray_studio/think65/solder/keymaps/vial/config.h b/keyboards/gray_studio/think65/solder/keymaps/vial/config.h new file mode 100644 index 0000000000..1420acde4e --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/vial/config.h @@ -0,0 +1,5 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0xC2, 0x84, 0x88, 0x70, 0x67, 0xE8, 0xC9, 0x7C} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/gray_studio/think65/solder/keymaps/vial/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/vial/keymap.c new file mode 100644 index 0000000000..0dbe44c872 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/vial/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2019 Rys Sommefeldt + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_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_BSPC, KC_BSPC, KC_DEL, + 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_HOME, + 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_NO, 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/gray_studio/think65/solder/keymaps/vial/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/vial/rules.mk new file mode 100644 index 0000000000..ee51cc7c92 --- /dev/null +++ b/keyboards/gray_studio/think65/solder/keymaps/vial/rules.mk @@ -0,0 +1,7 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + +CONSOLE_ENABLE = no + +VIAL_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/vial.json b/keyboards/gray_studio/think65/solder/keymaps/vial/vial.json similarity index 100% rename from keyboards/gray_studio/think65/solder/keymaps/via/vial.json rename to keyboards/gray_studio/think65/solder/keymaps/vial/vial.json diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h index 0ff05a3e4a..e6aeb38707 100644 --- a/keyboards/hineybush/h87a/config.h +++ b/keyboards/hineybush/h87a/config.h @@ -22,10 +22,6 @@ along with this program. If not, see . #define MANUFACTURER hineybush keyboards #define PRODUCT h87a -#define VIAL_KEYBOARD_UID { 0x02, 0x4B, 0x38, 0xA3, 0x30, 0x79, 0x76, 0x3E } -#define VIAL_UNLOCK_COMBO_ROWS { 0, 7 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } - #define CONFIG_H #include "config_common.h" diff --git a/keyboards/hineybush/h87a/h87a.c b/keyboards/hineybush/h87a/h87a.c index 2b34b14a81..37c1725693 100644 --- a/keyboards/hineybush/h87a/h87a.c +++ b/keyboards/hineybush/h87a/h87a.c @@ -35,7 +35,7 @@ void eeconfig_init_kb(void) { // EEPROM is getting reset! rgblight_enable(); // Enable RGB by default rgblight_sethsv(0, 255, 128); // Set default HSV - red hue, full saturation, medium brightness rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default - + eeconfig_update_kb(0); eeconfig_init_user(); } diff --git a/keyboards/hineybush/h87a/keymaps/via/rules.mk b/keyboards/hineybush/h87a/keymaps/via/rules.mk index c674759413..1e5b99807c 100644 --- a/keyboards/hineybush/h87a/keymaps/via/rules.mk +++ b/keyboards/hineybush/h87a/keymaps/via/rules.mk @@ -1,5 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -TAP_DANCE_ENABLE = no -COMBO_ENABLE = no -QMK_SETTINGS = no diff --git a/keyboards/hineybush/h87a/keymaps/vial/config.h b/keyboards/hineybush/h87a/keymaps/vial/config.h new file mode 100644 index 0000000000..e9c70ceda4 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/vial/config.h @@ -0,0 +1,6 @@ +#pragma once + +#define VIAL_KEYBOARD_UID { 0x02, 0x4B, 0x38, 0xA3, 0x30, 0x79, 0x76, 0x3E } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 7 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } + diff --git a/keyboards/hineybush/h87a/keymaps/vial/keymap.c b/keyboards/hineybush/h87a/keymaps/vial/keymap.c new file mode 100644 index 0000000000..d248a6d4a3 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/vial/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2020 Josh Hinnebusch + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/hineybush/h87a/keymaps/vial/readme.md b/keyboards/hineybush/h87a/keymaps/vial/readme.md new file mode 100644 index 0000000000..f81b69ee83 --- /dev/null +++ b/keyboards/hineybush/h87a/keymaps/vial/readme.md @@ -0,0 +1 @@ +# The default VIA keymap for h87a diff --git a/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk b/keyboards/hineybush/h87a/keymaps/vial/rules.mk similarity index 67% rename from keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk rename to keyboards/hineybush/h87a/keymaps/vial/rules.mk index bc8e7aad3b..1d50588b99 100644 --- a/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk +++ b/keyboards/hineybush/h87a/keymaps/vial/rules.mk @@ -1,7 +1,6 @@ -RGBLIGHT_ENABLE = yes -EXTRAKEY_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes -QMK_SETTINGS = no TAP_DANCE_ENABLE = no COMBO_ENABLE = no +QMK_SETTINGS = no + diff --git a/keyboards/hineybush/h87a/keymaps/via/vial.json b/keyboards/hineybush/h87a/keymaps/vial/vial.json similarity index 100% rename from keyboards/hineybush/h87a/keymaps/via/vial.json rename to keyboards/hineybush/h87a/keymaps/vial/vial.json diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h index fce6845462..89af18b6e3 100644 --- a/keyboards/hineybush/h88/config.h +++ b/keyboards/hineybush/h88/config.h @@ -26,9 +26,7 @@ along with this program. If not, see . #define MANUFACTURER hineybush keyboards #define PRODUCT h88 -#define VIAL_KEYBOARD_UID { 0xFC, 0x16, 0x30, 0x20, 0xDA, 0x5F, 0xCA, 0xAD } -#define VIAL_UNLOCK_COMBO_ROWS { 0, 7 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } + /* key matrix size */ #define MATRIX_ROWS 12 diff --git a/keyboards/hineybush/h88/keymaps/via/rules.mk b/keyboards/hineybush/h88/keymaps/via/rules.mk index c674759413..1e5b99807c 100644 --- a/keyboards/hineybush/h88/keymaps/via/rules.mk +++ b/keyboards/hineybush/h88/keymaps/via/rules.mk @@ -1,5 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -TAP_DANCE_ENABLE = no -COMBO_ENABLE = no -QMK_SETTINGS = no diff --git a/keyboards/hineybush/h88/keymaps/vial/config.h b/keyboards/hineybush/h88/keymaps/vial/config.h new file mode 100644 index 0000000000..f4ace644ac --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/vial/config.h @@ -0,0 +1,6 @@ +#pragma once + +#define VIAL_KEYBOARD_UID { 0xFC, 0x16, 0x30, 0x20, 0xDA, 0x5F, 0xCA, 0xAD } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 7 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } + diff --git a/keyboards/hineybush/h88/keymaps/vial/keymap.c b/keyboards/hineybush/h88/keymaps/vial/keymap.c new file mode 100644 index 0000000000..0e6bd37c1b --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/vial/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2020 Josh Hinnebusch + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_0, KC_PSCR, KC_SLCK, KC_PAUS, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + 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_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_TRNS, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_TRNS, BL_TOGG, BL_DEC, BL_INC, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT, KC_VOLD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +}; diff --git a/keyboards/hineybush/h88/keymaps/vial/readme.md b/keyboards/hineybush/h88/keymaps/vial/readme.md new file mode 100644 index 0000000000..086686e7d6 --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/vial/readme.md @@ -0,0 +1 @@ +# The default VIA keymap for h88a diff --git a/keyboards/hineybush/h88/keymaps/vial/rules.mk b/keyboards/hineybush/h88/keymaps/vial/rules.mk new file mode 100644 index 0000000000..1d50588b99 --- /dev/null +++ b/keyboards/hineybush/h88/keymaps/vial/rules.mk @@ -0,0 +1,6 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +TAP_DANCE_ENABLE = no +COMBO_ENABLE = no +QMK_SETTINGS = no + diff --git a/keyboards/hineybush/h88/keymaps/via/vial.json b/keyboards/hineybush/h88/keymaps/vial/vial.json similarity index 100% rename from keyboards/hineybush/h88/keymaps/via/vial.json rename to keyboards/hineybush/h88/keymaps/vial/vial.json diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h index 2adad49b2d..8a0852ccbd 100644 --- a/keyboards/idb/idb_60/config.h +++ b/keyboards/idb/idb_60/config.h @@ -26,12 +26,6 @@ along with this program. If not, see . #define MANUFACTURER idb Keyboards #define PRODUCT idb 60 -#define VIAL_KEYBOARD_UID { 0x7F, 0x0D, 0x87, 0x47, 0x88, 0xEF, 0x8E, 0xD7 } - -/* Vial unlock keycombo: ESC + Return */ -#define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/idb/idb_60/keymaps/via/rules.mk b/keyboards/idb/idb_60/keymaps/via/rules.mk index 46f9f1360f..1e5b99807c 100644 --- a/keyboards/idb/idb_60/keymaps/via/rules.mk +++ b/keyboards/idb/idb_60/keymaps/via/rules.mk @@ -1,3 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/idb/idb_60/keymaps/vial/config.h b/keyboards/idb/idb_60/keymaps/vial/config.h new file mode 100644 index 0000000000..0cd73cc8bc --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/vial/config.h @@ -0,0 +1,8 @@ +#pragma once + +#define VIAL_KEYBOARD_UID { 0x7F, 0x0D, 0x87, 0x47, 0x88, 0xEF, 0x8E, 0xD7 } + +/* Vial unlock keycombo: ESC + Return */ +#define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } + diff --git a/keyboards/idb/idb_60/keymaps/vial/keymap.c b/keyboards/idb/idb_60/keymaps/vial/keymap.c new file mode 100644 index 0000000000..60cac7559f --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/vial/keymap.c @@ -0,0 +1,34 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi_wkl_split_rshift( + KC_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_BSPC, + 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_60_ansi_wkl_split_rshift( + RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_ansi_wkl_split_rshift( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_60_ansi_wkl_split_rshift( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/idb/idb_60/keymaps/vial/rules.mk b/keyboards/idb/idb_60/keymaps/vial/rules.mk new file mode 100644 index 0000000000..0bfdf1cad5 --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/vial/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes + diff --git a/keyboards/idb/idb_60/keymaps/via/vial.json b/keyboards/idb/idb_60/keymaps/vial/vial.json similarity index 100% rename from keyboards/idb/idb_60/keymaps/via/vial.json rename to keyboards/idb/idb_60/keymaps/vial/vial.json diff --git a/keyboards/idb/idb_60/readme.md b/keyboards/idb/idb_60/readme.md index 0e6ebafe42..bd2f76ae68 100644 --- a/keyboards/idb/idb_60/readme.md +++ b/keyboards/idb/idb_60/readme.md @@ -1,9 +1,10 @@ -# idb 60 +# idb 60 PCB Firmware for the idb 60 PCB * Keyboard Maintainer: [pngu](https://github.com/itspngu) * Hardware Supported: idb 60 PCB +* Hardware Availability: [Case & PCB Files (CC-by-SA 4.0)](https://github.com/itspngu/idb_60) * Project Website: [idb Keyboards » 60](https://idb-keyboards.xyz/60) Make example for this keyboard (after setting up your build environment): @@ -14,13 +15,13 @@ Or to make and flash: make idb/idb_60:default:flash -To compile VIA(L) firmware: +To compile VIA firmware: make idb/idb_60:via LAYOUT_* Macros: - * *LAYOUT_default*: ANSI WKL with full backspace + * *LAYOUT_default*: ANSI WKL with full Backspace * *LAYOUT_all*: All split keys are available 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/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h index 6b912fb78a..fc5dd87f09 100644 --- a/keyboards/ilumkb/primus75/config.h +++ b/keyboards/ilumkb/primus75/config.h @@ -60,8 +60,3 @@ #define NO_ACTION_FUNCTION #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 - -/* Vial settings */ -#define VIAL_KEYBOARD_UID { 0x03, 0xB7, 0xC6, 0x97, 0x0B, 0xB1, 0x6B, 0x19 } -#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 15 } \ No newline at end of file diff --git a/keyboards/ilumkb/primus75/keymaps/vial/config.h b/keyboards/ilumkb/primus75/keymaps/vial/config.h new file mode 100644 index 0000000000..5a3372b782 --- /dev/null +++ b/keyboards/ilumkb/primus75/keymaps/vial/config.h @@ -0,0 +1,7 @@ +#pragma once + +/* Vial settings */ +#define VIAL_KEYBOARD_UID { 0x03, 0xB7, 0xC6, 0x97, 0x0B, 0xB1, 0x6B, 0x19 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 15 } + diff --git a/keyboards/keycapsss/plaid_pad/rules.mk b/keyboards/keycapsss/plaid_pad/rules.mk index dc510d3636..af2b13adf3 100644 --- a/keyboards/keycapsss/plaid_pad/rules.mk +++ b/keyboards/keycapsss/plaid_pad/rules.mk @@ -2,7 +2,7 @@ MCU = atmega328p # Bootloader selection -BOOTLOADER = USBasp +BOOTLOADER = usbasploader # Build Options # change yes to no to disable @@ -19,4 +19,4 @@ AUDIO_ENABLE = no # Audio output LAYOUTS = ortho_4x4 -DEFAULT_FOLDER = keycapsss/plaid_pad/rev3 +DEFAULT_FOLDER = keycapsss/plaid_pad/rev1 diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h index a2b62f5267..8790de8a7b 100755 --- a/keyboards/kprepublic/bm40hsrgb/config.h +++ b/keyboards/kprepublic/bm40hsrgb/config.h @@ -103,10 +103,3 @@ # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif - -/* Configuration for Vial */ -#define VIAL_KEYBOARD_UID {0x6A, 0x02, 0xE7, 0x64, 0x1D, 0x59, 0x0D, 0xC8} - -// to unlock the keyboard -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 11 } diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h index 2d2fa30bd3..a3aab0e65e 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h @@ -45,10 +45,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#define VIAL_KEYBOARD_UID {0x1B, 0x11, 0x17, 0xDD, 0x7C, 0xD2, 0x16, 0xB2} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 13} - #define RGB_DI_PIN E2 #define DRIVER_LED_TOTAL 67 #ifdef RGB_DI_PIN diff --git a/keyboards/misterdeck/keymaps/via/keymap.c b/keyboards/misterdeck/keymaps/vial/keymap.c similarity index 100% rename from keyboards/misterdeck/keymaps/via/keymap.c rename to keyboards/misterdeck/keymaps/vial/keymap.c diff --git a/keyboards/misterdeck/keymaps/via/rules.mk b/keyboards/misterdeck/keymaps/vial/rules.mk similarity index 100% rename from keyboards/misterdeck/keymaps/via/rules.mk rename to keyboards/misterdeck/keymaps/vial/rules.mk diff --git a/keyboards/misterdeck/keymaps/via/vial.json b/keyboards/misterdeck/keymaps/vial/vial.json similarity index 100% rename from keyboards/misterdeck/keymaps/via/vial.json rename to keyboards/misterdeck/keymaps/vial/vial.json diff --git a/keyboards/nk65/config.h b/keyboards/nk65/config.h index fa14e9ffbf..3268e8ebf4 100755 --- a/keyboards/nk65/config.h +++ b/keyboards/nk65/config.h @@ -148,7 +148,10 @@ along with this program. If not, see . * both 128kb and 256kb versions of F303. * Register 0x1FFFF7CC holds the size of the flash memory. */ -#define EEPROM_START_ADDRESS +#ifndef FLASHSIZE_BASE +# define FLASHSIZE_BASE ((uint32_t)0x1FFFF7CCU) /*!< FLASH Size register base address */ +#endif +#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK #define FEE_MCU_FLASH_SIZE \ ({ \ uint16_t (*flash_size) = (uint16_t*)FLASHSIZE_BASE; \ diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h index 387fad6ebb..c790ddfbb2 100644 --- a/keyboards/pohjolaworks/louhi/config.h +++ b/keyboards/pohjolaworks/louhi/config.h @@ -26,11 +26,6 @@ along with this program. If not, see . #define MANUFACTURER Pohjola Works #define PRODUCT Louhi -/* Vial */ -#define VIAL_KEYBOARD_UID {0x7F, 0xD7, 0x1E, 0x05, 0xFC, 0x51, 0x44, 0xAE} -#define VIAL_UNLOCK_COMBO_ROWS { 2, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 7 diff --git a/keyboards/pohjolaworks/louhi/keymaps/vial/config.h b/keyboards/pohjolaworks/louhi/keymaps/vial/config.h new file mode 100644 index 0000000000..37b0a482a1 --- /dev/null +++ b/keyboards/pohjolaworks/louhi/keymaps/vial/config.h @@ -0,0 +1,7 @@ +#pragma once + +/* Vial */ +#define VIAL_KEYBOARD_UID {0x7F, 0xD7, 0x1E, 0x05, 0xFC, 0x51, 0x44, 0xAE} +#define VIAL_UNLOCK_COMBO_ROWS { 2, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 6 } + diff --git a/keyboards/pohjolaworks/louhi/keymaps/via/keymap.c b/keyboards/pohjolaworks/louhi/keymaps/vial/keymap.c similarity index 100% rename from keyboards/pohjolaworks/louhi/keymaps/via/keymap.c rename to keyboards/pohjolaworks/louhi/keymaps/vial/keymap.c diff --git a/keyboards/pohjolaworks/louhi/keymaps/via/rules.mk b/keyboards/pohjolaworks/louhi/keymaps/vial/rules.mk similarity index 100% rename from keyboards/pohjolaworks/louhi/keymaps/via/rules.mk rename to keyboards/pohjolaworks/louhi/keymaps/vial/rules.mk diff --git a/keyboards/pohjolaworks/louhi/keymaps/via/vial.json b/keyboards/pohjolaworks/louhi/keymaps/vial/vial.json similarity index 100% rename from keyboards/pohjolaworks/louhi/keymaps/via/vial.json rename to keyboards/pohjolaworks/louhi/keymaps/vial/vial.json diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h index ac3d3ae25c..d6f31514e6 100644 --- a/keyboards/pteron36/config.h +++ b/keyboards/pteron36/config.h @@ -154,11 +154,6 @@ along with this program. If not, see . // for via #define DYNAMIC_KEYMAP_LAYER_COUNT 7 -#define VIAL_KEYBOARD_UID {0xD6, 0x68, 0xF2, 0x55, 0x9B, 0x48, 0x07, 0x6E} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 0 } - -//for encoder //left encoder #define ENCODERS_PAD_A { F5 } #define ENCODERS_PAD_B { F4 } @@ -167,16 +162,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A_RIGHT { F4 } #define ENCODERS_PAD_B_RIGHT { F5 } -//default trans keycode. -#define VIAL_ENCODER_DEFAULT { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS} - -//overwrite default tapping behaviour -#define IGNORE_MOD_TAP_INTERRUPT //RGB Underglow #define RGB_DI_PIN B6 -#define RGBLED_NUM 17 -#define RGBLIGHT_SPLIT -#define RGBLIGHT_EFFECT_KNIGHT - -//EE Handness -#define EE_HANDS +#define RGBLED_NUM 10 \ No newline at end of file diff --git a/keyboards/pteron36/keymaps/via/keymap.c b/keyboards/pteron36/keymaps/via/keymap.c index 52863d68f6..47533efc93 100644 --- a/keyboards/pteron36/keymaps/via/keymap.c +++ b/keyboards/pteron36/keymaps/via/keymap.c @@ -1,19 +1,19 @@ /* Copyright HarshitGoel96 2020 * With permission from mattdibi, the original maintainer of the Redox hardware. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include QMK_KEYBOARD_H // Each layer gets a name for readability, which is then used in the keymap matrix below. @@ -33,52 +33,111 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_split_3x5_3_encoder( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - KC_Z, KC_X, KC_C, KC_V, KC_B,KC_LBRACKET, KC_RBRACKET, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT - ), + [_QWERTY] = LAYOUT_split_3x5_3_encoder( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + ), - [_SYMB] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), + [_SYMB] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), - [_NAV] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), + [_NAV] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), - [_ADJUST] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [_MOUSE] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), + [_ADJUST] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), - [_NUMB] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), + [_MOUSE] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), - [_FNR] = LAYOUT_split_3x5_3_encoder( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) + [_NUMB] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [_FNR] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) }; + +#ifdef OLED_ENABLE + +static void render_logo(void) { + static const char PROGMEM qmk_logo[] = { + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + }; + + oled_write_P(qmk_logo, false); +} +static void render_status(void){ + oled_write_P(PSTR("Layer: "), false); + + switch (get_highest_layer(layer_state)) { + case _QWERTY: + oled_write_P(PSTR("Default\n"), false); + break; + case _SYMB: + oled_write_P(PSTR("Symbol\n"), false); + break; + case _NAV: + oled_write_P(PSTR("Nav\n"), false); + break; + case _ADJUST: + oled_write_P(PSTR("Adjust\n"), false); + break; + case _MOUSE: + oled_write_P(PSTR("Mouse\n"), false); + break; + case _NUMB: + oled_write_P(PSTR("Number\n"), false); + break; + case _FNR: + oled_write_P(PSTR("FunR\n"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("Undefined"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); +} +bool oled_task_user(void) { + if (is_keyboard_master()) { + render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc) + } else { + render_logo(); // Renders a static logo + oled_scroll_left(); // Turns on scrolling + } + return false; +} +#endif diff --git a/keyboards/pteron36/keymaps/via/rules.mk b/keyboards/pteron36/keymaps/via/rules.mk index be508f92a6..36b7ba9cbc 100644 --- a/keyboards/pteron36/keymaps/via/rules.mk +++ b/keyboards/pteron36/keymaps/via/rules.mk @@ -1,8 +1,2 @@ -LTO_ENABLE = yes VIA_ENABLE = yes -VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes -QMK_SETTINGS = no -COMBO_ENABLE = no -TAP_DANCE_ENABLE = no -OLED_ENABLE = no +LTO_ENABLE = yes diff --git a/keyboards/pteron36/keymaps/vial/config.h b/keyboards/pteron36/keymaps/vial/config.h new file mode 100644 index 0000000000..cecb9ac69e --- /dev/null +++ b/keyboards/pteron36/keymaps/vial/config.h @@ -0,0 +1,9 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0xD6, 0x68, 0xF2, 0x55, 0x9B, 0x48, 0x07, 0x6E} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 0 } + +//default trans keycode. +#define VIAL_ENCODER_DEFAULT { KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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/pteron36/keymaps/vial/keymap.c b/keyboards/pteron36/keymaps/vial/keymap.c new file mode 100644 index 0000000000..52863d68f6 --- /dev/null +++ b/keyboards/pteron36/keymaps/vial/keymap.c @@ -0,0 +1,84 @@ + /* Copyright HarshitGoel96 2020 + * With permission from mattdibi, the original maintainer of the Redox hardware. + * + * 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 + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +enum layer_names { + _QWERTY, + _SYMB, + _NAV, + _ADJUST, + _MOUSE, + _NUMB, + _FNR +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT_split_3x5_3_encoder( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B,KC_LBRACKET, KC_RBRACKET, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT + ), + + [_SYMB] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [_NAV] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [_ADJUST] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [_MOUSE] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [_NUMB] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [_FNR] = LAYOUT_split_3x5_3_encoder( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/pteron36/keymaps/vial/readme.md b/keyboards/pteron36/keymaps/vial/readme.md new file mode 100644 index 0000000000..5bde196156 --- /dev/null +++ b/keyboards/pteron36/keymaps/vial/readme.md @@ -0,0 +1 @@ +# Default keymap for via \ No newline at end of file diff --git a/keyboards/pteron36/keymaps/vial/rules.mk b/keyboards/pteron36/keymaps/vial/rules.mk new file mode 100644 index 0000000000..be508f92a6 --- /dev/null +++ b/keyboards/pteron36/keymaps/vial/rules.mk @@ -0,0 +1,8 @@ +LTO_ENABLE = yes +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no +COMBO_ENABLE = no +TAP_DANCE_ENABLE = no +OLED_ENABLE = no diff --git a/keyboards/pteron36/keymaps/via/vial.json b/keyboards/pteron36/keymaps/vial/vial.json similarity index 100% rename from keyboards/pteron36/keymaps/via/vial.json rename to keyboards/pteron36/keymaps/vial/vial.json diff --git a/keyboards/runner3680/5x6_5x8/.noci b/keyboards/runner3680/5x6_5x8/.noci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/runner3680/5x6_5x8/5x6_5x8.c deleted file mode 100644 index 34ea51211a..0000000000 --- a/keyboards/runner3680/5x6_5x8/5x6_5x8.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6_5x8.h" diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/runner3680/5x6_5x8/5x6_5x8.h deleted file mode 100644 index 7305af8dce..0000000000 --- a/keyboards/runner3680/5x6_5x8/5x6_5x8.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "runner3680.h" - -#include "quantum.h" - -#define LAYOUT( \ - L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \ - ) \ - { \ - { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07 }, \ - { KC_NO, KC_NO, L12, L13, L14, L15, L16, L17 }, \ - { KC_NO, KC_NO, L22, L23, L24, L25, L26, L27 }, \ - { KC_NO, KC_NO, L32, L33, L34, L35, L36, L37 }, \ - { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/runner3680/5x6_5x8/config.h b/keyboards/runner3680/5x6_5x8/config.h deleted file mode 100644 index 0ff7774a90..0000000000 --- a/keyboards/runner3680/5x6_5x8/config.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2019 omkbd - * - * 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 - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0005 -#define MANUFACTURER Omkbd -#define PRODUCT runner3680 - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 8 - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - -/* define tapping term */ -#define TAPPING_TERM 120 - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* 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 - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 70 -#define RGBLIGHT_SPLIT -#define RGBLED_SPLIT { 30, 40 } // Number of LEDs -#define RGBLIGHT_LIMIT_VAL 100 - -#define SOFT_SERIAL_PIN D2 -#define SELECT_SOFT_SERIAL_SPEED 1 -/*Sets the protocol speed when using serial communication*/ -//Speeds: -//0: about 189kbps (Experimental only) -//1: about 137kbps (default) -//2: about 75kbps -//3: about 39kbps -//4: about 26kbps -//5: about 20kbps diff --git a/keyboards/runner3680/5x6_5x8/info.json b/keyboards/runner3680/5x6_5x8/info.json deleted file mode 100644 index ea9a1c8e20..0000000000 --- a/keyboards/runner3680/5x6_5x8/info.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "keyboard_name": "runner3680 5x6+5x8", - "url": "", - "maintainer": "omkbd", - "width": 15, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} - ] - } - } -} diff --git a/keyboards/runner3680/5x6_5x8/keymaps/JIS/config.h b/keyboards/runner3680/5x6_5x8/keymaps/JIS/config.h deleted file mode 100644 index 43a82f38a0..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/JIS/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/runner3680/5x6_5x8/keymaps/JIS/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/JIS/keymap.c deleted file mode 100644 index 0892fc41a4..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/JIS/keymap.c +++ /dev/null @@ -1,99 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keymap_jp.h" - -extern keymap_config_t keymap_config; - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -rgblight_config_t RGB_current_config; -#endif - -enum layer_number { - _QWERTY = 0, - _ADJUST -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - ADJUST, - RGBRST -}; - -// Fillers to make layering more clear -#define EISU LALT(KC_GRV) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* QWERTY - * ,-----------------------------------------. ,--------------------------------------------------------. - * | EISU | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | ^ | \ | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | @ | [ | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Esc | A | S | D | F | G | | H | J | K | L | : | ; | ] | Enter| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / | \ | Up | Shift| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Ctrl | GUI | Alt | MHEN | Del | Space| | Enter| Bksp | HENK |Adjust| F10 | Left | Down | Right| - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_QWERTY] = LAYOUT( - JP_ZKHK, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, JP_CIRC, JP_YEN, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_BSPC, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, JP_COLN, JP_RBRC, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_DEL, KC_SPC, KC_ENT, KC_BSPC, KC_HENK, ADJUST, KC_F10, KC_LEFT, KC_DOWN, KC_RGHT - ), - - /* Adjust - * ,-----------------------------------------. ,--------------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | |RGBRST| RESET| | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | TOG | HUI | SAI | VAI | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | MOD | HUD | SAD | VAD | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_ADJUST] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, RGBRST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - break; - - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - break; - - case RGBRST: - #ifdef RGBLIGHT_ENABLE - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_config = rgblight_config; - } - #endif - break; - } - return true; -} diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/config.h b/keyboards/runner3680/5x6_5x8/keymaps/default/config.h deleted file mode 100644 index 43a82f38a0..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/default/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c deleted file mode 100644 index fc5ce959f2..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c +++ /dev/null @@ -1,97 +0,0 @@ -#include QMK_KEYBOARD_H - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -rgblight_config_t RGB_current_config; -#endif - -enum layer_number { - _QWERTY = 0, - _ADJUST -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - ADJUST, - RGBRST -}; - -// Fillers to make layering more clear -#define EISU LALT(KC_GRV) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* QWERTY - * ,-----------------------------------------. ,--------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | = | Del | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Esc | A | S | D | F | G | | H | J | K | L | ; | " | Enter| Enter| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / | \ | Up | Shift| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Ctrl | GUI | Alt | EISU | Del | Space| | Enter| Bksp | EISU | ESC |Adjust| Left | Down | Right| - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_QWERTY] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, - 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_BSPC, - KC_ESC, 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_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, EISU, KC_DEL, KC_SPC, KC_ENT, KC_BSPC, EISU, KC_ESC, ADJUST, KC_LEFT, KC_DOWN, KC_RGHT - ), - - /* Adjust - * ,-----------------------------------------. ,--------------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | |RGBRST| RESET| | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | TOG | HUI | SAI | VAI | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | MOD | HUD | SAD | VAD | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_ADJUST] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, RGBRST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - break; - - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - break; - - case RGBRST: - #ifdef RGBLIGHT_ENABLE - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_config = rgblight_config; - } - #endif - break; - } - return true; -} diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/config.h b/keyboards/runner3680/5x6_5x8/keymaps/via/config.h deleted file mode 100644 index 43a82f38a0..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/via/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c deleted file mode 100644 index e592bdaff6..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c +++ /dev/null @@ -1,57 +0,0 @@ -#include QMK_KEYBOARD_H - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -rgblight_config_t RGB_current_config; -#endif - - -#define _QWERTY 0 -#define _NAV 1 -#define _SYMBOL 2 -#define _MEDIA 3 - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV, - SYMBOL, - MEDIA, -}; - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_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_ESC, 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_ENT, - 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_DEL, - KC_LCTL, KC_LALT, KC_LGUI, MO(2), MO(1), KC_SPC, KC_SPC, MO(1), MO(2), KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT -), - -[_NAV] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_TRNS, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_TRNS, KC_TRNS, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_PGUP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END -), - -[_SYMBOL] = LAYOUT( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_BSPC, - KC_TRNS, KC_NO, KC_P7, KC_P8, KC_P9, KC_NO, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_NO, KC_LCBR, KC_RCBR, KC_PIPE, - KC_ESC, KC_NO, KC_P4, KC_P5, KC_P6, KC_NO, KC_LCBR, KC_RCBR, KC_MINS, KC_EQL, KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS, - KC_TRNS, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_LBRC, KC_RBRC, KC_LT, KC_GT, KC_QUES, KC_TRNS, KC_UP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT -), - -[_MEDIA] = LAYOUT( - KC_NO, KC_SLCK, KC_PAUS, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, - RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_NO, KC_NO, KC_NO, - KC_NO, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_G, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_NO, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_MRWD, KC_VOLD, KC_MFFD -) - -}; diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk b/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk deleted file mode 100644 index 88af8c20f6..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGBLIGHT_ENABLE = yes -EXTRAKEY_ENABLE = yes -VIA_ENABLE = yes diff --git a/keyboards/runner3680/5x6_5x8/keymaps/vial/config.h b/keyboards/runner3680/5x6_5x8/keymaps/vial/config.h deleted file mode 100644 index 931bff6ede..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/vial/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#define VIAL_KEYBOARD_UID {0x44, 0x25, 0x2A, 0x83, 0x83, 0x13, 0x46, 0xEE} -#define VIAL_UNLOCK_COMBO_ROWS { 2, 7 } -#define VIAL_UNLOCK_COMBO_COLS { 2, 0 } - -#undef RGBLIGHT_ANIMATIONS -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL - -#define VIAL_COMBO_ENTRIES 4 - -//#define USE_MATRIX_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/runner3680/5x6_5x8/keymaps/vial/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/vial/keymap.c deleted file mode 100644 index fc5ce959f2..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/vial/keymap.c +++ /dev/null @@ -1,97 +0,0 @@ -#include QMK_KEYBOARD_H - - -#ifdef RGBLIGHT_ENABLE -//Following line allows macro to read current RGB settings -extern rgblight_config_t rgblight_config; -rgblight_config_t RGB_current_config; -#endif - -enum layer_number { - _QWERTY = 0, - _ADJUST -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - ADJUST, - RGBRST -}; - -// Fillers to make layering more clear -#define EISU LALT(KC_GRV) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* QWERTY - * ,-----------------------------------------. ,--------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | = | Del | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | [ | ] | Bksp | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Esc | A | S | D | F | G | | H | J | K | L | ; | " | Enter| Enter| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | | N | M | , | . | / | \ | Up | Shift| - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | Ctrl | GUI | Alt | EISU | Del | Space| | Enter| Bksp | EISU | ESC |Adjust| Left | Down | Right| - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_QWERTY] = LAYOUT( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, - 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_BSPC, - KC_ESC, 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_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, EISU, KC_DEL, KC_SPC, KC_ENT, KC_BSPC, EISU, KC_ESC, ADJUST, KC_LEFT, KC_DOWN, KC_RGHT - ), - - /* Adjust - * ,-----------------------------------------. ,--------------------------------------------------------. - * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | F12 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | |RGBRST| RESET| | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | TOG | HUI | SAI | VAI | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | MOD | HUD | SAD | VAD | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `-----------------------------------------' `-------------------------------------------------------' - */ - [_ADJUST] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, - _______, RGBRST, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - break; - - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - break; - - case RGBRST: - #ifdef RGBLIGHT_ENABLE - if (record->event.pressed) { - eeconfig_update_rgblight_default(); - rgblight_enable(); - RGB_current_config = rgblight_config; - } - #endif - break; - } - return true; -} diff --git a/keyboards/runner3680/5x6_5x8/keymaps/vial/vial.json b/keyboards/runner3680/5x6_5x8/keymaps/vial/vial.json deleted file mode 100644 index 3dc94edc78..0000000000 --- a/keyboards/runner3680/5x6_5x8/keymaps/vial/vial.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "name": "Runner3680 5x6+5x8", - "vendorId": "0xFEED", - "productId": "0x0000", - "lighting": "qmk_rgblight", - "matrix": { - "rows": 10, - "cols": 8 - }, - "layouts": { - "labels": [], - "keymap": [ - { - "name": "Runner3680 5x6+5x8" - }, - [ - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - { - "x": 1 - }, - "5,7", - "5,6", - "5,5", - "5,4", - "5,3", - "5,2", - "5,1", - "5,0" - ], - [ - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - { - "x": 1 - }, - "6,7", - "6,6", - "6,5", - "6,4", - "6,3", - "6,2", - "6,1", - "6,0" - ], - [ - { - "c": "#777777" - }, - "2,2", - { - "c": "#cccccc" - }, - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - { - "x": 1 - }, - "7,7", - "7,6", - "7,5", - "7,4", - "7,3", - "7,2", - { - "c": "#777777" - }, - "7,1", - "7,0" - ], - [ - { - "c": "#cccccc" - }, - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - { - "x": 1 - }, - "8,7", - "8,6", - "8,5", - "8,4", - "8,3", - { - "c": "#aaaaaa" - }, - "8,2", - { - "c": "#777777" - }, - "8,1", - { - "c": "#cccccc" - }, - "8,0" - ], - [ - { - "c": "#aaaaaa" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - { - "c": "#cccccc" - }, - "4,7", - { - "x": 1 - }, - "9,7", - { - "c": "#aaaaaa" - }, - "9,6", - "9,5", - "9,4", - "9,3", - { - "c": "#777777" - }, - "9,2", - "9,1", - "9,0" - ] - ] - - } -} diff --git a/keyboards/runner3680/5x6_5x8/rules.mk b/keyboards/runner3680/5x6_5x8/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/runner3680/runner3680.h b/keyboards/runner3680/runner3680.h index 39a498e90a..e7842b765a 100644 --- a/keyboards/runner3680/runner3680.h +++ b/keyboards/runner3680/runner3680.h @@ -14,10 +14,6 @@ #include "5x6.h" #endif -#ifdef KEYBOARD_runner3680_5x6_5x8 - #include "5x6_5x8.h" -#endif - #ifdef KEYBOARD_runner3680_4x8 #include "4x8.h" #endif diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/via/keymap.c b/keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c similarity index 100% rename from keyboards/sergiopoverony/creator_lite/keymaps/via/keymap.c rename to keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk b/keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk similarity index 100% rename from keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk rename to keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/via/vial.json b/keyboards/sergiopoverony/creator_lite/keymaps/vial/vial.json similarity index 100% rename from keyboards/sergiopoverony/creator_lite/keymaps/via/vial.json rename to keyboards/sergiopoverony/creator_lite/keymaps/vial/vial.json diff --git a/keyboards/sergiopoverony/creator_pro/config.h b/keyboards/sergiopoverony/creator_pro/config.h index 3ab5ff396a..3bf7efc77d 100644 --- a/keyboards/sergiopoverony/creator_pro/config.h +++ b/keyboards/sergiopoverony/creator_pro/config.h @@ -1,37 +1,49 @@ +/* Copyright 2020-2021 SergioPoverony + * + * 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 0x8b1e // "AR" -#define PRODUCT_ID 0x0C00 // "OF" +/* vid pid */ +#define VENDOR_ID 0x8B1E +#define PRODUCT_ID 0x0C00 #define DEVICE_VER 0x0001 #define MANUFACTURER SergioPoverony #define PRODUCT Creator Pro -#define VIAL_KEYBOARD_UID {0x2A, 0xA3, 0x6B, 0x57, 0x59, 0xB3, 0x55, 0xC6} - -#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } - -/* key matrix size */ + +/* key matrix size pins */ #define MATRIX_ROWS 1 #define MATRIX_COLS 9 #define DIRECT_PINS { \ - { D1, D4, C6, D7, E6, F7, B1, B3, B2} \ + { D1, D4, C6, D7, \ + E6, \ + B2, B3, B1, F7 } \ } -/*led layout indication*/ -#define LED_PIN_ON_STATE 0 -#define GREEN_LED B5 -#define BLUE_LED D0 -#define RED_LED B6 -#define USB_POLLING_INTERVAL_MS 1 -#define QMK_KEYS_PER_SCAN 12 +/*led layout indication pins*/ +#define RED_LED D0 +#define BLUE_LED B5 +#define GREEN_LED B6 -/* encoder */ +/* encoder pins*/ #define ENCODERS_PAD_A { D2 } #define ENCODERS_PAD_B { D3 } #define ENCODER_RESOLUTION 1 #define UNUSED_PINS + diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.c b/keyboards/sergiopoverony/creator_pro/creator_pro.c index 525435a34f..55c0497df2 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.c +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.c @@ -1,20 +1,33 @@ +/* Copyright 2020-2021 SergioPoverony + * + * 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 "creator_pro.h" -void matrix_init_kb(void) -{ +void matrix_init_kb(void) { matrix_init_user(); - +/* led pins */ setPinOutput(RED_LED); setPinOutput(BLUE_LED); setPinOutput(GREEN_LED); } -void turn_off_leds(void) -{ +void turn_off_leds(void) { writePinLow(RED_LED); writePinLow(BLUE_LED); writePinLow(GREEN_LED); } -void turn_on_led(pin_t pin) -{ +void turn_on_led(pin_t pin) { writePinHigh(pin); } diff --git a/keyboards/sergiopoverony/creator_pro/creator_pro.h b/keyboards/sergiopoverony/creator_pro/creator_pro.h index 2f82de0915..566e94a77a 100644 --- a/keyboards/sergiopoverony/creator_pro/creator_pro.h +++ b/keyboards/sergiopoverony/creator_pro/creator_pro.h @@ -1,18 +1,33 @@ +/* Copyright 2020-2021 SergioPoverony + * + * 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" -/* Use VIA layout from David Doan*/ -/*layout*/ #define LAYOUT( \ - k01, k02, k04, k03, \ - k05, \ - k06, k07, k08, k09\ - ) { \ - { k01, k02, k03, k04, \ - k05, \ - k06, k07, k08, k09} \ -} +K01, K02, K03, K04, \ + K05, \ +K06, K07, K08, K09 \ +) { { \ +K01, K02, K03, K04, \ + K05, \ +K06, K07, K08, K09 \ +} } /*led work*/ void turn_off_leds(void); void turn_on_led(pin_t pin); + diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json index fad830b9b3..a64615a78f 100644 --- a/keyboards/sergiopoverony/creator_pro/info.json +++ b/keyboards/sergiopoverony/creator_pro/info.json @@ -2,20 +2,18 @@ "keyboard_name": "Creator Pro", "url": "https://github.com/sergiopoverony", "maintainer": "SergioPoverony", - "width": 1, - "height": 9, "layouts": { "LAYOUT": { "layout": [ - {"label": "K01", "x":0, "y":0}, - {"label": "K02", "x":1, "y":0}, - {"label": "K03", "x":2, "y":0}, - {"label": "K04", "x":3, "y":0}, - {"label": "K05", "x":4, "y":0}, - {"label": "K06", "x":5, "y":0}, - {"label": "K07", "x":6, "y":0}, - {"label": "K08", "x":7, "y":0}, - {"label": "K09", "x":8, "y":0} + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4.5, "y":0.5}, + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1} ] } } diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c index 8e61250f40..d29621929b 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c @@ -1,54 +1,110 @@ -#include QMK_KEYBOARD_H +/* Copyright 2020-2021 SergioPoverony + * + * 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 -/* default layers */ -enum layers { - _HOME = 0, - _RED = 1, - _BLUE = 2, - _GREEN = 3, +/* enum layers num */ +enum layer_number { + _HOME = 0, + _RED, + _BLUE, + _GREEN }; - -/* Encoder with all layouts - +/* Encoder function with layers function */ bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - if (clockwise) { - tap_code16(KC_RIGHT); - } else { - tap_code16(KC_LEFT); + if (index == 0) { + switch (get_highest_layer(layer_state)) { + + case _HOME: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + case _RED: + if (clockwise) { + tap_code(KC_MS_WH_UP); + } else { + tap_code(KC_MS_WH_DOWN); + } + break; + + case _BLUE: + if (clockwise) { + tap_code(KC_PGUP); + } else { + tap_code(KC_PGDN); + } + break; + + case _GREEN: + default: + if (clockwise) { + tap_code16(KC_LEFT); + } else { + tap_code16(KC_RIGHT); + } + break; + } } - } - return true; + return true; } -*/ + /* Layout */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_HOME] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_RED), KC_6, KC_6, KC_7, KC_8 - ), + KC_1, KC_2, KC_3, KC_4, + TO(_RED), + KC_5, KC_6, KC_7, KC_8 + ), + [_RED] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_BLUE), KC_6, KC_6, KC_7, KC_8 - ), + KC_Q, KC_W, KC_E, KC_R, + TO(_BLUE), + KC_A, KC_S, KC_D, KC_F + ), + [_BLUE] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_GREEN), KC_6, KC_6, KC_7, KC_8 - ), + KC_1, KC_2, KC_3, KC_4, + TO(_GREEN), + KC_5, KC_6, KC_7, KC_8 + ), + [_GREEN] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_HOME), KC_6, KC_6, KC_7, KC_8 - ) + KC_1, KC_2, KC_3, KC_4, + TO(_HOME), + KC_5, KC_6, KC_7, KC_8 + ), }; - + /* Select led layout */ layer_state_t layer_state_set_user(layer_state_t state) { - turn_off_leds(); + turn_off_leds(); + switch (get_highest_layer(state)) { case _HOME: - turn_on_led(RED_LED); - turn_on_led(BLUE_LED); + turn_on_led(RED_LED); + turn_on_led(BLUE_LED); break; case _RED: diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md b/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md index 4e82121dce..f899eb3c13 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md +++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/readme.md @@ -1,5 +1,5 @@ -![[2x4] + 1 Macropad Layout] +![Creator Pro Layout](https://i.imgur.com/0PmpLcM.png) -# Default [2x4] + 1 Macropad Layout +# Default Creator Pro Layout -This is the default layout that comes flashed on every [2x4] + 1 Macropad. The right most key (red) is the rotary and the key is binded to layer switching. The second layer is left blank for the user. +This is the default layout that comes flashed on every Creator Pro. The right most key (Encoder) is the rotary and the key is binded to layer switching. \ No newline at end of file diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c index 337e077a49..7566772461 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/keymap.c @@ -1,36 +1,110 @@ -#include QMK_KEYBOARD_H +/* Copyright 2020-2021 SergioPoverony + * + * 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 -/* default layers */ -enum layers { - _HOME = 0, - _RED = 1, - _BLUE = 2, - _GREEN = 3, +/* enum layers num */ +enum layer_number { + _HOME = 0, + _RED, + _BLUE, + _GREEN }; +/* Encoder function with layers function */ +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + + case _HOME: + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + break; + + case _RED: + if (clockwise) { + tap_code(KC_MS_WH_UP); + } else { + tap_code(KC_MS_WH_DOWN); + } + break; + + case _BLUE: + if (clockwise) { + tap_code(KC_PGUP); + } else { + tap_code(KC_PGDN); + } + break; + + case _GREEN: + default: + if (clockwise) { + tap_code16(KC_LEFT); + } else { + tap_code16(KC_RIGHT); + } + break; + } + } + return true; +} + + /* Layout */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_HOME] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_RED), KC_6, KC_7, KC_8, KC_9 - ), + KC_1, KC_2, KC_3, KC_4, + TO(_RED), + KC_5, KC_6, KC_7, KC_8 + ), + [_RED] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_BLUE), KC_6, KC_7, KC_8, KC_9 - ), + KC_Q, KC_W, KC_E, KC_R, + TO(_BLUE), + KC_A, KC_S, KC_D, KC_F + ), + [_BLUE] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_GREEN), KC_6, KC_7, KC_8, KC_9 - ), + KC_1, KC_2, KC_3, KC_4, + TO(_GREEN), + KC_5, KC_6, KC_7, KC_8 + ), + [_GREEN] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, TO(_HOME), KC_6, KC_7, KC_8, KC_9 - ) + KC_1, KC_2, KC_3, KC_4, + TO(_HOME), + KC_5, KC_6, KC_7, KC_8 + ), }; + /* Select led layout */ layer_state_t layer_state_set_user(layer_state_t state) { - turn_off_leds(); + turn_off_leds(); + switch (get_highest_layer(state)) { case _HOME: + turn_on_led(RED_LED); + turn_on_led(BLUE_LED); break; case _RED: diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk index b971612c01..1e5b99807c 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk @@ -1,5 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes -VIAL_INSECURE = yes -VIAL_ENCODERS_ENABLE = yes -QMK_SETTINGS = no diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/config.h b/keyboards/sergiopoverony/creator_pro/keymaps/vial/config.h new file mode 100644 index 0000000000..4d9280dd8a --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/config.h @@ -0,0 +1,7 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0x2A, 0xA3, 0x6B, 0x57, 0x59, 0xB3, 0x55, 0xC6} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } + diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c new file mode 100644 index 0000000000..337e077a49 --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c @@ -0,0 +1,49 @@ +#include QMK_KEYBOARD_H + +/* default layers */ +enum layers { + _HOME = 0, + _RED = 1, + _BLUE = 2, + _GREEN = 3, +}; + +/* Layout */ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_HOME] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, TO(_RED), KC_6, KC_7, KC_8, KC_9 + ), + [_RED] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, TO(_BLUE), KC_6, KC_7, KC_8, KC_9 + ), + [_BLUE] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, TO(_GREEN), KC_6, KC_7, KC_8, KC_9 + ), + [_GREEN] = LAYOUT( + KC_1, KC_2, KC_3, KC_4, TO(_HOME), KC_6, KC_7, KC_8, KC_9 + ) +}; + +/* Select led layout */ +layer_state_t layer_state_set_user(layer_state_t state) +{ + turn_off_leds(); + switch (get_highest_layer(state)) + { + case _HOME: + break; + + case _RED: + turn_on_led(RED_LED); + break; + + case _BLUE: + turn_on_led(BLUE_LED); + break; + + case _GREEN: + turn_on_led(GREEN_LED); + break; + } + return state; +}; diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk new file mode 100644 index 0000000000..9946c0d73e --- /dev/null +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk @@ -0,0 +1,6 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIAL_INSECURE = yes +VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no +COMBO_ENABLE = no diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/vial.json b/keyboards/sergiopoverony/creator_pro/keymaps/vial/vial.json similarity index 100% rename from keyboards/sergiopoverony/creator_pro/keymaps/via/vial.json rename to keyboards/sergiopoverony/creator_pro/keymaps/vial/vial.json diff --git a/keyboards/sergiopoverony/creator_pro/rules.mk b/keyboards/sergiopoverony/creator_pro/rules.mk index b74f11a38f..1599639564 100644 --- a/keyboards/sergiopoverony/creator_pro/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/rules.mk @@ -1,11 +1,19 @@ # MCU name MCU = atmega32u4 +# Bootloader selection BOOTLOADER = caterina +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -UNICODE_ENABLE = no +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h index 78c6f483aa..839babb920 100644 --- a/keyboards/tw40/config.h +++ b/keyboards/tw40/config.h @@ -47,7 +47,3 @@ along with this program. If not, see . #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION - -#define VIAL_KEYBOARD_UID {0xB3, 0x12, 0x72, 0xC5, 0x93, 0x2E, 0x5F, 0x82} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 12 } diff --git a/keyboards/tw40/keymaps/via/keymap.c b/keyboards/tw40/keymaps/via/keymap.c index ffa79bd8cd..ffa7470bc1 100644 --- a/keyboards/tw40/keymaps/via/keymap.c +++ b/keyboards/tw40/keymaps/via/keymap.c @@ -41,6 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/tw40/keymaps/via/rules.mk b/keyboards/tw40/keymaps/via/rules.mk index 148dfa63c4..36b7ba9cbc 100644 --- a/keyboards/tw40/keymaps/via/rules.mk +++ b/keyboards/tw40/keymaps/via/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes LTO_ENABLE = yes -VIAL_ENABLE = yes -QMK_SETTINGS = no diff --git a/keyboards/tw40/keymaps/vial/config.h b/keyboards/tw40/keymaps/vial/config.h new file mode 100644 index 0000000000..f48cd0c27e --- /dev/null +++ b/keyboards/tw40/keymaps/vial/config.h @@ -0,0 +1,6 @@ +#pragma once + +#define VIAL_KEYBOARD_UID {0xB3, 0x12, 0x72, 0xC5, 0x93, 0x2E, 0x5F, 0x82} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 12 } + diff --git a/keyboards/tw40/keymaps/vial/keymap.c b/keyboards/tw40/keymaps/vial/keymap.c new file mode 100644 index 0000000000..ffa7470bc1 --- /dev/null +++ b/keyboards/tw40/keymaps/vial/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 KnoblesseOblige + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [0] = LAYOUT_all( + 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_BSPC, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, MO(2), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, MO(1), KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT + + ), + [1] = LAYOUT_all( + 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_all( + KC_GRV, 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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + + ) + +}; diff --git a/keyboards/tw40/keymaps/vial/rules.mk b/keyboards/tw40/keymaps/vial/rules.mk new file mode 100644 index 0000000000..b7637e0a2e --- /dev/null +++ b/keyboards/tw40/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes +VIAL_ENABLE = yes +QMK_SETTINGS = no + diff --git a/keyboards/tw40/keymaps/via/vial.json b/keyboards/tw40/keymaps/vial/vial.json similarity index 100% rename from keyboards/tw40/keymaps/via/vial.json rename to keyboards/tw40/keymaps/vial/vial.json diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h index 9c3acbe1ec..f653710e6c 100644 --- a/keyboards/walletburner/cajal/config.h +++ b/keyboards/walletburner/cajal/config.h @@ -36,8 +36,6 @@ #define ENCODERS_PAD_A { D6 } #define ENCODERS_PAD_B { D7 } -#define ENCODER_DIRECTION_FLIP -#define ENCODER_RESOLUTION 4 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW