From 36d35959c8d849e82881ea107019e9302ef29f74 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Fri, 6 Jul 2018 08:15:56 -0700 Subject: [PATCH] E6-V2 Last Edition (LE) Support (#3324) * new matrix for LE(Last Edition) E6V2 * Update pin outs for the new version of the PCB * putting in some placeholders for now * Trying to get e6v2/oe:default to compile * put rules.mk in the right directory * Add and update readme files * move info.json to oe directory * Update LE directory * rename keyboard name * Add QMK Configurator Support At this time, ths only covers the ALL case and allows people to use the configurator to generate their keymaps. More work will need to be done. --- keyboards/e6v2/e6v2.c | 54 +------------- keyboards/e6v2/e6v2.h | 68 +++--------------- keyboards/e6v2/keymaps/amnesia0287/config.h | 1 - keyboards/e6v2/keymaps/amnesia0287/rules.mk | 0 keyboards/e6v2/keymaps/default/config.h | 1 - keyboards/e6v2/keymaps/default/rules.mk | 0 keyboards/e6v2/le/config.h | 65 +++++++++++++++++ keyboards/e6v2/le/info.json | 12 ++++ keyboards/e6v2/le/le.c | 53 ++++++++++++++ keyboards/e6v2/le/le.h | 19 +++++ keyboards/e6v2/le/readme.md | 17 +++++ keyboards/e6v2/le/rules.mk | 68 ++++++++++++++++++ keyboards/e6v2/{ => oe}/config.h | 0 keyboards/e6v2/{ => oe}/info.json | 2 +- .../{ => oe}/keymaps/amnesia0287/keymap.c | 0 .../{ => oe}/keymaps/amnesia0287/readme.md | 0 .../e6v2/{ => oe}/keymaps/default/keymap.c | 0 .../e6v2/{ => oe}/keymaps/default/readme.md | 0 keyboards/e6v2/oe/oe.c | 53 ++++++++++++++ keyboards/e6v2/oe/oe.h | 66 +++++++++++++++++ keyboards/e6v2/oe/readme.md | 17 +++++ keyboards/e6v2/oe/rules.mk | 70 ++++++++++++++++++ keyboards/e6v2/readme.md | 15 +--- keyboards/e6v2/rules.mk | 71 +------------------ 24 files changed, 454 insertions(+), 198 deletions(-) delete mode 100644 keyboards/e6v2/keymaps/amnesia0287/config.h delete mode 100644 keyboards/e6v2/keymaps/amnesia0287/rules.mk delete mode 100644 keyboards/e6v2/keymaps/default/config.h delete mode 100644 keyboards/e6v2/keymaps/default/rules.mk create mode 100644 keyboards/e6v2/le/config.h create mode 100644 keyboards/e6v2/le/info.json create mode 100644 keyboards/e6v2/le/le.c create mode 100644 keyboards/e6v2/le/le.h create mode 100644 keyboards/e6v2/le/readme.md create mode 100644 keyboards/e6v2/le/rules.mk rename keyboards/e6v2/{ => oe}/config.h (100%) rename keyboards/e6v2/{ => oe}/info.json (99%) rename keyboards/e6v2/{ => oe}/keymaps/amnesia0287/keymap.c (100%) rename keyboards/e6v2/{ => oe}/keymaps/amnesia0287/readme.md (100%) rename keyboards/e6v2/{ => oe}/keymaps/default/keymap.c (100%) rename keyboards/e6v2/{ => oe}/keymaps/default/readme.md (100%) create mode 100644 keyboards/e6v2/oe/oe.c create mode 100644 keyboards/e6v2/oe/oe.h create mode 100644 keyboards/e6v2/oe/readme.md create mode 100644 keyboards/e6v2/oe/rules.mk diff --git a/keyboards/e6v2/e6v2.c b/keyboards/e6v2/e6v2.c index 917f3e07b..e7d5fe9e3 100644 --- a/keyboards/e6v2/e6v2.c +++ b/keyboards/e6v2/e6v2.c @@ -1,53 +1 @@ -#include "e6v2.h" - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - - matrix_init_user(); -} - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - - matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - // put your per-action keyboard code here - // runs for every action, just before processing by the firmware - - return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - DDRB |= (1<<6); - if (usb_led & (1< + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0002 +#define MANUFACTURER Exclusive / E-Team +#define PRODUCT E6-V2 LE +#define DESCRIPTION E6-V2 LE QMK PCB (Mid-Port) + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* QMK E6-V2 PCB default pin-out */ +#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } +#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 } +#define UNUSED_PINS + +#define RGB_DI_PIN E6 +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 12 +#define RGBLIGHT_HUE_STEP 12 +#define RGBLIGHT_SAT_STEP 12 +#define RGBLIGHT_VAL_STEP 12 +#endif + +#define BACKLIGHT_PIN B6 +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 2 +#define BACKLIGHT_BREAHTING +#define BREATHING_PERIOD 3 +#endif + +#define DIODE_DIRECTION COL2ROW +#define DEBOUNCING_DELAY 5 + +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ + ) + + + +#endif diff --git a/keyboards/e6v2/le/info.json b/keyboards/e6v2/le/info.json new file mode 100644 index 000000000..9f9251282 --- /dev/null +++ b/keyboards/e6v2/le/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "E6-V2 LE", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.75}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.25}, {"label":"Win", "x":3, "y":4, "w":1.25}, {"label":"Alt", "x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":2.75}, {"x":8.25, "y":4, "w":1.75}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] + } + } +} \ No newline at end of file diff --git a/keyboards/e6v2/le/le.c b/keyboards/e6v2/le/le.c new file mode 100644 index 000000000..9083352d4 --- /dev/null +++ b/keyboards/e6v2/le/le.c @@ -0,0 +1,53 @@ +#include "le.h" + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + matrix_init_user(); +} + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + // put your per-action keyboard code here + // runs for every action, just before processing by the firmware + + return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + DDRB |= (1<<6); + if (usb_led & (1<