diff options
author | Drashna Jael're <drashna@live.com> | 2022-11-08 17:14:27 -0800 |
---|---|---|
committer | Drashna Jael're <drashna@live.com> | 2022-11-08 17:14:27 -0800 |
commit | 64f04b30c2f48fc0e7c49ca043443f03dc56df94 (patch) | |
tree | e0f374d3b92bacefd22c31e7bda8ee1c6fcb37de /keyboards/planck/ez | |
parent | d9f575fa86ca10b990958d4e677c6a0a387dc7c3 (diff) | |
parent | 96c48a5f4aa461ed31fd4ee61151ac206e16fb5f (diff) |
Merge tag '0.18.16' into firmware22
Diffstat (limited to 'keyboards/planck/ez')
-rw-r--r-- | keyboards/planck/ez/base/info.json | 6 | ||||
-rw-r--r-- | keyboards/planck/ez/base/rules.mk | 0 | ||||
-rw-r--r-- | keyboards/planck/ez/config.h | 13 | ||||
-rw-r--r-- | keyboards/planck/ez/ez.c | 21 | ||||
-rw-r--r-- | keyboards/planck/ez/glow/config.h | 25 | ||||
-rw-r--r-- | keyboards/planck/ez/glow/info.json | 6 | ||||
-rw-r--r-- | keyboards/planck/ez/glow/keymaps/glow/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/planck/ez/info.json | 6 | ||||
-rwxr-xr-x | keyboards/planck/ez/rules.mk | 2 |
9 files changed, 40 insertions, 41 deletions
diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/info.json new file mode 100644 index 0000000000..07167a8c2a --- /dev/null +++ b/keyboards/planck/ez/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ", + "usb": { + "pid": "0xC6CE" + } +} diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/planck/ez/base/rules.mk diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index a79f49aa38..4b47e2fe2f 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -18,18 +18,6 @@ #pragma once - -#undef VENDOR_ID -#define VENDOR_ID 0x3297 -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CE -#undef MANUFACTURER -#define MANUFACTURER ZSA Technology Labs -#undef PRODUCT -#define PRODUCT Planck EZ -#define DEVICE_VER 0x0000 - - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ @@ -181,4 +169,3 @@ #define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL #define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED #define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX - diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c index 5294be9ec0..93a17be293 100644 --- a/keyboards/planck/ez/ez.c +++ b/keyboards/planck/ez/ez.c @@ -292,7 +292,7 @@ bool music_mask_kb(uint16_t keycode) { case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX: case QK_MOD_TAP ... QK_MOD_TAP_MAX: case AU_ON ... MUV_DE: - case RESET: + case QK_BOOT: case EEP_RST: return false; default: @@ -371,3 +371,22 @@ void matrix_scan_kb(void) { #endif matrix_scan_user(); } + +#ifdef SWAP_HANDS_ENABLE +__attribute__ ((weak)) +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { + {{5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}}, + {{5, 5}, {4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}}, + {{5, 6}, {4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}}, + {{5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}}, + + {{5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}}, + {{5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}}, + {{5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}}, + {{5, 7}, {4, 7}, {3, 7}, {2, 7}, {1, 7}, {0, 7}}, +}; + +# ifdef ENCODER_MAP_ENABLE +const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0}; +# endif +#endif diff --git a/keyboards/planck/ez/glow/config.h b/keyboards/planck/ez/glow/config.h deleted file mode 100644 index 55ce289010..0000000000 --- a/keyboards/planck/ez/glow/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2018 Jack Humbert <jack.humb@gmail.com> - * Copyright 2015 ZSA Technology Labs Inc (@zsa) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CF - -#undef PRODUCT -#define PRODUCT Planck EZ Glow diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/info.json new file mode 100644 index 0000000000..4852258570 --- /dev/null +++ b/keyboards/planck/ez/glow/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ Glow", + "usb": { + "pid": "0xC6CF" + } +} diff --git a/keyboards/planck/ez/glow/keymaps/glow/keymap.c b/keyboards/planck/ez/glow/keymaps/glow/keymap.c index 37659fbc32..fb150a8901 100644 --- a/keyboards/planck/ez/glow/keymaps/glow/keymap.c +++ b/keyboards/planck/ez/glow/keymaps/glow/keymap.c @@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_grid( - _______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , + _______, QK_BOOT, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL , _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 6c9332b052..4008cb7057 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Planck EZ", + "manufacturer": "ZSA Technology Labs", "url": "https://ergodox-ez.com/pages/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x3297", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index d8494f1843..d493550fa8 100755 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -30,3 +30,5 @@ RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no MOUSE_SHARED_EP = no + +DEFAULT_FOLDER = planck/ez/base |