diff options
| -rw-r--r-- | keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c | 167 | ||||
| -rw-r--r-- | keyboards/xbows/nature/config.h | 3 | ||||
| -rw-r--r-- | keyboards/xbows/nature/keymaps/default/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/xbows/nature/nature.c | 4 | ||||
| -rw-r--r-- | keyboards/xbows/nature/rules.mk | 2 | 
5 files changed, 178 insertions, 10 deletions
| diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c new file mode 100644 index 0000000000..d30666f3a4 --- /dev/null +++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c @@ -0,0 +1,167 @@ +/* +Copyright 2021 Raphael Megzari <[email protected]> + +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 <http://www.gnu.org/licenses/>. +*/ + +#include QMK_KEYBOARD_H + +enum custom_layers { + _COLEMAK_DH, + _LEFT, + _LEFT_UP, + _RIGHT, + _RIGHT_UP, + _QWERTY +}; + +#define COLMAK TO(_COLEMAK_DH) +#define QWERTY TO(_QWERTY) + +enum custom_keycodes { +  EQ_SUP = SAFE_RANGE, +  INF_EQ, +  SUP_EQ, +  INF_MIN, +  MIN_SUP, +  PIPE_R, +  SUP_SUP, +  INF_INF, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +  [_COLEMAK_DH] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     QWERTY ,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_K   ,                         KC_Z   ,KC_L   ,KC_U   ,KC_Y   ,KC_COLN,_______, +     _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G   ,                         KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______, +     KC_LSFT,KC_J   ,KC_B   ,KC_C   ,KC_D   ,KC_V   ,                         KC_X   ,KC_H   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT, +                     KC_K   ,KC_V   ,                                                         KC_X   ,KC_Z   , +                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC), +                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______, +                                             _______,_______,         _______,_______ +  ), + +  [_QWERTY] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     COLMAK ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                         KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______, +     _______,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                         KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_COLN,_______, +     KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                         KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT, +                     _______,_______,                                                         _______,_______, +                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC), +                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______, +                                             _______,_______,         _______,_______ +  ), + +  [_LEFT] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,KC_PLUS,KC_CIRC,KC_AMPR,_______,                         _______,KC_EQL ,KC_PERC,KC_HASH,_______,_______, +     _______,_______,KC_TILD,KC_DQUO,KC_PIPE,_______,                         _______,KC_LPRN,KC_LCBR,KC_LBRC,_______,_______, +     _______,_______,KC_BSLS,KC_ASTR,KC_SLSH,_______,                         _______,KC_RPRN,KC_RCBR,KC_RBRC,_______,_______, +                     _______,_______,                                                         _______,_______, +                                     _______,_______,                         _______,_______, +                                             _______,_______,         _______,_______, +                                             _______,_______,         _______,_______ +  ), + +  [_LEFT_UP] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,KC_LABK,KC_MINS,KC_RABK,_______,                         _______,KC_7   ,KC_8   ,KC_9   ,_______,_______, +     _______,_______,KC_UNDS,KC_QUOT,KC_DLR ,KC_GRV ,                         _______,KC_4   ,KC_5   ,KC_6   ,KC_0   ,_______, +     _______,_______,KC_SCLN,KC_AT  ,KC_EXLM,_______,                         _______,KC_1   ,KC_2   ,KC_3   ,_______,_______, +                     _______,_______,                                                         _______,_______, +                                     _______,_______,                         _______,_______, +                                             _______,_______,         _______,_______, +                                             _______,_______,         _______,_______ +  ), + +  [_RIGHT] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______, +                     _______,_______,                                                         _______,_______, +                                     _______,_______,                         _______,_______, +                                             _______,_______,         _______,_______, +                                             _______,_______,         _______,_______ +  ), + +  [_RIGHT_UP] = LAYOUT_6x6( + +     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______, +     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______, +     _______,_______,INF_INF,_______,SUP_SUP,_______,                         _______,LCTL(KC_LEFT),KC_UP      ,LCTL(KC_RGHT),_______,_______, +     _______,_______,MIN_SUP,EQ_SUP ,PIPE_R ,_______,                         _______,KC_LEFT      ,KC_DOWN    ,KC_RGHT      ,LGUI(KC_UP),_______, +     _______,_______,INF_MIN,INF_EQ ,_______,_______,                         _______,_______      ,KC_CAPSLOCK,_______      ,_______,_______, +                     _______,_______,                                                               _______    ,_______      , +                                     _______,_______,                         _______,_______, +                                             _______,_______,         _______,_______, +                                             _______,_______,         _______,_______ +  ), + + +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +  switch(keycode) { +    case PIPE_R: +      if (record->event.pressed) { +        SEND_STRING("|> "); +      } +      break; +    case EQ_SUP: +      if (record->event.pressed) { +        SEND_STRING("=> "); +      } +      break; +    case INF_EQ: +      if (record->event.pressed) { +        SEND_STRING("<= "); +      } +      break; +    case MIN_SUP: +      if (record->event.pressed) { +        SEND_STRING("-> "); +      } +      break; +    case INF_MIN: +      if (record->event.pressed) { +        SEND_STRING("<- "); +      } +      break; +    case INF_INF: +      if (record->event.pressed) { +        SEND_STRING("<<"); +      } +      break; +    case SUP_SUP: +      if (record->event.pressed) { +        SEND_STRING(">>"); +      } +      break; +  } +  return true; +} + + diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h index 84b8a2af3e..c1ff793352 100644 --- a/keyboards/xbows/nature/config.h +++ b/keyboards/xbows/nature/config.h @@ -29,10 +29,11 @@  #define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }  #define DIODE_DIRECTION COL2ROW +#define DEBOUNCE 3 +  #ifdef RGB_MATRIX_ENABLE  #    define RGB_MATRIX_LED_PROCESS_LIMIT 18  #    define RGB_MATRIX_LED_FLUSH_LIMIT 16 -#    define DEBOUNCE 3  #    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects  #    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended  #    define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/xbows/nature/keymaps/default/keymap.c b/keyboards/xbows/nature/keymaps/default/keymap.c index b707311fa2..605c58bad4 100644 --- a/keyboards/xbows/nature/keymaps/default/keymap.c +++ b/keyboards/xbows/nature/keymaps/default/keymap.c @@ -40,10 +40,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,  		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),    [1] = LAYOUT( -    RESET,     NK_TOGG, RGB_TOG, RGB_MOD,  RGB_HUI,  RGB_SAI,   RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   EEP_RST, -    AG_TOGG,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK, -    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME, -    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END, -    KC_TRNS,   UC_M_WI, UC_M_MA, UC_M_LN,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_VOLU, -    KC_TRNS,   GUI_OFF, GUI_ON,            KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_TRNS,   RGB_SPD,   KC_VOLD,   RGB_SPI) +    RESET,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST, +    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK, +    RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME, +    KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END, +    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU, +    KC_TRNS,   KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_MPLY,   KC_MPRV,   KC_VOLD,   KC_MNXT)  }; diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c index 64b1c0dd6f..911d892ce8 100644 --- a/keyboards/xbows/nature/nature.c +++ b/keyboards/xbows/nature/nature.c @@ -135,8 +135,6 @@       4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4   } }; -#endif -  void suspend_power_down_kb(void) {      rgb_matrix_set_suspend_state(true); @@ -153,3 +151,5 @@ void suspend_wakeup_init_kb(void) {          rgb_matrix_set_color(45, 0xFF, 0x00, 0x00);      }  } + +#endif diff --git a/keyboards/xbows/nature/rules.mk b/keyboards/xbows/nature/rules.mk index 7eaceaa678..71883128e9 100644 --- a/keyboards/xbows/nature/rules.mk +++ b/keyboards/xbows/nature/rules.mk @@ -13,7 +13,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control  CONSOLE_ENABLE = no         # Console for debug  COMMAND_ENABLE = no         # Commands for debug and configuration  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend +SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend  # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  NKRO_ENABLE = yes           # USB Nkey Rollover  BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | 
