Add combos to userspace pdl

keyboards/foostan/cornelius/keymaps/pdl/config.h

@@ -23,5 +23,10 @@ along with this program. If not, see <http:https://www.gnu.org/licenses/>.
 
 #include "../../config.h"
 
+#define TAPPING_TOGGLE 2
 #define TAPPING_TERM 200
 #define PREVENT_STUCK_MODIFIERS
+
+#define COMBO_PDL
+#define COMBO_COUNT 28
+#define COMBO_TERM 100

keyboards/foostan/cornelius/keymaps/pdl/keymap.c

@@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_QWERTY] = KEYMAP_wrapper( \
  MY_FESC, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \
  KC_TAB, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, MY_SQUO, \
- MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, MY_SENT, \
- KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \
+ MY_SBSL, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_RSFT, \
+ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN,  MY_CENT \
  ),
  [_PROXIM] = KEYMAP_wrapper( \
  MY_FESC, _________________PROXIM_L1_________________, _________________PROXIM_R1_________________, KC_BSPC, \
  KC_TAB, _________________PROXIM_L2_________________, _________________PROXIM_R2_________________, MY_ASCL, \
- MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, MY_SENT, \
- KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, KC_UNDS, MY_CENT \
+ MY_SBSL, _________________PROXIM_L3_________________, _________________PROXIM_R3_________________, KC_RSFT, \
+ KC_LCTL, KC_LGUI, KC_LALT, NUMBRS, NAVIGN, KC_SPC, MY_SSPC, NUMBRS, NAVIGN, MY_AMNU, FUNCTN,  MY_CENT \
  ),
  [_NAVIGN] = KEYMAP_wrapper( \
  _______, _________________NAVIGN_L1_________________, _______, _______, _______, _______, _______, _______, \

users/pdl/pdl.c

@@ -37,6 +37,14 @@ uint32_t update_punctn_coding_layer_state(uint32_t state) {
  uint32_t maskPunctn = 1UL << _PUNCTN;
  uint32_t maskCoding = 1UL << _CODING;
 
+#ifdef COMBO_PDL
+ return (
+ (state & maskEither)
+ ? (state | maskPunctn) & ~maskCoding // either => punctn
+ : (state & ~maskCoding) & ~maskPunctn // neither => neither
+ );
+#endif
+
  return (
  (state & maskEither)
  ? (state & maskEither) == maskEither
@@ -72,16 +80,120 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  }
  return false;
  break;
- // KC_LBRC, KC_NUHS, KC_GRV, KC_RBRC [&#`]
+ // KC_LBRC, KC_NUHS, KC_GRV, KC_RBRC [#`]
  // These four keys are unshifted in the UK layout and should be sent as such.
- case KC_LBRC:
- return unshifted(keycode, record);
- case KC_NUHS:
- return unshifted(keycode, record);
- case KC_GRV:
- return unshifted(keycode, record);
- case KC_RBRC:
- return unshifted(keycode, record);
+ case KU_LBRC:
+ return unshifted(KC_LBRC, record);
+ case KU_NUHS:
+ return unshifted(KC_NUHS, record);
+ case KU_GRV:
+ return unshifted(KC_GRV, record);
+ case KU_RBRC:
+ return unshifted(KC_RBRC, record);
+ case KC_ESC:
+ if (!record->event.pressed) {
+ layer_off(_NUMBRS);
+ layer_off(_NAVIGN);
+ layer_off(_PUNCTN);
+ layer_off(_CODING);
+ }
+ return true;
  }
  return true;
 }
