From f006ebebbd0d4f9c3e57e299fc5e3e0326560702 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 14 May 2017 16:07:44 -0400 Subject: [PATCH 01/24] Initial push of my keymap --- keyboards/s60_x/keymaps/bluebear/Makefile | 18 +++ keyboards/s60_x/keymaps/bluebear/config.h | 122 ++++++++++++++++ keyboards/s60_x/keymaps/bluebear/keymap.c | 154 +++++++++++++++++++++ keyboards/s60_x/keymaps/bluebear/readme.md | 25 ++++ 4 files changed, 319 insertions(+) create mode 100644 keyboards/s60_x/keymaps/bluebear/Makefile create mode 100644 keyboards/s60_x/keymaps/bluebear/config.h create mode 100644 keyboards/s60_x/keymaps/bluebear/keymap.c create mode 100644 keyboards/s60_x/keymaps/bluebear/readme.md diff --git a/keyboards/s60_x/keymaps/bluebear/Makefile b/keyboards/s60_x/keymaps/bluebear/Makefile new file mode 100644 index 00000000..dfefad39 --- /dev/null +++ b/keyboards/s60_x/keymaps/bluebear/Makefile @@ -0,0 +1,18 @@ +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = no # Audio control and System control(+450) +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = yes # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +TAP_DANCE_ENABLE = no # Enable tap dancing keys + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h new file mode 100644 index 00000000..2cf96383 --- /dev/null +++ b/keyboards/s60_x/keymaps/bluebear/config.h @@ -0,0 +1,122 @@ +/* +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 0x0003 +#define MANUFACTURER Sentraq +#define PRODUCT S60-RGB +#define DESCRIPTION QMK keyboard firmware for Sentraq S60-RGB + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +// ROWS: Top to bottom, COLS: Left to right + +#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } +#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } +#define UNUSED_PINS + +#define BACKLIGHT_PIN B7 + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 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 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* Backlight configuration + */ +#define BACKLIGHT_LEVELS 3 + +/* Underlight configuration + */ + +#define RGB_DI_PIN F6 +#define RGBLIGHT_TIMER +#define RGBLED_NUM 10 // Number of LEDs +#define RGBLIGHT_HUE_STEP 10 +#define RGBLIGHT_SAT_STEP 17 +#define RGBLIGHT_VAL_STEP 17 + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION + +// For Tap Dancing + +#define TAPPING_TOGGLE 1 +#define TAPPING_TERM 300 + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +#define MIDI_TONE_KEYCODE_OCTAVES 2 + +#endif diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c new file mode 100644 index 00000000..3861ad04 --- /dev/null +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -0,0 +1,154 @@ +#include "s60_x.h" + +// Keyboard Layers + +enum keyboard_layers { + BASE = 0, //Base Layer + ARROW, //Arrow/FN Layer + MOUSE, //Mouse Layer + MIDI, //Midi Layer +}; + +// Midi Chord Keycodes + +enum midi_chord_keycodes { + + //Major Chords + + MI_CH_C = SAFE_RANGE, + MI_CH_Cs, + MI_CH_Db = MI_CH_Cs, + MI_CH_D, + MI_CH_Ds, + MI_CH_Eb = MI_CH_Ds, + MI_CH_E, + MI_CH_F, + MI_CH_Fs, + MI_CH_Gb = MI_CH_Fs, + MI_CH_G, + MI_CH_Gs, + MI_CH_Ab = MI_CH_Gs, + MI_CH_A, + MI_CH_As, + MI_CH_Bb = MI_CH_As, + MI_CH_B, + + //Minor Chords + + MI_CH_Cm, + MI_CH_Csm, + MI_CH_Dbm = MI_CH_Csm, + MI_CH_Dm, + MI_CH_Dsm, + MI_CH_Ebm = MI_CH_Dsm, + MI_CH_Em, + MI_CH_Fm, + MI_CH_Fsm, + MI_CH_Gbm = MI_CH_Fsm, + MI_CH_Gm, + MI_CH_Gsm, + MI_CH_Abm = MI_CH_Gsm, + MI_CH_Am, + MI_CH_Asm, + MI_CH_Bbm = MI_CH_Asm, + MI_CH_Bm, +}; + +//Keymaps + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* 0: Custom Dvorak/HHKBish Base Layer + + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │ ESC │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ [ │ ] │ \ │ ` │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ TAB │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │BSPC │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │CT/ES│ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │▒▒▒▒▒│CT/EN│█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │LSPO │▒▒▒▒▒│ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │▒▒▒▒▒│RSPC │▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │MO(2)│L_GUI│L_ALT│█████│█████│█████│SPFN1│█████│█████│█████│AG/AP│R_GUI│CT|S │CT|AL│█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [BASE] = KEYMAP( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, \ + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC, \ + CTL_T(KC_ESC), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_NO, MT(MOD_RCTL, KC_ENT), \ + KC_LSPO, KC_NO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_NO, KC_RSPC, KC_NO, \ + MO(2), KC_LGUI, KC_LALT, LT(1, KC_SPACE), ALGR_T(KC_APP), KC_RGUI, OSM(MOD_LCTL | MOD_LSFT), OSM(MOD_LCTL | MOD_LALT) + ), + + /* 1: Arrow/Missing Keys Layer + + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │TG(3)│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │CAPS │ │ │ │ │ │ │PGUP │ UP │HOME │ END │ │ INS │ DEL │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │ │ │ │ │LEFT │DOWN │RIGHT│ │ │▒▒▒▒▒│ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │▒▒▒▒▒│ │ │ │ │ │SPACE│PGDN │PSCR │SLCK │PAUSE│▒▒▒▒▒│ │▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │█████│█████│█████│ │█████│█████│█████│ │ │ │ │█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [ARROW] = KEYMAP( + TG(3), 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_NO, KC_NO, \ + KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_TRNS, KC_NO, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + /* 2: Mouse Keys Layer + + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │RESET│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ │ │ │ │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │ │ │ │ │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │▒▒▒▒▒│ │ │ │ │ │ │ │ │ │ │▒▒▒▒▒│ │▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │█████│█████│█████│ PWR │█████│█████│█████│ │ │ │ │█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [MOUSE] = KEYMAP( + + 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, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_TRNS, KC_NO, KC_NO, KC_POWER, KC_NO, KC_NO, KC_NO, KC_NO + ), + + /* 3: Midi Layer + + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │TG(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│ │ │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ C# │ D# │ │ F# │ G# │ A# │ │ C# │ D# │ │ │ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │OCT- │ C │ D │ E │ F │ G │ A │ B │ C │ D │ E │ F │▒▒▒▒▒│OCT+ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ Am │▒▒▒▒▒│ Em │ Bm │ F#m │ C#m │ G#m │ D#m │ Bbm │ Fm │ Cm │ Gm │▒▒▒▒▒│ Dm │▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │█████│█████│█████│A-OFF│█████│█████│█████│ │ │ │ │█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [MIDI] = KEYMAP( + TO(0), MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Gb, MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, KC_NO, KC_NO, \ + KC_NO, KC_NO, MI_Cs, MI_Ds, KC_NO, MI_Fs, MI_Gs, MI_As, KC_NO, MI_Cs_1, MI_Ds_1, KC_NO, KC_NO, KC_NO, \ + MI_OCTD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, KC_NO, MI_OCTU, \ + MI_CH_Am, KC_NO, MI_CH_Em, MI_CH_Bm, MI_CH_Fsm, MI_CH_Csm, MI_CH_Gsm, MI_CH_Dsm, MI_CH_Bbm, MI_CH_Fm, MI_CH_Cm, MI_CH_Gm, KC_NO, MI_CH_Dm, KC_NO, \ + KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO + ), + +}; diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md new file mode 100644 index 00000000..579683ab --- /dev/null +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -0,0 +1,25 @@ +## Bluebear’s custom S60X layout + +Custom keyboard layout for my S60X, my first ever custom mechanical keyboard kit. + +This layout was inspired in part by the HHKB line of keyboards and a quest to find the perfect ergonomic, logical layout for what I do. If you like this layout, please feel free to use it, modify it and share it. + +## Base Layer + +-Hold left control key for LCTL, and tap it for ESC +-Hold enter key for RCTL and tap for ENT +-Hold the space key to momentarily switch to [ARROW] layer +-Left bottom key acts as momentary switch to the [MOUSE] layer +-Hold right alt key for AltGr and tap for APP(which I have mapped to Compose in OS) +-Hold left shift key for LSFT and tap for ( (Space Cadet style) +-Hold right shift key for RSFT and tap for ) (Space Cadet style) +-Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift) +-Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt) + +## Mouse Layer + +-Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it +-Hitting the space key in this layer is like hitting power button on computer + + + From ee0b34feaf99debbc47fe736001181dffa3cd6b1 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 14 May 2017 20:07:35 -0400 Subject: [PATCH 02/24] Started working on custom midi chord function --- keyboards/s60_x/keymaps/bluebear/keymap.c | 68 +++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 3861ad04..f963043c 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -11,6 +11,13 @@ enum keyboard_layers { // Midi Chord Keycodes +bool midi_chord(uint8_t mode, uint16_t root); + +enum midi_chord_modes { + major = 0, + minor, +}; + enum midi_chord_keycodes { //Major Chords @@ -152,3 +159,64 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; + +// Midi Chord Function + +bool midi_chord(uint8_t mode, uint16_t root) { + switch (mode) { + case 0: + uint8_t channel = midi_config.channel; + uint8_t tone = root - MIDI_TONE_MIN; + uint8_t velocity = compute_velocity(midi_config.velocity); + if (record->event.pressed) { + uint8_t root_note = midi_compute_note(root); + uint8_t major_third = midi_compute_note(root) + 4; + uint8_t fifth = midi_compute_note(root) + 7; + midi_send_noteon(&midi_device, channel, root_note, velocity); + midi_send_noteon(&midi_device, channel, major_third, velocity); + midi_send_noteon(&midi_device, channel, fifth, velocity); + tone_status[tone] = root_note; + } + else { + uint8_t root_note = tone_status[tone]; + uint8_t major_third = root_note + 4; + uint8_t fifth = root_note + 7; + if (root_note != MIDI_INVALID_NOTE) + { + midi_send_noteoff(&midi_device, channel, root_note, velocity); + midi_send_noteoff(&midi_device, channel, major_third, velocity); + midi_send_noteoff(&midi_device, channel, fifth, velocity); + } + tone_status[tone] = MIDI_INVALID_NOTE; + } + return false; + case 1: + uint8_t channel = midi_config.channel; + uint8_t tone = root - MIDI_TONE_MIN; + uint8_t velocity = compute_velocity(midi_config.velocity); + if (record->event.pressed) { + uint8_t root_note = midi_compute_note(root); + uint8_t minor_third = midi_compute_note(root) + 3; + uint8_t fifth = midi_compute_note(root) + 7; + midi_send_noteon(&midi_device, channel, root_note, velocity); + midi_send_noteon(&midi_device, channel, major_third, velocity); + midi_send_noteon(&midi_device, channel, fifth, velocity); + tone_status[tone] = root_note; + } + else { + uint8_t root_note = tone_status[tone]; + uint8_t minor_third = root_note + 3; + uint8_t fifth = root_note + 7; + if (root_note != MIDI_INVALID_NOTE) + { + midi_send_noteoff(&midi_device, channel, root_note, velocity); + midi_send_noteoff(&midi_device, channel, minor_third, velocity); + midi_send_noteoff(&midi_device, channel, fifth, velocity); + } + tone_status[tone] = MIDI_INVALID_NOTE; + } + return false; + }; + return true; +}; + From 814b570ba1f2f9a12996c50844b7c8861ec1e919 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 15 May 2017 22:56:33 -0400 Subject: [PATCH 03/24] Working on keymap.c file... --- keyboards/s60_x/keymaps/bluebear/keymap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index f963043c..124c482b 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -9,15 +9,16 @@ enum keyboard_layers { MIDI, //Midi Layer }; -// Midi Chord Keycodes +// Midi Chord Keycodes +/* bool midi_chord(uint8_t mode, uint16_t root); enum midi_chord_modes { major = 0, minor, }; - +*/ enum midi_chord_keycodes { //Major Chords @@ -160,6 +161,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +/* // Midi Chord Function bool midi_chord(uint8_t mode, uint16_t root) { @@ -199,7 +201,7 @@ bool midi_chord(uint8_t mode, uint16_t root) { uint8_t minor_third = midi_compute_note(root) + 3; uint8_t fifth = midi_compute_note(root) + 7; midi_send_noteon(&midi_device, channel, root_note, velocity); - midi_send_noteon(&midi_device, channel, major_third, velocity); + midi_send_noteon(&midi_device, channel, minor_third, velocity); midi_send_noteon(&midi_device, channel, fifth, velocity); tone_status[tone] = root_note; } @@ -219,4 +221,4 @@ bool midi_chord(uint8_t mode, uint16_t root) { }; return true; }; - +*/ From 26c6f6a85c9c16a3be27e6c61609b3da99ec3f73 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Tue, 16 May 2017 22:08:45 -0400 Subject: [PATCH 04/24] Added Space Cadet Rollover Disable to config.h --- keyboards/s60_x/keymaps/bluebear/config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h index 2cf96383..94438bdc 100644 --- a/keyboards/s60_x/keymaps/bluebear/config.h +++ b/keyboards/s60_x/keymaps/bluebear/config.h @@ -119,4 +119,7 @@ along with this program. If not, see . /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ #define MIDI_TONE_KEYCODE_OCTAVES 2 +// Space Cadet Rollover - if set, allows to tap opposite shift key to cancel erroneous press +#define DISABLE_SPACE_CADET_ROLLOVER + #endif From b766407cbe07e78f5cf5ce2ec77694541d598e0e Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 21 May 2017 08:40:42 -0400 Subject: [PATCH 05/24] Continuing work on keymap.c --- keyboards/s60_x/keymaps/bluebear/keymap.c | 450 ++++++++++++++++++++-- 1 file changed, 416 insertions(+), 34 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 124c482b..0b3b8b65 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -4,62 +4,140 @@ enum keyboard_layers { BASE = 0, //Base Layer - ARROW, //Arrow/FN Layer + ARROWFN, //Arrow/FN Layer MOUSE, //Mouse Layer MIDI, //Midi Layer + MORSE, //Morse Code Layer }; +// Midi Chords -// Midi Chord Keycodes -/* -bool midi_chord(uint8_t mode, uint16_t root); - -enum midi_chord_modes { +enum midi_chord_modes { //ACTION_FUNCTION id major = 0, minor, }; -*/ + +enum midi_chord_root { //ACTION_FUNCTION opt + C = 0, + Cs, + Db = Cs, + D, + Ds, + Eb = Ds, + E, + F, + Fs, + Gb = Fs, + G, + Gs, + Ab = Gs, + A, + As, + Bb = As, + B, +}; + enum midi_chord_keycodes { //Major Chords - MI_CH_C = SAFE_RANGE, - MI_CH_Cs, + MI_CH_C = ACTION_FUNCTION(0, 0), + MI_CH_Cs = ACTION_FUNCTION(0, 1), MI_CH_Db = MI_CH_Cs, - MI_CH_D, - MI_CH_Ds, + MI_CH_D = ACTION_FUNCTION(0, 2), + MI_CH_Ds = ACTION_FUNCTION(0, 3), MI_CH_Eb = MI_CH_Ds, - MI_CH_E, - MI_CH_F, - MI_CH_Fs, + MI_CH_E = ACTION_FUNCTION(0, 4), + MI_CH_F = ACTION_FUNCTION(0, 5), + MI_CH_Fs = ACTION_FUNCTION(0, 6), MI_CH_Gb = MI_CH_Fs, - MI_CH_G, - MI_CH_Gs, + MI_CH_G = ACTION_FUNCTION(0, 7), + MI_CH_Gs = ACTION_FUNCTION(0, 8), MI_CH_Ab = MI_CH_Gs, - MI_CH_A, - MI_CH_As, + MI_CH_A = ACTION_FUNCTION(0, 9), + MI_CH_As = ACTION_FUNCTION(0, 10), MI_CH_Bb = MI_CH_As, - MI_CH_B, + MI_CH_B = ACTION_FUNCTION(0, 11), //Minor Chords - MI_CH_Cm, - MI_CH_Csm, + MI_CH_Cm = ACTION_FUNCTION(1, 0), + MI_CH_Csm = ACTION_FUNCTION(1, 1), MI_CH_Dbm = MI_CH_Csm, - MI_CH_Dm, - MI_CH_Dsm, + MI_CH_Dm = ACTION_FUNCTION(1, 2), + MI_CH_Dsm = ACTION_FUNCTION(1, 3), MI_CH_Ebm = MI_CH_Dsm, - MI_CH_Em, - MI_CH_Fm, - MI_CH_Fsm, + MI_CH_Em = ACTION_FUNCTION(1, 4), + MI_CH_Fm = ACTION_FUNCTION(1, 5), + MI_CH_Fsm = ACTION_FUNCTION(1, 6), MI_CH_Gbm = MI_CH_Fsm, - MI_CH_Gm, - MI_CH_Gsm, + MI_CH_Gm = ACTION_FUNCTION(1, 7), + MI_CH_Gsm= ACTION_FUNCTION(1, 8), MI_CH_Abm = MI_CH_Gsm, - MI_CH_Am, - MI_CH_Asm, + MI_CH_Am = ACTION_FUNCTION(1, 9), + MI_CH_Asm = ACTION_FUNCTION(1, 10), MI_CH_Bbm = MI_CH_Asm, - MI_CH_Bm, + MI_CH_Bm = ACTION_FUNCTION(1, 11), +}; + +//Morse Code Macro Keys + +enum morse_macros { + MC_0 = M(0), + MC_1 = M(1), + MC_2 = M(2), + MC_3 = M(3), + MC_4 = M(4), + MC_5 = M(5), + MC_6 = M(6), + MC_7 = M(7), + MC_8 = M(8), + MC_9 = M(9), + MC_A = M(10), + MC_B = M(11), + MC_C = M(12), + MC_D = M(13), + MC_E = M(14), + MC_F = M(15), + MC_G = M(16), + MC_H = M(17), + MC_I = M(18), + MC_J = M(19), + MC_K = M(20), + MC_L = M(21), + MC_M = M(22), + MC_N = M(23), + MC_O = M(24), + MC_P = M(25), + MC_Q = M(26), + MC_R = M(27), + MC_S = M(28), + MC_T = M(29), + MC_U = M(30), + MC_V = M(31), + MC_W = M(32), + MC_X = M(33), + MC_Y = M(34), + MC_Z = M(35), + MC_DOT = M(36), + MC_COMM = M(37), + MC_QUES = M(38), + MC_APOS = M(39), + MC_EXCL = M(40), + MC_SLSH = M(41), + MC_PARO = M(42), + MC_PARC = M(43), + MC_AMP = M(44), + MC_COL = M(45), + MC_SCLN = M(46), + MC_EQL = M(47), + MC_PLUS = M(48), + MC_MINS = M(49), + MC_QUOT = M(50), + MC_DOLR = M(51), + MC_AT = M(52), + MC_UNDS = M(53), + MC_SPACE = M(54), }; //Keymaps @@ -89,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(2), KC_LGUI, KC_LALT, LT(1, KC_SPACE), ALGR_T(KC_APP), KC_RGUI, OSM(MOD_LCTL | MOD_LSFT), OSM(MOD_LCTL | MOD_LALT) ), - /* 1: Arrow/Missing Keys Layer + /* 1: Arrow/FN Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ │TG(3)│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ @@ -104,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ - [ARROW] = KEYMAP( + [ARROWFN] = KEYMAP( TG(3), 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_NO, KC_NO, \ KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ @@ -159,12 +237,316 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO ), + /* 4: Morse Code Layer + + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ │ │ │ │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │BSPC │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ A │ O │ E │ U │ I │ D │ H │ T │ N │ S │ - │▒▒▒▒▒│ENTER│█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │SHIFT│▒▒▒▒▒│ ; │ Q │ J │ K │ X │ B │ M │ W │ V │ Z │▒▒▒▒▒│SHIFT│▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │█████│█████│█████│SPACE│█████│█████│█████│ │ │ │ │█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [MORSE] = KEYMAP( + KC_NO, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_0, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_NO, MC_APOS, MC_COMM, MC_DOT, MC_P, MC_Y, MC_F, MC_G, MC_C, MC_R, MC_L, MC_SLSH, MC_EQL, KC_BSPC, \ + KC_NO, MC_A, MC_O, MC_E, MC_U, MC_I, MC_D, MC_H, MC_T, MC_N, MC_S, MC_MINS, KC_NO, KC_ENT, \ + KC_LSFT, KC_NO, MC_SCLN, MC_Q, MC_J, MC_K, MC_X, MC_B, MC_M, MC_W, MC_V, MC_Z, KC_NO, KC_RSFT, KC_NO, \ + KC_NO, KC_NO, KC_NO, MC_SPACE, KC_NO, KC_NO, KC_NO, KC_NO + ), + +}; + +// Morse Code Macros + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + switch(id) { + case 0: //Number 0 + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- + } + break; + case 1: //Number 1 + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.---- + } + break; + case 2: //Number 2 + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //..--- + } + break; + case 3: // Number 3 + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- + } + break; + case 4: //Number 4 + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //....- + } + break; + case 5: //Number 5 + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... + } + break; + case 6: //Number 6 + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... + } + break; + case 7: //Number 7 + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //--... + } + break; + case 8: //Number 8 + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. + } + break; + case 9: //Number 9 + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //----. + } + break; + case 10: //Letter A + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- + } + break; + case 11: //Letter B + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... + } + break; + case 12: //Letter C + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. + } + break; + case 13: //Letter D + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. + } + break; + case 14: //Letter E + if (record->event.pressed) { + return MACRO(T(DOT), T(SPACE), END); //. + } + break; + case 15: //Letter F + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. + } + break; + case 16: //Letter G + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. + } + break; + case 17: //Letter H + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... + } + break; + case 18: //Letter I + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. + } + break; + case 19: //Letter J + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- + } + break; + case 20: //Letter K + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- + } + break; + case 21: //Letter L + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. + } + break; + case 22: //Letter M + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- + } + break; + case 23: //Letter N + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. + } + break; + case 24: //Letter O + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- + } + break; + case 25: //Letter P + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. + } + break; + case 26: //Letter Q + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- + } + break; + case 27: //Letter R + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. + } + break; + case 28: //Letter S + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... + } + break; + case 29: //Letter T + if (record->event.pressed) { + return MACRO(T(MINS), T(SPACE), END); //- + } + break; + case 30: //Letter U + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- + } + break; + case 31: //Letter V + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- + } + break; + case 32: //Letter W + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- + } + break; + case 33: //Letter X + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- + } + break; + case 34: //Letter Y + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- + } + break; + case 35: //Letter Z + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. + } + break; + case 36: //Punctuation . + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- + } + break; + case 37: //Punctuation , + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- + } + break; + case 38: //Punctuation ? + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. + } + break; + case 39: //Punctuation ' + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-....- + } + break; + case 40: //Punctuation ! + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- + } + break; + case 41: //Punctuation / + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-..-. + } + break; + case 42: //Punctuation ( + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. + } + break; + case 43: //Punctuation ) + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- + } + break; + case 44: //Punctuation & + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... + } + break; + case 45: //Punctuation : + if (record->event.pressed) { + return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... + } + break; + case 46: //Punctuation ; + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.-. + } + break; + case 47: //Punctuation = + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-...- + } + break; + case 48: //Punctuation + + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. + } + break; + case 49: //Punctuation - + if (record->event.pressed) { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-....- + } + break; + case 50: //Punctuation " + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. + } + break; + case 51: //Punctuation $ + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- + } + break; + case 52: //Punctuation @ + if (record->event.pressed) { + return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. + } + break; + case 53: //Punctuation _ + if (record->event.pressed) { + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- + case 54: //Morse Space + if (record->event.pressed) { + return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse + } + break; + } + return MACRO_NONE; }; /* // Midi Chord Function -bool midi_chord(uint8_t mode, uint16_t root) { switch (mode) { case 0: uint8_t channel = midi_config.channel; From 06433eb1a0563fe8c17bdd31c42d5f6b94a6e508 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 21 May 2017 22:37:20 -0400 Subject: [PATCH 06/24] More work on keymap.c and config.h --- keyboards/s60_x/keymaps/bluebear/config.h | 5 +- keyboards/s60_x/keymaps/bluebear/keymap.c | 296 ++++++++++++++-------- 2 files changed, 197 insertions(+), 104 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/config.h b/keyboards/s60_x/keymaps/bluebear/config.h index 94438bdc..5c0d0883 100644 --- a/keyboards/s60_x/keymaps/bluebear/config.h +++ b/keyboards/s60_x/keymaps/bluebear/config.h @@ -121,5 +121,8 @@ along with this program. If not, see . // Space Cadet Rollover - if set, allows to tap opposite shift key to cancel erroneous press #define DISABLE_SPACE_CADET_ROLLOVER - + +// Prevent stuck modifiers +#define PREVENT_STUCK_MODIFIERS + #endif diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 0b3b8b65..d383d2e2 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -3,7 +3,7 @@ // Keyboard Layers enum keyboard_layers { - BASE = 0, //Base Layer + BASE, //Base Layer ARROWFN, //Arrow/FN Layer MOUSE, //Mouse Layer MIDI, //Midi Layer @@ -13,12 +13,12 @@ enum keyboard_layers { // Midi Chords enum midi_chord_modes { //ACTION_FUNCTION id - major = 0, + major, minor, }; enum midi_chord_root { //ACTION_FUNCTION opt - C = 0, + C, Cs, Db = Cs, D, @@ -41,43 +41,43 @@ enum midi_chord_keycodes { //Major Chords - MI_CH_C = ACTION_FUNCTION(0, 0), - MI_CH_Cs = ACTION_FUNCTION(0, 1), + MI_CH_C = ACTION_FUNCTION_OPT(major,C), + MI_CH_Cs = ACTION_FUNCTION_OPT(major,Cs), MI_CH_Db = MI_CH_Cs, - MI_CH_D = ACTION_FUNCTION(0, 2), - MI_CH_Ds = ACTION_FUNCTION(0, 3), + MI_CH_D = ACTION_FUNCTION_OPT(major,D), + MI_CH_Ds = ACTION_FUNCTION_OPT(major,Ds), MI_CH_Eb = MI_CH_Ds, - MI_CH_E = ACTION_FUNCTION(0, 4), - MI_CH_F = ACTION_FUNCTION(0, 5), - MI_CH_Fs = ACTION_FUNCTION(0, 6), + MI_CH_E = ACTION_FUNCTION_OPT(major,E), + MI_CH_F = ACTION_FUNCTION_OPT(major,F), + MI_CH_Fs = ACTION_FUNCTION_OPT(major,Fs), MI_CH_Gb = MI_CH_Fs, - MI_CH_G = ACTION_FUNCTION(0, 7), - MI_CH_Gs = ACTION_FUNCTION(0, 8), + MI_CH_G = ACTION_FUNCTION_OPT(major,G), + MI_CH_Gs = ACTION_FUNCTION_OPT(major,Gs), MI_CH_Ab = MI_CH_Gs, - MI_CH_A = ACTION_FUNCTION(0, 9), - MI_CH_As = ACTION_FUNCTION(0, 10), + MI_CH_A = ACTION_FUNCTION_OPT(major,A), + MI_CH_As = ACTION_FUNCTION_OPT(major,As), MI_CH_Bb = MI_CH_As, - MI_CH_B = ACTION_FUNCTION(0, 11), + MI_CH_B = ACTION_FUNCTION_OPT(major,B), //Minor Chords - MI_CH_Cm = ACTION_FUNCTION(1, 0), - MI_CH_Csm = ACTION_FUNCTION(1, 1), + MI_CH_Cm = ACTION_FUNCTION_OPT(minor,C), + MI_CH_Csm = ACTION_FUNCTION_OPT(minor,Cs), MI_CH_Dbm = MI_CH_Csm, - MI_CH_Dm = ACTION_FUNCTION(1, 2), - MI_CH_Dsm = ACTION_FUNCTION(1, 3), + MI_CH_Dm = ACTION_FUNCTION_OPT(minor,D), + MI_CH_Dsm = ACTION_FUNCTION_OPT(minor,Ds), MI_CH_Ebm = MI_CH_Dsm, - MI_CH_Em = ACTION_FUNCTION(1, 4), - MI_CH_Fm = ACTION_FUNCTION(1, 5), - MI_CH_Fsm = ACTION_FUNCTION(1, 6), + MI_CH_Em = ACTION_FUNCTION_OPT(minor,E), + MI_CH_Fm = ACTION_FUNCTION_OPT(minor,F), + MI_CH_Fsm = ACTION_FUNCTION_OPT(minor,Fs), MI_CH_Gbm = MI_CH_Fsm, - MI_CH_Gm = ACTION_FUNCTION(1, 7), - MI_CH_Gsm= ACTION_FUNCTION(1, 8), + MI_CH_Gm = ACTION_FUNCTION_OPT(minor,G), + MI_CH_Gsm= ACTION_FUNCTION_OPT(minor,Gs), MI_CH_Abm = MI_CH_Gsm, - MI_CH_Am = ACTION_FUNCTION(1, 9), - MI_CH_Asm = ACTION_FUNCTION(1, 10), + MI_CH_Am = ACTION_FUNCTION_OPT(minor,A), + MI_CH_Asm = ACTION_FUNCTION_OPT(minor,As), MI_CH_Bbm = MI_CH_Asm, - MI_CH_Bm = ACTION_FUNCTION(1, 11), + MI_CH_Bm = ACTION_FUNCTION_OPT(minor,B), }; //Morse Code Macro Keys @@ -166,11 +166,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSPO, KC_NO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_NO, KC_RSPC, KC_NO, \ MO(2), KC_LGUI, KC_LALT, LT(1, KC_SPACE), ALGR_T(KC_APP), KC_RGUI, OSM(MOD_LCTL | MOD_LSFT), OSM(MOD_LCTL | MOD_LALT) ), - + /* 1: Arrow/FN Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │TG(3)│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ + │ │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │TO(3)│TO(4)│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │CAPS │ │ │ │ │ │ │PGUP │ UP │HOME │ END │ │ INS │ DEL │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -183,17 +183,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [ARROWFN] = KEYMAP( - TG(3), 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_NO, KC_NO, \ - KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_TRNS, KC_NO, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(4), \ + KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_TRNS, KC_NO, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), /* 2: Mouse Keys Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │RESET│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ │ │ │ │ + │RESET│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -217,7 +217,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 3: Midi Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │TG(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│ │ │ + │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│ │ │ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ C# │ D# │ │ F# │ G# │ A# │ │ C# │ D# │ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -240,7 +240,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 4: Morse Code Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ │ │ │ │ + │TO(0)│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ │ │ │ │ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ ' │ , │ . │ P │ Y │ F │ G │ C │ R │ L │ / │ = │BSPC │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -253,19 +253,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [MORSE] = KEYMAP( - KC_NO, MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_0, KC_NO, KC_NO, KC_NO, KC_NO, \ - KC_NO, MC_APOS, MC_COMM, MC_DOT, MC_P, MC_Y, MC_F, MC_G, MC_C, MC_R, MC_L, MC_SLSH, MC_EQL, KC_BSPC, \ - KC_NO, MC_A, MC_O, MC_E, MC_U, MC_I, MC_D, MC_H, MC_T, MC_N, MC_S, MC_MINS, KC_NO, KC_ENT, \ - KC_LSFT, KC_NO, MC_SCLN, MC_Q, MC_J, MC_K, MC_X, MC_B, MC_M, MC_W, MC_V, MC_Z, KC_NO, KC_RSFT, KC_NO, \ - KC_NO, KC_NO, KC_NO, MC_SPACE, KC_NO, KC_NO, KC_NO, KC_NO - ), + TO(0), MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_0, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_TAB, MC_APOS, MC_COMM, MC_DOT, MC_P, MC_Y, MC_F, MC_G, MC_C, MC_R, MC_L, MC_SLSH, MC_EQL, KC_BSPC, \ + KC_NO, MC_A, MC_O, MC_E, MC_U, MC_I, MC_D, MC_H, MC_T, MC_N, MC_S, MC_MINS, KC_NO, KC_ENT, \ + KC_LSFT, KC_NO, MC_SCLN, MC_Q, MC_J, MC_K, MC_X, MC_B, MC_M, MC_W, MC_V, MC_Z, KC_NO, KC_RSFT, KC_NO, \ + KC_NO, KC_NO, KC_NO, MC_SPACE, KC_NO, KC_NO, KC_NO, KC_NO + ), }; // Morse Code Macros -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { case 0: //Number 0 if (record->event.pressed) { @@ -319,131 +318,209 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) break; case 10: //Letter A if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- } break; case 11: //Letter B if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... } break; case 12: //Letter C if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. } break; case 13: //Letter D if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. } break; case 14: //Letter E if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(SPACE), END); //. } break; case 15: //Letter F if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. } break; case 16: //Letter G if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. } break; case 17: //Letter H - if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... + if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); } + return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... + } break; case 18: //Letter I if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. } break; case 19: //Letter J if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- } break; case 20: //Letter K if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- } break; case 21: //Letter L if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. } break; case 22: //Letter M if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- } break; case 23: //Letter N if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. } break; case 24: //Letter O if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- } break; case 25: //Letter P if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. } break; case 26: //Letter Q if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- } break; case 27: //Letter R if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. } break; case 28: //Letter S if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... } break; case 29: //Letter T if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(SPACE), END); //- } break; case 30: //Letter U if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- } break; case 31: //Letter V if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- } break; case 32: //Letter W if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- } break; case 33: //Letter X if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- } break; case 34: //Letter Y if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- } break; case 35: //Letter Z if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. } break; @@ -535,6 +612,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) case 53: //Punctuation _ if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- + } + break; case 54: //Morse Space if (record->event.pressed) { return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse @@ -547,60 +626,71 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) /* // Midi Chord Function - switch (mode) { - case 0: - uint8_t channel = midi_config.channel; - uint8_t tone = root - MIDI_TONE_MIN; - uint8_t velocity = compute_velocity(midi_config.velocity); - if (record->event.pressed) { - uint8_t root_note = midi_compute_note(root); - uint8_t major_third = midi_compute_note(root) + 4; - uint8_t fifth = midi_compute_note(root) + 7; - midi_send_noteon(&midi_device, channel, root_note, velocity); - midi_send_noteon(&midi_device, channel, major_third, velocity); - midi_send_noteon(&midi_device, channel, fifth, velocity); - tone_status[tone] = root_note; - } - else { - uint8_t root_note = tone_status[tone]; - uint8_t major_third = root_note + 4; - uint8_t fifth = root_note + 7; - if (root_note != MIDI_INVALID_NOTE) - { - midi_send_noteoff(&midi_device, channel, root_note, velocity); - midi_send_noteoff(&midi_device, channel, major_third, velocity); - midi_send_noteoff(&midi_device, channel, fifth, velocity); - } - tone_status[tone] = MIDI_INVALID_NOTE; - } - return false; - case 1: - uint8_t channel = midi_config.channel; - uint8_t tone = root - MIDI_TONE_MIN; - uint8_t velocity = compute_velocity(midi_config.velocity); - if (record->event.pressed) { - uint8_t root_note = midi_compute_note(root); - uint8_t minor_third = midi_compute_note(root) + 3; - uint8_t fifth = midi_compute_note(root) + 7; - midi_send_noteon(&midi_device, channel, root_note, velocity); - midi_send_noteon(&midi_device, channel, minor_third, velocity); - midi_send_noteon(&midi_device, channel, fifth, velocity); - tone_status[tone] = root_note; - } - else { - uint8_t root_note = tone_status[tone]; - uint8_t minor_third = root_note + 3; - uint8_t fifth = root_note + 7; - if (root_note != MIDI_INVALID_NOTE) - { - midi_send_noteoff(&midi_device, channel, root_note, velocity); - midi_send_noteoff(&midi_device, channel, minor_third, velocity); - midi_send_noteoff(&midi_device, channel, fifth, velocity); - } - tone_status[tone] = MIDI_INVALID_NOTE; - } - return false; - }; - return true; +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { +uint16_t root_note; +uint8_t channel = midi_config.channel; +uint8_t velocity = compute_velocity(midi_config.velocity); +switch (opt) { +case 0: //Root note C +root_note = MI_C; +case 1: //Root note C#/Db +root_note = MI_Cs; +case 2: // Root note D +root_note = MI_D; +case 3: // Root note D#/Eb +root_note = MI_Ds; +case 4: // Root note E +root_note = MI_E; +case 5: // Root note F +root_note = MI_F; +case 6: // Root note F#/Gb +root_note = MI_Fs; +case 7: // Root note G +root_note = MI_G; +case 8: // Root note G#/Ab +root_note = MI_Gs; +case 9: // Root note A +root_note = MI_A; +case 10: // Root note A#/Bb +root_note = MI_As; +case 11: // Root note B +root_note = MI_B; +switch (id) { +uint8_t tone = root_note - MIDI_TONE_MIN; +uint8_t root = midi_compute_note(root_note); +uint8_t major_third = midi_compute_note(root_note) + 4; +uint8_t minor_third = midi_compute_note(root_note) + 3; +uint8_t fifth = midi_compute_note(root_note) + 7; +case 0: //Major chord +if (record->event.pressed) { +midi_send_noteon(&midi_device, channel, root, velocity); +midi_send_noteon(&midi_device, channel, major_third, velocity); +midi_send_noteon(&midi_device, channel, fifth, velocity); +tone_status[tone] = root; +} +else { +uint8_t root = tone_status[tone]; +if (root != MIDI_INVALID_NOTE) +{ +midi_send_noteoff(&midi_device, channel, root, velocity); +} +tone_status[tone] = MIDI_INVALID_NOTE; +} +case 1: //Minor chord +if (record->event.pressed) { +midi_send_noteon(&midi_device, channel, root_note, velocity); +midi_send_noteon(&midi_device, channel, minor_third, velocity); +midi_send_noteon(&midi_device, channel, fifth, velocity); +} +else { +uint8_t root = tone_status[tone]; +if (root != MIDI_INVALID_NOTE) +{ +midi_send_noteoff(&midi_device, channel, root, velocity); +} +tone_status[tone] = MIDI_INVALID_NOTE; +} +} +} }; */ From 4d783d0e69444a660c53c95e83bf6ca011bc6c8e Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 22 May 2017 23:30:25 -0400 Subject: [PATCH 07/24] More work on my keymap.c and added .png images of my different layers. --- .../bluebear/S60X-Bluebear-ARROWFN-Layer.png | Bin 0 -> 17938 bytes .../bluebear/S60X-Bluebear-BASE-Layer.png | Bin 0 -> 28068 bytes .../bluebear/S60X-Bluebear-MIDI-Layer.png | Bin 0 -> 21329 bytes .../bluebear/S60X-Bluebear-MORSE-Layer.png | Bin 0 -> 14330 bytes .../bluebear/S60X-Bluebear-MOUSE-Layer.png | Bin 0 -> 16119 bytes keyboards/s60_x/keymaps/bluebear/keymap.c | 219 ++++++++++-------- 6 files changed, 120 insertions(+), 99 deletions(-) create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..a7c6df504412616e24c67efae9d5b18e5097d222 GIT binary patch literal 17938 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 literal 0 HcmV?d00001 diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..e77287a0f145f18a6ce5425cfbfc60d470c0092b GIT binary patch literal 28068 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 CJ-;#l literal 0 HcmV?d00001 diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..c8df0a9e9e7c0ae12beeb972a4c3ad0adec9c420 GIT binary patch literal 21329 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 AqyPW_ literal 0 HcmV?d00001 diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..0e72d103263d0b2aa83a06682ca5e11dec96bc78 GIT binary patch literal 14330 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 u>d&Jn4b9oN)CNu|BJ9A1!A^F6Wd;bH2BSuXC literal 0 HcmV?d00001 diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index d383d2e2..32a65a59 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -121,23 +121,12 @@ enum morse_macros { MC_Z = M(35), MC_DOT = M(36), MC_COMM = M(37), - MC_QUES = M(38), - MC_APOS = M(39), - MC_EXCL = M(40), - MC_SLSH = M(41), - MC_PARO = M(42), - MC_PARC = M(43), - MC_AMP = M(44), - MC_COL = M(45), - MC_SCLN = M(46), - MC_EQL = M(47), - MC_PLUS = M(48), - MC_MINS = M(49), - MC_QUOT = M(50), - MC_DOLR = M(51), - MC_AT = M(52), - MC_UNDS = M(53), - MC_SPACE = M(54), + MC_APOS = M(38), + MC_SLSH = M(39), + MC_SCLN = M(40), + MC_EQL = M(41), + MC_MINS = M(42), + MC_SPACE = M(43), }; //Keymaps @@ -183,11 +172,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [ARROWFN] = KEYMAP( - KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(4), \ + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(4), \ KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_TRNS, KC_NO, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NO, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS ), /* 2: Mouse Keys Layer @@ -266,54 +255,102 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { - case 0: //Number 0 + case 0: //Number 0-) if (record->event.pressed) { - return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- + } + else { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- + } } break; - case 1: //Number 1 + case 1: //Number 1-! if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.---- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- + } + else { + return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.---- + } } break; - case 2: //Number 2 + case 2: //Number 2-@ if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //..--- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. + } + else { + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //..--- + } } break; case 3: // Number 3 if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- } break; - case 4: //Number 4 + case 4: //Number 4-$ if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //....- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- + } + else { + return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //....- + } } break; case 5: //Number 5 if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... } break; case 6: //Number 6 if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... } break; - case 7: //Number 7 + case 7: //Number 7-& if (record->event.pressed) { - return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //--... + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... + } + else { + return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //--... + } } break; case 8: //Number 8 if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. } break; - case 9: //Number 9 + case 9: //Number 9-( if (record->event.pressed) { - return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //----. + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. + } + else { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //----. + } } break; case 10: //Letter A @@ -526,96 +563,80 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 36: //Punctuation . if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- } break; case 37: //Punctuation , if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- } break; - case 38: //Punctuation ? - if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. - } - break; - case 39: //Punctuation ' - if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-....- - } - break; - case 40: //Punctuation ! + case 38: //Punctuation '-" if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- - } - break; - case 41: //Punctuation / - if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-..-. - } - break; - case 42: //Punctuation ( - if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. - } - break; - case 43: //Punctuation ) - if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- - } - break; - case 44: //Punctuation & - if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... - } - break; - case 45: //Punctuation : - if (record->event.pressed) { - return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... - } - break; - case 46: //Punctuation ; - if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.-. - } - break; - case 47: //Punctuation = - if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-...- - } - break; - case 48: //Punctuation + - if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. + } + else { + return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-....- + } } break; - case 49: //Punctuation - + case 39: //Punctuation /-? if (record->event.pressed) { - return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-....- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. + } + else { + return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-..-. + } } break; - case 50: //Punctuation " + case 40: //Punctuation ;-: if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... + } + else { + return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-.-. + } } break; - case 51: //Punctuation $ + case 41: //Punctuation =-+ if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. + } + else { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-...- + } } break; - case 52: //Punctuation @ + case 42: //Punctuation --_ if (record->event.pressed) { - return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. - } - break; - case 53: //Punctuation _ - if (record->event.pressed) { - return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- + } + else { + return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-....- + } } break; - case 54: //Morse Space + case 43: //Morse Space if (record->event.pressed) { + if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + } return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse } break; From 1a0dfbbc96b32aeae27ace398282c18227fc4b4e Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Wed, 24 May 2017 21:15:41 -0400 Subject: [PATCH 08/24] More updates to keymap.c - still errors with midi when trying to compile --- keyboards/s60_x/keymaps/bluebear/keymap.c | 132 ++++++++++------------ 1 file changed, 61 insertions(+), 71 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 32a65a59..dfb0b966 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -161,9 +161,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ │ │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │TO(3)│TO(4)│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │CAPS │ │ │ │ │ │ │PGUP │ UP │HOME │ END │ │ INS │ DEL │█████│ + │ │ │ │ │ │ │ │PGUP │ UP │ │ │ │ INS │ DEL │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ │ │ │ │ │ │ │LEFT │DOWN │RIGHT│ │ │▒▒▒▒▒│ │█████│ + │CAPS │HOME │ │ END │ │ │ │LEFT │DOWN │RIGHT│ │ │▒▒▒▒▒│ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │▒▒▒▒▒│ │ │ │ │ │SPACE│PGDN │PSCR │SLCK │PAUSE│▒▒▒▒▒│ │▒▒▒▒▒│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -173,8 +173,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [ARROWFN] = KEYMAP( KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(4), \ - KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_HOME, KC_END, KC_NO, KC_INS, KC_DEL, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_NO, KC_NO, KC_NO, KC_INS, KC_DEL, \ + KC_CAPS, KC_HOME, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS ), @@ -644,74 +644,64 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }; -/* // Midi Chord Function void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { -uint16_t root_note; -uint8_t channel = midi_config.channel; -uint8_t velocity = compute_velocity(midi_config.velocity); -switch (opt) { -case 0: //Root note C -root_note = MI_C; -case 1: //Root note C#/Db -root_note = MI_Cs; -case 2: // Root note D -root_note = MI_D; -case 3: // Root note D#/Eb -root_note = MI_Ds; -case 4: // Root note E -root_note = MI_E; -case 5: // Root note F -root_note = MI_F; -case 6: // Root note F#/Gb -root_note = MI_Fs; -case 7: // Root note G -root_note = MI_G; -case 8: // Root note G#/Ab -root_note = MI_Gs; -case 9: // Root note A -root_note = MI_A; -case 10: // Root note A#/Bb -root_note = MI_As; -case 11: // Root note B -root_note = MI_B; -switch (id) { -uint8_t tone = root_note - MIDI_TONE_MIN; -uint8_t root = midi_compute_note(root_note); -uint8_t major_third = midi_compute_note(root_note) + 4; -uint8_t minor_third = midi_compute_note(root_note) + 3; -uint8_t fifth = midi_compute_note(root_note) + 7; -case 0: //Major chord -if (record->event.pressed) { -midi_send_noteon(&midi_device, channel, root, velocity); -midi_send_noteon(&midi_device, channel, major_third, velocity); -midi_send_noteon(&midi_device, channel, fifth, velocity); -tone_status[tone] = root; -} -else { -uint8_t root = tone_status[tone]; -if (root != MIDI_INVALID_NOTE) -{ -midi_send_noteoff(&midi_device, channel, root, velocity); -} -tone_status[tone] = MIDI_INVALID_NOTE; -} -case 1: //Minor chord -if (record->event.pressed) { -midi_send_noteon(&midi_device, channel, root_note, velocity); -midi_send_noteon(&midi_device, channel, minor_third, velocity); -midi_send_noteon(&midi_device, channel, fifth, velocity); -} -else { -uint8_t root = tone_status[tone]; -if (root != MIDI_INVALID_NOTE) -{ -midi_send_noteoff(&midi_device, channel, root, velocity); -} -tone_status[tone] = MIDI_INVALID_NOTE; -} -} + uint16_t root_note; + uint8_t channel = midi_config.channel; + uint8_t velocity = compute_velocity(midi_config.velocity); + switch (opt) { + case 0: //Root note C + root_note = MI_C; + case 1: //Root note C#/Db + root_note = MI_Cs; + case 2: // Root note D + root_note = MI_D; + case 3: // Root note D#/Eb + root_note = MI_Ds; + case 4: // Root note E + root_note = MI_E; + case 5: // Root note F + root_note = MI_F; + case 6: // Root note F#/Gb + root_note = MI_Fs; + case 7: // Root note G + root_note = MI_G; + case 8: // Root note G#/Ab + root_note = MI_Gs; + case 9: // Root note A + root_note = MI_A; + case 10: // Root note A#/Bb + root_note = MI_As; + case 11: // Root note B + root_note = MI_B; + switch (id) { + uint8_t root = midi_compute_note(root_note); + uint8_t major_third = midi_compute_note(root_note) + 4; + uint8_t minor_third = midi_compute_note(root_note) + 3; + uint8_t fifth = midi_compute_note(root_note) + 7; + case 0: //Major chord + if (record->event.pressed) { + midi_send_noteon(&midi_device, channel, root, velocity); + midi_send_noteon(&midi_device, channel, major_third, velocity); + midi_send_noteon(&midi_device, channel, fifth, velocity); + } + else { + midi_send_noteoff(&midi_device, channel, root, velocity); + midi_send_noteoff(&midi_device, channel, major_third, velocity); + midi_send_noteoff(&midi_device, channel, fifth, velocity); + } + case 1: //Minor chord + if (record->event.pressed) { + midi_send_noteon(&midi_device, channel, root_note, velocity); + midi_send_noteon(&midi_device, channel, minor_third, velocity); + midi_send_noteon(&midi_device, channel, fifth, velocity); + } + else { + midi_send_noteoff(&midi_device, channel, root, velocity); + midi_send_noteoff(&midi_device, channel, minor_third, velocity); + midi_send_noteoff(&midi_device, channel, fifth, velocity); + } + } + } } -}; -*/ From b4b06f81b5024bb5963753edfc07f9e2e0054cfd Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Thu, 25 May 2017 23:03:33 -0400 Subject: [PATCH 09/24] More changes to keymap.c to try and get midi chords to work --- keyboards/s60_x/keymaps/bluebear/keymap.c | 160 ++++++++++++---------- 1 file changed, 86 insertions(+), 74 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index dfb0b966..2dc7500c 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -258,7 +258,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 0: //Number 0-) if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- } else { @@ -269,7 +269,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 1: //Number 1-! if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- } else { @@ -280,7 +280,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 2: //Number 2-@ if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. } else { @@ -291,7 +291,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 3: // Number 3 if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- } @@ -299,7 +299,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 4: //Number 4-$ if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- } else { @@ -310,7 +310,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 5: //Number 5 if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... } @@ -318,7 +318,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 6: //Number 6 if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... } @@ -326,7 +326,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 7: //Number 7-& if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... } else { @@ -337,7 +337,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 8: //Number 8 if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. } @@ -345,7 +345,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 9: //Number 9-( if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. } else { @@ -356,7 +356,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 10: //Letter A if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- } @@ -364,7 +364,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 11: //Letter B if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... } @@ -372,7 +372,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 12: //Letter C if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. } @@ -380,7 +380,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 13: //Letter D if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. } @@ -388,7 +388,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 14: //Letter E if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(SPACE), END); //. } @@ -396,7 +396,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 15: //Letter F if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. } @@ -404,7 +404,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 16: //Letter G if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. } @@ -412,7 +412,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 17: //Letter H if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... } @@ -420,7 +420,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 18: //Letter I if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. } @@ -428,7 +428,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 19: //Letter J if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- } @@ -436,7 +436,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 20: //Letter K if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- } @@ -444,7 +444,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 21: //Letter L if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. } @@ -452,7 +452,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 22: //Letter M if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- } @@ -460,7 +460,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 23: //Letter N if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. } @@ -468,7 +468,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 24: //Letter O if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- } @@ -476,7 +476,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 25: //Letter P if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. } @@ -484,7 +484,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 26: //Letter Q if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- } @@ -492,7 +492,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 27: //Letter R if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. } @@ -500,7 +500,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 28: //Letter S if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... } @@ -508,7 +508,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 29: //Letter T if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(SPACE), END); //- } @@ -516,7 +516,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 30: //Letter U if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- } @@ -524,7 +524,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 31: //Letter V if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- } @@ -532,7 +532,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 32: //Letter W if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- } @@ -540,7 +540,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 33: //Letter X if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- } @@ -548,7 +548,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 34: //Letter Y if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- } @@ -556,7 +556,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 35: //Letter Z if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. } @@ -564,7 +564,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 36: //Punctuation . if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- } @@ -572,7 +572,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 37: //Punctuation , if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- } @@ -580,7 +580,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 38: //Punctuation '-" if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. } else { @@ -591,7 +591,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 39: //Punctuation /-? if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. } else { @@ -602,7 +602,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 40: //Punctuation ;-: if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... } else { @@ -613,7 +613,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 41: //Punctuation =-+ if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. } else { @@ -624,7 +624,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 42: //Punctuation --_ if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- } else { @@ -635,7 +635,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { case 43: //Morse Space if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { - unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)); + clear_mods(); } return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse } @@ -647,61 +647,73 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // Midi Chord Function void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - uint16_t root_note; - uint8_t channel = midi_config.channel; - uint8_t velocity = compute_velocity(midi_config.velocity); + uint16_t root_note = MIDI_INVALID_NOTE; switch (opt) { case 0: //Root note C root_note = MI_C; + break; case 1: //Root note C#/Db root_note = MI_Cs; + break; case 2: // Root note D root_note = MI_D; + break; case 3: // Root note D#/Eb root_note = MI_Ds; + break; case 4: // Root note E root_note = MI_E; + break; case 5: // Root note F root_note = MI_F; + break; case 6: // Root note F#/Gb root_note = MI_Fs; + break; case 7: // Root note G root_note = MI_G; + break; case 8: // Root note G#/Ab root_note = MI_Gs; + break; case 9: // Root note A root_note = MI_A; + break; case 10: // Root note A#/Bb root_note = MI_As; + break; case 11: // Root note B root_note = MI_B; - switch (id) { - uint8_t root = midi_compute_note(root_note); - uint8_t major_third = midi_compute_note(root_note) + 4; - uint8_t minor_third = midi_compute_note(root_note) + 3; - uint8_t fifth = midi_compute_note(root_note) + 7; - case 0: //Major chord - if (record->event.pressed) { - midi_send_noteon(&midi_device, channel, root, velocity); - midi_send_noteon(&midi_device, channel, major_third, velocity); - midi_send_noteon(&midi_device, channel, fifth, velocity); - } - else { - midi_send_noteoff(&midi_device, channel, root, velocity); - midi_send_noteoff(&midi_device, channel, major_third, velocity); - midi_send_noteoff(&midi_device, channel, fifth, velocity); - } - case 1: //Minor chord - if (record->event.pressed) { - midi_send_noteon(&midi_device, channel, root_note, velocity); - midi_send_noteon(&midi_device, channel, minor_third, velocity); - midi_send_noteon(&midi_device, channel, fifth, velocity); - } - else { - midi_send_noteoff(&midi_device, channel, root, velocity); - midi_send_noteoff(&midi_device, channel, minor_third, velocity); - midi_send_noteoff(&midi_device, channel, fifth, velocity); - } + break; + } + // uint8_t root = midi_compute_note(root_note); + uint8_t major_third = root_note + 4; + uint8_t minor_third = root_note + 3; + uint8_t fifth = root_note + 7; + switch (id) { + case 0: //Major chord + if (record->event.pressed) { + register_code16(root_note); + register_code16(major_third); + register_code16(fifth); } + else { + unregister_code16(root_note); + unregister_code16(major_third); + unregister_code16(fifth); + } + break; + case 1: //Minor chord + if (record->event.pressed) { + register_code16(root_note); + register_code16(minor_third); + register_code16(fifth); + } + else { + unregister_code16(root_note); + unregister_code16(minor_third); + unregister_code16(fifth); + } + break; } } From 6b1f707ce9431abfff6e6f8aa5730c77578fbc08 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Fri, 26 May 2017 09:54:40 -0400 Subject: [PATCH 10/24] Still working on these MIDI CHORDS! --- keyboards/s60_x/keymaps/bluebear/Makefile | 4 +-- keyboards/s60_x/keymaps/bluebear/keymap.c | 33 +++++++---------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/Makefile b/keyboards/s60_x/keymaps/bluebear/Makefile index dfefad39..a444eeb7 100644 --- a/keyboards/s60_x/keymaps/bluebear/Makefile +++ b/keyboards/s60_x/keymaps/bluebear/Makefile @@ -1,8 +1,8 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = no # Audio control and System control(+450) -CONSOLE_ENABLE = no # Console for debug(+400) -COMMAND_ENABLE = no # Commands for debug and configuration +CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = yes # MIDI controls diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 2dc7500c..0047a87d 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -184,7 +184,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ │RESET│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ │ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ + │DEBUG│ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ │ │ │ │ │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -197,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MOUSE] = KEYMAP( 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, KC_NO, KC_NO, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ + DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TRNS, KC_NO, KC_NO, KC_POWER, KC_NO, KC_NO, KC_NO, KC_NO @@ -646,7 +646,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // Midi Chord Function -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { +void action_function_opt(keyrecord_t *record, uint8_t id, uint8_t opt) { uint16_t root_note = MIDI_INVALID_NOTE; switch (opt) { case 0: //Root note C @@ -686,34 +686,19 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { root_note = MI_B; break; } - // uint8_t root = midi_compute_note(root_note); uint8_t major_third = root_note + 4; uint8_t minor_third = root_note + 3; uint8_t fifth = root_note + 7; switch (id) { case 0: //Major chord - if (record->event.pressed) { - register_code16(root_note); - register_code16(major_third); - register_code16(fifth); - } - else { - unregister_code16(root_note); - unregister_code16(major_third); - unregister_code16(fifth); - } + process_midi(root_note, record); + process_midi(major_third, record); + process_midi(fifth, record); break; case 1: //Minor chord - if (record->event.pressed) { - register_code16(root_note); - register_code16(minor_third); - register_code16(fifth); - } - else { - unregister_code16(root_note); - unregister_code16(minor_third); - unregister_code16(fifth); - } + process_midi(root_note, record); + process_midi(minor_third, record); + process_midi(fifth, record); break; } } From a5846757359a27f9e5ed67cfe96f1d92e72b1b4b Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 28 May 2017 08:14:17 -0400 Subject: [PATCH 11/24] Midi Chord Function is now working! But some chords lag... --- keyboards/s60_x/keymaps/bluebear/Makefile | 4 +- keyboards/s60_x/keymaps/bluebear/keymap.c | 166 ++++++++++++++++------ 2 files changed, 124 insertions(+), 46 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/Makefile b/keyboards/s60_x/keymaps/bluebear/Makefile index a444eeb7..dfefad39 100644 --- a/keyboards/s60_x/keymaps/bluebear/Makefile +++ b/keyboards/s60_x/keymaps/bluebear/Makefile @@ -1,8 +1,8 @@ BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = no # Audio control and System control(+450) -CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = yes # MIDI controls diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 0047a87d..3be39c3f 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -37,47 +37,90 @@ enum midi_chord_root { //ACTION_FUNCTION opt B, }; -enum midi_chord_keycodes { +enum midi_chord_id { //ACTION_FUNCTION Progmem Id //Major Chords - MI_CH_C = ACTION_FUNCTION_OPT(major,C), - MI_CH_Cs = ACTION_FUNCTION_OPT(major,Cs), + CMajor, + CsMajor, + DbMajor = CsMajor, + DMajor, + DsMajor, + EbMajor = DsMajor, + EMajor, + FMajor, + FsMajor, + GbMajor = FsMajor, + GMajor, + GsMajor, + AbMajor = GsMajor, + AMajor, + AsMajor, + BbMajor = AsMajor, + BMajor, + + //Minor Chords + + CMinor, + CsMinor, + DbMinor = CsMinor, + DMinor, + DsMinor, + EbMinor = DsMinor, + EMinor, + FMinor, + FsMinor, + GbMinor = FsMinor, + GMinor, + GsMinor, + AbMinor = GsMinor, + AMinor, + AsMinor, + BbMinor = AsMinor, + BMinor, +}; + +enum midi_chord_keycodes { //Midi Chocd Keycodes + + //Major Chord Keycodes + + MI_CH_C = F(CMajor), + MI_CH_Cs = F(CsMajor), MI_CH_Db = MI_CH_Cs, - MI_CH_D = ACTION_FUNCTION_OPT(major,D), - MI_CH_Ds = ACTION_FUNCTION_OPT(major,Ds), + MI_CH_D = F(DMajor), + MI_CH_Ds = F(DsMajor), MI_CH_Eb = MI_CH_Ds, - MI_CH_E = ACTION_FUNCTION_OPT(major,E), - MI_CH_F = ACTION_FUNCTION_OPT(major,F), - MI_CH_Fs = ACTION_FUNCTION_OPT(major,Fs), + MI_CH_E = F(EMajor), + MI_CH_F = F(FMajor), + MI_CH_Fs = F(FsMajor), MI_CH_Gb = MI_CH_Fs, - MI_CH_G = ACTION_FUNCTION_OPT(major,G), - MI_CH_Gs = ACTION_FUNCTION_OPT(major,Gs), + MI_CH_G = F(GMajor), + MI_CH_Gs = F(GsMajor), MI_CH_Ab = MI_CH_Gs, - MI_CH_A = ACTION_FUNCTION_OPT(major,A), - MI_CH_As = ACTION_FUNCTION_OPT(major,As), + MI_CH_A = F(AMajor), + MI_CH_As = F(AsMajor), MI_CH_Bb = MI_CH_As, - MI_CH_B = ACTION_FUNCTION_OPT(major,B), + MI_CH_B = F(BMajor), - //Minor Chords + //Minor Chord Keycodes - MI_CH_Cm = ACTION_FUNCTION_OPT(minor,C), - MI_CH_Csm = ACTION_FUNCTION_OPT(minor,Cs), + MI_CH_Cm = F(CMinor), + MI_CH_Csm = F(CsMinor), MI_CH_Dbm = MI_CH_Csm, - MI_CH_Dm = ACTION_FUNCTION_OPT(minor,D), - MI_CH_Dsm = ACTION_FUNCTION_OPT(minor,Ds), + MI_CH_Dm = F(DMinor), + MI_CH_Dsm = F(DsMinor), MI_CH_Ebm = MI_CH_Dsm, - MI_CH_Em = ACTION_FUNCTION_OPT(minor,E), - MI_CH_Fm = ACTION_FUNCTION_OPT(minor,F), - MI_CH_Fsm = ACTION_FUNCTION_OPT(minor,Fs), + MI_CH_Em = F(EMinor), + MI_CH_Fm = F(FMinor), + MI_CH_Fsm = F(FsMinor), MI_CH_Gbm = MI_CH_Fsm, - MI_CH_Gm = ACTION_FUNCTION_OPT(minor,G), - MI_CH_Gsm= ACTION_FUNCTION_OPT(minor,Gs), + MI_CH_Gm = F(GMinor), + MI_CH_Gsm = F(GsMinor), MI_CH_Abm = MI_CH_Gsm, - MI_CH_Am = ACTION_FUNCTION_OPT(minor,A), - MI_CH_Asm = ACTION_FUNCTION_OPT(minor,As), + MI_CH_Am = F(AMinor), + MI_CH_Asm = F(AsMinor), MI_CH_Bbm = MI_CH_Asm, - MI_CH_Bm = ACTION_FUNCTION_OPT(minor,B), + MI_CH_Bm = F(BMinor), }; //Morse Code Macro Keys @@ -646,56 +689,91 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // Midi Chord Function -void action_function_opt(keyrecord_t *record, uint8_t id, uint8_t opt) { +const uint16_t PROGMEM fn_actions[] = { + + //Major Chords + + [CMajor] = ACTION_FUNCTION_OPT(major, C), + [CsMajor] = ACTION_FUNCTION_OPT(major, Cs), + [DMajor] = ACTION_FUNCTION_OPT(major, D), + [DsMajor] = ACTION_FUNCTION_OPT(major, Ds), + [EMajor] = ACTION_FUNCTION_OPT(major, E), + [FMajor] = ACTION_FUNCTION_OPT(major, F), + [FsMajor] = ACTION_FUNCTION_OPT(major, Fs), + [GMajor] = ACTION_FUNCTION_OPT(major, G), + [GsMajor] = ACTION_FUNCTION_OPT(major, Gs), + [AMajor] = ACTION_FUNCTION_OPT(major, A), + [AsMajor] = ACTION_FUNCTION_OPT(major, As), + [BMajor] = ACTION_FUNCTION_OPT(major, B), + + //Minor Chords + + [CMinor] = ACTION_FUNCTION_OPT(minor, C), + [CsMinor] = ACTION_FUNCTION_OPT(minor, Cs), + [DMinor] = ACTION_FUNCTION_OPT(minor, D), + [DsMinor] = ACTION_FUNCTION_OPT(minor, Ds), + [EMinor] = ACTION_FUNCTION_OPT(minor, E), + [FMinor] = ACTION_FUNCTION_OPT(minor, F), + [FsMinor] = ACTION_FUNCTION_OPT(minor, Fs), + [GMinor] = ACTION_FUNCTION_OPT(minor, G), + [GsMinor] = ACTION_FUNCTION_OPT(minor, Gs), + [AMinor] = ACTION_FUNCTION_OPT(minor, A), + [AsMinor] = ACTION_FUNCTION_OPT(minor, As), + [BMinor] = ACTION_FUNCTION_OPT(minor, B), +}; + +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { uint16_t root_note = MIDI_INVALID_NOTE; switch (opt) { - case 0: //Root note C + case C: //Root note C root_note = MI_C; break; - case 1: //Root note C#/Db + case Cs: //Root note C#/Db root_note = MI_Cs; break; - case 2: // Root note D + case D: // Root note D root_note = MI_D; break; - case 3: // Root note D#/Eb + case Ds: // Root note D#/Eb root_note = MI_Ds; break; - case 4: // Root note E + case E: // Root note E root_note = MI_E; break; - case 5: // Root note F + case F: // Root note F root_note = MI_F; break; - case 6: // Root note F#/Gb + case Fs: // Root note F#/Gb root_note = MI_Fs; break; - case 7: // Root note G + case G: // Root note G root_note = MI_G; break; - case 8: // Root note G#/Ab + case Gs: // Root note G#/Ab root_note = MI_Gs; break; - case 9: // Root note A + case A: // Root note A root_note = MI_A; break; - case 10: // Root note A#/Bb + case As: // Root note A#/Bb root_note = MI_As; break; - case 11: // Root note B + case B: // Root note B root_note = MI_B; break; } - uint8_t major_third = root_note + 4; - uint8_t minor_third = root_note + 3; - uint8_t fifth = root_note + 7; + uint16_t major_third = root_note + 4; + uint16_t minor_third = root_note + 3; + uint16_t fifth = root_note + 7; switch (id) { - case 0: //Major chord + case major: //Major chord + dprintf("Root Note:%d - Major Third:%d - Fifth:%d\n", root_note, major_third, fifth); process_midi(root_note, record); process_midi(major_third, record); process_midi(fifth, record); break; - case 1: //Minor chord + case minor: //Minor chord + dprintf("Root Note:%d - Minor Third:%d - Fifth:%d\n", root_note, minor_third, fifth); process_midi(root_note, record); process_midi(minor_third, record); process_midi(fifth, record); From 4c48c29c0e65f66f95290a6f056d0af5b3cc5ab0 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 29 May 2017 22:09:06 -0400 Subject: [PATCH 12/24] Added MIDI_CHORD layer and other little fixes. Updated readme.md --- .../bluebear/S60X-Bluebear-ARROWFN-Layer.png | Bin 17938 -> 18499 bytes .../bluebear/S60X-Bluebear-MIDI-Layer.png | Bin 21329 -> 0 bytes .../bluebear/S60X-Bluebear-MOUSE-Layer.png | Bin 16119 -> 16499 bytes keyboards/s60_x/keymaps/bluebear/keymap.c | 195 +++++++++++++++--- keyboards/s60_x/keymaps/bluebear/readme.md | 60 +++++- 5 files changed, 226 insertions(+), 29 deletions(-) delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png index a7c6df504412616e24c67efae9d5b18e5097d222..1f659d184d9816a81983cf34436995d000dab4fe 100644 GIT binary patch literal 18499 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 S;mv`zDaotKC7jlK^#1^gAcJlI literal 17938 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 diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI-Layer.png deleted file mode 100644 index c8df0a9e9e7c0ae12beeb972a4c3ad0adec9c420..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21329 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 AqyPW_ diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png index c74348389d9dd947bd86552851dca0c7dbb271d3..4e92a60c761c8401b667a5a8e8ac591a9b85d4ab 100644 GIT binary patch literal 16499 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 literal 16119 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 u>d&Jn4b9oN)CNu|BJ9A1!A^F6Wd;bH2BSuXC diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 3be39c3f..44ebb5aa 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -3,11 +3,12 @@ // Keyboard Layers enum keyboard_layers { - BASE, //Base Layer - ARROWFN, //Arrow/FN Layer - MOUSE, //Mouse Layer - MIDI, //Midi Layer - MORSE, //Morse Code Layer + BASE, //Base Layer + ARROWFN, //Arrow/FN Layer + MOUSE, //Mouse Layer + MIDI_BASE, //Midi Layer + MIDI_CHORDS, //Midi Chord Layer + MORSE, //Morse Code Layer }; // Midi Chords @@ -15,6 +16,8 @@ enum keyboard_layers { enum midi_chord_modes { //ACTION_FUNCTION id major, minor, + dom_seventh, + dim_seventh, }; enum midi_chord_root { //ACTION_FUNCTION opt @@ -78,6 +81,46 @@ enum midi_chord_id { //ACTION_FUNCTION Progmem Id AsMinor, BbMinor = AsMinor, BMinor, + + //Dominant Seventh Chords + + CDom7, + CsDom7, + DbDom7 = CsDom7, + DDom7, + DsDom7, + EbDom7 = DsDom7, + EDom7, + FDom7, + FsDom7, + GbDom7 = FsDom7, + GDom7, + GsDom7, + AbDom7 = GsDom7, + ADom7, + AsDom7, + BbDom7 = AsDom7, + BDom7, + + //Diminished Seventh Chords + + CDim7, + CsDim7, + DbDim7 = CsDim7, + DDim7, + DsDim7, + EbDim7 = DsDim7, + EDim7, + FDim7, + FsDim7, + GbDim7 = FsDim7, + GDim7, + GsDim7, + AbDim7 = GsDim7, + ADim7, + AsDim7, + BbDim7 = AsDim7, + BDim7, }; enum midi_chord_keycodes { //Midi Chocd Keycodes @@ -121,6 +164,46 @@ enum midi_chord_keycodes { //Midi Chocd Keycodes MI_CH_Asm = F(AsMinor), MI_CH_Bbm = MI_CH_Asm, MI_CH_Bm = F(BMinor), + + //Dominant Seventh Keycodes + + MI_CH_CDom7 = F(CDom7), + MI_CH_CsDom7 = F(CsDom7), + MI_CH_DbDom7 = MI_CH_CsDom7, + MI_CH_DDom7 = F(DDom7), + MI_CH_DsDom7 = F(DsDom7), + MI_CH_EbDom7 = MI_CH_DsDom7, + MI_CH_EDom7 = F(EDom7), + MI_CH_FDom7 = F(FDom7), + MI_CH_FsDom7 = F(FsDom7), + MI_CH_GbDom7 = MI_CH_FsDom7, + MI_CH_GDom7 = F(GDom7), + MI_CH_GsDom7 = F(GsDom7), + MI_CH_AbDom7 = MI_CH_GsDom7, + MI_CH_ADom7 = F(ADom7), + MI_CH_AsDom7 = F(AsDom7), + MI_CH_BbDom7 = MI_CH_AsDom7, + MI_CH_BDom7 = F(BDom7), + + //Diminished Seventh Keycodes + + MI_CH_CDim7 = F(CDim7), + MI_CH_CsDim7 = F(CsDim7), + MI_CH_DbDim7 = MI_CH_CsDim7, + MI_CH_DDim7 = F(DDim7), + MI_CH_DsDim7 = F(DsDim7), + MI_CH_EbDim7 = MI_CH_DsDim7, + MI_CH_EDim7 = F(EDim7), + MI_CH_FDim7 = F(FDim7), + MI_CH_FsDim7 = F(FsDim7), + MI_CH_GbDim7 = MI_CH_FsDim7, + MI_CH_GDim7 = F(GDim7), + MI_CH_GsDim7 = F(GsDim7), + MI_CH_AbDim7 = MI_CH_GsDim7, + MI_CH_ADim7 = F(ADim7), + MI_CH_AsDim7 = F(AsDim7), + MI_CH_BbDim7 = MI_CH_AsDim7, + MI_CH_BDim7 = F(BDim7), }; //Morse Code Macro Keys @@ -202,7 +285,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 1: Arrow/FN Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │ │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │TO(3)│TO(4)│ + │ │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │TO(3)│TO(5)│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ │ │ │ │ │PGUP │ UP │ │ │ │ INS │ DEL │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -215,7 +298,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [ARROWFN] = KEYMAP( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(4), \ + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(5), \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_NO, KC_NO, KC_NO, KC_INS, KC_DEL, \ KC_CAPS, KC_HOME, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NO, KC_NO, \ @@ -225,7 +308,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* 2: Mouse Keys Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │RESET│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │ │ │ + │RESET│ F13 │ F14 │ F15 │ F16 │ F17 │ F18 │ F19 │ F20 │ F21 │ F22 │ F23 │ F24 │ │ │ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │DEBUG│ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ @@ -239,37 +322,60 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MOUSE] = KEYMAP( - 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, KC_NO, KC_NO, \ + RESET, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO, KC_NO, \ DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TRNS, KC_NO, KC_NO, KC_POWER, KC_NO, KC_NO, KC_NO, KC_NO ), - /* 3: Midi Layer + /* 3: Midi Base Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│ │ │ + │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│ │TO(4)│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ │ │ C# │ D# │ │ F# │ G# │ A# │ │ C# │ D# │ │ │ │█████│ + │OCT+ │ │ C# │ D# │ │ F# │ G# │ A# │ │ C# │ D# │ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │OCT- │ C │ D │ E │ F │ G │ A │ B │ C │ D │ E │ F │▒▒▒▒▒│OCT+ │█████│ + │OCT- │ C │ D │ E │ F │ G │ A │ B │ C │ D │ E │ F │▒▒▒▒▒│ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ Am │▒▒▒▒▒│ Em │ Bm │ F#m │ C#m │ G#m │ D#m │ Bbm │ Fm │ Cm │ Gm │▒▒▒▒▒│ Dm │▒▒▒▒▒│ + │ Cm │▒▒▒▒▒│ Gm │ Dm │ Am │ Em │ Bm │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │▒▒▒▒▒│ Fm │▒▒▒▒▒│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ │█████│█████│█████│A-OFF│█████│█████│█████│ │ │ │ │█████│ └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ - [MIDI] = KEYMAP( - TO(0), MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Gb, MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, KC_NO, KC_NO, \ - KC_NO, KC_NO, MI_Cs, MI_Ds, KC_NO, MI_Fs, MI_Gs, MI_As, KC_NO, MI_Cs_1, MI_Ds_1, KC_NO, KC_NO, KC_NO, \ - MI_OCTD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, KC_NO, MI_OCTU, \ - MI_CH_Am, KC_NO, MI_CH_Em, MI_CH_Bm, MI_CH_Fsm, MI_CH_Csm, MI_CH_Gsm, MI_CH_Dsm, MI_CH_Bbm, MI_CH_Fm, MI_CH_Cm, MI_CH_Gm, KC_NO, MI_CH_Dm, KC_NO, \ - KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO - ), + [MIDI_BASE] = KEYMAP( + TO(0), MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Gb, MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, KC_NO, TO(4), \ + MI_OCTU, KC_NO, MI_Cs, MI_Ds, KC_NO, MI_Fs, MI_Gs, MI_As, KC_NO, MI_Cs_1, MI_Ds_1, KC_NO, KC_NO, KC_NO, \ + MI_OCTD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, KC_NO, KC_NO, \ + MI_CH_Cm, KC_NO, MI_CH_Gm, MI_CH_Dm, MI_CH_Am, MI_CH_Em, MI_CH_Bm, MI_CH_Gbm, MI_CH_Dbm, MI_CH_Abm, MI_CH_Ebm, MI_CH_Bbm, KC_NO, MI_CH_Fm, KC_NO, \ + KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO + ), + + /* 4: Midi Chord Layer - /* 4: Morse Code Layer + ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + │TO(0)│ Cmaj│ Gmaj│ Dmaj│ Amaj│ Emaj│ Bmaj│Gbmaj│Dbmaj│Abmaj│Ebmaj│Bbmaj│ Fmaj│TO(3)│ │ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │OCT+ │ Cm │ Gm │ Dm │ Am │ Em │ Bbm │ Gbm │ Dbm │ Abm │ Ebm │ Bbm │ Fm │ │█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │OCT- │Cdom7│Gdom7│Ddom7│Adom7│Edom7│Bdom7│Gbdo7│Dbdo7│Abdo7│Ebdo7│Bbdo7│▒▒▒▒▒│Fdom7│█████│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │Cdim7│▒▒▒▒▒│Gdim7│Ddim7│Adim7│Edim7│Bdim7│Gbdi7│Dbdi7│Abdi7│Ebdi7│Bbdi7│▒▒▒▒▒│Fdim7│▒▒▒▒▒│ + ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + │ │ │ │█████│█████│█████│A-OFF│█████│█████│█████│ │ │ │ │█████│ + └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [MIDI_CHORDS] = KEYMAP( + TO(0), MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Gb, MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, TO(3), KC_NO, \ + MI_OCTU, MI_CH_Cm, MI_CH_Gm, MI_CH_Dm, MI_CH_Am, MI_CH_Em, MI_CH_Bbm, MI_CH_Gbm, MI_CH_Dbm, MI_CH_Abm, MI_CH_Ebm, MI_CH_Bbm, MI_CH_Fm, KC_NO, \ + MI_OCTD, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_GbDom7, MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, KC_NO, MI_CH_FDom7, \ + MI_CH_CDim7, KC_NO, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_GbDim7, MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, KC_NO, MI_CH_FDim7, KC_NO, \ + KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO + ), + + /* 5: Morse Code Layer ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ │TO(0)│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ │ │ │ │ @@ -720,6 +826,36 @@ const uint16_t PROGMEM fn_actions[] = { [AMinor] = ACTION_FUNCTION_OPT(minor, A), [AsMinor] = ACTION_FUNCTION_OPT(minor, As), [BMinor] = ACTION_FUNCTION_OPT(minor, B), + + //Dominant 7th + + [CDom7] = ACTION_FUNCTION_OPT(dom_seventh, C), + [CsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Cs), + [DDom7] = ACTION_FUNCTION_OPT(dom_seventh, D), + [DsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Ds), + [EDom7] = ACTION_FUNCTION_OPT(dom_seventh, E), + [FDom7] = ACTION_FUNCTION_OPT(dom_seventh, F), + [FsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Fs), + [GDom7] = ACTION_FUNCTION_OPT(dom_seventh, G), + [GsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Gs), + [ADom7] = ACTION_FUNCTION_OPT(dom_seventh, A), + [AsDom7] = ACTION_FUNCTION_OPT(dom_seventh, As), + [BDom7] = ACTION_FUNCTION_OPT(dom_seventh, B), + + //Diminished 7th + + [CDim7] = ACTION_FUNCTION_OPT(dim_seventh, C), + [CsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Cs), + [DDim7] = ACTION_FUNCTION_OPT(dim_seventh, D), + [DsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Ds), + [EDim7] = ACTION_FUNCTION_OPT(dim_seventh, E), + [FDim7] = ACTION_FUNCTION_OPT(dim_seventh, F), + [FsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Fs), + [GDim7] = ACTION_FUNCTION_OPT(dim_seventh, G), + [GsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Gs), + [ADim7] = ACTION_FUNCTION_OPT(dim_seventh, A), + [AsDim7] = ACTION_FUNCTION_OPT(dim_seventh, As), + [BDim7] = ACTION_FUNCTION_OPT(dim_seventh, B), }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { @@ -764,19 +900,30 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } uint16_t major_third = root_note + 4; uint16_t minor_third = root_note + 3; + //uint16_t flat_fifth = root_note + 6; uint16_t fifth = root_note + 7; + uint16_t minor_seventh = root_note + 10; + uint16_t diminished_seventh = root_note -3; switch (id) { case major: //Major chord - dprintf("Root Note:%d - Major Third:%d - Fifth:%d\n", root_note, major_third, fifth); process_midi(root_note, record); process_midi(major_third, record); process_midi(fifth, record); break; case minor: //Minor chord - dprintf("Root Note:%d - Minor Third:%d - Fifth:%d\n", root_note, minor_third, fifth); process_midi(root_note, record); process_midi(minor_third, record); process_midi(fifth, record); break; + case dom_seventh: //Dominant Seventh chord + process_midi(root_note, record); + process_midi(major_third, record); + process_midi(minor_seventh, record); + break; + case dim_seventh: //Diminished Seventh Chord + process_midi(root_note, record); + process_midi(minor_third, record); + process_midi(diminished_seventh, record); + break; } } diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 579683ab..9a70cde9 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -1,25 +1,75 @@ -## Bluebear’s custom S60X layout +# Bluebear’s custom S60X layout Custom keyboard layout for my S60X, my first ever custom mechanical keyboard kit. This layout was inspired in part by the HHKB line of keyboards and a quest to find the perfect ergonomic, logical layout for what I do. If you like this layout, please feel free to use it, modify it and share it. -## Base Layer +## BASE Layer +![BASE Layer](S60X-Bluebear-BASE-Layer.png) + +-Dvorak keyboard layout -Hold left control key for LCTL, and tap it for ESC -Hold enter key for RCTL and tap for ENT --Hold the space key to momentarily switch to [ARROW] layer --Left bottom key acts as momentary switch to the [MOUSE] layer +-Hold the space key to momentarily switch to ARROWFN layer +-Left bottom key acts as momentary switch to the MOUSE layer -Hold right alt key for AltGr and tap for APP(which I have mapped to Compose in OS) -Hold left shift key for LSFT and tap for ( (Space Cadet style) -Hold right shift key for RSFT and tap for ) (Space Cadet style) -Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift) -Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt) -## Mouse Layer +## ARROWFN Layer + +![ARROWFN Layer](S60X-Bluebear-ARROWFN-Layer.png) + +-Number row becomes F1 to F12 +-C, T, H, N keys become Up, Down, Left, Right +-Access to various other keys normally found on a full sized keyboard +-Top right button toggles MORSE layer +-Second from right, top row, toggles MIDI_BASE layer +## MOUSE Layer + +![MOUSE Layer](S60X-Bluebear-MOUSE-Layer.png) + +-Move the mouse with mouse keys -Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it -Hitting the space key in this layer is like hitting power button on computer +-Hitting the tab button toggles caps lock +-Number row becomes F13 to F24 + +## MIDI_BASE Layer + +![MIDI_BASE Layer](S60X-Bluebear-MIDI_BASE-Layer.png) + +This layer was inspired by the Satan Midi layout (https://github.com/qmk/qmk_firmware/tree/master/keyboards/satan/keymaps/midi) and gives access to basic MIDI notes. What I added were two layers of MIDI chords (major and minor triads) arranged in a circle of fifths pattern. Thanks to @fredizzimo for helping me with the code for these chords. + +-Top right button toggles MORSE_CHORDS layer +-Escape brings you back to the BASE layer + +## MIDI_CHORDS Layer + +![MIDI_CHORDS Layer](S60X-Bluebear-MIDI_CHORDS-Layer.png) + +After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the Stradella Base system (https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. + +-Second from right, top row, toggles MIDI_BASE layer +-Escape brings you back to the BASE layer + +## MORSE LAYER + +![MORSE Layer](S60X-Bluebear-MORSE-Layer.png) + +This layer is really just for fun, and because I am a ham radio operator and morse code enthusiast. Hitting the alphanumerical keys in this layer will send a series of dits (.) and dahs (-) representing that character in morse code. + +-Escape brings you back to the BASE layer + +### THIS IS STILL A WORK IN PROGRESS + +This keyboard layout is still a work in progress and there are a couple of kinks left to iron out. But it is still very usable and the midi and morse code layers are lots of fun to use. Please feel free to use, share and improve all, or part of this layout. + + From 1ef911d150e361668be72e0082ade728a199e889 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 29 May 2017 22:11:48 -0400 Subject: [PATCH 13/24] Added a few images --- .../bluebear/120-button_Stradella_chart.svg | 5190 +++++++++++++++++ .../S60X-Bluebear-MIDI_BASE-Layer.png | Bin 0 -> 22521 bytes .../S60X-Bluebear-MIDI_CHORD-Layer.png | Bin 0 -> 23687 bytes 3 files changed, 5190 insertions(+) create mode 100644 keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png create mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png diff --git a/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg b/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg new file mode 100644 index 00000000..bd878faa --- /dev/null +++ b/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg @@ -0,0 +1,5190 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..58ad1605f0324229ff9ba3c84ac5350bb61df90b GIT binary patch literal 22521 zcmeHvcQ}>*|G$=zP1zEPN|6YKqpTFsGAbQ2Bb%(_AS069QV}7PWF-3>LP+8m8QCK% z>)6NsJ#U)t&-?rN{{H=4*RRWUB{}!~x?kh@d_KnW4mhWNigr84b}}+D+S4kE7s$xA zpvcHJ@lle)Poz#zFp`n&COfTo@{&u`DBk_%CC%vhtMjRj&0PG!`?pqJ)l6m=kF8Wh z)0pJp^^r>A6}MnEu`4y`CRr`jhp_~hyEkor{NV!C zripg44C#Q5T7KR=URyWo@M?WlHJ!&!@T6Qyy72JDfvDt6=f;REl*L|6LCvMi`H9hs zdNrvIYKe?%HP58yt1?XqbI*=Bkoz*oQ}X&U#POLDqQ|72$J<5D#;-X#ISItbx@D)m zc|#i^qUTrD&-df^_U2(1ju+2&X$OR`*1gW%`{!g#RYHNpD94M5WCQNIY!L1hOLwB z$8S^ZG_8r+bN%D11&U8IQX zY4^n|SGL1dbw$*V%DmSVNo7qcf&1RQyB)?}VwmwfJG+VKg+t%4urNR_Pq{woZTK(V z=o=?Rve<_Eg%6eK9b^$#zNKwsb!gQvqnlIC^j)ensb$RRfn3IWo3J6*PTy41vqLUd zg!7}1_CyY@_{YF=y|>OOwa$ru@xu7Cyxs9dfhf|*Nm2E-C%h#_tr#*RxuH&fjL)YI?Y+O7L9go*X zt``56RV}f0E01SSPf3Hoeg(ouV#DlbQgMZzpq93_>M;_3;QQg5AqA!Ns=HuV>@Ygx zTj-g4US_lMTQRqfl5Q@)t|Z!uF>Qn_q z$a%JS6FkSG{MY)Ha!xe76MbT|5HeFdm?XEdzi@TYVt6}@XyaCxxF=Aq32{ZSOla>id7euYT)Asr8()1<-OLpGjSta_veDx|knQVRD zf86_eP(yqFh+Si18N$+=)}lnWOiFgWR3z4k(^gkklN!@J_G)gb{o_%q z*hJ!~t`qZa4l~(1ID|(<(L`30`M4ZVc}y{mDm^6{O*fcb|GE0nQH-U<;#(4 z(i1jau)_7Ww&rMGy4>b=Tp<8NYBM@pM|~r z^C8n}-71y$`DnMkVd;CEq?>D7Jnd#`D#*mdL^FF& znDn6w8?RxTM-1F{pAI$fO0s*pH_u=#gg`6Ve(TXAmNae$GqaBucgQV$CA`>g`Forq znA@GI67uX=tyJ9rZ|}`Bb90zS`N4E=d*<#PAkB;xmI~&+*mL&T;gq1A*hKX@;@8CY z3Zc=(uv;LE^fni*9`$ATSW`3iPBptE@yCHiCP8}$Z_NLoIO+9kY9Z}Z-^LqC_V!0a ztPekZbZ-IG(;vg4PJbX*SEQK}`!+LE)P3=0OtI&;@KgE{kr_7{4-Eff*{1L9l=TT! z+sBBNw<{k!_n1KX_U+qyO9}t6aU6@HOVZtl;9T=V@^m&h#pkHn|RKQ4EFaMbQQWc_a~Th7#bQfz^-U% z(P?*|?|{?BKJTtcWRlm{*C%5M+%`NsjG8|~m2)5MC}odRHhj?B^yX@YMYHfVe4^SD z@6VsrqNMEPT}9Xf%3V>l-SOrek3{swr(1=zQi#dnlix*a$5NY-ow^XUwnSQAS?e1bGF+!k-eqUU#m8@f5v!=Fedxry@hT3< zMY&H^3ZjeFhEB-#<_#^bK*^Z>7@ zC}VJNuo1?;^mN+ssFxi*a~N2$bC)l_dabRk&6;i1=BE_MvVUSPf1MP8f*ETm!CAO6 zca>n|?(R++cP<*y^x>4W=E~&uvUbL!>$kXw7 z9Cq37W{x?J+vRL$$&^q-DQmNgZXe%ZfDXoqvg zziZ_rmqdGvFU45Sd;6*#pEIz6FR9rMlN2lHR7Dn^YtOh|H!>nf*m#;(@Wot}gn(GH)nxzI^#YI_ONDbU)gWO@&A` zsKb5yriyb~O^rHk>XXpN%F6Sds>*S7LXW$rJKZK+uZ6{>r!&CSrVD(>ruwTsR#z(- z8uCH7BrcAmotn6iW6SSvI+}PSlCm!!-w@XV2~v5-QDi99iC_SWr-K{@gi+w_=n~GM+qh=5Dh@vg;c(zIBjI z+CJ}UZq!U_>4_SWuS1G_4=htCx3tr4At6=dKr5%|dxtV?h8%ahVfaHh|0yD2ZJB^N zdVJXdiP0izQGBS%p@h@M#JmKb6&{ZTPB2q!YgJpP2U%y(|7k^J%Pmia! zx3{*wzSlJ+Kfl%D$58dXHKfW9Ttahmb03bZ{^VAvB97U{iS<|+(K8xr&2m{BPMWNd zo(Q^ZN<~G5E>4P%_bE0NFY0;}!pfsoeyuB#{A&A-cD8tffp=`}PnZHDR^5(lj5-j_ zgn1_CxvR3W5;*}D7DD+jb!c=*P!J8F-}mU*QdrTU%ORPTUyl&FC>DDx%Y)d>ZrmuT ztz~eU=%hW{aQN`y?yPGkPi{&@}A{Jn6qne7rJ-Ta$WnI_dG?RgG$U%wtRdDcHL(3?@Q zOTpP$5`)2nMMP9|8||P$&D`4r(@j1zb;HU^NnM=|0vLQj01gQWp*yIX%OI~S{n4r; zew9k zY1%KnL+b#GhnGMT^jk8|Q41wsL0S(VZW=J>kBHM7w#~^XOWe7$imtoW< zo4Ln~%)zDk?_*<1y1HCQtiqfgKl+FnFb8$rP+2!~9Fmp{tx238+KG~nnc{iH%7VJA z&d#@*m~}l%Z$Gkaxa-+ni0w(u4ps#$`d_=cynTly`OM3MKjv8o9Phl+JwJPj=~H(@ zZSAemQOnO!$C$NV?}ReUHcvO7?#5w@-LtI*k&%%Z*adrt29K*vj7?19-o3kIF5+o1 zYjNYo%`U27wlpuVO*#izVj>whdUo8MoXXLXW5WH;p?q;T`J?FK#qU|3w~eCd%QX^Q zQSIoSr-SgxbA;()soRD)c~Kj+0qH$7sAfr?@00jv`sEiEyTz8LA3C%2Hug&#%s_t2B$GQ|RB4U38j za$lN@EhylG>Nj_ya7jjw{7aw)YGF@`bV^mfJO*=I!lpB*sY&bR&705Pz1sm>r=`F- z?JYV!t!8F*X<|wD*=Z#a-mR#WnTwwzCF$Y+Jth*E)RWEyX}>(&`WkAgwrs1?IHf?o zPgOj#v$MJLoo>9o?|aJv@z#ZG2lQldo1YDq4zt#{qK~GX7<6sK`95}urk_V8mdNmo z>b@Lwsr1`bEEu*BR%{y7?ekVGcivcE*)piv$YSE``;eVoWf~ECp1XYMe{K4qyt`L~ z#bpKGcWTmaTg>t@7B|;wfew9k+;RKm%a=)zo)UycPv9jiTW$q&N-pB&Ac3Y|uVT55 zUmg>WpQwn9i(uG%`}XaYLU(DXbp{=o6VzTYg?-hU9??&v+bq3Xtilxo6p=;V*E^`9r5cil9NrjZ}EXI#e%Z39V7R`jc6~~ z*@@n}e}A%sT13Ag@vO?(vt^&3h-Fx{Nf4ZPu*6LRgczg%*9Qv1W#mncz){hmj8c=0 z%+5I2Ke191bmrDuw#ib>H(6voXeovor#9U|SaoXPR!hYE&miT>i^n*|u&O0h9 z>dw@Zq}D2BR@$!rcr>ri(>Cvd-v|u$+hJLP%~+>HfO`o z+lu%6Ct7k{>9Fyb=G-GF*!Lgl{52;Qx4|BW*T8~qVW|$FcXk=8^)+TMRX|yeeo|cw2`dMyT z8hs3Qipn~FSb*T<+-^tVG}?mXY%Vzuu8fR~`>l4fEe6#lVh~izqt0p0PR)DZ@%YEb z9h2+(G_PF?hSN@IH&*T>5m{})u9*95hASqJB_=GhUq$hIV(=!%m}@W={#)sYtB5zx#eBQTJSL0aA!d(Ei2N~he2jL->!KnaX{XT>T3T9)uE8d@whX6FpJroYgT%quiJh)a zCw)K4qb~lhGtw8Nkvk}l#~CYzb~6tRc8-r*$B3$^sGKl0O&XkpL@B<1Wmkg3AR$Iuj`aK>GplC?8Egi!>rdFQ&Wyc@WzVgev1wu__#+BBunn{%!n0`^ zg5F}ke7j+Y=s}Vc7ai2s9U~b~i>4KG+E8#UxS`RzcDc`-zjW!+b3DGImcHJiIkgO` zb}YIeCFQda>E!^N9p$tYt?JjXpX}`H%*@RvWwfqc8_S~MYgdnjJrS+_^)&z%lgwki zIKQuX4oL(GiL(vqCe=^FmcI8Kt&_3w)sq@<)x--t9n_q8Y8EYdgNOPQk*cx%@GctE zqWd`af}6a&w<#xY>Y-V66&0ei*3bGyVWpcNj)2W^6G&S$53a{e)%fl+ z6T~i7`{j!-Fb<=gc+RJZu7!`;#&6le#-w8j>tqjxm0KI zZHZPoxUe^(g~A}Uc|dB@oY`(1tz8ZO?!4o!_NY64Q1@j-M9>f; z)_bL0dTRcmkapbj=VWjsqZ6$2^71^^ge4_eLuKdKpf;;(Xz+nD5{?29?P zZq>+vomj4dwZj+w)jc!rsS<{ZM_>6#RXX& zz7FaYazP;qK`-_#`ssk1r$3ZTp7y^YSdfd25j&)mR(TvLpGe72An_oq zaAa*im)Z-)s~;E^Tw|s)hb_h`fvi>-<-5QQS>kg=U7D5RZ!+DeP1nisXzdSC1h1N zus*gmZp@1DoFoX~ND9pAveqSXEo!;^b-p~+M|wsHIK8C>p2z2M?-ZLF8#JhL|0L-* z=Tr+eieBo<^5s;j1@>l-Rky0Fuxa<#R7XQBLZ9u+ zWqF`nIA_Ciq^IbvAP=@Y|BP?)AJqTGRYke59Q>b!_7qnD8NM8_Eq_}~t7h}&8izIg zl5$Vdh=iwWrEgoG8fm4~!qhqat1stjPLbb^`<1>r)k|3vf!;P37nrH_bJ`4Y+Rk6N zU`TpCtc0-VJ2nXVUo%>YR&bK8Q3`9$yT?THb!?F$roR4y&V42U$EFHB;uE{Rti6^k zmh$e!Syq08RvCu~Do@D}EJ3KRV_O^b3uCFY7@nWmi>xbyOC;r}4p6Hd4W(A#tQuEU>oSlW0 z_Tz(c{^>fk^HWuu1|L611|_egv~AR>pt)Y`VS3xxOX7W+;k|-?@31=(BJ*Bb*xt5n z0%6B*)G3#qi}FC}FTJOV=yk~}CFNjISt5p~{z_P)2uRgh}i1f9c5y7x`s3Vl+)QR9Z~5R zrjq{86A`$z-anrrW>R=W`|4F{kW%3Iy)4@}ejZDLVXFL}TK$2Qr-1`_+s2eHUSx(k&<6;@-tUdC`?hzuP2dfNrO0`V@J{3H0fDR{9OH^2O$K{HSn*$` z?oowk&tNLIBHt#^(^8={M;`&{3}-y7px{jaE~l=xwmT=IXsKf&EIix`(hDLTAgOS^a9;L7LUfv+KZ-FP>xaB({V_li8_K#57!&GYWz7) zl*o%KtpKLz>C>mk{b4d(qa6x5Am1r~C~`nZNVba_bW`s{b2NN%(Mt7s@!-sG157c{ zvhZ7h|I2-sLI|*3GVJ=4ft_fupt=J4sBmF`ld^{!H8nLw9EuN(i;LSlHa3PL;Afkz zB5(o-R#{431|FUXssr+rFr&{C63T3@TIcn%fav^n+6`(6lbWdEtm=>5(~a7CJ&&$h z2mJSO(BhM?0s#iHo!oPvOZ7Y!_D)Sthlhu6f-~&D3qvV_BW^|*)|sL6YLODOdY+$B z4QhXS0alLs=CVitI0b6ppYK0rsZQke%JJflLtf z3znJ>h1#`$|NiJePD)-|5GIUZ%flkhHtU@N-kRm0&Mj>{_noSb4tkaL++x@a+#hlv zqA}n16S~laSax85y+L{c9&4A|Xolzn_sz*(r4*fv&6AUp$T>{be2uFiqp~|hl381x zMt*Y5x#Ko$;RDIkSLsCxI_Lm)xJ(+-(9*JR#EIbbIKc>U!nKm}N1UKWg_jtM*l@qP z{U)MWao#>ILKpqEcoG7#?b_X%$-9?CzCyM}zn$UrAvl(FD?o$>b^2G3tRwf)pkyyJ z^N#-45Lw*K&l`RPRKOqcJ#7-t!NC#s>{;*=G1HP8S$uMGJi-yG5fawGOzL4Lm0IxP zXBE`cXb>rilQXbjqLB0G(WCjZ`19x^P>LbpiJXUuLa84GMuK&XdlN9?jX+;~`(})Q zeNchStgXvIzZ%SwsyhrCDX^zgZ6P2D5o8xxM9`xfXJ3=k)Z_-bDl<+~eiNu;NoCC(q~6gFN>`PB(JvhuECejGo4fetC8Aa_wQv6SA;L%U8@c_`sg z#6kCu-TXbzU$*~FOlcW-(7fu}+hxX=xQ^eXq@d#>ax#dYoepH!3_(nSj{CUrort3B zXt1OJ%X-G`=NhtO_i*iaxb!<29?jOav^fmlm3JLSAVp1aFE z#2NddZ@5<0`_rJ9=!LuA>p@zLFDlWcbrZ6F?*~RL~ z=fb1cKkWc=yZ1u?vtLMr<;TN3f>~X# zi5DNo2yrIh3nT?0h*4?yxu?xWN$St!p)%PJhW|nP#?K-`E~s3Tj4iS|gD6o(S^XHC z07j%Kwvb1EGkX#(r-XiAc`(Y;t^55Z5PbK(%&4yt3X|COUC{T0fdOx}O;-ri0zC;4 z=p*mwDlDpu=ij{6PBR2)>7=yXTK?(+5n|1)4(s`XH_63GQ00zUWK`AYkgFS3HC?} zh|=-DzedJ9B=tl5%@2BrMtf!NXDC`-^#IQ8T~=0XVq&>zz-6hC!(rK53v9st*85N! zeNtUL#Gr34f6r5TdhX-CTPWy)*qJtSQ^ezynXLaYjS>=On(?N_*UA#8~{e!oPRc$ygd@+IY#En8e5)7y2q&)@za1osBD$v^kR zGaY~C&}K8JEuTFvue6kiPf9ZV+)QJVGBdUP#aXXKsQ>w;rNLcALq}I)lIeO#l-iVA z{mY|~uQ|%X0o3y@l`6RdrIXpTCR{<$lAC1Pb+u&iv$)j{%NS3-pJ*Lhdtc27(p*4qnwJK5%sqL+a}4yZ};? zAJxKyAe-a^p~v?5%aed9@l{${1sDaoZyrCd zskt*t>X|y%F?-|BD2}xB>wgp$8>6}_v3a;Oot)>0DD%$j|DdCcaVRKAf?z2yuYQ?4 z5e_LZs2Q^9J;qnyU;CS;3!g+PxFe8$hJScke}3=?n#XSsDai5YHl~*6iiZC|g}}|e z$gcZDA3R_aPT~VL1YibZv;W_0%X8KzFX`=i^-{EZfEwW{?lt zZTG`;tM;_g*c(cbf=rL)$qEp~B-@L5pt`j^{!GfQ*H@#B$8*^ZT*H{tTmOJPiYNh& zLEr(D*Sh;Ad|VwJk17xxd)H4<1q~`xZZ((CcPez3l95q-j}=d7dATwcxDO+B#hH85 ze+@54vgRiXrMTxD9F$AMS8v{wK`~BaGw%|0-0{=IlaxsTzMmGsAV2gB-;`*llo)9r zcx>>ofihsB^W9Rtn`L3-KU0^|h;xbgEXqgFM6=;MynI^OY zHO~T}ObHRXIf0+|OXvf!NzaIq@h;wd? z$HIk4>*LKd3GON%=aE^n8F|^!sUoTqsOq%GDgYOjANR*lp7d%eDiD0F=n`HpG9w8w3@3O2nH3QWOwY zeh|7L6$9#ri_v=!w_s=LP6615XYnaBEC#j*N?LHj%dA3GlafLc$a1J8>X-v@I%W;q zUTjPR?=?Kt`U4*64Ez{yv$$ftrm3(oN<-uCnl~hZv6dAvu91_IpSyU`CpT9L3n!AH zL^`bfKip~{vAunJWW$w)I8EMYVP_k)_Z>X=VRdDx$Eg5GUOQM>`@AT25!+Zii<36& zY_}OU!_y#(3gj1jA#_bd1O@L_v}^xPnb|KF;enRA)=<_3V-n&L5^=Gyn{qmwIN`}; zCNkWYoPcQP$t0jk&q{WPkLw>H{ghPT!PqC1zA5H+i*>TczYL zArk{Rr2-d1ib5DV%zVvs6i}c*et-q}{N>BT3utI9V1nHRpRBXFT7JCm{=IvfdAEXz zxc2MUVb@g9T!FiW)n1)1szBsAAX@lkWx2t&`GM00=LLJvaAk28Js~>fO~-tw&*)z! z-4r)LN!SO`#V-Ao$zZfOl=$w8okChAbon0N_lDls3YeO@qNQ~ZW}9CpqKS! zMZ0VQAP&B(eaMkdD_Z4%8&Nv3AY(_(oPWx%(M1cx8lHEdLB$B%!z2Ly2=FdiX)99F(~IevC(bXK z%}}BUGSf8R9vv@SvQEpqafHR}Ff-$?ogSzC5`U*1j`6=xX%7ZzJ}pcSX51XUfasTd z_m(->ZQ6+)*(|>?w^NEXdDKx9>j##{+b3w`=VuD7|2PDS?E5NC#JfI@M(;)*stxgzGvL ze~OsVHU?}r(C%~CW|gMRv?hGN+ZkrIXR(HJ?)Ra8!i72H7&(MK{dR|0`ad5Q2S!^4 zj7P;O7CuMh!@mnM$eCMFH8iNZ#XzyGw_+gu8=!3jex&fx*!ur}x-k#2+C+0RvlC8E z62L}N0b>vLm|R`q;qBs&15_HsKYaMGTR?yu>^!+k;|1q0UNmaaxm{whXXai57^?q; z<U~i-p4%V6Uz(-_{rqqhZG& z8y~SnI5>zQZep;Lz%W{xe^6bB-g> z_So$Pp(u3>hB4287_b}88^i^dv8-n7-96CY)#b7D=F&C{o_X{K{m6Mli-xjpI15+` z%l6#5!CCqZC;GmTz5k>j?%tW?xaO~&hAsp4{lPqVGd%l(C4o68eJkSU5FNTBE!?+Z zzb?ARslFlbBQ0#v*i*#Q8XBh@95Q=^y><-Es;46^V-R6JxGH^jQS#PCrZif{JU6rx z4Uq|oW;39L&YlhKsp^nF@Bi%CGnf8{+F|$a$K$kjPcO$R_}cI z5ni(}C>PD?z}?WR=R`>#dtW3$%pi}Uln?Fhvz1DR6q;6npel0?5E6E4dQC~A!Z{iE z8ZE%i+>&nKLl}v8_;5cbc5!hLQMRBrhG5j#*ytzhOs&c71YJ6o5<+_Z#h<5>DSR^q zTpRJrKpp!3x<^BOy*E^4fD9;vBd7&6qCY@Q#(!WpsFm?JT$HwBymkv75ifvBhw=cp zwZ@BqAny6;mTS_d`B2dF@$;9CIJ&vH830pwb)4nyaV{>d56~+a{^ZFkEH^nkA_oIv zYntVtC+9ha`*C0(-jXK!atEW`4nwaDm}OF~6|iWh>V~JDNSj}!1E4Gc=dNex>G_j) zzI5~Zo&XjVbQ}H5uke))Mq03%>H{%+26K#y4!D;E+#J+v>jPL(Z4d`5aqm!FJmYzP zuw5o^^99eSCcZp!kRAJt$Y)>L&3tlbC)Swnf*=&pKiF)Dyt^;pRl57QvJng%3`J6@ zw8C|$dBDqZu6PhGN9yBQGjnOHhzG7b#&gy6-0xVf3?c~Q0-H@#DGL^m(Rpocikvnp z7yp-cpkldp?OE4WX*BVeUGG-ZD#=J8wTXoi@C1p}7itGw>GQt|V6%C?;$VjsZw+^M z*$}Q{o7eU615A6ME;tp!#hz(XvEf{C8f8Q1|6CtA_{-O*B4oj8-sSg*5H;E@yu18Z zO0mCh$fP$|SHu}#ZT}M~2EL?O&m-}F`%>bLz-a0yP+(BUU)kZt{P6g2!`T3>DY<4%gntdrcP9X_EQ)~8ON4(PG3Qv|46Utb^g z=#h!b)fwaQ_B@w`{)pkfx;7bKp+7iB2^}~vL;C|#%ZxA!!0duK6+o~T95Ezh5haFC zf{zeN3b3%@cij3Lbq2{IsPh-fp8BkD2LuSfz-5mPUF`-mef4T!n@tfn0M~~PANu9k z907kr34mH~! z&z(DW3$Q}H>ZU*JIef6k^!rlWi2H$`*3x>^Q=-TN=zQ5P1$<*rc9gbBvI7UOotk<@ z9fPz8{bD!dHyfoqt^d=JA*0E*>9-qW;%$CM0eB3`E7Ku=*l9R4s0#nSF(nm^=g|ZU zVow<@UxZ3w7(!a>rhZ&BlgLu6#^=H;>zW`^Z>iB!wLw z1yXy_eH9QkX*82S<4mkT;__&VXwlfN!Uuct-@Jao&xA*;q9Fk{&dgU`j#OK<(Z`U8 z245N*i^rT4C{OMwA9I3+SL@H2P6GGWA`^B=JJA5J76svn)|q(9%}p8*KP23qhPg>= zwDRwcIHhl~i1P z^q<(5ofZ^QzH(9YSy57$r~xrHqVBgv1^J&?HR5^=4CQt!k&eHaQj;iZAEj`t_>aa| zMx*lrq;{9SU{Vjg=N*t?N~ME+g-LA3YGR}G|LFX?ld+E(Yn|Ie4#fz%rY-QYC?^kPBo^JO4?B{;+@NRpAUzC_*&;9>IL?)cAcPCw`) z-n_RwPMa8R9yR;-Eb9W;_}Q{4kNw@U39F*(Nes7(ntlA&svsN#l8GcDW%Z8p+uP%d zPnFv>8T|p#X4cse-Wv?bOC+{{=%g>#y?>nuB@w2M!=$j&8^t@AbB;=aadE02#6xIU z`uO>?qPh92L05d!sLc=cTL<@V>Nl$GaiRmo-etuexBpd(gQt!>1K6&{S|>>25i`mFZ9>XiqP@jeHE)e z`YI@63I3Tsba8{}spf%e1x`KCuDHvY^DEw$0bwXW&B(CsIF6gCS7pZdf7<`0FCjBC+ z&V1qGMNx+VHOsc_>dX$v0l`2V-mb3dqWHAI=4hIy{VjFnU6pz!FN?-BKWAKOR{66l z(c_;ZsM?@vrk9BBQp%m73Ju~=q#!1h|FzNZ4LEi|;DV``|KEEG-EhmXNfC@o5pqf4 zU1jJ0b0Q8MsvdOX1D$G|@Uh!ramJjm6oO7}Xl@?NGb(5s^JD0Aww(aLa`NO!9sCA? z(wh~00}b@u+`?{IXaQV*L zamC}r<;zdH)-6H2yu8Jk9Ybpmc@{WIiy|T-`XE+NzSe#YqJ8CmxaHe{;*H&vR!7ha zjX1y5JTyNsG<55$rNj&J*_nUdX?l>rf9x20Sy`DG^tM6Y+o!53@DcUoMWrX2yMQT6 zw#p6?{J_G}2~^b19Xq;Vs~F63xNGKs09N#8-yNo-vl9)LF~a2n+vB%y;Fj(1Xyq|I z{w_~o4Zv}rXkwDcd-P=zD{tvv2RAD_n@>=X0;*p40#f1BsZ$gz!n%~ug88vE-%$wU z@$vi-VNkZ+R-NMLO<_$>cJy2$&_~6Cw;U2-jMb$ndnqp9j;374fF;B{D!ARS|I&Kr zoWRKSZ*YizSF(Ozo_9`@^U5PbKpZ!J&;hUdm4bYJ@BW`Yob?1pgEGEwm{eP3_QMPb ztILX>=- zRuK@x=^6FY@4@j#7FgEnfV4gdTzSnyh5n6?8PB7`#nJK~9orik0;h4u(ek#@g5kl? zIuB+J@S(Tl*zh3seCR(1JWdaNg-D{TU1&SB_>fbLMcsc)yv%a6gJ zz(y7J^l9=tZBI`**oA-|fgSG4gl3c_<6OEs;oXg2zXoWdUAG-Oc8syV-zH_5@r)h} zM0Wgkm4?Vhf8EBYjHBrXQ7oyhJ~4vv6#IQNHXKA1R=J7h$TEU$OGc@!x!E5y&#jUj zH}C%#&FA%wDO~xNE=7)1q+V&;@Dg!cD8jh@RN-|CGM-hNOkW{q9CyD!nB*8avCACI zAMrx*UbFNB4tPCaJm5roB_;}Bf$i7HwtUhYd_w;Qs7t;wW&QK)=h$aoe5+y*UaB3L90AJSAa5+1c_15P0yLKiimMY=a$M zt_dCnV$p)L5r@Ebhi8m$2ji1L)1rS zU@?(S6L5x*a83|NwTV>CQvMEOIXBRM=A{tpjlAD_S27G}9c^Ef(D2uqB)s7FAW18Vn%mri5K^0;6PHnSjld81>WoYy4rlg16piVs1X-4@49MQ%0&k8kqS%S%@#q zPn-g0i!Vd&Saw@&W8+SHWa}LpzukarJ)m0fo1Y*D0=C{fs=QlaM)?!K|M&muvnr8) zxD`L%*YNL6HwG;gP>edwtZ;)}T*jnLllXVEJ^6C^BnG!6t>_(*XpVGC*2SOVFR@6O zcY&t=NuclIfb1CD5;aP|qYThB~G11u$42^nQ04n|pu4;3Xb;KL0OJR=|GG}nz5GSW2A5~DJ02aLmoHLqtJlqm?cVAzqTsaha-cSFkRF~B* zT?8TVuP&E6AAXANc3eUv5aap)$04Sm9=cWdiy?$tdLXCc56A-$LeWDY`4tH9Ozc6d z*h|;rsI)YHMfFlqM3ELKv zkxH)2x8;82R{v517wH*e7w?1!j^7xZk%^6$3guM54H~>(Rd_A(aw#AJ;59Ssoh-6X zq@9J)9t+no`#1lBwXD2eh>0Hh_l7vJkW+v?aA^|U43a8zft-XM3g98q!5LlJ_JRTo zz##1ZQ;G)UZG3i^0}K2@Q<@(A>&8!Fa*POru_4xP26myf^-8#=X& zGX1+49vJqXsC_Y?0wE>f?Ny+-JXRB6+5~^cH28oVuLKV1gDinPW05oFy?>>&nj-+?HgA4 z-sqEFkLYdq*JG^J5C_)9&gUbZ^1bo?0|yWiVdD>K4{GoK6ztsxK{$rRY*K#EM9%BGmHO8;6=GUzSL~aB zC-_^lSKJC176g2w)ll!sZ)?gi6(QWEa594C=A25oXI_9u3+{}x(AptV{$EsKc2;>wZIFp7ZfjHGv{-y=&LF&)=4K+a0Ao__%Bi$hjpM4{)NxA?4_t zJ6GG%a)%(dhW#9HCyNpPV_JVsP3~$dCHPz5Em}B!c_ru|Iaj9ji%B?V`~A!QqP3C3 zor)h??}Q+;s^248#<@O%;E~s~M$w2r9{gzC3q;6_J}L6 zQHYp}h~FaknS0F+@bRAGK0ByP->8^%|4&aMaO&>@r2SA>EnxXipFSbb5b?*$tt}A1 z%n!wHSY%`%KrEP{s(X-+^~wyrClYxAD|P`<)jsi2Mc zY|K3UjJxux<;^1IWB+AT;LHHP5BG((4@-&2X8W8IJ_Nv+U}g0Mct!)23^Tk0s=B)D z=~0VrFmN~(ARY&3CXHzp`d7i+(z)tTPWOD#nk?e>e}8rE>H4vHRyjhCpu$ zfI<;v;OWIlz_u@0Mudgkf*0Ko`oKg7N(ibABHY3|cuP@T<}>gS0CKv6NRgha(=qOy za<%j91TRHFnM9XTqwR18?cB49yGsqJuV!RO#1%-W5NBp*d4+}P4jnoaU9s-cE7-XlVGfx0XD*0%D(mYBQLUH6+wRp^;|Xry3{3G_4MgtC|QYR zta|!T)uJYNJ}#+!I}yjc>mqI=?&KD>>JtqzZog^K;jFvHxyR*4|LiWk{F|?!zj=0R z%wMgpXjX2pC4f`70#1e9!qoMYD_Ps23l@5_T}Cr1aF1&6@VYb7T3eo5hrlB#y3#`0 zyR=73m{_|D>>h?h`}s-RQgO4|?qT)Hz4Prv_&(w1&x78EB6xufzrXpk3GGqFPJrWXoO)kER4aP}up$vssA|<|C zZ`u9uY{1tYR%ZNZwEm$jcgqrk^V`T&u3t2iP~vR;Xi?h3pKX|79zQNYcH!%T$7k#O zB&J$zNq64pShl__puKhJ|6lU|-MI`l^d~@DLuqrGp4-}W%eL8BN8lY!X8^zz#xBmh znl~+?=8^NDndmCgz%ZJ}hpcacko8T_w$F+5d2rhH=FJ_cX=!e2w=Koq#mC1_pdZTJ z9sBle&*;R2|Mc{9XHludvzQov5L0dK?eER-)t9f>Ae(Nu1vZ_LwABu2EK8u0l#C2b z=GTMZgC9Vsj~*hC*fimG)iSV*kBf)LAABRog}Ax6eEa(PCOo=$@OR$Xt*vj=WWwFzc z8_4XMU*#(D_CzbT){>tPj%3Q*-Ha!o@Oo5Y(6M5)3S}V(@@+SJ2Sqyh#gE`#E z;4s^z>*5^l)28n-Gc(hn@#tyd@XErO8&3sB$H)CLGsUdTw(Jhv2pUGy$Wy}`a+lS) zP-JB9@q@%oWMt#A{`6#IwiCy&WMsG8CT3>DXk`IwxQl?7&IbJ}l# TJmxv@bF$M)>WZoI`riKscXTD} literal 0 HcmV?d00001 diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png new file mode 100644 index 0000000000000000000000000000000000000000..74a373ae225018269919e1f18fbebab25bf4c35e GIT binary patch literal 23687 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 Z^81DLsEu?5`jCG(BX?dlSz6om{{Wy;U(x^o literal 0 HcmV?d00001 From cd4ccee703770bf5dce977f539e53f30e139313d Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 29 May 2017 22:13:52 -0400 Subject: [PATCH 14/24] Corrected typo in readme.md --- keyboards/s60_x/keymaps/bluebear/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 9a70cde9..50af6d83 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -48,9 +48,9 @@ This layer was inspired by the Satan Midi layout (https://github.com/qmk/qmk_fir -Top right button toggles MORSE_CHORDS layer -Escape brings you back to the BASE layer -## MIDI_CHORDS Layer +## MIDI_CHORD Layer -![MIDI_CHORDS Layer](S60X-Bluebear-MIDI_CHORDS-Layer.png) +![MIDI_CHORD Layer](S60X-Bluebear-MIDI_CHORDS-Layer.png) After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the Stradella Base system (https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. From 06684555d21059e55a549fc6c24936920e35f965 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 29 May 2017 22:16:17 -0400 Subject: [PATCH 15/24] Another typo... --- keyboards/s60_x/keymaps/bluebear/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 50af6d83..6f54d4d5 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -50,7 +50,7 @@ This layer was inspired by the Satan Midi layout (https://github.com/qmk/qmk_fir ## MIDI_CHORD Layer -![MIDI_CHORD Layer](S60X-Bluebear-MIDI_CHORDS-Layer.png) +![MIDI_CHORD Layer](S60X-Bluebear-MIDI_CHORD-Layer.png) After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the Stradella Base system (https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. From fbaf964a854a8fc754871730deb219ab48fd6937 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Tue, 30 May 2017 21:27:00 -0400 Subject: [PATCH 16/24] Improvements to Midi and keymap --- keyboards/s60_x/keymaps/bluebear/keymap.c | 114 +++++++++++----------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 44ebb5aa..87a792a0 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -13,14 +13,14 @@ enum keyboard_layers { // Midi Chords -enum midi_chord_modes { //ACTION_FUNCTION id +enum midi_chord_modes { //ACTION_FUNCTION opt major, minor, dom_seventh, dim_seventh, }; -enum midi_chord_root { //ACTION_FUNCTION opt +enum midi_chord_root { //ACTION_FUNCTION id C, Cs, Db = Cs, @@ -301,8 +301,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, TO(3), TO(5), \ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_UP, KC_NO, KC_NO, KC_NO, KC_INS, KC_DEL, \ KC_CAPS, KC_HOME, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO, KC_NO, KC_NO, KC_TRNS, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_NO, KC_NO, \ - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPACE, KC_PGDN, KC_PSCR, KC_SLCK, KC_PAUS, KC_NO, KC_TRNS, KC_NO, \ + KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), /* 2: Mouse Keys Layer @@ -324,9 +324,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RESET, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO, KC_NO, \ DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, KC_NO, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - KC_TRNS, KC_NO, KC_NO, KC_POWER, KC_NO, KC_NO, KC_NO, KC_NO + KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, 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_NO, KC_NO, KC_TRNS, KC_NO, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_POWER, KC_TRNS, KC_TRNS, KC_NO, KC_NO ), /* 3: Midi Base Layer @@ -799,68 +799,68 @@ const uint16_t PROGMEM fn_actions[] = { //Major Chords - [CMajor] = ACTION_FUNCTION_OPT(major, C), - [CsMajor] = ACTION_FUNCTION_OPT(major, Cs), - [DMajor] = ACTION_FUNCTION_OPT(major, D), - [DsMajor] = ACTION_FUNCTION_OPT(major, Ds), - [EMajor] = ACTION_FUNCTION_OPT(major, E), - [FMajor] = ACTION_FUNCTION_OPT(major, F), - [FsMajor] = ACTION_FUNCTION_OPT(major, Fs), - [GMajor] = ACTION_FUNCTION_OPT(major, G), - [GsMajor] = ACTION_FUNCTION_OPT(major, Gs), - [AMajor] = ACTION_FUNCTION_OPT(major, A), - [AsMajor] = ACTION_FUNCTION_OPT(major, As), - [BMajor] = ACTION_FUNCTION_OPT(major, B), + [CMajor] = ACTION_FUNCTION_OPT(C, major), + [CsMajor] = ACTION_FUNCTION_OPT(Cs, major), + [DMajor] = ACTION_FUNCTION_OPT(D, major), + [DsMajor] = ACTION_FUNCTION_OPT(Ds, major), + [EMajor] = ACTION_FUNCTION_OPT(E, major), + [FMajor] = ACTION_FUNCTION_OPT(F, major), + [FsMajor] = ACTION_FUNCTION_OPT(Fs, major), + [GMajor] = ACTION_FUNCTION_OPT(G, major), + [GsMajor] = ACTION_FUNCTION_OPT(Gs, major), + [AMajor] = ACTION_FUNCTION_OPT(A, major), + [AsMajor] = ACTION_FUNCTION_OPT(As, major), + [BMajor] = ACTION_FUNCTION_OPT(B, major), //Minor Chords - [CMinor] = ACTION_FUNCTION_OPT(minor, C), - [CsMinor] = ACTION_FUNCTION_OPT(minor, Cs), - [DMinor] = ACTION_FUNCTION_OPT(minor, D), - [DsMinor] = ACTION_FUNCTION_OPT(minor, Ds), - [EMinor] = ACTION_FUNCTION_OPT(minor, E), - [FMinor] = ACTION_FUNCTION_OPT(minor, F), - [FsMinor] = ACTION_FUNCTION_OPT(minor, Fs), - [GMinor] = ACTION_FUNCTION_OPT(minor, G), - [GsMinor] = ACTION_FUNCTION_OPT(minor, Gs), - [AMinor] = ACTION_FUNCTION_OPT(minor, A), - [AsMinor] = ACTION_FUNCTION_OPT(minor, As), - [BMinor] = ACTION_FUNCTION_OPT(minor, B), + [CMinor] = ACTION_FUNCTION_OPT(C, minor), + [CsMinor] = ACTION_FUNCTION_OPT(Cs, minor), + [DMinor] = ACTION_FUNCTION_OPT(D, minor), + [DsMinor] = ACTION_FUNCTION_OPT(Ds, minor), + [EMinor] = ACTION_FUNCTION_OPT(E, minor), + [FMinor] = ACTION_FUNCTION_OPT(F, minor), + [FsMinor] = ACTION_FUNCTION_OPT(Fs, minor), + [GMinor] = ACTION_FUNCTION_OPT(G, minor), + [GsMinor] = ACTION_FUNCTION_OPT(Gs, minor), + [AMinor] = ACTION_FUNCTION_OPT(A, minor), + [AsMinor] = ACTION_FUNCTION_OPT(As, minor), + [BMinor] = ACTION_FUNCTION_OPT(B, minor), //Dominant 7th - [CDom7] = ACTION_FUNCTION_OPT(dom_seventh, C), - [CsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Cs), - [DDom7] = ACTION_FUNCTION_OPT(dom_seventh, D), - [DsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Ds), - [EDom7] = ACTION_FUNCTION_OPT(dom_seventh, E), - [FDom7] = ACTION_FUNCTION_OPT(dom_seventh, F), - [FsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Fs), - [GDom7] = ACTION_FUNCTION_OPT(dom_seventh, G), - [GsDom7] = ACTION_FUNCTION_OPT(dom_seventh, Gs), - [ADom7] = ACTION_FUNCTION_OPT(dom_seventh, A), - [AsDom7] = ACTION_FUNCTION_OPT(dom_seventh, As), - [BDom7] = ACTION_FUNCTION_OPT(dom_seventh, B), + [CDom7] = ACTION_FUNCTION_OPT(C, dom_seventh), + [CsDom7] = ACTION_FUNCTION_OPT(Cs, dom_seventh), + [DDom7] = ACTION_FUNCTION_OPT(D, dom_seventh), + [DsDom7] = ACTION_FUNCTION_OPT(Ds, dom_seventh), + [EDom7] = ACTION_FUNCTION_OPT(E, dom_seventh), + [FDom7] = ACTION_FUNCTION_OPT(F, dom_seventh), + [FsDom7] = ACTION_FUNCTION_OPT(Fs, dom_seventh), + [GDom7] = ACTION_FUNCTION_OPT(G, dom_seventh), + [GsDom7] = ACTION_FUNCTION_OPT(Gs, dom_seventh), + [ADom7] = ACTION_FUNCTION_OPT(A, dom_seventh), + [AsDom7] = ACTION_FUNCTION_OPT(As, dom_seventh), + [BDom7] = ACTION_FUNCTION_OPT(B, dom_seventh), //Diminished 7th - [CDim7] = ACTION_FUNCTION_OPT(dim_seventh, C), - [CsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Cs), - [DDim7] = ACTION_FUNCTION_OPT(dim_seventh, D), - [DsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Ds), - [EDim7] = ACTION_FUNCTION_OPT(dim_seventh, E), - [FDim7] = ACTION_FUNCTION_OPT(dim_seventh, F), - [FsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Fs), - [GDim7] = ACTION_FUNCTION_OPT(dim_seventh, G), - [GsDim7] = ACTION_FUNCTION_OPT(dim_seventh, Gs), - [ADim7] = ACTION_FUNCTION_OPT(dim_seventh, A), - [AsDim7] = ACTION_FUNCTION_OPT(dim_seventh, As), - [BDim7] = ACTION_FUNCTION_OPT(dim_seventh, B), + [CDim7] = ACTION_FUNCTION_OPT(C, dim_seventh), + [CsDim7] = ACTION_FUNCTION_OPT(Cs, dim_seventh), + [DDim7] = ACTION_FUNCTION_OPT(D, dim_seventh), + [DsDim7] = ACTION_FUNCTION_OPT(Ds, dim_seventh), + [EDim7] = ACTION_FUNCTION_OPT(E, dim_seventh), + [FDim7] = ACTION_FUNCTION_OPT(F, dim_seventh), + [FsDim7] = ACTION_FUNCTION_OPT(Fs, dim_seventh), + [GDim7] = ACTION_FUNCTION_OPT(G, dim_seventh), + [GsDim7] = ACTION_FUNCTION_OPT(Gs, dim_seventh), + [ADim7] = ACTION_FUNCTION_OPT(A, dim_seventh), + [AsDim7] = ACTION_FUNCTION_OPT(As, dim_seventh), + [BDim7] = ACTION_FUNCTION_OPT(B, dim_seventh), }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { uint16_t root_note = MIDI_INVALID_NOTE; - switch (opt) { + switch (id) { case C: //Root note C root_note = MI_C; break; @@ -904,7 +904,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { uint16_t fifth = root_note + 7; uint16_t minor_seventh = root_note + 10; uint16_t diminished_seventh = root_note -3; - switch (id) { + switch (opt) { case major: //Major chord process_midi(root_note, record); process_midi(major_third, record); From 9cfa37bb3dba3a93edb47c0b08075aa05ea6b492 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Fri, 2 Jun 2017 22:57:57 -0400 Subject: [PATCH 17/24] Improvements and corrections to morse code macros layer --- keyboards/s60_x/keymaps/bluebear/keymap.c | 88 +++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 87a792a0..c4baadfc 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -406,7 +406,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { case 0: //Number 0-) if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- } @@ -417,7 +417,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 1: //Number 1-! if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- } @@ -428,7 +428,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 2: //Number 2-@ if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. } @@ -439,7 +439,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 3: // Number 3 if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- @@ -447,7 +447,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 4: //Number 4-$ if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- } @@ -458,7 +458,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 5: //Number 5 if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... @@ -466,7 +466,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 6: //Number 6 if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... @@ -474,7 +474,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 7: //Number 7-& if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... } @@ -485,7 +485,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 8: //Number 8 if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. @@ -493,7 +493,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 9: //Number 9-( if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. } @@ -504,7 +504,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 10: //Letter A if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- @@ -512,7 +512,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 11: //Letter B if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... @@ -520,7 +520,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 12: //Letter C if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. @@ -528,7 +528,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 13: //Letter D if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. @@ -536,7 +536,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 14: //Letter E if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(SPACE), END); //. @@ -544,7 +544,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 15: //Letter F if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. @@ -552,7 +552,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 16: //Letter G if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. @@ -560,7 +560,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 17: //Letter H if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... @@ -568,7 +568,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 18: //Letter I if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. @@ -576,7 +576,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 19: //Letter J if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- @@ -584,7 +584,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 20: //Letter K if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- @@ -592,7 +592,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 21: //Letter L if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. @@ -600,7 +600,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 22: //Letter M if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- @@ -608,7 +608,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 23: //Letter N if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. @@ -616,7 +616,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 24: //Letter O if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- @@ -624,7 +624,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 25: //Letter P if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. @@ -632,7 +632,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 26: //Letter Q if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- @@ -640,7 +640,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 27: //Letter R if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. @@ -648,7 +648,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 28: //Letter S if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... @@ -656,7 +656,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 29: //Letter T if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(SPACE), END); //- @@ -664,7 +664,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 30: //Letter U if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- @@ -672,7 +672,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 31: //Letter V if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- @@ -680,7 +680,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 32: //Letter W if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- @@ -688,7 +688,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 33: //Letter X if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- @@ -696,7 +696,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 34: //Letter Y if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- @@ -704,7 +704,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 35: //Letter Z if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. @@ -712,7 +712,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 36: //Punctuation . if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- @@ -720,7 +720,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 37: //Punctuation , if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- @@ -728,7 +728,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 38: //Punctuation '-" if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. } @@ -739,7 +739,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 39: //Punctuation /-? if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. } @@ -750,7 +750,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 40: //Punctuation ;-: if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... } @@ -761,7 +761,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 41: //Punctuation =-+ if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. } @@ -772,7 +772,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 42: //Punctuation --_ if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- } @@ -783,7 +783,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 43: //Morse Space if (record->event.pressed) { - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || MOD_BIT(KC_RSFT)) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); } return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse From 1b8ed53f21702d279dc5b5bffc2d0213943a22ad Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 5 Jun 2017 22:17:35 -0400 Subject: [PATCH 18/24] Added a couple of custom keys and updated layer image --- .../bluebear/S60X-Bluebear-MOUSE-Layer.png | Bin 16499 -> 18972 bytes keyboards/s60_x/keymaps/bluebear/keymap.c | 43 +++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png index 4e92a60c761c8401b667a5a8e8ac591a9b85d4ab..f37249b8114e3520ef699850116c47dac65e3e52 100644 GIT binary patch literal 18972 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 GH~$xObxqU& literal 16499 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 diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index c4baadfc..22356db2 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -255,6 +255,13 @@ enum morse_macros { MC_SPACE = M(43), }; +// Custom Keys + +enum custom_keys { + MAGSYS, // Magic SysRq key - Sends Alt-PSCR + TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del +}; + //Keymaps const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -312,9 +319,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │DEBUG│ │ │ │ │ │ │BTN1 │MS_UP│BTN2 │WH_UP│ │ │ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ │ │ │ │ │ │ │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│ │█████│ + │TFS │ │ │ │ │ │ │MS_LT│MS_DN│MS_RT│WH_DN│BTN3 │▒▒▒▒▒│ │█████│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - │ │▒▒▒▒▒│ │ │ │ │ │ │ │ │ │ │▒▒▒▒▒│ │▒▒▒▒▒│ + │MAGSYS▒▒▒▒▒│ │ │ │ │ │ │ │ │ │ │▒▒▒▒▒│ │▒▒▒▒▒│ ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤ │ │ │ │█████│█████│█████│ PWR │█████│█████│█████│ │ │ │ │█████│ └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ @@ -324,8 +331,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RESET, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_NO, KC_NO, \ DEBUG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_UP, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_NO, \ - KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, 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_NO, KC_NO, KC_TRNS, KC_NO, \ + TFS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_WH_D, KC_BTN3, KC_NO, KC_TRNS, \ + MAGSYS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_POWER, KC_TRNS, KC_TRNS, KC_NO, KC_NO ), @@ -400,13 +407,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -// Morse Code Macros +// Macros const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { switch(id) { + + // Morse Code Macros + case 0: //Number 0-) if (record->event.pressed) { - if (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { clear_mods(); return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- } @@ -791,7 +801,26 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; } return MACRO_NONE; -}; +} + +// Custom Keys + +bool process_record_user (uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + case MAGSYS: //Magic SysRq function - Toggles key on and off depending on state of LALT key + if (record->event.pressed) { + if (keyboard_report->mods & (MOD_BIT(KC_LALT))) { + unregister_code(KC_PSCR); + unregister_code(KC_LALT); + } else { + register_code(KC_LALT); + register_code(KC_PSCR); + } + } + break; + } + return true; +} // Midi Chord Function From 8f80f35186353801b960d536339b70f43f484c46 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Wed, 7 Jun 2017 22:01:28 -0400 Subject: [PATCH 19/24] Working on Morse Code Macros --- keyboards/s60_x/keymaps/bluebear/keymap.c | 33 ++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 22356db2..1ecddb8d 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -407,21 +407,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -// Macros +// Custom Function - Check if shift is pressed + +bool check_shift(void); + +bool check_shift() { + if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT))) { + return KC_LSHIFT; + } + if (keyboard_report->mods & (MOD_BIT(KC_RSHIFT))) { + return KC_RSHIFT; + } + else { + return false; + } +} + +// Morse Code Macros const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + uint16_t is_shift = check_shift(); switch(id) { - - // Morse Code Macros - case 0: //Number 0-) if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- - } + if (is_shift == false) { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- + } else { - return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- + unregister_mods(MOD_BIT(is_shift)); + return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- + register_code(is_shift); } } break; From 7146dfea6e564660e525c5c8280d5c73a73697f3 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Wed, 7 Jun 2017 23:57:14 -0400 Subject: [PATCH 20/24] =?UTF-8?q?Created=20special=20shift=20keys=20for=20?= =?UTF-8?q?Morse=20layer=20that=20change=20variable=20value,=20enabling=20?= =?UTF-8?q?to=20send=20=E2=80=9Cshifted=E2=80=9D=20special=20morse=20code?= =?UTF-8?q?=20characters.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/s60_x/keymaps/bluebear/keymap.c | 172 ++++------------------ 1 file changed, 29 insertions(+), 143 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 1ecddb8d..878a54e2 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -258,7 +258,9 @@ enum morse_macros { // Custom Keys enum custom_keys { - MAGSYS, // Magic SysRq key - Sends Alt-PSCR + MAGSYS = SAFE_RANGE, // Magic SysRq key - Sends Alt-PSCR + MC_LSFT, + MC_RSFT, TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del }; @@ -401,49 +403,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TO(0), MC_1, MC_2, MC_3, MC_4, MC_5, MC_6, MC_7, MC_8, MC_9, MC_0, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_TAB, MC_APOS, MC_COMM, MC_DOT, MC_P, MC_Y, MC_F, MC_G, MC_C, MC_R, MC_L, MC_SLSH, MC_EQL, KC_BSPC, \ KC_NO, MC_A, MC_O, MC_E, MC_U, MC_I, MC_D, MC_H, MC_T, MC_N, MC_S, MC_MINS, KC_NO, KC_ENT, \ - KC_LSFT, KC_NO, MC_SCLN, MC_Q, MC_J, MC_K, MC_X, MC_B, MC_M, MC_W, MC_V, MC_Z, KC_NO, KC_RSFT, KC_NO, \ + MC_LSFT, KC_NO, MC_SCLN, MC_Q, MC_J, MC_K, MC_X, MC_B, MC_M, MC_W, MC_V, MC_Z, KC_NO, MC_RSFT, KC_NO, \ KC_NO, KC_NO, KC_NO, MC_SPACE, KC_NO, KC_NO, KC_NO, KC_NO ), }; -// Custom Function - Check if shift is pressed - -bool check_shift(void); - -bool check_shift() { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT))) { - return KC_LSHIFT; - } - if (keyboard_report->mods & (MOD_BIT(KC_RSHIFT))) { - return KC_RSHIFT; - } - else { - return false; - } -} - // Morse Code Macros +int mc_shift_on = false; + const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - uint16_t is_shift = check_shift(); switch(id) { case 0: //Number 0-) if (record->event.pressed) { - if (is_shift == false) { - return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- - } - else { - unregister_mods(MOD_BIT(is_shift)); + if (mc_shift_on == true) { return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.--.- - register_code(is_shift); + } + else { + return MACRO(T(MINS), T(MINS), T(MINS), T(MINS), T(MINS), T(SPACE), END); //----- } } break; case 1: //Number 1-! if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-.-- } else { @@ -453,8 +437,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 2: //Number 2-@ if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.--.-. } else { @@ -464,16 +447,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 3: // Number 3 if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- } break; case 4: //Number 4-$ if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...-..- } else { @@ -483,24 +462,17 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 5: //Number 5 if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... } break; case 6: //Number 6 if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... } break; case 7: //Number 7-& if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.-... } else { @@ -510,16 +482,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 8: //Number 8 if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. } break; case 9: //Number 9-( if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //-.--. } else { @@ -529,232 +497,149 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 10: //Letter A if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- } break; case 11: //Letter B if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... } break; case 12: //Letter C if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. } break; case 13: //Letter D if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. } break; case 14: //Letter E if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(SPACE), END); //. } break; case 15: //Letter F if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. } break; case 16: //Letter G if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. } break; case 17: //Letter H if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... } break; case 18: //Letter I if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. } break; case 19: //Letter J if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- } break; case 20: //Letter K if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- } break; case 21: //Letter L if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. } break; case 22: //Letter M if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- } break; case 23: //Letter N if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. } break; case 24: //Letter O if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- } break; case 25: //Letter P if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. } break; case 26: //Letter Q if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- } break; case 27: //Letter R if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. } break; case 28: //Letter S if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... } break; case 29: //Letter T if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(SPACE), END); //- } break; case 30: //Letter U if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- } break; case 31: //Letter V if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- } break; case 32: //Letter W if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- } break; case 33: //Letter X if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- } break; case 34: //Letter Y if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { } return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- } break; case 35: //Letter Z if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. } break; case 36: //Punctuation . if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- } break; case 37: //Punctuation , if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- } break; case 38: //Punctuation '-" if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-..-. } else { @@ -764,8 +649,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 39: //Punctuation /-? if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //..--.. } else { @@ -775,8 +659,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 40: //Punctuation ;-: if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //---... } else { @@ -786,8 +669,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 41: //Punctuation =-+ if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-.-. } else { @@ -797,8 +679,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 42: //Punctuation --_ if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); + if (mc_shift_on == true) { return MACRO(T(DOT), T(DOT), T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //..--.- } else { @@ -808,9 +689,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { break; case 43: //Morse Space if (record->event.pressed) { - if (keyboard_report->mods & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) { - clear_mods(); - } return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse } break; @@ -833,6 +711,14 @@ bool process_record_user (uint16_t keycode, keyrecord_t *record) { } } break; + case MC_LSFT ... MC_RSFT: + if (record->event.pressed) { + mc_shift_on = true; + } + else { + mc_shift_on = false; + } + break; } return true; } From 54d48140cd4e0f03876b336c170a15076e123c69 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Sun, 11 Jun 2017 16:00:40 -0400 Subject: [PATCH 21/24] -MIDI Chords now using process_record_user instead of F(n) keys -Morse Code shift keys implemented --- keyboards/s60_x/keymaps/bluebear/keymap.c | 492 ++++++++-------------- 1 file changed, 164 insertions(+), 328 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/keymap.c b/keyboards/s60_x/keymaps/bluebear/keymap.c index 878a54e2..cfd8d4b5 100644 --- a/keyboards/s60_x/keymaps/bluebear/keymap.c +++ b/keyboards/s60_x/keymaps/bluebear/keymap.c @@ -11,202 +11,7 @@ enum keyboard_layers { MORSE, //Morse Code Layer }; -// Midi Chords - -enum midi_chord_modes { //ACTION_FUNCTION opt - major, - minor, - dom_seventh, - dim_seventh, -}; - -enum midi_chord_root { //ACTION_FUNCTION id - C, - Cs, - Db = Cs, - D, - Ds, - Eb = Ds, - E, - F, - Fs, - Gb = Fs, - G, - Gs, - Ab = Gs, - A, - As, - Bb = As, - B, -}; - -enum midi_chord_id { //ACTION_FUNCTION Progmem Id - - //Major Chords - - CMajor, - CsMajor, - DbMajor = CsMajor, - DMajor, - DsMajor, - EbMajor = DsMajor, - EMajor, - FMajor, - FsMajor, - GbMajor = FsMajor, - GMajor, - GsMajor, - AbMajor = GsMajor, - AMajor, - AsMajor, - BbMajor = AsMajor, - BMajor, - - //Minor Chords - - CMinor, - CsMinor, - DbMinor = CsMinor, - DMinor, - DsMinor, - EbMinor = DsMinor, - EMinor, - FMinor, - FsMinor, - GbMinor = FsMinor, - GMinor, - GsMinor, - AbMinor = GsMinor, - AMinor, - AsMinor, - BbMinor = AsMinor, - BMinor, - - //Dominant Seventh Chords - - CDom7, - CsDom7, - DbDom7 = CsDom7, - DDom7, - DsDom7, - EbDom7 = DsDom7, - EDom7, - FDom7, - FsDom7, - GbDom7 = FsDom7, - GDom7, - GsDom7, - AbDom7 = GsDom7, - ADom7, - AsDom7, - BbDom7 = AsDom7, - BDom7, - - //Diminished Seventh Chords - - CDim7, - CsDim7, - DbDim7 = CsDim7, - DDim7, - DsDim7, - EbDim7 = DsDim7, - EDim7, - FDim7, - FsDim7, - GbDim7 = FsDim7, - GDim7, - GsDim7, - AbDim7 = GsDim7, - ADim7, - AsDim7, - BbDim7 = AsDim7, - BDim7, -}; - -enum midi_chord_keycodes { //Midi Chocd Keycodes - - //Major Chord Keycodes - - MI_CH_C = F(CMajor), - MI_CH_Cs = F(CsMajor), - MI_CH_Db = MI_CH_Cs, - MI_CH_D = F(DMajor), - MI_CH_Ds = F(DsMajor), - MI_CH_Eb = MI_CH_Ds, - MI_CH_E = F(EMajor), - MI_CH_F = F(FMajor), - MI_CH_Fs = F(FsMajor), - MI_CH_Gb = MI_CH_Fs, - MI_CH_G = F(GMajor), - MI_CH_Gs = F(GsMajor), - MI_CH_Ab = MI_CH_Gs, - MI_CH_A = F(AMajor), - MI_CH_As = F(AsMajor), - MI_CH_Bb = MI_CH_As, - MI_CH_B = F(BMajor), - - //Minor Chord Keycodes - - MI_CH_Cm = F(CMinor), - MI_CH_Csm = F(CsMinor), - MI_CH_Dbm = MI_CH_Csm, - MI_CH_Dm = F(DMinor), - MI_CH_Dsm = F(DsMinor), - MI_CH_Ebm = MI_CH_Dsm, - MI_CH_Em = F(EMinor), - MI_CH_Fm = F(FMinor), - MI_CH_Fsm = F(FsMinor), - MI_CH_Gbm = MI_CH_Fsm, - MI_CH_Gm = F(GMinor), - MI_CH_Gsm = F(GsMinor), - MI_CH_Abm = MI_CH_Gsm, - MI_CH_Am = F(AMinor), - MI_CH_Asm = F(AsMinor), - MI_CH_Bbm = MI_CH_Asm, - MI_CH_Bm = F(BMinor), - - //Dominant Seventh Keycodes - - MI_CH_CDom7 = F(CDom7), - MI_CH_CsDom7 = F(CsDom7), - MI_CH_DbDom7 = MI_CH_CsDom7, - MI_CH_DDom7 = F(DDom7), - MI_CH_DsDom7 = F(DsDom7), - MI_CH_EbDom7 = MI_CH_DsDom7, - MI_CH_EDom7 = F(EDom7), - MI_CH_FDom7 = F(FDom7), - MI_CH_FsDom7 = F(FsDom7), - MI_CH_GbDom7 = MI_CH_FsDom7, - MI_CH_GDom7 = F(GDom7), - MI_CH_GsDom7 = F(GsDom7), - MI_CH_AbDom7 = MI_CH_GsDom7, - MI_CH_ADom7 = F(ADom7), - MI_CH_AsDom7 = F(AsDom7), - MI_CH_BbDom7 = MI_CH_AsDom7, - MI_CH_BDom7 = F(BDom7), - - //Diminished Seventh Keycodes - - MI_CH_CDim7 = F(CDim7), - MI_CH_CsDim7 = F(CsDim7), - MI_CH_DbDim7 = MI_CH_CsDim7, - MI_CH_DDim7 = F(DDim7), - MI_CH_DsDim7 = F(DsDim7), - MI_CH_EbDim7 = MI_CH_DsDim7, - MI_CH_EDim7 = F(EDim7), - MI_CH_FDim7 = F(FDim7), - MI_CH_FsDim7 = F(FsDim7), - MI_CH_GbDim7 = MI_CH_FsDim7, - MI_CH_GDim7 = F(GDim7), - MI_CH_GsDim7 = F(GsDim7), - MI_CH_AbDim7 = MI_CH_GsDim7, - MI_CH_ADim7 = F(ADim7), - MI_CH_AsDim7 = F(AsDim7), - MI_CH_BbDim7 = MI_CH_AsDim7, - MI_CH_BDim7 = F(BDim7), -}; - -//Morse Code Macro Keys +// Morse Code Macro Keys enum morse_macros { MC_0 = M(0), @@ -258,10 +63,94 @@ enum morse_macros { // Custom Keys enum custom_keys { + + // Miscellaneous Keycodes + + TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del MAGSYS = SAFE_RANGE, // Magic SysRq key - Sends Alt-PSCR - MC_LSFT, - MC_RSFT, - TFS = LCTL(LALT(KC_DEL)), // Three Finger Salute - Sends Ctl-Alt-Del + MC_LSFT, // Morse Code Left Shift + MC_RSFT, // Morse Code Right Shift + + // MIDI Chord Keycodes - Major + + MI_CH_C, + MI_CH_Cs, + MI_CH_Db = MI_CH_Cs, + MI_CH_D, + MI_CH_Ds, + MI_CH_Eb = MI_CH_Ds, + MI_CH_E, + MI_CH_F, + MI_CH_Fs, + MI_CH_Gb = MI_CH_Fs, + MI_CH_G , + MI_CH_Gs, + MI_CH_Ab = MI_CH_Gs, + MI_CH_A, + MI_CH_As, + MI_CH_Bb = MI_CH_As, + MI_CH_B, + + // MIDI Chord Keycodes Minor + + MI_CH_Cm, + MI_CH_Csm, + MI_CH_Dbm = MI_CH_Csm, + MI_CH_Dm, + MI_CH_Dsm, + MI_CH_Ebm = MI_CH_Dsm, + MI_CH_Em, + MI_CH_Fm, + MI_CH_Fsm, + MI_CH_Gbm = MI_CH_Fsm, + MI_CH_Gm, + MI_CH_Gsm, + MI_CH_Abm = MI_CH_Gsm, + MI_CH_Am, + MI_CH_Asm, + MI_CH_Bbm = MI_CH_Asm, + MI_CH_Bm, + + //MIDI Chord Keycodes Dominant Seventh + + MI_CH_CDom7, + MI_CH_CsDom7, + MI_CH_DbDom7 = MI_CH_CsDom7, + MI_CH_DDom7, + MI_CH_DsDom7, + MI_CH_EbDom7 = MI_CH_DsDom7, + MI_CH_EDom7, + MI_CH_FDom7, + MI_CH_FsDom7, + MI_CH_GbDom7 = MI_CH_FsDom7, + MI_CH_GDom7, + MI_CH_GsDom7, + MI_CH_AbDom7 = MI_CH_GsDom7, + MI_CH_ADom7, + MI_CH_AsDom7, + MI_CH_BbDom7 = MI_CH_AsDom7, + MI_CH_BDom7, + + // MIDI Chord Keycodes Diminished Seventh + + MI_CH_CDim7, + MI_CH_CsDim7, + MI_CH_DbDim7 = MI_CH_CsDim7, + MI_CH_DDim7, + MI_CH_DsDim7, + MI_CH_EbDim7 = MI_CH_DsDim7, + MI_CH_EDim7, + MI_CH_FDim7, + MI_CH_FsDim7, + MI_CH_GbDim7 = MI_CH_FsDim7, + MI_CH_GDim7, + MI_CH_GsDim7, + MI_CH_AbDim7 = MI_CH_GsDim7, + MI_CH_ADim7, + MI_CH_AsDim7, + MI_CH_BbDim7 = MI_CH_AsDim7, + MI_CH_BDim7, + }; //Keymaps @@ -378,7 +267,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MIDI_CHORDS] = KEYMAP( TO(0), MI_CH_C, MI_CH_G, MI_CH_D, MI_CH_A, MI_CH_E, MI_CH_B, MI_CH_Gb, MI_CH_Db, MI_CH_Ab, MI_CH_Eb, MI_CH_Bb, MI_CH_F, TO(3), KC_NO, \ - MI_OCTU, MI_CH_Cm, MI_CH_Gm, MI_CH_Dm, MI_CH_Am, MI_CH_Em, MI_CH_Bbm, MI_CH_Gbm, MI_CH_Dbm, MI_CH_Abm, MI_CH_Ebm, MI_CH_Bbm, MI_CH_Fm, KC_NO, \ + MI_OCTU, MI_CH_Cm, MI_CH_Gm, MI_CH_Dm, MI_CH_Am, MI_CH_Em, MI_CH_Bm, MI_CH_Gbm, MI_CH_Dbm, MI_CH_Abm, MI_CH_Ebm, MI_CH_Bbm, MI_CH_Fm, KC_NO, \ MI_OCTD, MI_CH_CDom7, MI_CH_GDom7, MI_CH_DDom7, MI_CH_ADom7, MI_CH_EDom7, MI_CH_BDom7, MI_CH_GbDom7, MI_CH_DbDom7, MI_CH_AbDom7, MI_CH_EbDom7, MI_CH_BbDom7, KC_NO, MI_CH_FDom7, \ MI_CH_CDim7, KC_NO, MI_CH_GDim7, MI_CH_DDim7, MI_CH_ADim7, MI_CH_EDim7, MI_CH_BDim7, MI_CH_GbDim7, MI_CH_DbDim7, MI_CH_AbDim7, MI_CH_EbDim7, MI_CH_BbDim7, KC_NO, MI_CH_FDim7, KC_NO, \ KC_NO, KC_NO, KC_NO, MI_ALLOFF, KC_NO, KC_NO, KC_NO, KC_NO @@ -411,10 +300,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Morse Code Macros -int mc_shift_on = false; +int mc_shift_on = false; // Variable that defines whether MC_LSFT or MC_RSFT are pressed const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + switch(id) { + case 0: //Number 0-) if (record->event.pressed) { if (mc_shift_on == true) { @@ -425,6 +316,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 1: //Number 1-! if (record->event.pressed) { if (mc_shift_on == true) { @@ -435,6 +327,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 2: //Number 2-@ if (record->event.pressed) { if (mc_shift_on == true) { @@ -445,11 +338,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 3: // Number 3 if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //...-- } break; + case 4: //Number 4-$ if (record->event.pressed) { if (mc_shift_on == true) { @@ -460,16 +355,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 5: //Number 5 if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //..... } break; + case 6: //Number 6 if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-.... } break; + case 7: //Number 7-& if (record->event.pressed) { if (mc_shift_on == true) { @@ -480,11 +378,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 8: //Number 8 if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //---.. } break; + case 9: //Number 9-( if (record->event.pressed) { if (mc_shift_on == true) { @@ -495,126 +395,151 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 10: //Letter A if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(SPACE), END); //.- } break; + case 11: //Letter B if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(DOT), T(DOT), T(SPACE), END); //-... } break; + case 12: //Letter C if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(MINS), T(DOT), T(SPACE), END); //-.-. } break; + case 13: //Letter D if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(DOT), T(SPACE), END); //-.. } break; + case 14: //Letter E if (record->event.pressed) { return MACRO(T(DOT), T(SPACE), END); //. } break; + case 15: //Letter F if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(MINS), T(DOT), T(SPACE), END); //..-. } break; + case 16: //Letter G if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(DOT), T(SPACE), END); //--. } break; + case 17: //Letter H if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(DOT), T(DOT), T(SPACE), END); //.... } break; + case 18: //Letter I if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(SPACE), END); //.. } break; + case 19: //Letter J if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(MINS), T(MINS), T(SPACE), END); //.--- } break; + case 20: //Letter K if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(MINS), T(SPACE), END); //-.- } break; + case 21: //Letter L if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(DOT), T(DOT), T(SPACE), END); //.-.. } break; + case 22: //Letter M if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(SPACE), END); //-- } break; + case 23: //Letter N if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(SPACE), END); //-. } break; + case 24: //Letter O if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(MINS), T(SPACE), END); //--- } break; + case 25: //Letter P if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(MINS), T(DOT), T(SPACE), END); //.--. } break; + case 26: //Letter Q if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(DOT), T(MINS), T(SPACE), END); //--.- } break; + case 27: //Letter R if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(DOT), T(SPACE), END); //.-. } break; + case 28: //Letter S if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(DOT), T(SPACE), END); //... } break; + case 29: //Letter T if (record->event.pressed) { return MACRO(T(MINS), T(SPACE), END); //- } break; + case 30: //Letter U if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(MINS), T(SPACE), END); //..- } break; + case 31: //Letter V if (record->event.pressed) { return MACRO(T(DOT), T(DOT), T(DOT), T(MINS), T(SPACE), END); //...- } break; + case 32: //Letter W if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(MINS), T(SPACE), END); //.-- } break; + case 33: //Letter X if (record->event.pressed) { return MACRO(T(MINS), T(DOT), T(DOT), T(MINS), T(SPACE), END); //-..- } break; + case 34: //Letter Y if (record->event.pressed) { if (mc_shift_on == true) { @@ -622,21 +547,25 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO(T(MINS), T(DOT), T(MINS), T(MINS), T(SPACE), END); //-.-- } break; + case 35: //Letter Z if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(SPACE), END); //--.. } break; + case 36: //Punctuation . if (record->event.pressed) { return MACRO(T(DOT), T(MINS), T(DOT), T(MINS), T(DOT), T(MINS), T(SPACE), END); //.-.-.- } break; + case 37: //Punctuation , if (record->event.pressed) { return MACRO(T(MINS), T(MINS), T(DOT), T(DOT), T(MINS), T(MINS), T(SPACE), END); //--..-- } break; + case 38: //Punctuation '-" if (record->event.pressed) { if (mc_shift_on == true) { @@ -647,6 +576,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 39: //Punctuation /-? if (record->event.pressed) { if (mc_shift_on == true) { @@ -657,6 +587,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 40: //Punctuation ;-: if (record->event.pressed) { if (mc_shift_on == true) { @@ -667,6 +598,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 41: //Punctuation =-+ if (record->event.pressed) { if (mc_shift_on == true) { @@ -677,6 +609,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 42: //Punctuation --_ if (record->event.pressed) { if (mc_shift_on == true) { @@ -687,6 +620,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 43: //Morse Space if (record->event.pressed) { return MACRO(T(BSLS), T(SPACE), END); //When pressed, this sends a slash followed by a space, making it easier to distinguish words in Morse @@ -699,7 +633,13 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // Custom Keys bool process_record_user (uint16_t keycode, keyrecord_t *record) { + + uint16_t root_note = MIDI_INVALID_NOTE; // Starting value for the root note of each chord + switch(keycode) { + + // Miscellaneous Keycodes + case MAGSYS: //Magic SysRq function - Toggles key on and off depending on state of LALT key if (record->event.pressed) { if (keyboard_report->mods & (MOD_BIT(KC_LALT))) { @@ -711,6 +651,7 @@ bool process_record_user (uint16_t keycode, keyrecord_t *record) { } } break; + case MC_LSFT ... MC_RSFT: if (record->event.pressed) { mc_shift_on = true; @@ -719,141 +660,36 @@ bool process_record_user (uint16_t keycode, keyrecord_t *record) { mc_shift_on = false; } break; - } - return true; -} - -// Midi Chord Function - -const uint16_t PROGMEM fn_actions[] = { - - //Major Chords - - [CMajor] = ACTION_FUNCTION_OPT(C, major), - [CsMajor] = ACTION_FUNCTION_OPT(Cs, major), - [DMajor] = ACTION_FUNCTION_OPT(D, major), - [DsMajor] = ACTION_FUNCTION_OPT(Ds, major), - [EMajor] = ACTION_FUNCTION_OPT(E, major), - [FMajor] = ACTION_FUNCTION_OPT(F, major), - [FsMajor] = ACTION_FUNCTION_OPT(Fs, major), - [GMajor] = ACTION_FUNCTION_OPT(G, major), - [GsMajor] = ACTION_FUNCTION_OPT(Gs, major), - [AMajor] = ACTION_FUNCTION_OPT(A, major), - [AsMajor] = ACTION_FUNCTION_OPT(As, major), - [BMajor] = ACTION_FUNCTION_OPT(B, major), - - //Minor Chords - - [CMinor] = ACTION_FUNCTION_OPT(C, minor), - [CsMinor] = ACTION_FUNCTION_OPT(Cs, minor), - [DMinor] = ACTION_FUNCTION_OPT(D, minor), - [DsMinor] = ACTION_FUNCTION_OPT(Ds, minor), - [EMinor] = ACTION_FUNCTION_OPT(E, minor), - [FMinor] = ACTION_FUNCTION_OPT(F, minor), - [FsMinor] = ACTION_FUNCTION_OPT(Fs, minor), - [GMinor] = ACTION_FUNCTION_OPT(G, minor), - [GsMinor] = ACTION_FUNCTION_OPT(Gs, minor), - [AMinor] = ACTION_FUNCTION_OPT(A, minor), - [AsMinor] = ACTION_FUNCTION_OPT(As, minor), - [BMinor] = ACTION_FUNCTION_OPT(B, minor), - - //Dominant 7th - - [CDom7] = ACTION_FUNCTION_OPT(C, dom_seventh), - [CsDom7] = ACTION_FUNCTION_OPT(Cs, dom_seventh), - [DDom7] = ACTION_FUNCTION_OPT(D, dom_seventh), - [DsDom7] = ACTION_FUNCTION_OPT(Ds, dom_seventh), - [EDom7] = ACTION_FUNCTION_OPT(E, dom_seventh), - [FDom7] = ACTION_FUNCTION_OPT(F, dom_seventh), - [FsDom7] = ACTION_FUNCTION_OPT(Fs, dom_seventh), - [GDom7] = ACTION_FUNCTION_OPT(G, dom_seventh), - [GsDom7] = ACTION_FUNCTION_OPT(Gs, dom_seventh), - [ADom7] = ACTION_FUNCTION_OPT(A, dom_seventh), - [AsDom7] = ACTION_FUNCTION_OPT(As, dom_seventh), - [BDom7] = ACTION_FUNCTION_OPT(B, dom_seventh), - - //Diminished 7th - - [CDim7] = ACTION_FUNCTION_OPT(C, dim_seventh), - [CsDim7] = ACTION_FUNCTION_OPT(Cs, dim_seventh), - [DDim7] = ACTION_FUNCTION_OPT(D, dim_seventh), - [DsDim7] = ACTION_FUNCTION_OPT(Ds, dim_seventh), - [EDim7] = ACTION_FUNCTION_OPT(E, dim_seventh), - [FDim7] = ACTION_FUNCTION_OPT(F, dim_seventh), - [FsDim7] = ACTION_FUNCTION_OPT(Fs, dim_seventh), - [GDim7] = ACTION_FUNCTION_OPT(G, dim_seventh), - [GsDim7] = ACTION_FUNCTION_OPT(Gs, dim_seventh), - [ADim7] = ACTION_FUNCTION_OPT(A, dim_seventh), - [AsDim7] = ACTION_FUNCTION_OPT(As, dim_seventh), - [BDim7] = ACTION_FUNCTION_OPT(B, dim_seventh), -}; -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - uint16_t root_note = MIDI_INVALID_NOTE; - switch (id) { - case C: //Root note C - root_note = MI_C; - break; - case Cs: //Root note C#/Db - root_note = MI_Cs; - break; - case D: // Root note D - root_note = MI_D; - break; - case Ds: // Root note D#/Eb - root_note = MI_Ds; - break; - case E: // Root note E - root_note = MI_E; - break; - case F: // Root note F - root_note = MI_F; - break; - case Fs: // Root note F#/Gb - root_note = MI_Fs; - break; - case G: // Root note G - root_note = MI_G; - break; - case Gs: // Root note G#/Ab - root_note = MI_Gs; - break; - case A: // Root note A - root_note = MI_A; - break; - case As: // Root note A#/Bb - root_note = MI_As; - break; - case B: // Root note B - root_note = MI_B; - break; - } - uint16_t major_third = root_note + 4; - uint16_t minor_third = root_note + 3; - //uint16_t flat_fifth = root_note + 6; - uint16_t fifth = root_note + 7; - uint16_t minor_seventh = root_note + 10; - uint16_t diminished_seventh = root_note -3; - switch (opt) { - case major: //Major chord + // MIDI Chord Keycodes + + case MI_CH_C ... MI_CH_B: // Major Chords + root_note = keycode - MI_CH_C + MI_C; process_midi(root_note, record); - process_midi(major_third, record); - process_midi(fifth, record); + process_midi(root_note + 4, record); // Major Third Note + process_midi(root_note + 7, record); // Fifth Note break; - case minor: //Minor chord + + case MI_CH_Cm ... MI_CH_Bm: // Minor Chord + root_note = keycode - MI_CH_Cm + MI_C; process_midi(root_note, record); - process_midi(minor_third, record); - process_midi(fifth, record); + process_midi(root_note + 3, record); // Minor Third Note + process_midi(root_note + 7, record); // Fifth Note break; - case dom_seventh: //Dominant Seventh chord + + case MI_CH_CDom7 ... MI_CH_BDom7: // Dominant 7th Chord + root_note = keycode - MI_CH_CDom7 + MI_C; process_midi(root_note, record); - process_midi(major_third, record); - process_midi(minor_seventh, record); + process_midi(root_note + 4, record); // Major Third Note + process_midi(root_note + 10, record); // Minor Seventh Note break; - case dim_seventh: //Diminished Seventh Chord + + case MI_CH_CDim7 ... MI_CH_BDim7: // Diminished 7th Chord + root_note = keycode - MI_CH_CDim7 + MI_C; process_midi(root_note, record); - process_midi(minor_third, record); - process_midi(diminished_seventh, record); + process_midi(root_note + 3, record); // Minor Third Note + process_midi(root_note - 3, record); // Diminished 7th Note break; } + return true; } From 78a4cfd453ddd66d2dc3f8c06827e89ec015cdc0 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 12 Jun 2017 20:13:17 -0400 Subject: [PATCH 22/24] Modifications to readme.md and deletion of keyboard layout images --- .../bluebear/120-button_Stradella_chart.svg | 5190 ----------------- .../bluebear/S60X-Bluebear-ARROWFN-Layer.png | Bin 18499 -> 0 bytes .../bluebear/S60X-Bluebear-BASE-Layer.png | Bin 28068 -> 0 bytes .../S60X-Bluebear-MIDI_BASE-Layer.png | Bin 22521 -> 0 bytes .../S60X-Bluebear-MIDI_CHORD-Layer.png | Bin 23687 -> 0 bytes .../bluebear/S60X-Bluebear-MORSE-Layer.png | Bin 14330 -> 0 bytes .../bluebear/S60X-Bluebear-MOUSE-Layer.png | Bin 18972 -> 0 bytes keyboards/s60_x/keymaps/bluebear/readme.md | 40 +- 8 files changed, 16 insertions(+), 5214 deletions(-) delete mode 100644 keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png delete mode 100644 keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MOUSE-Layer.png diff --git a/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg b/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg deleted file mode 100644 index bd878faa..00000000 --- a/keyboards/s60_x/keymaps/bluebear/120-button_Stradella_chart.svg +++ /dev/null @@ -1,5190 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-ARROWFN-Layer.png deleted file mode 100644 index 1f659d184d9816a81983cf34436995d000dab4fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18499 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 S;mv`zDaotKC7jlK^#1^gAcJlI diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-BASE-Layer.png deleted file mode 100644 index e77287a0f145f18a6ce5425cfbfc60d470c0092b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28068 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 CJ-;#l diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_BASE-Layer.png deleted file mode 100644 index 58ad1605f0324229ff9ba3c84ac5350bb61df90b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22521 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 TJmxv@bF$M)>WZoI`riKscXTD} diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MIDI_CHORD-Layer.png deleted file mode 100644 index 74a373ae225018269919e1f18fbebab25bf4c35e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23687 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 Z^81DLsEu?5`jCG(BX?dlSz6om{{Wy;U(x^o diff --git a/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png b/keyboards/s60_x/keymaps/bluebear/S60X-Bluebear-MORSE-Layer.png deleted file mode 100644 index 0e72d103263d0b2aa83a06682ca5e11dec96bc78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14330 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 GH~$xObxqU& diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 6f54d4d5..66c270ff 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -4,9 +4,7 @@ Custom keyboard layout for my S60X, my first ever custom mechanical keyboard kit This layout was inspired in part by the HHKB line of keyboards and a quest to find the perfect ergonomic, logical layout for what I do. If you like this layout, please feel free to use it, modify it and share it. -## BASE Layer - -![BASE Layer](S60X-Bluebear-BASE-Layer.png) +## [BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X - Bluebear - BASE layer&author=Ante Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true%3B&@_c=%23ff7a00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9%3B%3B&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A<%2F%2Fi>&_c=%23cccccc%3B&=!%0A1&=%2F@%0A2&=%23%0A3&=$%0A4&=%25%0A5&=^%0A6&=%2F&%0A7&=*%0A8&=(%0A9&=)%0A0&={%0A[&=}%0A]&=|%0A\&=~%0A`%3B&@_w:1.5%3B&=Tab&=”%0A’&=<%0A,&=>%0A.&=P&=Y&=F&=G&=C&=R&=L&=%3F%0A%2F%2F&=+%0A%2F=&_w:1.5%3B&=Backspace%3B&@_w:1.75%3B&=Ctrl (hold)%0AEsc (tap)&=A&=O&=E&=U&=I&=D&=H&=T&=N&=S&=%2F_%0A-&_w:2.25%3B&=Enter (tap)%0ACtrl (hold)%3B&@_w:2.25%3B&=Shift (hold)%0A( (tap)&=%2F:%0A%2F%3B&=Q&=J&=K&=X&=B&=M&=W&=V&=Z&_w:2.75%3B&=Shift (hold)%0A) (tap)%3B&@_w:1.25%3B&=Mouse Layer (hold)&_w:1.25%3B&=Win&_w:1.25%3B&=Alt&_a:5&w:6.25%3B&=Space (tap)%0AArrowFN Layer (hold)&_a:4&w:1.25%3B&=AltGr(h)%0AComp (t)&_w:1.25%3B&=Win&_w:1.25%3B&=Ctrl + Shift (oneshot)&_w:1.25%3B&=Ctrl + Alt (oneshot)) -Dvorak keyboard layout -Hold left control key for LCTL, and tap it for ESC @@ -19,49 +17,43 @@ This layout was inspired in part by the HHKB line of keyboards and a quest to fi -Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift) -Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt) -## ARROWFN Layer - -![ARROWFN Layer](S60X-Bluebear-ARROWFN-Layer.png) +## [ARROWFN Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20ARROWFN%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true%3B&@_c=%23ff6b00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9%3B%3B&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class%2F=%27kb%20kb-logo-commodore%27%3E%3C%2F%2Fi%3E&_c=%23cccccc%3B&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F0&=F11&=F12&=To%20MIDI%20Layer&=To%20MORSE%20Layer%3B&@_a:7&w:1.5%3B&=&=&=&=&=&=&=&_a:4%3B&=PgUp&=%3Ci%20class%2F=%27kb%20kb-Arrows-Up%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&=&_a:4%3B&=Ins&_w:1.5%3B&=Delete%3B&@_w:1.75%3B&=Caps%20Lock&=Home&_a:7%3B&=&_a:4%3B&=End&_a:7%3B&=&=&=&_a:4%3B&=%3Ci%20class%2F=%27kb%20kb-Arrows-Left%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Down%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Right%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&_a:4&w:2.25%3B&=Enter%3B&@_a:7&w:2.25%3B&=&=&=&=&=&=&_a:4%3B&=Space&=PgDn&=Print%20Screen&=Scroll%20Lock&=Pause&_a:7&w:2.75%3B&=%3B&@_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:6.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=) -Number row becomes F1 to F12 --C, T, H, N keys become Up, Down, Left, Right --Access to various other keys normally found on a full sized keyboard +-C, T, H, N keys become Up, Down, Left, Right (equivalent to IJKL on QWERTY keyboard) +-Access to various other keys normally found on a full sized keyboard (INS, DEL, PSCR, SLCK, PAUSE, PGUP, PGDN, HOME, END) -Top right button toggles MORSE layer -Second from right, top row, toggles MIDI_BASE layer +-Holding Space-B lets you send Space repeatedly +-Hitting the LCTL button in this layer toggles caps lock -## MOUSE Layer - -![MOUSE Layer](S60X-Bluebear-MOUSE-Layer.png) +## [MOUSE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MOUSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7f08&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Reset%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=F13&=F14&=F15&=F16&=F17&=F18&=F19&=F20&=F21&=F22&=F23&=F24&_a:7;&=&=;&@_a:4&w:1.5;&=Debug&_a:7;&=&=&=&=&=&=&_a:4;&=Mouse%20Button%201&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&=Mouse%20Button%202&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&_a:7;&=&=&_w:1.5;&=;&@_a:4&w:1.75;&=Ctl+%0ADel%0A%0A%0A%0A%0AAlt+&_a:7;&=&=&=&=&=&=&_a:4&f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Left%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Right%27%3E%3C//i%3E&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&=Mouse%20Button%203&_a:7&w:2.25;&=;&@_a:4&w:2.25;&=Magic%0AToggle%0A%0A%0A%0A%0ASysRq&_a:7;&=&=&=&=&=&=&=&=&=&=&_w:2.75;&=;&@_w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&w:6.25;&=Power&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) -Move the mouse with mouse keys -Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it +-If Debug is enabled, hitting the TAB key in this layer activates debugging to the console when listening with hid-listen +-TFS button (Three Finger Salute) sends Ctl-Alt-Del +-MAGSYS toggles the Magic SysRq key (works only in Linux) -Hitting the space key in this layer is like hitting power button on computer --Hitting the tab button toggles caps lock -Number row becomes F13 to F24 -## MIDI_BASE Layer +## [MIDI_BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20BASE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_a:7;&=&_a:4&f:3;&=To%0AChord%0A%0A%0A%0A%0AMidi;&@_f:3&w:1.5;&=Octave%20Up&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AC#//Db&_f:3;&=%E2%99%A9%0AD#//Eb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AF#//Gb&_f:3;&=%E2%99%A9%0AG#//Ab&_f:3;&=%E2%99%A9%0AA#//Bb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AD1b%0A%0A%0A%0A%0AC1#//&_f:3;&=%E2%99%A9%0AE1b%0A%0A%0A%0A%0AD1#//&_a:7;&=&=&_w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%E2%99%A9%0AC&_f:3;&=%E2%99%A9%0AD&_f:3;&=%E2%99%A9%0AE&_f:3;&=%E2%99%A9%0AF&_f:3;&=%E2%99%A9%0AG&_f:3;&=%E2%99%A9%0AA&_f:3;&=%E2%99%A9%0AB&_f:3;&=%E2%99%A9%0AC1&_f:3;&=%E2%99%A9%0AD1&_f:3;&=%E2%99%A9%0AE1&_f:3;&=%E2%99%A9%0AF1&_a:7&w:2.25;&=;&@_a:4&f:3&w:2.25;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFm;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) -![MIDI_BASE Layer](S60X-Bluebear-MIDI_BASE-Layer.png) - -This layer was inspired by the Satan Midi layout (https://github.com/qmk/qmk_firmware/tree/master/keyboards/satan/keymaps/midi) and gives access to basic MIDI notes. What I added were two layers of MIDI chords (major and minor triads) arranged in a circle of fifths pattern. Thanks to @fredizzimo for helping me with the code for these chords. +This layer was inspired by the [Satan Midi layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/satan/keymaps/midi) and gives access to basic MIDI notes. What I added were two layers of MIDI chords (major and minor triads) arranged in a circle of fifths pattern. Thanks to @fredizzimo for helping me with the code for these. -Top right button toggles MORSE_CHORDS layer -Escape brings you back to the BASE layer -## MIDI_CHORD Layer - -![MIDI_CHORD Layer](S60X-Bluebear-MIDI_CHORD-Layer.png) +## [MIDI_CHORD Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20CHORD%20Layer&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true&pcb:false;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_f:3;&=To%20Midi%20Base&_a:7;&=;&@_a:4&f:3&w:1.5;&=Octave%20Up&_f:3;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm//&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3;&=%F0%9F%8E%B6%0AFm&_a:7&w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%F0%9F%8E%B6%0AC7&_f:3;&=%F0%9F%8E%B6%0AG7&_f:3;&=%F0%9F%8E%B6%0AD7&_f:3;&=%F0%9F%8E%B6%0AA7&_f:3;&=%F0%9F%8E%B6%0AE7&_f:3;&=%F0%9F%8E%B6%0AB7&_f:3;&=%F0%9F%8E%B6%0AF#7%0A%0A%0A%0A%0AGb7//&_f:3;&=%F0%9F%8E%B6%0AC#7%0A%0A%0A%0A%0ADb7//&_f:3;&=%F0%9F%8E%B6%0AG#7%0A%0A%0A%0A%0AAb7//&_f:3;&=%F0%9F%8E%B6%0AD#7%0A%0A%0A%0A%0AEb7//&_f:3;&=%F0%9F%8E%B6%0AA#7%0A%0A%0A%0A%0ABb7//&_f:3&w:2.25;&=%F0%9F%8E%B6%0AF7;&@_f:3&w:2.25;&=%F0%9F%8E%B6%0ACdim7&_f:3;&=%F0%9F%8E%B6%0AGdim7&_f:3;&=%F0%9F%8E%B6%0ADdim7&_f:3;&=%F0%9F%8E%B6%0AAdim7&_f:3;&=%F0%9F%8E%B6%0AEdim7&_f:3;&=%F0%9F%8E%B6%0ABdim7&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AGb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ADb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AAb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AEb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ABb&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFdim7;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) -After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the Stradella Base system (https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. +After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the [Stradella Base system](https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. Originally, I had written the chord functions using the F(n) functions, but finally ended up using process_record_user and custom keycodes. I think this was a more efficient and elegant way of coding these. -Second from right, top row, toggles MIDI_BASE layer -Escape brings you back to the BASE layer -## MORSE LAYER - -![MORSE Layer](S60X-Bluebear-MORSE-Layer.png) +## [MORSE LAYER](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MORSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8a00&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&fa@:5&:5;;&=-.-.--%0A.----&=.--.-.%0A..---&=%0A...--&=...-..-%0A....-&=%0A.....&=%0A-....&=.-...%0A--...&=%0A---..&=-.--.%0A----.&=-.--.-%0A-----&_a:7;&=&=&=&=;&@_w:1.5;&=&_a:4;&=.-..-.%0A.----.&=%0A--..--&=%0A.-.-.-&=.--.&=-.--&=..-.&=--.&=-.-.&=.-.&=.-..&=..--..%0A-..-.&=.-.-.%0A-...-&_f:3&w:1.5;&=Backspace;&@_a:7&w:1.75;&=&_a:4&f:3;&=.-&_f:3;&=---&_f:3;&=.&_f:3&n:true;&=..-&_f:3;&=..&_f:3;&=-..&_f:3&n:true;&=....&_f:3;&=-&_f:3;&=-.&_f:3;&=...&_f:3;&=..--.-%0A-....-&_f:3&w:2.25;&=Enter;&@_f:3&w:2.25;&=Shift&_f:3;&=---...%0A-.-.-.&_f:3;&=--.-&_f:3;&=.---&_f:3;&=-.-&_f:3;&=-..-&_f:3;&=-...&_f:3;&=--&_f:3;&=.--&_f:3;&=...-&_f:3;&=--..&_f:3&w:2.75;&=Shift;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=Space%20(%5C%20)&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) -This layer is really just for fun, and because I am a ham radio operator and morse code enthusiast. Hitting the alphanumerical keys in this layer will send a series of dits (.) and dahs (-) representing that character in morse code. +This layer is really just for fun, and because I am a ham radio operator and morse code enthusiast. Hitting the alphanumerical keys in this layer will send a series of dits (.) and dahs (-) representing that character in morse code. This is all done through M(n). There are also a couple of characters that are sent through a shifted key on a regular layout, like @ or !. The same applies on this layer. And because I type using the Dvorak layout, this layer is also arranged in this manner. -Escape brings you back to the BASE layer From 3ee346c07ba60589162c83408e46b28d25b7bf83 Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 12 Jun 2017 20:20:28 -0400 Subject: [PATCH 23/24] Mods to readme.md --- keyboards/s60_x/keymaps/bluebear/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 66c270ff..153a8259 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -4,7 +4,7 @@ Custom keyboard layout for my S60X, my first ever custom mechanical keyboard kit This layout was inspired in part by the HHKB line of keyboards and a quest to find the perfect ergonomic, logical layout for what I do. If you like this layout, please feel free to use it, modify it and share it. -## [BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X - Bluebear - BASE layer&author=Ante Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true%3B&@_c=%23ff7a00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9%3B%3B&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A<%2F%2Fi>&_c=%23cccccc%3B&=!%0A1&=%2F@%0A2&=%23%0A3&=$%0A4&=%25%0A5&=^%0A6&=%2F&%0A7&=*%0A8&=(%0A9&=)%0A0&={%0A[&=}%0A]&=|%0A\&=~%0A`%3B&@_w:1.5%3B&=Tab&=”%0A’&=<%0A,&=>%0A.&=P&=Y&=F&=G&=C&=R&=L&=%3F%0A%2F%2F&=+%0A%2F=&_w:1.5%3B&=Backspace%3B&@_w:1.75%3B&=Ctrl (hold)%0AEsc (tap)&=A&=O&=E&=U&=I&=D&=H&=T&=N&=S&=%2F_%0A-&_w:2.25%3B&=Enter (tap)%0ACtrl (hold)%3B&@_w:2.25%3B&=Shift (hold)%0A( (tap)&=%2F:%0A%2F%3B&=Q&=J&=K&=X&=B&=M&=W&=V&=Z&_w:2.75%3B&=Shift (hold)%0A) (tap)%3B&@_w:1.25%3B&=Mouse Layer (hold)&_w:1.25%3B&=Win&_w:1.25%3B&=Alt&_a:5&w:6.25%3B&=Space (tap)%0AArrowFN Layer (hold)&_a:4&w:1.25%3B&=AltGr(h)%0AComp (t)&_w:1.25%3B&=Win&_w:1.25%3B&=Ctrl + Shift (oneshot)&_w:1.25%3B&=Ctrl + Alt (oneshot)) +## [BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20BASE%20layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7a00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=!%0A1&=/@%0A2&=#%0A3&=$%0A4&=%25%0A5&=%5E%0A6&=/&%0A7&=*%0A8&=(%0A9&=)%0A0&=%7B%0A%5B&=%7D%0A%5D&=%7C%0A%5C&=~%0A%60;&@_w:1.5;&=Tab&=%22%0A%27&=%3C%0A,&=%3E%0A.&=P&=Y&=F&=G&=C&=R&=L&=?%0A//&=+%0A/=&_w:1.5;&=Backspace;&@_w:1.75;&=Ctrl%20(hold)%0AEsc%20%20(tap)&=A&=O&=E&=U&=I&=D&=H&=T&=N&=S&=/_%0A-&_w:2.25;&=Enter%20(tap)%0ACtrl%20(hold);&@_w:2.25;&=Shift%20(hold)%0A(%20(tap)&=/:%0A/;&=Q&=J&=K&=X&=B&=M&=W&=V&=Z&_w:2.75;&=Shift%20(hold)%0A)%20(tap);&@_w:1.25;&=Mouse%20Layer%20(hold)&_w:1.25;&=Win&_w:1.25;&=Alt&_a:5&w:6.25;&=Space%20(tap)%0AArrowFN%20Layer%20(hold)&_a:4&w:1.25;&=AltGr(h)%0AComp%20(t)&_w:1.25;&=Win&_w:1.25;&=Ctrl%20+%20Shift%20(oneshot)&_w:1.25;&=Ctrl%20+%20Alt%20(oneshot)) -Dvorak keyboard layout -Hold left control key for LCTL, and tap it for ESC From f37daa53430bafb3abb00efd60d6a684b82ad99a Mon Sep 17 00:00:00 2001 From: Ante Laurijssen Date: Mon, 12 Jun 2017 20:24:56 -0400 Subject: [PATCH 24/24] Properly formatted unordered lists in readme.md --- keyboards/s60_x/keymaps/bluebear/readme.md | 58 +++++++++++----------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/keyboards/s60_x/keymaps/bluebear/readme.md b/keyboards/s60_x/keymaps/bluebear/readme.md index 153a8259..d2cf6a4c 100644 --- a/keyboards/s60_x/keymaps/bluebear/readme.md +++ b/keyboards/s60_x/keymaps/bluebear/readme.md @@ -6,56 +6,56 @@ This layout was inspired in part by the HHKB line of keyboards and a quest to fi ## [BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20BASE%20layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7a00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=!%0A1&=/@%0A2&=#%0A3&=$%0A4&=%25%0A5&=%5E%0A6&=/&%0A7&=*%0A8&=(%0A9&=)%0A0&=%7B%0A%5B&=%7D%0A%5D&=%7C%0A%5C&=~%0A%60;&@_w:1.5;&=Tab&=%22%0A%27&=%3C%0A,&=%3E%0A.&=P&=Y&=F&=G&=C&=R&=L&=?%0A//&=+%0A/=&_w:1.5;&=Backspace;&@_w:1.75;&=Ctrl%20(hold)%0AEsc%20%20(tap)&=A&=O&=E&=U&=I&=D&=H&=T&=N&=S&=/_%0A-&_w:2.25;&=Enter%20(tap)%0ACtrl%20(hold);&@_w:2.25;&=Shift%20(hold)%0A(%20(tap)&=/:%0A/;&=Q&=J&=K&=X&=B&=M&=W&=V&=Z&_w:2.75;&=Shift%20(hold)%0A)%20(tap);&@_w:1.25;&=Mouse%20Layer%20(hold)&_w:1.25;&=Win&_w:1.25;&=Alt&_a:5&w:6.25;&=Space%20(tap)%0AArrowFN%20Layer%20(hold)&_a:4&w:1.25;&=AltGr(h)%0AComp%20(t)&_w:1.25;&=Win&_w:1.25;&=Ctrl%20+%20Shift%20(oneshot)&_w:1.25;&=Ctrl%20+%20Alt%20(oneshot)) --Dvorak keyboard layout --Hold left control key for LCTL, and tap it for ESC --Hold enter key for RCTL and tap for ENT --Hold the space key to momentarily switch to ARROWFN layer --Left bottom key acts as momentary switch to the MOUSE layer --Hold right alt key for AltGr and tap for APP(which I have mapped to Compose in OS) --Hold left shift key for LSFT and tap for ( (Space Cadet style) --Hold right shift key for RSFT and tap for ) (Space Cadet style) --Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift) --Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt) +- Dvorak keyboard layout +- Hold left control key for LCTL, and tap it for ESC +- Hold enter key for RCTL and tap for ENT +- Hold the space key to momentarily switch to ARROWFN layer +- Left bottom key acts as momentary switch to the MOUSE layer +- Hold right alt key for AltGr and tap for APP(which I have mapped to Compose in OS) +- Hold left shift key for LSFT and tap for ( (Space Cadet style) +- Hold right shift key for RSFT and tap for ) (Space Cadet style) +- Tap key on bottom row, second from the right (where APP usually is) to get CTL-Shift (one shot modifier - next key pressed will be modified by ctl-shift) +- Tap key on bottom right to get CTL-Alt (one shot modifier - next key pressed will be modified by ctl-alt) ## [ARROWFN Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20ARROWFN%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true%3B&@_c=%23ff6b00&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9%3B%3B&=Esc%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class%2F=%27kb%20kb-logo-commodore%27%3E%3C%2F%2Fi%3E&_c=%23cccccc%3B&=F1&=F2&=F3&=F4&=F5&=F6&=F7&=F8&=F9&=F0&=F11&=F12&=To%20MIDI%20Layer&=To%20MORSE%20Layer%3B&@_a:7&w:1.5%3B&=&=&=&=&=&=&=&_a:4%3B&=PgUp&=%3Ci%20class%2F=%27kb%20kb-Arrows-Up%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&=&_a:4%3B&=Ins&_w:1.5%3B&=Delete%3B&@_w:1.75%3B&=Caps%20Lock&=Home&_a:7%3B&=&_a:4%3B&=End&_a:7%3B&=&=&=&_a:4%3B&=%3Ci%20class%2F=%27kb%20kb-Arrows-Left%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Down%27%3E%3C%2F%2Fi%3E&=%3Ci%20class%2F=%27kb%20kb-Arrows-Right%27%3E%3C%2F%2Fi%3E&_a:7%3B&=&=&_a:4&w:2.25%3B&=Enter%3B&@_a:7&w:2.25%3B&=&=&=&=&=&=&_a:4%3B&=Space&=PgDn&=Print%20Screen&=Scroll%20Lock&=Pause&_a:7&w:2.75%3B&=%3B&@_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:6.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=&_w:1.25%3B&=) --Number row becomes F1 to F12 --C, T, H, N keys become Up, Down, Left, Right (equivalent to IJKL on QWERTY keyboard) --Access to various other keys normally found on a full sized keyboard (INS, DEL, PSCR, SLCK, PAUSE, PGUP, PGDN, HOME, END) --Top right button toggles MORSE layer --Second from right, top row, toggles MIDI_BASE layer --Holding Space-B lets you send Space repeatedly --Hitting the LCTL button in this layer toggles caps lock +- Number row becomes F1 to F12 +- C, T, H, N keys become Up, Down, Left, Right (equivalent to IJKL on QWERTY keyboard) +- Access to various other keys normally found on a full sized keyboard (INS, DEL, PSCR, SLCK, PAUSE, PGUP, PGDN, HOME, END) +- Top right button toggles MORSE layer +- Second from right, top row, toggles MIDI_BASE layer +- Holding Space-B lets you send Space repeatedly +- Hitting the LCTL button in this layer toggles caps lock ## [MOUSE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MOUSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff7f08&fa@:0&:0&:0&:0&:0&:0&:0&:0&:0&:0&:9;;&=Reset%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E&_c=#cccccc;&=F13&=F14&=F15&=F16&=F17&=F18&=F19&=F20&=F21&=F22&=F23&=F24&_a:7;&=&=;&@_a:4&w:1.5;&=Debug&_a:7;&=&=&=&=&=&=&_a:4;&=Mouse%20Button%201&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&=Mouse%20Button%202&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Up%27%3E%3C//i%3E&_a:7;&=&=&_w:1.5;&=;&@_a:4&w:1.75;&=Ctl+%0ADel%0A%0A%0A%0A%0AAlt+&_a:7;&=&=&=&=&=&=&_a:4&f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Left%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&_f:3;&=Mouse%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Right%27%3E%3C//i%3E&_f:3;&=Mouse%20Wheel%0A%0A%0A%0A%0A%0A%0A%0A%0A%0A%3Ci%20class/=%27kb%20kb-Arrows-Down%27%3E%3C//i%3E&=Mouse%20Button%203&_a:7&w:2.25;&=;&@_a:4&w:2.25;&=Magic%0AToggle%0A%0A%0A%0A%0ASysRq&_a:7;&=&=&=&=&=&=&=&=&=&=&_w:2.75;&=;&@_w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&w:6.25;&=Power&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) --Move the mouse with mouse keys --Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it --If Debug is enabled, hitting the TAB key in this layer activates debugging to the console when listening with hid-listen --TFS button (Three Finger Salute) sends Ctl-Alt-Del --MAGSYS toggles the Magic SysRq key (works only in Linux) --Hitting the space key in this layer is like hitting power button on computer --Number row becomes F13 to F24 +- Move the mouse with mouse keys +- Hitting the escape key in this layer will give RESET, which puts the controller into dfu mode for flashing firmware onto it +- If Debug is enabled, hitting the TAB key in this layer activates debugging to the console when listening with hid-listen +- TFS button (Three Finger Salute) sends Ctl-Alt-Del +- MAGSYS toggles the Magic SysRq key (works only in Linux) +- Hitting the space key in this layer is like hitting power button on computer +- Number row becomes F13 to F24 ## [MIDI_BASE Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20BASE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_a:7;&=&_a:4&f:3;&=To%0AChord%0A%0A%0A%0A%0AMidi;&@_f:3&w:1.5;&=Octave%20Up&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AC#//Db&_f:3;&=%E2%99%A9%0AD#//Eb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AF#//Gb&_f:3;&=%E2%99%A9%0AG#//Ab&_f:3;&=%E2%99%A9%0AA#//Bb&_a:7;&=&_a:4&f:3;&=%E2%99%A9%0AD1b%0A%0A%0A%0A%0AC1#//&_f:3;&=%E2%99%A9%0AE1b%0A%0A%0A%0A%0AD1#//&_a:7;&=&=&_w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%E2%99%A9%0AC&_f:3;&=%E2%99%A9%0AD&_f:3;&=%E2%99%A9%0AE&_f:3;&=%E2%99%A9%0AF&_f:3;&=%E2%99%A9%0AG&_f:3;&=%E2%99%A9%0AA&_f:3;&=%E2%99%A9%0AB&_f:3;&=%E2%99%A9%0AC1&_f:3;&=%E2%99%A9%0AD1&_f:3;&=%E2%99%A9%0AE1&_f:3;&=%E2%99%A9%0AF1&_a:7&w:2.25;&=;&@_a:4&f:3&w:2.25;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFm;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) This layer was inspired by the [Satan Midi layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/satan/keymaps/midi) and gives access to basic MIDI notes. What I added were two layers of MIDI chords (major and minor triads) arranged in a circle of fifths pattern. Thanks to @fredizzimo for helping me with the code for these. --Top right button toggles MORSE_CHORDS layer --Escape brings you back to the BASE layer +- Top right button toggles MORSE_CHORDS layer +- Escape brings you back to the BASE layer ## [MIDI_CHORD Layer](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MIDI%20CHORD%20Layer&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true&pcb:false;&@_c=#ff8300&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&f:3;&=%F0%9F%8E%B6%0ACmaj&_f:3;&=%F0%9F%8E%B6%0AGmaj&_f:3;&=%F0%9F%8E%B6%0ADmaj&_f:3;&=%F0%9F%8E%B6%0AAmaj&_f:3;&=%F0%9F%8E%B6%0AEmaj&_f:3;&=%F0%9F%8E%B6%0ABmaj&_f:3;&=%F0%9F%8E%B6%0AF#maj%0A%0A%0A%0A%0AGbmaj//&_f:3;&=%F0%9F%8E%B6%0AC#maj%0A%0A%0A%0A%0ADbmaj//&_f:3;&=%F0%9F%8E%B6%0AG#maj%0A%0A%0A%0A%0AAbmaj&_f:3;&=%F0%9F%8E%B6%0AD#maj%0A%0A%0A%0A%0AEbmaj//&_f:3;&=%F0%9F%8E%B6%0AA#maj%0A%0A%0A%0A%0ABbmaj//&_f:3;&=%F0%9F%8E%B6%0AFmaj&_f:3;&=To%20Midi%20Base&_a:7;&=;&@_a:4&f:3&w:1.5;&=Octave%20Up&_f:3;&=%F0%9F%8E%B6%0ACm&_f:3;&=%F0%9F%8E%B6%0AGm&_f:3;&=%F0%9F%8E%B6%0ADm&_f:3;&=%F0%9F%8E%B6%0AAm&_f:3;&=%F0%9F%8E%B6%0AEm&_f:3;&=%F0%9F%8E%B6%0ABm&_f:3;&=%F0%9F%8E%B6%0AF#m%0A%0A%0A%0A%0AGbm//&_f:3;&=%F0%9F%8E%B6%0AC#m%0A%0A%0A%0A%0ADbm//&_f:3;&=%F0%9F%8E%B6%0AG#m%0A%0A%0A%0A%0AAbm//&_f:3;&=%F0%9F%8E%B6%0AD#m%0A%0A%0A%0A%0AEbm//&_f:3;&=%F0%9F%8E%B6%0AA#m%0A%0A%0A%0A%0ABbm//&_f:3;&=%F0%9F%8E%B6%0AFm&_a:7&w:1.5;&=;&@_a:4&f:3&w:1.75;&=Octave%20Down&_f:3;&=%F0%9F%8E%B6%0AC7&_f:3;&=%F0%9F%8E%B6%0AG7&_f:3;&=%F0%9F%8E%B6%0AD7&_f:3;&=%F0%9F%8E%B6%0AA7&_f:3;&=%F0%9F%8E%B6%0AE7&_f:3;&=%F0%9F%8E%B6%0AB7&_f:3;&=%F0%9F%8E%B6%0AF#7%0A%0A%0A%0A%0AGb7//&_f:3;&=%F0%9F%8E%B6%0AC#7%0A%0A%0A%0A%0ADb7//&_f:3;&=%F0%9F%8E%B6%0AG#7%0A%0A%0A%0A%0AAb7//&_f:3;&=%F0%9F%8E%B6%0AD#7%0A%0A%0A%0A%0AEb7//&_f:3;&=%F0%9F%8E%B6%0AA#7%0A%0A%0A%0A%0ABb7//&_f:3&w:2.25;&=%F0%9F%8E%B6%0AF7;&@_f:3&w:2.25;&=%F0%9F%8E%B6%0ACdim7&_f:3;&=%F0%9F%8E%B6%0AGdim7&_f:3;&=%F0%9F%8E%B6%0ADdim7&_f:3;&=%F0%9F%8E%B6%0AAdim7&_f:3;&=%F0%9F%8E%B6%0AEdim7&_f:3;&=%F0%9F%8E%B6%0ABdim7&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AGb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ADb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AAb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0AEb&_f:3;&=%F0%9F%8E%B6%0Adim7%0A%0A%0A%0A%0ABb&_f:3&w:2.75;&=%F0%9F%8E%B6%0AFdim7;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=All%20notes%20off&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) After figuring out how to code my MIDI chord function, I decided to dedicate a full layer to these chords. This chord layout was inspired by the [Stradella Base system](https://en.wikipedia.org/wiki/Stradella_bass_system) found on accordions. This layer is a tool for musical composition and songwriting. Originally, I had written the chord functions using the F(n) functions, but finally ended up using process_record_user and custom keycodes. I think this was a more efficient and elegant way of coding these. --Second from right, top row, toggles MIDI_BASE layer --Escape brings you back to the BASE layer +- Second from right, top row, toggles MIDI_BASE layer +- Escape brings you back to the BASE layer ## [MORSE LAYER](http://www.keyboard-layout-editor.com/##@_name=S60X%20-%20Bluebear%20-%20MORSE%20Layer&author=Ante%20Laurijssen&switchMount=cherry&switchBrand=outemu&switchType=PG150Q01-1&plate:true;&@_c=#ff8a00&a:5&fa@:9;;&=%3Ci%20class/=%27kb%20kb-logo-commodore%27%3E%3C//i%3E%0ABASE%0A%0A%0ALayer&_c=#cccccc&a:4&fa@:5&:5;;&=-.-.--%0A.----&=.--.-.%0A..---&=%0A...--&=...-..-%0A....-&=%0A.....&=%0A-....&=.-...%0A--...&=%0A---..&=-.--.%0A----.&=-.--.-%0A-----&_a:7;&=&=&=&=;&@_w:1.5;&=&_a:4;&=.-..-.%0A.----.&=%0A--..--&=%0A.-.-.-&=.--.&=-.--&=..-.&=--.&=-.-.&=.-.&=.-..&=..--..%0A-..-.&=.-.-.%0A-...-&_f:3&w:1.5;&=Backspace;&@_a:7&w:1.75;&=&_a:4&f:3;&=.-&_f:3;&=---&_f:3;&=.&_f:3&n:true;&=..-&_f:3;&=..&_f:3;&=-..&_f:3&n:true;&=....&_f:3;&=-&_f:3;&=-.&_f:3;&=...&_f:3;&=..--.-%0A-....-&_f:3&w:2.25;&=Enter;&@_f:3&w:2.25;&=Shift&_f:3;&=---...%0A-.-.-.&_f:3;&=--.-&_f:3;&=.---&_f:3;&=-.-&_f:3;&=-..-&_f:3;&=-...&_f:3;&=--&_f:3;&=.--&_f:3;&=...-&_f:3;&=--..&_f:3&w:2.75;&=Shift;&@_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_a:5&f:3&w:6.25;&=Space%20(%5C%20)&_a:7&w:1.25;&=&_w:1.25;&=&_w:1.25;&=&_w:1.25;&=) This layer is really just for fun, and because I am a ham radio operator and morse code enthusiast. Hitting the alphanumerical keys in this layer will send a series of dits (.) and dahs (-) representing that character in morse code. This is all done through M(n). There are also a couple of characters that are sent through a shifted key on a regular layout, like @ or !. The same applies on this layer. And because I type using the Dvorak layout, this layer is also arranged in this manner. --Escape brings you back to the BASE layer +- Escape brings you back to the BASE layer ### THIS IS STILL A WORK IN PROGRESS