From 19b02bf2673e891888cdbf00fc5f7a3776e50505 Mon Sep 17 00:00:00 2001 From: Jason Gorman Date: Wed, 28 Feb 2018 13:22:53 -0800 Subject: Merge of e6v2 stuff as well as my personal keymaps (#2434) * Checkin of tada keymap and initial commit for e6v2. * checking in other remaining changes before trying to merge * Reverting pin change. This was done based on the json orginally provided by exclusive, but it was later determined my map was the correct one based on user testing * fix extra key for ansi keymap. Didn't include fn as standard ansi shift is not split but still had it in keymap * Fix default help file and add reset to default --- keyboards/e6v2/config.h | 65 +++++++++++++++++++++++ keyboards/e6v2/e6v2.c | 53 +++++++++++++++++++ keyboards/e6v2/e6v2.h | 66 +++++++++++++++++++++++ keyboards/e6v2/keymaps/amnesia0287/config.h | 1 + keyboards/e6v2/keymaps/amnesia0287/keymap.c | 79 ++++++++++++++++++++++++++++ keyboards/e6v2/keymaps/amnesia0287/readme.md | 8 +++ keyboards/e6v2/keymaps/amnesia0287/rules.mk | 0 keyboards/e6v2/keymaps/default/config.h | 1 + keyboards/e6v2/keymaps/default/keymap.c | 18 +++++++ keyboards/e6v2/keymaps/default/readme.md | 8 +++ keyboards/e6v2/keymaps/default/rules.mk | 0 keyboards/e6v2/readme.md | 18 +++++++ keyboards/e6v2/rules.mk | 68 ++++++++++++++++++++++++ 13 files changed, 385 insertions(+) create mode 100644 keyboards/e6v2/config.h create mode 100644 keyboards/e6v2/e6v2.c create mode 100644 keyboards/e6v2/e6v2.h create mode 100644 keyboards/e6v2/keymaps/amnesia0287/config.h create mode 100644 keyboards/e6v2/keymaps/amnesia0287/keymap.c create mode 100644 keyboards/e6v2/keymaps/amnesia0287/readme.md create mode 100644 keyboards/e6v2/keymaps/amnesia0287/rules.mk create mode 100644 keyboards/e6v2/keymaps/default/config.h create mode 100644 keyboards/e6v2/keymaps/default/keymap.c create mode 100644 keyboards/e6v2/keymaps/default/readme.md create mode 100644 keyboards/e6v2/keymaps/default/rules.mk create mode 100644 keyboards/e6v2/readme.md create mode 100644 keyboards/e6v2/rules.mk (limited to 'keyboards/e6v2') diff --git a/keyboards/e6v2/config.h b/keyboards/e6v2/config.h new file mode 100644 index 000000000..b80afcb51 --- /dev/null +++ b/keyboards/e6v2/config.h @@ -0,0 +1,65 @@ +/* +Copyright 2012 Jun Wako + +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 +#define DESCRIPTION E6-V2 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 { D0, D1, D2, D3, D5 } +#define MATRIX_COL_PINS { C7, C6, B5, B4, D7, D6, D4, F6, F7, F5, F4, F1, F0, B0, B1 } +#define UNUSED_PINS { E6, B2, B3, B7 } + +#define RGB_DI_PIN E2 +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 8 +#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 5 +#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/e6v2.c b/keyboards/e6v2/e6v2.c new file mode 100644 index 000000000..917f3e07b --- /dev/null +++ b/keyboards/e6v2/e6v2.c @@ -0,0 +1,53 @@ +#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<event.pressed) + { + layer_on(_HLa); + update_tri_layer(_HLa, _HLb, _HL); + } + else + { + layer_off(_HLa); + update_tri_layer(_HLa, _HLb, _HL); + } + return false; + break; + case FN_HLb: + if (record->event.pressed) + { + layer_on(_HLb); + update_tri_layer(_HLa, _HLb, _HL); + } + else + { + layer_off(_HLb); + update_tri_layer(_HLa, _HLb, _HL); + } + return false; + break; + } + return true; +} \ No newline at end of file diff --git a/keyboards/e6v2/keymaps/amnesia0287/readme.md b/keyboards/e6v2/keymaps/amnesia0287/readme.md new file mode 100644 index 000000000..834604ce2 --- /dev/null +++ b/keyboards/e6v2/keymaps/amnesia0287/readme.md @@ -0,0 +1,8 @@ +amnesia0287's Keymap +=== + +Keymap Maintainer: [Jason Gorman](https://github.com/amnesia0287) + +Difference from base layout: Primarily the HHKB-ness + +Intended usage: Daily driver for programming diff --git a/keyboards/e6v2/keymaps/amnesia0287/rules.mk b/keyboards/e6v2/keymaps/amnesia0287/rules.mk new file mode 100644 index 000000000..e69de29bb diff --git a/keyboards/e6v2/keymaps/default/config.h b/keyboards/e6v2/keymaps/default/config.h new file mode 100644 index 000000000..a5568e400 --- /dev/null +++ b/keyboards/e6v2/keymaps/default/config.h @@ -0,0 +1 @@ +#include "../../config.h" diff --git a/keyboards/e6v2/keymaps/default/keymap.c b/keyboards/e6v2/keymaps/default/keymap.c new file mode 100644 index 000000000..ae63df8c0 --- /dev/null +++ b/keyboards/e6v2/keymaps/default/keymap.c @@ -0,0 +1,18 @@ +#include "e6v2.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = KEYMAP_ANSI( + 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_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, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RALT, MO(1), KC_MENU, KC_RCTL + ), + [1] = KEYMAP_ANSI( + 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_DEL, + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/e6v2/keymaps/default/readme.md b/keyboards/e6v2/keymaps/default/readme.md new file mode 100644 index 000000000..02153cb0d --- /dev/null +++ b/keyboards/e6v2/keymaps/default/readme.md @@ -0,0 +1,8 @@ +Default Keymap +=== + +Super simple default keymap with only a base layer. + +Keymap Maintainer: [Jason Gorman](https://github.com/amnesia0287) + +Intended usage: This is mostly provided for testing before you build your own keymap and as a reference to a stock(ish) configuration diff --git a/keyboards/e6v2/keymaps/default/rules.mk b/keyboards/e6v2/keymaps/default/rules.mk new file mode 100644 index 000000000..e69de29bb diff --git a/keyboards/e6v2/readme.md b/keyboards/e6v2/readme.md new file mode 100644 index 000000000..725c264ca --- /dev/null +++ b/keyboards/e6v2/readme.md @@ -0,0 +1,18 @@ +E6-V2 +=== + +These docs are for the QMK version of the PCB. [More info on qmk.fm](http://qmk.fm/) + +Keyboard Maintainer: [Jason Gorman](https://github.com/amnesia0287) +Hardware Supported: E6-V2 Mid Port rev.qmk +Hardware Availability: [geekhack.org/index.php?topic=90787.0](https://geekhack.org/index.php?topic=90787.0) + +Make example for this keyboard (after setting up your build environment): + + make e6v2:default + +Or to make and flash: + + make e6v2:default:dfu + +See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/e6v2/rules.mk b/keyboards/e6v2/rules.mk new file mode 100644 index 000000000..c2c02b614 --- /dev/null +++ b/keyboards/e6v2/rules.mk @@ -0,0 +1,68 @@ +# MCU name +#MCU = at90usb1287 +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default +RGBLIGHT_ENABLE = yes +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 -- cgit v1.2.3