+
+#ifdef COMBO_PDL
+enum combos {
+ VCOMBO_PU,
+ VCOMBO_NU,
+ VCOMBO_EU,
+ VCOMBO_IU,
+ VCOMBO_LU,
+ VCOMBO_PD,
+ VCOMBO_ND,
+ VCOMBO_ED,
+ VCOMBO_ID,
+ VCOMBO_LD,
+ HCOMBO_JR,
+ HCOMBO_UR,
+ HCOMBO_PR,
+ HCOMBO_MR,
+ HCOMBO_HR,
+ XCOMBO_LEFT,
+ XCOMBO_RIGHT,
+ XCOMBO_UP,
+ XCOMBO_DOWN,
+ XCOMBO_ENTER,
+ XCOMBO_DEL,
+ XCOMBO_BKSP,
+ XCOMBO_MINS,
+ XCOMBO_TAB,
+ XCOMBO_UNDO,
+ XCOMBO_REDO,
+ XCOMBO_PGUP,
+ XCOMBO_PGDN
+};
+
+const uint16_t PROGMEM vcombo_pu[] = {KC_J, KC_P, COMBO_END};
+const uint16_t PROGMEM vcombo_nu[] = {KC_Y, KC_N, COMBO_END};
+const uint16_t PROGMEM vcombo_eu[] = {KC_O, KC_E, COMBO_END};
+const uint16_t PROGMEM vcombo_iu[] = {KC_U, KC_I, COMBO_END};
+const uint16_t PROGMEM vcombo_lu[] = {KC_QUOT, KC_L, COMBO_END};
+const uint16_t PROGMEM vcombo_pd[] = {KC_M, KC_P, COMBO_END};
+const uint16_t PROGMEM vcombo_nd[] = {KC_H, KC_N, COMBO_END};
+const uint16_t PROGMEM vcombo_ed[] = {KC_COMM, KC_E, COMBO_END};
+const uint16_t PROGMEM vcombo_id[] = {KC_DOT, KC_I, COMBO_END};
+const uint16_t PROGMEM vcombo_ld[] = {KC_SLSH, KC_L, COMBO_END};
+const uint16_t PROGMEM hcombo_jr[] = {KC_J, KC_Y, COMBO_END};
+const uint16_t PROGMEM hcombo_ur[] = {KC_QUOT, KC_U, COMBO_END};
+const uint16_t PROGMEM hcombo_pr[] = {KC_P, KC_N, COMBO_END};
+const uint16_t PROGMEM hcombo_mr[] = {KC_M, KC_H, COMBO_END};
+const uint16_t PROGMEM hcombo_hr[] = {KC_COMM, KC_H, COMBO_END};
+
+const uint16_t PROGMEM xcombo_left[] = {KC_K, KC_P, COMBO_END};
+const uint16_t PROGMEM xcombo_right[] = {KC_M, KC_G, COMBO_END};
+const uint16_t PROGMEM xcombo_up[] = {KC_B, KC_J, COMBO_END};
+const uint16_t PROGMEM xcombo_down[] = {KC_K, KC_M, COMBO_END};
+const uint16_t PROGMEM xcombo_enter[] = {KC_G, KC_P, COMBO_END};
+const uint16_t PROGMEM xcombo_del[] = {KC_M, KC_B, COMBO_END};
+const uint16_t PROGMEM xcombo_bksp[] = {KC_K, KC_J, COMBO_END};
+const uint16_t PROGMEM xcombo_mins[] = {KC_V, KC_H, COMBO_END};
+const uint16_t PROGMEM xcombo_tab[] = {KC_V, KC_K, COMBO_END};
+const uint16_t PROGMEM xcombo_undo[] = {KC_V, KC_J, COMBO_END};
+const uint16_t PROGMEM xcombo_redo[] = {KC_B, KC_H, COMBO_END};
+const uint16_t PROGMEM xcombo_pgup[] = {KC_G, KC_B, COMBO_END};
+const uint16_t PROGMEM xcombo_pgdn[] = {KC_G, KC_K, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+ [VCOMBO_PU] = COMBO(vcombo_pu, KC_CIRC),
+ [VCOMBO_NU] = COMBO(vcombo_nu, KC_LBRC),
+ [VCOMBO_EU] = COMBO(vcombo_eu, LSFT(KC_9)),
+ [VCOMBO_IU] = COMBO(vcombo_iu, LSFT(KC_0)),
+ [VCOMBO_LU] = COMBO(vcombo_lu, KC_RBRC),
+ [VCOMBO_PD] = COMBO(vcombo_pd, LSFT(KC_7)),
+ [VCOMBO_ND] = COMBO(vcombo_nd, KC_EQL),
+ [VCOMBO_ED] = COMBO(vcombo_ed, KC_MINS),
+ [VCOMBO_ID] = COMBO(vcombo_id, LSFT(KC_1)),
+ [VCOMBO_LD] = COMBO(vcombo_ld, LSFT(KC_5)),
+ [HCOMBO_JR] = COMBO(hcombo_jr, KC_GRV),
+ [HCOMBO_UR] = COMBO(hcombo_ur, LSFT(KC_2)),
+ [HCOMBO_PR] = COMBO(hcombo_pr, LSFT(KC_8)),
+ [HCOMBO_MR] = COMBO(hcombo_mr, KC_NUHS),
+ [HCOMBO_HR] = COMBO(hcombo_hr, KC_NUBS),
+
+ [XCOMBO_LEFT] = COMBO(xcombo_left, KC_LEFT),
+ [XCOMBO_RIGHT] = COMBO(xcombo_right, KC_RGHT),
+ [XCOMBO_UP] = COMBO(xcombo_up, KC_UP),
+ [XCOMBO_DOWN] = COMBO(xcombo_down, KC_DOWN),
+ [XCOMBO_ENTER] = COMBO(xcombo_enter, KC_ENT),
+ [XCOMBO_DEL] = COMBO(xcombo_del, KC_DEL),
+ [XCOMBO_BKSP] = COMBO(xcombo_bksp, KC_BSPC),
+ [XCOMBO_MINS] = COMBO(xcombo_mins, KC_MINS),
+ [XCOMBO_TAB] = COMBO(xcombo_tab, KC_TAB),
+ [XCOMBO_UNDO] = COMBO(xcombo_undo, LCTL(KC_Y)),
+ [XCOMBO_REDO] = COMBO(xcombo_redo, LCTL(KC_Z)),
+ [XCOMBO_PGUP] = COMBO(xcombo_pgup, KC_PGUP),
+ [XCOMBO_PGDN] = COMBO(xcombo_pgdn, KC_PGDN)
+};
+
+#endif

