From 168ba88ada31e9c70e39ee7a592595a7a771afe3 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Sat, 9 Nov 2019 17:05:37 +0100 Subject: [PATCH 01/14] Add SofleKeyboard support to QMK firmware. --- keyboards/sofle/config.h | 4 + keyboards/sofle/keymaps/default/config.h | 9 + keyboards/sofle/keymaps/default/keymap.c | 369 ++++++++++++++++++++++ keyboards/sofle/keymaps/default/readme.md | 20 ++ keyboards/sofle/keymaps/default/rules.mk | 5 + keyboards/sofle/readme.md | 27 ++ keyboards/sofle/rev1/config.h | 38 +++ keyboards/sofle/rev1/info.json | 19 ++ keyboards/sofle/rev1/rev1.c | 1 + keyboards/sofle/rev1/rev1.h | 37 +++ keyboards/sofle/rev1/rules.mk | 2 + keyboards/sofle/rules.mk | 4 + keyboards/sofle/sofle.c | 5 + keyboards/sofle/sofle.h | 5 + 14 files changed, 545 insertions(+) create mode 100644 keyboards/sofle/config.h create mode 100644 keyboards/sofle/keymaps/default/config.h create mode 100644 keyboards/sofle/keymaps/default/keymap.c create mode 100644 keyboards/sofle/keymaps/default/readme.md create mode 100644 keyboards/sofle/keymaps/default/rules.mk create mode 100644 keyboards/sofle/readme.md create mode 100644 keyboards/sofle/rev1/config.h create mode 100644 keyboards/sofle/rev1/info.json create mode 100644 keyboards/sofle/rev1/rev1.c create mode 100644 keyboards/sofle/rev1/rev1.h create mode 100644 keyboards/sofle/rev1/rules.mk create mode 100644 keyboards/sofle/rules.mk create mode 100644 keyboards/sofle/sofle.c create mode 100644 keyboards/sofle/sofle.h diff --git a/keyboards/sofle/config.h b/keyboards/sofle/config.h new file mode 100644 index 0000000000..0ff762c00b --- /dev/null +++ b/keyboards/sofle/config.h @@ -0,0 +1,4 @@ +#pragma once + +#include "config_common.h" + diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h new file mode 100644 index 0000000000..8133e12fcf --- /dev/null +++ b/keyboards/sofle/keymaps/default/config.h @@ -0,0 +1,9 @@ +#pragma once + +/* The way how "handedness" is decided (which half is which), +see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness +for more options. +*/ +#define MASTER_LEFT + +#define TAPPING_FORCE_HOLD diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c new file mode 100644 index 0000000000..894cb33cd1 --- /dev/null +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -0,0 +1,369 @@ +#include QMK_KEYBOARD_H + +enum sofle_layers { + /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */ + _M_QWERTY, + _W_QWERTY, + _M_COLEMAK, + _W_COLEMAK, + _M_LOWER, + _W_LOWER, + _M_RAISE, + _W_RAISE, + _ADJUST, +}; + +enum custom_keycodes { + KC_M_QWERTY = SAFE_RANGE, + KC_W_QWERTY, + KC_M_COLEMAK, + KC_W_COLEMAK, + KC_M_LOWER, + KC_W_LOWER, + KC_M_RAISE, + KC_W_RAISE, + KC_ADJUST, +}; + +/* Linux/win variants */ +#define KC_W_UNDO LCTL(KC_Z) +#define KC_W_CUT LCTL(KC_X) +#define KC_W_COPY LCTL(KC_C) +#define KC_W_PASTE LCTL(KC_V) +#define KC_W_PRVWD LCTL(KC_LEFT) +#define KC_W_NXTWD LCTL(KC_RIGHT) +#define KC_W_LSTRT KC_HOME +#define KC_W_LEND KC_END +#define KC_W_DLINE LCTL(KC_BSPC) + +/* Mac variants */ +#define KC_M_UNDO LGUI(KC_Z) +#define KC_M_CUT LGUI(KC_X) +#define KC_M_COPY LGUI(KC_C) +#define KC_M_PASTE LGUI(KC_V) +#define KC_M_PRVWD LALT(KC_LEFT) +#define KC_M_NXTWD LALT(KC_RIGHT) +#define KC_M_LSTRT LGUI(KC_LEFT) +#define KC_M_LEND LGUI(KC_RIGHT) +#define KC_M_DLINE LGUI(KC_BSPC) + +#define KC_____ KC_TRNS +#define KC_XXXX KC_NO +#define KC_RESET RESET + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* + * QWERTY + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | Q | W | E | R | T | | Y | U | I | O | P | Bspc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' | + * |------+------+------+------+------+------| | | |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LGUI | LAlt | LCTR |LOWER | /Enter / \Space \ |RAISE | RCTR | RAlt | RGUI | + * | | | | |/ / \ \ | | | | | + * `----------------------------------' '------''---------------------------' + */ +[_M_QWERTY] = LAYOUT_kc( \ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ + ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ + TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ + LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ + LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ +), +[_W_QWERTY] = LAYOUT_kc( \ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ + ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ + TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ + LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ + LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ +), +/* + * COLEMAK + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | ` | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ESC | Q | W | F | P | G | | J | L | U | Y | ; | Bspc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | TAB | A | R | S | T | D |-------. ,-------| H | N | E | I | O | ' | + * |------+------+------+------+------+------| MUTE | | |------+------+------+------+------+------| + * |LShift| Z | X | C | V | B |-------| |-------| K | M | , | . | / |RShift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LGUI | LAlt | LCTR |LOWER | /Enter / \Space \ |RAISE | RCTR | RAlt | RGUI | + * | | | | |/ / \ \ | | | | | + * `----------------------------------' '------''---------------------------' + */ + +[_M_COLEMAK] = LAYOUT_kc( \ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ + ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ + TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ + LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ + LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ +), +[_W_COLEMAK] = LAYOUT_kc( \ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ + ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ + TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ + LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ + LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ +), +/* LOWER + * ,-----------------------------------------. ,-----------------------------------------. + * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | | | + * |------+------+------+------+------+------| MUTE | | |------+------+------+------+------+------| + * | Shift| = | - | + | { | } |-------| |-------| [ | ] | ; | : | \ | Shift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LGUI | LAlt | LCTR |LOWER | /Enter / \Space \ |RAISE | RCTR | RAlt | RGUI | + * | | | | |/ / \ \ | | | | | + * `----------------------------------' '------''---------------------------' + */ +[_M_LOWER] = LAYOUT_kc( \ + ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \ + ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \ + ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\ +), +[_W_LOWER] = LAYOUT_kc( \ + ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ + GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \ + ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \ + ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\ +), +/* RAISE + * ,----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Esc | Ins | Pscr | Menu | | | | | PWrd | Up | NWrd | DLine| Bspc | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | LAt | LCtl |LShift| | Caps |-------. ,-------| | Left | Down | Rigth| Del | Bspc | + * |------+------+------+------+------+------| MUTE | | |------+------+------+------+------+------| + * |Shift | Undo | Cut | Copy | Paste| |-------| |-------| | LStr | | LEnd | | Shift| + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LGUI | LAlt | LCTR |LOWER | /Enter / \Space \ |RAISE | RCTR | RAlt | RGUI | + * | | | | |/ / \ \ | | | | | + * `----------------------------------' '------''---------------------------' + */ +[_M_RAISE] = LAYOUT_kc( \ + ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ ,____, \ + ____, INS, PSCR, APP, XXXX, XXXX, PGUP, M_PRVWD, UP,M_NXTWD,M_DLINE,BSPC, \ + ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ + ____,M_UNDO, M_CUT,M_COPY,M_PASTE,XXXX, ____, ____, XXXX, M_LSTRT, XXXX, M_LEND, XXXX, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ +), +[_W_RAISE] = LAYOUT_kc( \ + ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ , ____, \ + ____, INS, PSCR, APP, XXXX, XXXX, PGUP, W_PRVWD, UP,W_NXTWD,W_DLINE, BSPC, \ + ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ + ____,W_UNDO, W_CUT,W_COPY,W_PASTE,XXXX, ____, ____, XXXX, W_LSTRT, XXXX, W_LEND, XXXX, ____, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ +), +/* ADJUST + * ,-----------------------------------------. ,-----------------------------------------. + * | | | | | | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | RESET| |MACQWR|MACCOL| | | | | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | |WINQWR|WINCOL| | |-------. ,-------| | VOLDO| MUTE | VOLUP| | | + * |------+------+------+------+------+------| MUTE | | |------+------+------+------+------+------| + * | | | | | | |-------| |-------| | PREV | PLAY | NEXT | | | + * `-----------------------------------------/ / \ \-----------------------------------------' + * | LGUI | LAlt | LCTR |LOWER | /Enter / \Space \ |RAISE | RCTR | RAlt | RGUI | + * | | | | |/ / \ \ | | | | | + * `----------------------------------' '------''---------------------------' + */ + [_ADJUST] = LAYOUT_kc( \ + XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ + RESET, XXXX,M_QWERTY,M_COLEMAK, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ + XXXX , XXXX,W_QWERTY,W_COLEMAK, XXXX, XXXX, XXXX, VOLD, MUTE, VOLU, XXXX, XXXX, \ + XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, MPRV, MPLY, MNXT, XXXX, XXXX, \ + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ + ) +}; + +#ifdef OLED_DRIVER_ENABLE + +static void render_logo(void) { + static const char PROGMEM qmk_logo[] = { + 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, + 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, + 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0 + }; + + oled_write_P(qmk_logo, false); +} + +static void print_status_narrow(void) { + // Print current mode + oled_write_P(PSTR("\n\n"), false); + oled_write_ln_P(PSTR("MODE"), false); + oled_write_ln_P(PSTR(""), false); + switch (biton32(default_layer_state)) { + case _W_QWERTY: + oled_write_P(PSTR("Qwrt\nLinux"), false); + break; + case _M_QWERTY: + oled_write_P(PSTR("Qwrt\nMac\n"), false); + break; + case _W_COLEMAK: + oled_write_P(PSTR("Clmk\nLinux"), false); + break; + case _M_COLEMAK: + oled_write_P(PSTR("Clmk\nMac\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + oled_write_P(PSTR("\n\n"), false); + // Print current layer + oled_write_ln_P(PSTR("LAYER"), false); + switch (biton32(layer_state)) { + case _M_COLEMAK: + case _W_COLEMAK: + case _M_QWERTY: + case _W_QWERTY: + oled_write_P(PSTR("Base\n"), false); + break; + case _M_RAISE: + case _W_RAISE: + oled_write_P(PSTR("Raise"), false); + break; + case _M_LOWER: + case _W_LOWER: + oled_write_P(PSTR("Lower"), false); + break; + case _ADJUST: + oled_write_P(PSTR("Adj\n"), false); + break; + default: + oled_write_ln_P(PSTR("Undef"), false); + } + oled_write_P(PSTR("\n\n"), false); + uint8_t led_usb_state = host_keyboard_leds(); + oled_write_ln_P(led_usb_state & (1 << USB_LED_CAPS_LOCK) ? PSTR("CPSLK") : PSTR(" "), false); +} + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + if (is_keyboard_master()) { + return OLED_ROTATION_270; + } + return rotation; +} + +void oled_task_user(void) { + if (is_keyboard_master()) { + print_status_narrow(); + } else { + render_logo(); + } +} + +#endif + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case KC_W_QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_W_QWERTY); + } + return false; + break; + case KC_M_QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_M_QWERTY); + } + return false; + break; + case KC_W_COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_W_COLEMAK); + } + return false; + break; + case KC_M_COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_M_COLEMAK); + } + return false; + break; + case KC_M_LOWER: + if (record->event.pressed) { + layer_on(_M_LOWER); + update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + } else { + layer_off(_M_LOWER); + update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + } + return false; + break; + case KC_M_RAISE: + if (record->event.pressed) { + layer_on(_M_RAISE); + update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + } else { + layer_off(_M_RAISE); + update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + } + return false; + break; + case KC_W_LOWER: + if (record->event.pressed) { + layer_on(_W_LOWER); + update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + } else { + layer_off(_W_LOWER); + update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + } + return false; + break; + case KC_W_RAISE: + if (record->event.pressed) { + layer_on(_W_RAISE); + update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + } else { + layer_off(_W_RAISE); + update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + } + return false; + break; + case KC_ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} + +#ifdef ENCODER_ENABLE + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } else if (index == 1) { + if (clockwise) { + tap_code(KC_PGDOWN); + } else { + tap_code(KC_PGUP); + } + } +} + +#endif + diff --git a/keyboards/sofle/keymaps/default/readme.md b/keyboards/sofle/keymaps/default/readme.md new file mode 100644 index 0000000000..e409040ac7 --- /dev/null +++ b/keyboards/sofle/keymaps/default/readme.md @@ -0,0 +1,20 @@ +![SofleKeyboard defualt keymap](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard.png) +![SofleKeyboard adjust layer](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard_layout_adjust.png) + + +# Default keymap for Sofle Keyboard + +Layout in [Keyboard Layout Editor](http://www.keyboard-layout-editor.com/#/gists/76efb423a46cbbea75465cb468eef7ff) and [adjust layer](http://www.keyboard-layout-editor.com/#/gists/4bcf66f922cfd54da20ba04905d56bd4) + + +Features: + +- Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift) +- Various modes, can be switched (using Adjust layer and the selected one is stored in EEPROM. +- Modes for Qwerty and Colemak support +- Modes for Mac vs Linux/Win support -> different order of modifiers and different action shortcuts on the "UPPER" layer (the red one in the image). Designed to simplify transtions when switching between operating systems often. +- The OLED on master half shows selected mode and caps lock state and is rotated. +- Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN. + + + diff --git a/keyboards/sofle/keymaps/default/rules.mk b/keyboards/sofle/keymaps/default/rules.mk new file mode 100644 index 0000000000..6da1df16fd --- /dev/null +++ b/keyboards/sofle/keymaps/default/rules.mk @@ -0,0 +1,5 @@ + +OLED_DRIVER_ENABLE = yes +ENCODER_ENABLE = yes +CONSOLE_ENABLE = yes +EXTRAKEY_ENABLE = yes diff --git a/keyboards/sofle/readme.md b/keyboards/sofle/readme.md new file mode 100644 index 0000000000..27071e6f33 --- /dev/null +++ b/keyboards/sofle/readme.md @@ -0,0 +1,27 @@ +# Sofle Keyboard + +![SofleKeyboard version 1](https://raw.githubusercontent.com/josefadamcik/SofleKeyboard/master/Images/IMG_20200126_114622.jpg) + +Sofle is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards. + +More details about the keyboard on my blog: [Let me introduce you SofleKeyboard - a split keyboard based on Lily58 and Crkbd](https://josef-adamcik.cz/electronics/let-me-introduce-you-sofle-keyboard-split-keyboard-based-on-lily58.html) + +The current (temporary) build guide and a build log is available here: [SofleKeyboard build log/guide](https://josef-adamcik.cz/electronics/soflekeyboard-build-log-and-build-guide.html) + +* Keyboard Maintainer: [Josef Adamcik](https://josef-adamcik.cz) [Twitter:@josefadamcik](https://twitter.com/josefadamcik) +* Hardware Supported: SofleKeyboard PCB, ProMicro +* Hardware Availability: [PCB & Case Data](https://github.com/josefadamcik/SofleKeyboard) + +Make example for this keyboard (after setting up your build environment): + + make sofle:default + +Flash the default keymap: + + make sofle:default:avrdude + +Press reset button on he keyboard when asked. + +Disconnect the first half, connect the second one and repeat the process. + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h new file mode 100644 index 0000000000..154d1fae10 --- /dev/null +++ b/keyboards/sofle/rev1/config.h @@ -0,0 +1,38 @@ +#pragma once + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFC32 +#define PRODUCT_ID 0x0287 +#define DEVICE_VER 0x0001 +#define MANUFACTURER JosefAdamcik +#define PRODUCT Sofle +#define DESCRIPTION Sofle is 6×4+5keys+encoder column-staggered split keyboard. + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 10 +#define MATRIX_COLS 6 + +// wiring of each half +#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } +#define DIODE_DIRECTION COL2ROW + +#define TAPPING_TERM 100 +#define DEBOUNCE 5 + +/* encoder support */ +#define ENCODERS_PAD_A { F5 } +#define ENCODERS_PAD_B { F4 } +#define ENCODERS_PAD_A_RIGHT { F4 } +#define ENCODERS_PAD_B_RIGHT { F5 } +#define ENCODER_RESOLUTION 2 + +/* communication between sides */ +#define USE_SERIAL +#define SERIAL_USE_MULTI_TRANSACTION +#define SOFT_SERIAL_PIN D2 + +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json new file mode 100644 index 0000000000..0a495dd3bc --- /dev/null +++ b/keyboards/sofle/rev1/info.json @@ -0,0 +1,19 @@ +{ + "keyboard_name": "Sofle", + "url": "https://github.com/josefadamcik/SofleKeyboard", + "maintainer": "Josef Adamcik ", + "width": 16.5, + "height": 5.25, + "layouts": { + "LAYOUT": { + "key_count": 60, + "layout": [ + {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, + {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, + {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, + {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, + {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.125}, {"x":14, "y":4.375} + ] + } + } +} diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c new file mode 100644 index 0000000000..bbb014c4df --- /dev/null +++ b/keyboards/sofle/rev1/rev1.c @@ -0,0 +1 @@ +#include "sofle.h" diff --git a/keyboards/sofle/rev1/rev1.h b/keyboards/sofle/rev1/rev1.h new file mode 100644 index 0000000000..86924e4d2c --- /dev/null +++ b/keyboards/sofle/rev1/rev1.h @@ -0,0 +1,37 @@ +#pragma once +#include "quantum.h" + +#define LAYOUT( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ + L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ + ) \ + { \ + { L00, L01, L02, L03, L04, L05 }, \ + { L10, L11, L12, L13, L14, L15 }, \ + { L20, L21, L22, L23, L24, L25 }, \ + { L30, L31, L32, L33, L34, L35 }, \ + { L40, L41, L42, L43, L44, L45 }, \ + { R05, R04, R03, R02, R01, R00 }, \ + { R15, R14, R13, R12, R11, R10 }, \ + { R25, R24, R23, R22, R21, R20 }, \ + { R35, R34, R33, R32, R31, R30 }, \ + { R45, R44, R43, R42, R41, R40 } \ + } + +#define LAYOUT_kc( \ + L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ + L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ + L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ + L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ + L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ + ) \ + LAYOUT( \ + KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ + KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ + KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ + KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L45, KC_##R40, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 , \ + KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \ +) diff --git a/keyboards/sofle/rev1/rules.mk b/keyboards/sofle/rev1/rules.mk new file mode 100644 index 0000000000..2ba231d86b --- /dev/null +++ b/keyboards/sofle/rev1/rules.mk @@ -0,0 +1,2 @@ +ENCODER_ENABLE = yes +OLED_DRIVER_ENABLE = yes diff --git a/keyboards/sofle/rules.mk b/keyboards/sofle/rules.mk new file mode 100644 index 0000000000..820061832a --- /dev/null +++ b/keyboards/sofle/rules.mk @@ -0,0 +1,4 @@ +MCU = atmega32u4 +BOOTLOADER = caterina +SPLIT_KEYBOARD = yes +DEFAULT_FOLDER = sofle/rev1 diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c new file mode 100644 index 0000000000..9d61b0e585 --- /dev/null +++ b/keyboards/sofle/sofle.c @@ -0,0 +1,5 @@ +#include "sofle.h" + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + return process_record_user(keycode, record); +} diff --git a/keyboards/sofle/sofle.h b/keyboards/sofle/sofle.h new file mode 100644 index 0000000000..67bd529a1b --- /dev/null +++ b/keyboards/sofle/sofle.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_sofle_rev1 + #include "rev1.h" +#endif From 41fd60d624c260d75de3d507bbbbaf9d8f977665 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Wed, 29 Apr 2020 17:11:16 +0200 Subject: [PATCH 02/14] Sofle: Remove LAYOUT_kc macro for default layout. Remove unnecessary code. --- keyboards/sofle/keymaps/default/keymap.c | 138 +++++++++++------------ keyboards/sofle/rev1/rev1.h | 14 --- keyboards/sofle/sofle.c | 4 - 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 894cb33cd1..23086bcd69 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -6,8 +6,7 @@ enum sofle_layers { _W_QWERTY, _M_COLEMAK, _W_COLEMAK, - _M_LOWER, - _W_LOWER, + _LOWER, _M_RAISE, _W_RAISE, _ADJUST, @@ -47,9 +46,8 @@ enum custom_keycodes { #define KC_M_LEND LGUI(KC_RIGHT) #define KC_M_DLINE LGUI(KC_BSPC) -#define KC_____ KC_TRNS -#define KC_XXXX KC_NO -#define KC_RESET RESET +#define ______ KC_TRNS +#define XXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* @@ -67,19 +65,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ -[_M_QWERTY] = LAYOUT_kc( \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ - LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ - LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ +[_M_QWERTY] = LAYOUT( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \ ), -[_W_QWERTY] = LAYOUT_kc( \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ - ESC, Q, W, E, R, T, Y, U, I, O, P, BSPC, \ - TAB, A, S, D, F, G, H, J, K, L, SCLN, QUOT, \ - LSFT, Z, X, C, V, B, MUTE, XXXX, N, M, COMM, DOT, SLSH, RSFT, \ - LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ +[_W_QWERTY] = LAYOUT( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* * COLEMAK @@ -97,19 +95,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ -[_M_COLEMAK] = LAYOUT_kc( \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ - ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ - TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ - LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ - LCTRL,LALT,LGUI,M_LOWER, ENT, SPC, M_RAISE, RGUI, RALT, RCTRL \ +[_M_COLEMAK] = LAYOUT( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ + KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ + KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \ ), -[_W_COLEMAK] = LAYOUT_kc( \ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, GRV, \ - ESC, Q, W, F, P, G, J, L, U, Y, SCLN, BSPC, \ - TAB, A, R, S, T, D, H, N, E, I, O, QUOT, \ - LSFT, Z, X, C, V, B, MUTE, XXXX, K, M, COMM, DOT, SLSH, RSFT, \ - LGUI, LALT,LCTRL,W_LOWER,ENT, SPC, W_RAISE, RCTRL,RALT, RGUI \ +[_W_COLEMAK] = LAYOUT( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ + KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ + KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* LOWER * ,-----------------------------------------. ,-----------------------------------------. @@ -125,19 +123,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ -[_M_LOWER] = LAYOUT_kc( \ - ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \ - ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \ - ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\ -), -[_W_LOWER] = LAYOUT_kc( \ - ____, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, F12, \ - ____, EXLM, AT, HASH, DLR, PERC, CIRC, AMPR, ASTR, LPRN, RPRN, PIPE, \ - ____, EQL, MINS, PLUS, LCBR, RCBR, ____, ____, LBRC, RBRC, SCLN, COLN, BSLS, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____\ +[_LOWER] = LAYOUT( \ + ______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, \ + ______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + ______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, ______, ______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______\ ), /* RAISE * ,----------------------------------------. ,-----------------------------------------. @@ -153,19 +144,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ -[_M_RAISE] = LAYOUT_kc( \ - ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ ,____, \ - ____, INS, PSCR, APP, XXXX, XXXX, PGUP, M_PRVWD, UP,M_NXTWD,M_DLINE,BSPC, \ - ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ - ____,M_UNDO, M_CUT,M_COPY,M_PASTE,XXXX, ____, ____, XXXX, M_LSTRT, XXXX, M_LEND, XXXX, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ +[_M_RAISE] = LAYOUT( \ + ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ + ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_M_PRVWD, KC_UP,KC_M_NXTWD,KC_M_DLINE,KC_BSPC, \ + ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ + ______,KC_M_UNDO, KC_M_CUT,KC_M_COPY,KC_M_PASTE, XXXXXX,______, ______, XXXXXX, KC_M_LSTRT, XXXXXX, KC_M_LEND, XXXXXX, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ ), -[_W_RAISE] = LAYOUT_kc( \ - ____, ____ , ____ , ____ , ____ , ____, ____, ____ , ____, ____ , ____ , ____, \ - ____, INS, PSCR, APP, XXXX, XXXX, PGUP, W_PRVWD, UP,W_NXTWD,W_DLINE, BSPC, \ - ____, LALT, LCTL, LSFT, XXXX, CAPS, PGDN, LEFT, DOWN, RGHT, DEL, BSPC, \ - ____,W_UNDO, W_CUT,W_COPY,W_PASTE,XXXX, ____, ____, XXXX, W_LSTRT, XXXX, W_LEND, XXXX, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ +[_W_RAISE] = LAYOUT( \ + ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ + ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_W_PRVWD, KC_UP,KC_W_NXTWD,KC_W_DLINE, KC_BSPC, \ + ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ + ______,KC_W_UNDO,KC_W_CUT,KC_W_COPY,KC_W_PASTE,XXXXXX, ______, ______, XXXXXX, KC_W_LSTRT, XXXXXX, KC_W_LEND, XXXXXX, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ ), /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. @@ -181,12 +172,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ - [_ADJUST] = LAYOUT_kc( \ - XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ - RESET, XXXX,M_QWERTY,M_COLEMAK, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ - XXXX , XXXX,W_QWERTY,W_COLEMAK, XXXX, XXXX, XXXX, VOLD, MUTE, VOLU, XXXX, XXXX, \ - XXXX , XXXX, XXXX , XXXX , XXXX, XXXX, XXXX, XXXX, XXXX, MPRV, MPLY, MNXT, XXXX, XXXX, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ \ + [_ADJUST] = LAYOUT( \ + XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ + RESET , XXXXXX,KC_M_QWERTY,KC_M_COLEMAK,XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ + XXXXXX , XXXXXX,KC_W_QWERTY,KC_W_COLEMAK,XXXXXX, XXXXXX, XXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXX, XXXXXX, \ + XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ ) }; @@ -237,8 +228,7 @@ static void print_status_narrow(void) { case _W_RAISE: oled_write_P(PSTR("Raise"), false); break; - case _M_LOWER: - case _W_LOWER: + case _LOWER: oled_write_P(PSTR("Lower"), false); break; case _ADJUST: @@ -297,41 +287,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case KC_M_LOWER: if (record->event.pressed) { - layer_on(_M_LOWER); - update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + layer_on(_LOWER); + update_tri_layer(_LOWER, _M_RAISE, _ADJUST); } else { - layer_off(_M_LOWER); - update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + layer_off(_LOWER); + update_tri_layer(_LOWER, _M_RAISE, _ADJUST); } return false; break; case KC_M_RAISE: if (record->event.pressed) { layer_on(_M_RAISE); - update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + update_tri_layer(_LOWER, _M_RAISE, _ADJUST); } else { layer_off(_M_RAISE); - update_tri_layer(_M_LOWER, _M_RAISE, _ADJUST); + update_tri_layer(_LOWER, _M_RAISE, _ADJUST); } return false; break; case KC_W_LOWER: if (record->event.pressed) { - layer_on(_W_LOWER); - update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + layer_on(_LOWER); + update_tri_layer(_LOWER, _W_RAISE, _ADJUST); } else { - layer_off(_W_LOWER); - update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + layer_off(_LOWER); + update_tri_layer(_LOWER, _W_RAISE, _ADJUST); } return false; break; case KC_W_RAISE: if (record->event.pressed) { layer_on(_W_RAISE); - update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + update_tri_layer(_LOWER, _W_RAISE, _ADJUST); } else { layer_off(_W_RAISE); - update_tri_layer(_W_LOWER, _W_RAISE, _ADJUST); + update_tri_layer(_LOWER, _W_RAISE, _ADJUST); } return false; break; diff --git a/keyboards/sofle/rev1/rev1.h b/keyboards/sofle/rev1/rev1.h index 86924e4d2c..6c0c4a89df 100644 --- a/keyboards/sofle/rev1/rev1.h +++ b/keyboards/sofle/rev1/rev1.h @@ -21,17 +21,3 @@ { R45, R44, R43, R42, R41, R40 } \ } -#define LAYOUT_kc( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - LAYOUT( \ - KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ - KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ - KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ - KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L45, KC_##R40, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 , \ - KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \ -) diff --git a/keyboards/sofle/sofle.c b/keyboards/sofle/sofle.c index 9d61b0e585..bbb014c4df 100644 --- a/keyboards/sofle/sofle.c +++ b/keyboards/sofle/sofle.c @@ -1,5 +1 @@ #include "sofle.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - return process_record_user(keycode, record); -} From a84d23966163a4436309df95bda423d3d0ac4242 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Wed, 29 Apr 2020 17:30:04 +0200 Subject: [PATCH 03/14] Fix mistake in the latest commit --- keyboards/sofle/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 23086bcd69..e9c07a10fd 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \ ), [_W_QWERTY] = LAYOUT( \ @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ + KC_LGUI,KC_LALT,KC_LCTRL,KC_W_LOWER, KC_ENT, KC_SPC, KC_W_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* * COLEMAK @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LGUI,KC_LALT,KC_LCTRL,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ + KC_LGUI,KC_LALT,KC_LCTRL,KC_W_LOWER, KC_ENT, KC_SPC, KC_W_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* LOWER * ,-----------------------------------------. ,-----------------------------------------. From 3de4c3ea6a16d64aaf9a86484f57777fe54270ab Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Wed, 29 Apr 2020 20:16:03 +0200 Subject: [PATCH 04/14] Remove duplicated layers for MAC/WIN support --- keyboards/sofle/keymaps/default/keymap.c | 328 ++++++++++++++--------- 1 file changed, 194 insertions(+), 134 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index e9c07a10fd..a236142388 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -2,50 +2,26 @@ enum sofle_layers { /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */ - _M_QWERTY, - _W_QWERTY, - _M_COLEMAK, - _W_COLEMAK, + _QWERTY, + _COLEMAK, _LOWER, - _M_RAISE, - _W_RAISE, + _RAISE, _ADJUST, }; enum custom_keycodes { - KC_M_QWERTY = SAFE_RANGE, - KC_W_QWERTY, - KC_M_COLEMAK, - KC_W_COLEMAK, - KC_M_LOWER, - KC_W_LOWER, - KC_M_RAISE, - KC_W_RAISE, + KC_QWERTY = SAFE_RANGE, + KC_COLEMAK, + KC_LOWER, + KC_RAISE, KC_ADJUST, + KC_PRVWD, + KC_NXTWD, + KC_LSTRT, + KC_LEND, + KC_DLINE }; -/* Linux/win variants */ -#define KC_W_UNDO LCTL(KC_Z) -#define KC_W_CUT LCTL(KC_X) -#define KC_W_COPY LCTL(KC_C) -#define KC_W_PASTE LCTL(KC_V) -#define KC_W_PRVWD LCTL(KC_LEFT) -#define KC_W_NXTWD LCTL(KC_RIGHT) -#define KC_W_LSTRT KC_HOME -#define KC_W_LEND KC_END -#define KC_W_DLINE LCTL(KC_BSPC) - -/* Mac variants */ -#define KC_M_UNDO LGUI(KC_Z) -#define KC_M_CUT LGUI(KC_X) -#define KC_M_COPY LGUI(KC_C) -#define KC_M_PASTE LGUI(KC_V) -#define KC_M_PRVWD LALT(KC_LEFT) -#define KC_M_NXTWD LALT(KC_RIGHT) -#define KC_M_LSTRT LGUI(KC_LEFT) -#define KC_M_LEND LGUI(KC_RIGHT) -#define KC_M_DLINE LGUI(KC_BSPC) - #define ______ KC_TRNS #define XXXXXX KC_NO @@ -65,19 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ -[_M_QWERTY] = LAYOUT( \ + +[_QWERTY] = LAYOUT( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \ -), -[_W_QWERTY] = LAYOUT( \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LGUI,KC_LALT,KC_LCTRL,KC_W_LOWER, KC_ENT, KC_SPC, KC_W_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ + KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_ENT, KC_SPC, KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* * COLEMAK @@ -95,19 +65,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ -[_M_COLEMAK] = LAYOUT( \ +[_COLEMAK] = LAYOUT( \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTRL,KC_LALT,KC_LGUI,KC_M_LOWER, KC_ENT, KC_SPC, KC_M_RAISE, KC_RGUI, KC_RALT, KC_RCTRL \ -), -[_W_COLEMAK] = LAYOUT( \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ - KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ - KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LGUI,KC_LALT,KC_LCTRL,KC_W_LOWER, KC_ENT, KC_SPC, KC_W_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ + KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT, KC_SPC, KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* LOWER * ,-----------------------------------------. ,-----------------------------------------. @@ -144,27 +107,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | |/ / \ \ | | | | | * `----------------------------------' '------''---------------------------' */ -[_M_RAISE] = LAYOUT( \ - ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ - ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_M_PRVWD, KC_UP,KC_M_NXTWD,KC_M_DLINE,KC_BSPC, \ - ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ - ______,KC_M_UNDO, KC_M_CUT,KC_M_COPY,KC_M_PASTE, XXXXXX,______, ______, XXXXXX, KC_M_LSTRT, XXXXXX, KC_M_LEND, XXXXXX, ______, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ -), -[_W_RAISE] = LAYOUT( \ - ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ - ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_W_PRVWD, KC_UP,KC_W_NXTWD,KC_W_DLINE, KC_BSPC, \ - ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ - ______,KC_W_UNDO,KC_W_CUT,KC_W_COPY,KC_W_PASTE,XXXXXX, ______, ______, XXXXXX, KC_W_LSTRT, XXXXXX, KC_W_LEND, XXXXXX, ______, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ +[_RAISE] = LAYOUT( \ + ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ + ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_PRVWD, KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC, \ + ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ + ______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXX, ______, ______, XXXXXX, KC_LSTRT, XXXXXX, KC_LEND, XXXXXX, ______, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ ), /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. * | | | | | | | | | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | RESET| |MACQWR|MACCOL| | | | | | | | | | + * | RESET| |QWERTY|COLEMAK| | | | | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | |WINQWR|WINCOL| | |-------. ,-------| | VOLDO| MUTE | VOLUP| | | + * | | |MACWIN| | | |-------. ,-------| | VOLDO| MUTE | VOLUP| | | * |------+------+------+------+------+------| MUTE | | |------+------+------+------+------+------| * | | | | | | |-------| |-------| | PREV | PLAY | NEXT | | | * `-----------------------------------------/ / \ \-----------------------------------------' @@ -173,11 +129,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ [_ADJUST] = LAYOUT( \ - XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ - RESET , XXXXXX,KC_M_QWERTY,KC_M_COLEMAK,XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ - XXXXXX , XXXXXX,KC_W_QWERTY,KC_W_COLEMAK,XXXXXX, XXXXXX, XXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXX, XXXXXX, \ - XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ + XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ + RESET , XXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ + XXXXXX , XXXXXX,CG_TOGG, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXX, XXXXXX, \ + XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, \ + ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ ) }; @@ -198,18 +154,18 @@ static void print_status_narrow(void) { oled_write_P(PSTR("\n\n"), false); oled_write_ln_P(PSTR("MODE"), false); oled_write_ln_P(PSTR(""), false); + if (keymap_config.swap_lctl_lgui) { + oled_write_ln_P(PSTR("MAC"), false); + } else { + oled_write_ln_P(PSTR("WIN"), false); + } + switch (biton32(default_layer_state)) { - case _W_QWERTY: - oled_write_P(PSTR("Qwrt\nLinux"), false); + case _QWERTY: + oled_write_ln_P(PSTR("Qwrt"), false); break; - case _M_QWERTY: - oled_write_P(PSTR("Qwrt\nMac\n"), false); - break; - case _W_COLEMAK: - oled_write_P(PSTR("Clmk\nLinux"), false); - break; - case _M_COLEMAK: - oled_write_P(PSTR("Clmk\nMac\n"), false); + case _COLEMAK: + oled_write_ln_P(PSTR("Clmk"), false); break; default: oled_write_P(PSTR("Undefined\n"), false); @@ -218,14 +174,11 @@ static void print_status_narrow(void) { // Print current layer oled_write_ln_P(PSTR("LAYER"), false); switch (biton32(layer_state)) { - case _M_COLEMAK: - case _W_COLEMAK: - case _M_QWERTY: - case _W_QWERTY: + case _COLEMAK: + case _QWERTY: oled_write_P(PSTR("Base\n"), false); break; - case _M_RAISE: - case _W_RAISE: + case _RAISE: oled_write_P(PSTR("Raise"), false); break; case _LOWER: @@ -261,67 +214,35 @@ void oled_task_user(void) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case KC_W_QWERTY: + case KC_QWERTY: if (record->event.pressed) { - set_single_persistent_default_layer(_W_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; - case KC_M_QWERTY: + case KC_COLEMAK: if (record->event.pressed) { - set_single_persistent_default_layer(_M_QWERTY); + set_single_persistent_default_layer(_COLEMAK); } return false; break; - case KC_W_COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_W_COLEMAK); - } - return false; - break; - case KC_M_COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_M_COLEMAK); - } - return false; - break; - case KC_M_LOWER: + case KC_LOWER: if (record->event.pressed) { layer_on(_LOWER); - update_tri_layer(_LOWER, _M_RAISE, _ADJUST); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } else { layer_off(_LOWER); - update_tri_layer(_LOWER, _M_RAISE, _ADJUST); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; break; - case KC_M_RAISE: + case KC_RAISE: if (record->event.pressed) { - layer_on(_M_RAISE); - update_tri_layer(_LOWER, _M_RAISE, _ADJUST); + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } else { - layer_off(_M_RAISE); - update_tri_layer(_LOWER, _M_RAISE, _ADJUST); - } - return false; - break; - case KC_W_LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _W_RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _W_RAISE, _ADJUST); - } - return false; - break; - case KC_W_RAISE: - if (record->event.pressed) { - layer_on(_W_RAISE); - update_tri_layer(_LOWER, _W_RAISE, _ADJUST); - } else { - layer_off(_W_RAISE); - update_tri_layer(_LOWER, _W_RAISE, _ADJUST); + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; break; @@ -333,6 +254,145 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case KC_PRVWD: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(A(KC_LEFT)); + } else { + register_code16(C(KC_LEFT)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(A(KC_LEFT)); + } else { + unregister_code16(C(KC_LEFT)); + } + } + break; + case KC_NXTWD: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(A(KC_RIGHT)); + } else { + register_code16(C(KC_RIGHT)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(A(KC_RIGHT)); + } else { + unregister_code16(C(KC_RIGHT)); + } + } + break; + case KC_LSTRT: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_LEFT)); + } else { + register_code(KC_HOME); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_LEFT)); + } else { + unregister_code(KC_HOME); + } + } + break; + case KC_LEND: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_RIGHT)); + } else { + register_code(KC_END); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_RIGHT)); + } else { + unregister_code(KC_END); + } + } + break; + case KC_DLINE: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_BSPC)); + } else { + register_code16(C(KC_BSPC)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_BSPC)); + } else { + unregister_code16(C(KC_BSPC)); + } + } + break; + case KC_COPY: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_C)); + } else { + register_code16(C(KC_C)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_C)); + } else { + unregister_code16(C(KC_C)); + } + } + return false; + break; + case KC_PASTE: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_V)); + } else { + register_code16(C(KC_V)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_V)); + } else { + unregister_code16(C(KC_V)); + } + } + return false; + break; + case KC_CUT: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_X)); + } else { + register_code16(C(KC_X)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_X)); + } else { + unregister_code16(C(KC_X)); + } + } + return false; + break; + case KC_UNDO: + if (record->event.pressed) { + if (keymap_config.swap_lctl_lgui) { + register_code16(G(KC_Z)); + } else { + register_code16(C(KC_Z)); + } + } else { + if (keymap_config.swap_lctl_lgui) { + unregister_code16(G(KC_Z)); + } else { + unregister_code16(C(KC_Z)); + } + } + return false; + break; } return true; } From 3d760caa85bfd6988584754ee8987d089ca59aa6 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Fri, 1 May 2020 16:37:07 +0200 Subject: [PATCH 05/14] Improve according to suggestion in PR --- keyboards/sofle/keymaps/default/keymap.c | 110 ++++++++++------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index a236142388..9ef4de08d3 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -257,43 +257,54 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_PRVWD: if (record->event.pressed) { if (keymap_config.swap_lctl_lgui) { - register_code16(A(KC_LEFT)); + register_mods(mod_config(MOD_LALT)); + register_code(KC_LEFT); } else { - register_code16(C(KC_LEFT)); + register_mods(mod_config(MOD_LCTL)); + register_code(KC_LEFT); } } else { if (keymap_config.swap_lctl_lgui) { - unregister_code16(A(KC_LEFT)); + unregister_mods(mod_config(MOD_LALT)); + unregister_code(KC_LEFT); } else { - unregister_code16(C(KC_LEFT)); + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_LEFT); } } break; case KC_NXTWD: - if (record->event.pressed) { + if (record->event.pressed) { if (keymap_config.swap_lctl_lgui) { - register_code16(A(KC_RIGHT)); + register_mods(mod_config(MOD_LALT)); + register_code(KC_RIGHT); } else { - register_code16(C(KC_RIGHT)); + register_mods(mod_config(MOD_LCTL)); + register_code(KC_RIGHT); } } else { if (keymap_config.swap_lctl_lgui) { - unregister_code16(A(KC_RIGHT)); + unregister_mods(mod_config(MOD_LALT)); + unregister_code(KC_RIGHT); } else { - unregister_code16(C(KC_RIGHT)); + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_RIGHT); } } break; case KC_LSTRT: if (record->event.pressed) { if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_LEFT)); + //CMD-arrow on Mac, but we have CTL and GUI swapped + register_mods(mod_config(MOD_LCTL)); + register_code(KC_LEFT); } else { register_code(KC_HOME); } } else { if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_LEFT)); + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_LEFT); } else { unregister_code(KC_HOME); } @@ -302,13 +313,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_LEND: if (record->event.pressed) { if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_RIGHT)); + //CMD-arrow on Mac, but we have CTL and GUI swapped + register_mods(mod_config(MOD_LCTL)); + register_code(KC_RIGHT); } else { register_code(KC_END); } } else { if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_RIGHT)); + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_RIGHT); } else { unregister_code(KC_END); } @@ -316,80 +330,50 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case KC_DLINE: if (record->event.pressed) { - if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_BSPC)); - } else { - register_code16(C(KC_BSPC)); - } + register_mods(mod_config(MOD_LCTL)); + register_code(KC_BSPC); } else { - if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_BSPC)); - } else { - unregister_code16(C(KC_BSPC)); - } + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_BSPC); } break; case KC_COPY: if (record->event.pressed) { - if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_C)); - } else { - register_code16(C(KC_C)); - } + register_mods(mod_config(MOD_LCTL)); + register_code(KC_C); } else { - if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_C)); - } else { - unregister_code16(C(KC_C)); - } + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_C); } return false; break; case KC_PASTE: if (record->event.pressed) { - if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_V)); - } else { - register_code16(C(KC_V)); - } + register_mods(mod_config(MOD_LCTL)); + register_code(KC_V); } else { - if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_V)); - } else { - unregister_code16(C(KC_V)); - } + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_V); } return false; break; case KC_CUT: if (record->event.pressed) { - if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_X)); - } else { - register_code16(C(KC_X)); - } + register_mods(mod_config(MOD_LCTL)); + register_code(KC_X); } else { - if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_X)); - } else { - unregister_code16(C(KC_X)); - } + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_X); } return false; break; case KC_UNDO: if (record->event.pressed) { - if (keymap_config.swap_lctl_lgui) { - register_code16(G(KC_Z)); - } else { - register_code16(C(KC_Z)); - } + register_mods(mod_config(MOD_LCTL)); + register_code(KC_Z); } else { - if (keymap_config.swap_lctl_lgui) { - unregister_code16(G(KC_Z)); - } else { - unregister_code16(C(KC_Z)); - } + unregister_mods(mod_config(MOD_LCTL)); + unregister_code(KC_Z); } return false; break; From 65c8ac9ac9ad66405eaf65f742bdbdd6a73685c2 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Sat, 2 May 2020 10:03:17 +0200 Subject: [PATCH 06/14] Add more improvements from PR --- keyboards/sofle/keymaps/default/keymap.c | 38 +++++++++++------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 9ef4de08d3..1b332713e5 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -22,8 +22,6 @@ enum custom_keycodes { KC_DLINE }; -#define ______ KC_TRNS -#define XXXXXX KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* @@ -46,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXXX,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ KC_LGUI,KC_LALT,KC_LCTRL, KC_LOWER, KC_ENT, KC_SPC, KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* @@ -69,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, \ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, XXXXXXX,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ KC_LGUI,KC_LALT,KC_LCTRL,KC_LOWER, KC_ENT, KC_SPC, KC_RAISE, KC_RCTRL, KC_RALT, KC_RGUI \ ), /* LOWER @@ -87,11 +85,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ [_LOWER] = LAYOUT( \ - ______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\ + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, \ - ______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ - ______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, ______, ______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, ______, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______\ + _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \ + _______, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______\ ), /* RAISE * ,----------------------------------------. ,-----------------------------------------. @@ -108,11 +106,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ [_RAISE] = LAYOUT( \ - ______, ______ , ______ , ______ , ______ , ______, ______, ______ , ______, ______ , ______ ,______, \ - ______, KC_INS, KC_PSCR, KC_APP, XXXXXX, XXXXXX, KC_PGUP, KC_PRVWD, KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC, \ - ______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ - ______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXX, ______, ______, XXXXXX, KC_LSTRT, XXXXXX, KC_LEND, XXXXXX, ______, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ + _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, \ + _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_PGUP, KC_PRVWD, KC_UP, KC_NXTWD,KC_DLINE, KC_BSPC, \ + _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_BSPC, \ + _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX, _______, _______, XXXXXXX, KC_LSTRT, XXXXXXX, KC_LEND, XXXXXXX, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ), /* ADJUST * ,-----------------------------------------. ,-----------------------------------------. @@ -129,11 +127,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------' '------''---------------------------' */ [_ADJUST] = LAYOUT( \ - XXXXXX , XXXXXX, XXXXXX , XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ - RESET , XXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, \ - XXXXXX , XXXXXX,CG_TOGG, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXX, XXXXXX, \ - XXXXXX , XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, \ - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ \ + XXXXXXX , XXXXXXX, XXXXXXX , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + RESET , XXXXXXX,KC_QWERTY,KC_COLEMAK,CG_TOGG,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX , XXXXXXX,CG_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_MUTE, KC_VOLU, XXXXXXX, XXXXXXX, \ + XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ ) }; @@ -160,7 +158,7 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("WIN"), false); } - switch (biton32(default_layer_state)) { + switch (get_highest_layer(default_layer_state)) { case _QWERTY: oled_write_ln_P(PSTR("Qwrt"), false); break; @@ -173,7 +171,7 @@ static void print_status_narrow(void) { oled_write_P(PSTR("\n\n"), false); // Print current layer oled_write_ln_P(PSTR("LAYER"), false); - switch (biton32(layer_state)) { + switch (get_highest_layer(layer_state)) { case _COLEMAK: case _QWERTY: oled_write_P(PSTR("Base\n"), false); From 178649099328b5f40ac4f58c6116a98ba1abf4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:41:55 +0200 Subject: [PATCH 07/14] Fix a typo in README.md Co-authored-by: Nick Brassel --- keyboards/sofle/keymaps/default/readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/sofle/keymaps/default/readme.md b/keyboards/sofle/keymaps/default/readme.md index e409040ac7..6d6dea228c 100644 --- a/keyboards/sofle/keymaps/default/readme.md +++ b/keyboards/sofle/keymaps/default/readme.md @@ -1,4 +1,4 @@ -![SofleKeyboard defualt keymap](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard.png) +![SofleKeyboard default keymap](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard.png) ![SofleKeyboard adjust layer](https://github.com/josefadamcik/SofleKeyboard/raw/master/Images/soflekeyboard_layout_adjust.png) @@ -17,4 +17,3 @@ Features: - Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN. - From ac3d2a3810ad600b1d7909f32fd75bbdaaaec318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:42:17 +0200 Subject: [PATCH 08/14] Remove unneeded break. Co-authored-by: Nick Brassel --- keyboards/sofle/keymaps/default/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 1b332713e5..7edaa61ea3 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -217,7 +217,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_QWERTY); } return false; - break; case KC_COLEMAK: if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAK); @@ -398,4 +397,3 @@ void encoder_update_user(uint8_t index, bool clockwise) { } #endif - From 2f5521cd48f692366d04679357c0f92b4bb36442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:42:32 +0200 Subject: [PATCH 09/14] Remove unneeded break. Co-authored-by: Nick Brassel --- keyboards/sofle/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 7edaa61ea3..29807fba19 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -222,7 +222,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_COLEMAK); } return false; - break; case KC_LOWER: if (record->event.pressed) { layer_on(_LOWER); From 2a43989d30818feae5e71c505fda721afa8bf19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:43:35 +0200 Subject: [PATCH 10/14] Apply suggestions from code review Remove unneeded breaks. Co-authored-by: Nick Brassel --- keyboards/sofle/keymaps/default/keymap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 29807fba19..9f3a0ba90c 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -231,7 +231,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; - break; case KC_RAISE: if (record->event.pressed) { layer_on(_RAISE); @@ -241,7 +240,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { update_tri_layer(_LOWER, _RAISE, _ADJUST); } return false; - break; case KC_ADJUST: if (record->event.pressed) { layer_on(_ADJUST); @@ -249,7 +247,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { layer_off(_ADJUST); } return false; - break; case KC_PRVWD: if (record->event.pressed) { if (keymap_config.swap_lctl_lgui) { @@ -372,7 +369,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_Z); } return false; - break; } return true; } From 2651edc24347c52093f15a83603515c3d215dca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:45:38 +0200 Subject: [PATCH 11/14] Apply suggestions from code review Remove unneeded breaks (few more forgotten ones). Co-authored-by: Nick Brassel --- keyboards/sofle/keymaps/default/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 9f3a0ba90c..5c52de7132 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -339,7 +339,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_C); } return false; - break; case KC_PASTE: if (record->event.pressed) { register_mods(mod_config(MOD_LCTL)); @@ -349,7 +348,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_V); } return false; - break; case KC_CUT: if (record->event.pressed) { register_mods(mod_config(MOD_LCTL)); From f6cec668c7ad623043b0c7796fb599602b41eb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:56:08 +0200 Subject: [PATCH 12/14] Apply suggestions from code review Co-authored-by: Drashna Jaelre --- keyboards/sofle/keymaps/default/config.h | 1 - keyboards/sofle/keymaps/default/keymap.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h index 8133e12fcf..0b1e2a11c6 100644 --- a/keyboards/sofle/keymaps/default/config.h +++ b/keyboards/sofle/keymaps/default/config.h @@ -4,6 +4,5 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness for more options. */ -#define MASTER_LEFT #define TAPPING_FORCE_HOLD diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index 5c52de7132..aa8fd15f80 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -166,7 +166,7 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("Clmk"), false); break; default: - oled_write_P(PSTR("Undefined\n"), false); + oled_write_P(PSTR("Undef"), false); } oled_write_P(PSTR("\n\n"), false); // Print current layer @@ -189,8 +189,8 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("Undef"), false); } oled_write_P(PSTR("\n\n"), false); - uint8_t led_usb_state = host_keyboard_leds(); - oled_write_ln_P(led_usb_state & (1 << USB_LED_CAPS_LOCK) ? PSTR("CPSLK") : PSTR(" "), false); + led_t led_usb_state = host_keyboard_led_state()(); + oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock); } oled_rotation_t oled_init_user(oled_rotation_t rotation) { From 22ad35b22575b1ff4a1b68d86a01a25c4a39fa5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Adam=C4=8D=C3=ADk?= Date: Mon, 18 May 2020 12:57:16 +0200 Subject: [PATCH 13/14] Remove TAPPING_FORCE_HOLD from default keymap. --- keyboards/sofle/keymaps/default/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/sofle/keymaps/default/config.h b/keyboards/sofle/keymaps/default/config.h index 0b1e2a11c6..c5494c20aa 100644 --- a/keyboards/sofle/keymaps/default/config.h +++ b/keyboards/sofle/keymaps/default/config.h @@ -4,5 +4,3 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness for more options. */ - -#define TAPPING_FORCE_HOLD From fb9425df827400f040c6760eff11c4b980a76a99 Mon Sep 17 00:00:00 2001 From: Josef Adamcik Date: Mon, 18 May 2020 13:11:22 +0200 Subject: [PATCH 14/14] Add TAP_CODE_DELAY 10. Fix a typo (compilation error) --- keyboards/sofle/keymaps/default/keymap.c | 2 +- keyboards/sofle/rev1/config.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c index aa8fd15f80..38200bfb7e 100644 --- a/keyboards/sofle/keymaps/default/keymap.c +++ b/keyboards/sofle/keymaps/default/keymap.c @@ -189,7 +189,7 @@ static void print_status_narrow(void) { oled_write_ln_P(PSTR("Undef"), false); } oled_write_P(PSTR("\n\n"), false); - led_t led_usb_state = host_keyboard_led_state()(); + led_t led_usb_state = host_keyboard_led_state(); oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock); } diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h index 154d1fae10..232306e0bc 100644 --- a/keyboards/sofle/rev1/config.h +++ b/keyboards/sofle/rev1/config.h @@ -28,6 +28,8 @@ #define ENCODERS_PAD_B_RIGHT { F5 } #define ENCODER_RESOLUTION 2 +#define TAP_CODE_DELAY 10 + /* communication between sides */ #define USE_SERIAL #define SERIAL_USE_MULTI_TRANSACTION