users/pdl/pdl.h

@@ -7,6 +7,10 @@ enum userspace_layer_codes {
  PROXIM,
  PUNCTN,
  CODING,
+ KU_LBRC,
+ KU_NUHS,
+ KU_GRV,
+ KU_RBRC,
  NEW_SAFE_RANGE
 };
 
@@ -86,15 +90,15 @@ enum userspace_layer_codes {
 #define _________________PROXIM_R2_________________ KC_P, KC_N, KC_E, KC_I, KC_L
 #define _________________PROXIM_R3_________________ KC_M, KC_H, KC_COMM, KC_DOT, KC_SLASH
 
-#define _________________PUNCTN_R1_________________ KC_LT, KC_GT,  KC_LPRN, KC_RPRN, _______
-#define _________________PUNCTN_R2_________________ KC_ASTR, KC_EQL, KC_MINS, KC_PLUS, KC_SLSH
-#define _________________PUNCTN_R3_________________ KC_LCBR, KC_RCBR, _______, _______, _______
+#define _________________PUNCTN_R1_________________ KC_NUBS, KC_NUHS, KC_LPRN, KC_RPRN, _______
+#define _________________PUNCTN_R2_________________ KC_GRV,  KC_EQL, KC_MINS, KC_PLUS, KC_SLSH
+#define _________________PUNCTN_R3_________________ KC_LBRC, KC_RBRC, _______, _______, _______
 
-#define _________________CODING_R1_________________ KC_GRV, KC_PERC, KC_DLR, KC_AT, _______
-#define _________________CODING_R2_________________ KC_CIRC, KC_UNDS, MY_TILD, KC_AMPR, KC_NUHS
-#define _________________CODING_R3_________________ KC_LBRC, KC_RBRC, _______, _______, _______
+#define _________________CODING_R1_________________ KU_GRV, KC_PERC, KC_DLR, KC_AT, _______
+#define _________________CODING_R2_________________ KC_CIRC, KC_UNDS, MY_TILD, KC_AMPR, KU_NUHS
+#define _________________CODING_R3_________________ KU_LBRC, KU_RBRC, _______, _______, _______
 
-#define _________________NAVIGN_L1_________________ KC_DEL, KC_PGUP, KC_UP, KC_PGDN, KC_BSPC
+#define _________________NAVIGN_L1_________________ KC_DEL, KC_PGUP, KC_UP, KC_PGDN,  KC_BSPC
 #define _________________NAVIGN_L2_________________ KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
 #define _________________NAVIGN_L3_________________ MY_UNDO, MY_CUT, MY_COPY, MY_PASTE, KC_ENT
 

users/pdl/rules.mk

@@ -0,0 +1 @@
+COMBO_ENABLE = yes