From e4eb4eaa16d7e86290c825dd17df9c192378c107 Mon Sep 17 00:00:00 2001 From: Martin Gondermann Date: Fri, 9 Jun 2017 04:55:34 +0200 Subject: Fix layer LED signalling in magicmonty keymap (#1373) * Fix layer LED signalling in magicmonty keymap * Include the breathing modes in layer signalling * Reverts mode to 1 as the other modes flicker * Add Cursor keys on VIM positions and PAUSE to function layer --- keyboards/clueboard/keymaps/magicmonty/keymap.c | 19 ++++++++++++------- keyboards/clueboard/keymaps/magicmonty/layout.png | Bin 165761 -> 181744 bytes 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'keyboards/clueboard') diff --git a/keyboards/clueboard/keymaps/magicmonty/keymap.c b/keyboards/clueboard/keymaps/magicmonty/keymap.c index fdfe2151d..6ca843aab 100644 --- a/keyboards/clueboard/keymaps/magicmonty/keymap.c +++ b/keyboards/clueboard/keymaps/magicmonty/keymap.c @@ -28,8 +28,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = KEYMAP( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_STEP, \ - _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,_______, _______, _______, _______, _______, _______, \ - MO(_FL), _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, \ + _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,_______, KC_PAUS, _______, _______, _______, _______, \ + MO(_FL), _______, MO(_CL),_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RGHT, _______, _______, _______, _______, \ _______, _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, _______, _______, _______, KC_PGUP, \ _______, _______, _______,_______, _______,_______, _______, _______, _______, MO(_FL), KC_HOME, KC_PGDN, KC_END), @@ -116,24 +116,29 @@ enum layer_id { void clueboard_set_led(uint8_t id) { switch (id) { case LAYER_BASE: - rgblight_sethsv(346, 0, 255); + rgblight_sethsv_noeeprom(346, 0, 255); break; case LAYER_FUNCTION: - rgblight_sethsv(46, 255, 255); + rgblight_sethsv_noeeprom(46, 255, 255); break; case LAYER_MEDIA: - rgblight_sethsv(86, 255, 255); + rgblight_sethsv_noeeprom(86, 255, 255); break; case LAYER_CONTROL: - rgblight_sethsv(346, 255, 255); + rgblight_sethsv_noeeprom(346, 255, 255); break; case LAYER_MOUSE: - rgblight_sethsv(206, 255, 255); + rgblight_sethsv_noeeprom(206, 255, 255); break; } }; void matrix_scan_user(void) { + rgblight_config_t rgblight_config; + rgblight_config.raw = eeconfig_read_rgblight(); + + if (!rgblight_config.enable || rgblight_config.mode != 1) { return; } + uint32_t layer = layer_state; if (layer & (1<<_FL)) { diff --git a/keyboards/clueboard/keymaps/magicmonty/layout.png b/keyboards/clueboard/keymaps/magicmonty/layout.png index 168eec2d6..9e866a92c 100644 Binary files a/keyboards/clueboard/keymaps/magicmonty/layout.png and b/keyboards/clueboard/keymaps/magicmonty/layout.png differ -- cgit v1.2.3 From 2a667eba2ae88aeff5e29ec33a337b4fab07fb63 Mon Sep 17 00:00:00 2001 From: skullY Date: Thu, 8 Jun 2017 20:42:24 -0700 Subject: Cleanup the Clueboard readme files. --- keyboards/clueboard/keymaps/caps_fn/layout.png | Bin 112289 -> 0 bytes keyboards/clueboard/keymaps/caps_fn/readme.md | 11 +---------- keyboards/clueboard/keymaps/default/layout.png | Bin 112442 -> 0 bytes keyboards/clueboard/keymaps/default/readme.md | 11 +---------- keyboards/clueboard/keymaps/jokrik/readme.md | 9 --------- keyboards/clueboard/keymaps/mac_optimized/layout.png | Bin 107368 -> 0 bytes keyboards/clueboard/keymaps/mac_optimized/readme.md | 11 +---------- keyboards/clueboard/keymaps/magicmonty/layout.png | Bin 181744 -> 0 bytes keyboards/clueboard/keymaps/magicmonty/readme.md | 11 +---------- keyboards/clueboard/keymaps/maximised/layout.png | Bin 111157 -> 0 bytes keyboards/clueboard/keymaps/maximised/readme.md | 11 +---------- keyboards/clueboard/keymaps/mouse_keys/layout.png | Bin 143816 -> 0 bytes keyboards/clueboard/keymaps/mouse_keys/readme.md | 9 --------- keyboards/clueboard/keymaps/serubin/layout-base.png | Bin 38703 -> 0 bytes keyboards/clueboard/keymaps/serubin/layout-fn.png | Bin 35216 -> 0 bytes keyboards/clueboard/keymaps/serubin/layout-media.png | Bin 28944 -> 0 bytes keyboards/clueboard/keymaps/serubin/readme.md | 15 +++------------ keyboards/clueboard/keymaps/shift_fn/layout.png | Bin 107234 -> 0 bytes keyboards/clueboard/keymaps/shift_fn/readme.md | 11 ----------- keyboards/clueboard/keymaps/skully/layout.png | Bin 111676 -> 0 bytes keyboards/clueboard/keymaps/skully/readme.md | 17 ++++++----------- keyboards/clueboard/keymaps/smt/layout.png | Bin 130672 -> 0 bytes keyboards/clueboard/keymaps/smt/readme.md | 11 +---------- keyboards/clueboard/keymaps/unix_optimized/layout.png | Bin 111171 -> 0 bytes keyboards/clueboard/keymaps/unix_optimized/readme.md | 11 +---------- keyboards/clueboard/keymaps/win_optimized/layout.png | Bin 110405 -> 0 bytes keyboards/clueboard/keymaps/win_optimized/readme.md | 11 +---------- 27 files changed, 17 insertions(+), 132 deletions(-) delete mode 100644 keyboards/clueboard/keymaps/caps_fn/layout.png delete mode 100644 keyboards/clueboard/keymaps/default/layout.png delete mode 100644 keyboards/clueboard/keymaps/mac_optimized/layout.png delete mode 100644 keyboards/clueboard/keymaps/magicmonty/layout.png delete mode 100644 keyboards/clueboard/keymaps/maximised/layout.png delete mode 100644 keyboards/clueboard/keymaps/mouse_keys/layout.png delete mode 100644 keyboards/clueboard/keymaps/serubin/layout-base.png delete mode 100644 keyboards/clueboard/keymaps/serubin/layout-fn.png delete mode 100644 keyboards/clueboard/keymaps/serubin/layout-media.png delete mode 100644 keyboards/clueboard/keymaps/shift_fn/layout.png delete mode 100644 keyboards/clueboard/keymaps/skully/layout.png delete mode 100644 keyboards/clueboard/keymaps/smt/layout.png delete mode 100644 keyboards/clueboard/keymaps/unix_optimized/layout.png delete mode 100644 keyboards/clueboard/keymaps/win_optimized/layout.png (limited to 'keyboards/clueboard') diff --git a/keyboards/clueboard/keymaps/caps_fn/layout.png b/keyboards/clueboard/keymaps/caps_fn/layout.png deleted file mode 100644 index a5bd57adb..000000000 Binary files a/keyboards/clueboard/keymaps/caps_fn/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/caps_fn/readme.md b/keyboards/clueboard/keymaps/caps_fn/readme.md index 74ad01fca..47a530a80 100644 --- a/keyboards/clueboard/keymaps/caps_fn/readme.md +++ b/keyboards/clueboard/keymaps/caps_fn/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/kGADucy.png) # Caps Fn Layout diff --git a/keyboards/clueboard/keymaps/default/layout.png b/keyboards/clueboard/keymaps/default/layout.png deleted file mode 100644 index cd318163e..000000000 Binary files a/keyboards/clueboard/keymaps/default/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/default/readme.md b/keyboards/clueboard/keymaps/default/readme.md index cede17ee1..019131aeb 100644 --- a/keyboards/clueboard/keymaps/default/readme.md +++ b/keyboards/clueboard/keymaps/default/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/7Capi8W.png) # Default Clueboard Layout diff --git a/keyboards/clueboard/keymaps/jokrik/readme.md b/keyboards/clueboard/keymaps/jokrik/readme.md index cc5eeba96..a845e65f1 100644 --- a/keyboards/clueboard/keymaps/jokrik/readme.md +++ b/keyboards/clueboard/keymaps/jokrik/readme.md @@ -1,11 +1,2 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - # Jokrik's Clueboard Layout diff --git a/keyboards/clueboard/keymaps/mac_optimized/layout.png b/keyboards/clueboard/keymaps/mac_optimized/layout.png deleted file mode 100644 index e84ba54ea..000000000 Binary files a/keyboards/clueboard/keymaps/mac_optimized/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/mac_optimized/readme.md b/keyboards/clueboard/keymaps/mac_optimized/readme.md index 940e09125..282da369d 100644 --- a/keyboards/clueboard/keymaps/mac_optimized/readme.md +++ b/keyboards/clueboard/keymaps/mac_optimized/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/7oZCsHF.png) # Default Clueboard Layout for Mac diff --git a/keyboards/clueboard/keymaps/magicmonty/layout.png b/keyboards/clueboard/keymaps/magicmonty/layout.png deleted file mode 100644 index 9e866a92c..000000000 Binary files a/keyboards/clueboard/keymaps/magicmonty/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/magicmonty/readme.md b/keyboards/clueboard/keymaps/magicmonty/readme.md index 728c18822..2959172df 100644 --- a/keyboards/clueboard/keymaps/magicmonty/readme.md +++ b/keyboards/clueboard/keymaps/magicmonty/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/ngg4EAY.png) # MouseKeys Layout diff --git a/keyboards/clueboard/keymaps/maximised/layout.png b/keyboards/clueboard/keymaps/maximised/layout.png deleted file mode 100644 index bdc5d7623..000000000 Binary files a/keyboards/clueboard/keymaps/maximised/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/maximised/readme.md b/keyboards/clueboard/keymaps/maximised/readme.md index b95d1750f..fc82e6879 100644 --- a/keyboards/clueboard/keymaps/maximised/readme.md +++ b/keyboards/clueboard/keymaps/maximised/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/7oZCsHF.png) # Maximised Clueboard Layout diff --git a/keyboards/clueboard/keymaps/mouse_keys/layout.png b/keyboards/clueboard/keymaps/mouse_keys/layout.png deleted file mode 100644 index 52e5c4581..000000000 Binary files a/keyboards/clueboard/keymaps/mouse_keys/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/mouse_keys/readme.md b/keyboards/clueboard/keymaps/mouse_keys/readme.md index 97ac6dfa2..7fb038205 100644 --- a/keyboards/clueboard/keymaps/mouse_keys/readme.md +++ b/keyboards/clueboard/keymaps/mouse_keys/readme.md @@ -1,12 +1,3 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - ![Clueboard Layout Image](layout.png) # MouseKeys Layout diff --git a/keyboards/clueboard/keymaps/serubin/layout-base.png b/keyboards/clueboard/keymaps/serubin/layout-base.png deleted file mode 100644 index 8dcdc0643..000000000 Binary files a/keyboards/clueboard/keymaps/serubin/layout-base.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/serubin/layout-fn.png b/keyboards/clueboard/keymaps/serubin/layout-fn.png deleted file mode 100644 index 3cff46a72..000000000 Binary files a/keyboards/clueboard/keymaps/serubin/layout-fn.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/serubin/layout-media.png b/keyboards/clueboard/keymaps/serubin/layout-media.png deleted file mode 100644 index 753cb64fa..000000000 Binary files a/keyboards/clueboard/keymaps/serubin/layout-media.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/serubin/readme.md b/keyboards/clueboard/keymaps/serubin/readme.md index e39adbb16..78eef5352 100644 --- a/keyboards/clueboard/keymaps/serubin/readme.md +++ b/keyboards/clueboard/keymaps/serubin/readme.md @@ -1,23 +1,14 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - # Serubin's Clueboard Layout This is the layout based on the clueboard default, modified for development on Mac, PC, and Windows. This layout also handles media and volume keys on all the previously listed platforms. Most importantly, Capslock has been replaced by a dual function Esc/Ctrl key. This is particularly handy for use in Vim. #### Base Layer -![Base Layout Image](layout-base.png) +![Base Layout Image](http://i.imgur.com/qL78n1y.png) #### Fn Layer -![Fn Layout Image](layout-fn.png) +![Fn Layout Image](http://i.imgur.com/QuwxePw.png) #### Media Layer -![Media Layer Image](layout-media.png) +![Media Layer Image](http://i.imgur.com/oOfWXMf.png) diff --git a/keyboards/clueboard/keymaps/shift_fn/layout.png b/keyboards/clueboard/keymaps/shift_fn/layout.png deleted file mode 100644 index 66d85410c..000000000 Binary files a/keyboards/clueboard/keymaps/shift_fn/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/shift_fn/readme.md b/keyboards/clueboard/keymaps/shift_fn/readme.md index 369f556f8..4bd920ad4 100644 --- a/keyboards/clueboard/keymaps/shift_fn/readme.md +++ b/keyboards/clueboard/keymaps/shift_fn/readme.md @@ -1,14 +1,3 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) - # Shift Fn Clueboard Layout This is an experimental layout. It makes the left shift key a dual roll key. diff --git a/keyboards/clueboard/keymaps/skully/layout.png b/keyboards/clueboard/keymaps/skully/layout.png deleted file mode 100644 index 64854aaef..000000000 Binary files a/keyboards/clueboard/keymaps/skully/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/skully/readme.md b/keyboards/clueboard/keymaps/skully/readme.md index 08255dfbc..b9ad1b09a 100644 --- a/keyboards/clueboard/keymaps/skully/readme.md +++ b/keyboards/clueboard/keymaps/skully/readme.md @@ -1,16 +1,11 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/VaoGn3M.png) # skullY's Clueboard Layout This layout is what I (@skullydazed) use on my personal Clueboards. I mostly use it for programming, CAD, and general typing. -The most notable change from the default layout is putting Ctrl on the Capslock key. I also swap Alt and Cmd because I mostly use a Mac day to day. +I've made the following changes from the default layout: + +* shift_fn on left shift +* Change capslock to control +* Swap Alt and Cmd diff --git a/keyboards/clueboard/keymaps/smt/layout.png b/keyboards/clueboard/keymaps/smt/layout.png deleted file mode 100644 index 6c27277a9..000000000 Binary files a/keyboards/clueboard/keymaps/smt/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/smt/readme.md b/keyboards/clueboard/keymaps/smt/readme.md index 6a8b3edb4..7fc0f0248 100644 --- a/keyboards/clueboard/keymaps/smt/readme.md +++ b/keyboards/clueboard/keymaps/smt/readme.md @@ -1,15 +1,6 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - # smt Clueboard Layout (HHKB variant) -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/Ll5gGte.png) This is smt's HHKB variant layout, based on the default layout that comes flashed on every Clueboard. The primary differences from the default are: diff --git a/keyboards/clueboard/keymaps/unix_optimized/layout.png b/keyboards/clueboard/keymaps/unix_optimized/layout.png deleted file mode 100644 index ea7d30e35..000000000 Binary files a/keyboards/clueboard/keymaps/unix_optimized/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/unix_optimized/readme.md b/keyboards/clueboard/keymaps/unix_optimized/readme.md index 3510e138b..9e6d0e902 100644 --- a/keyboards/clueboard/keymaps/unix_optimized/readme.md +++ b/keyboards/clueboard/keymaps/unix_optimized/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/BnWlOht.png) # Default Clueboard Layout diff --git a/keyboards/clueboard/keymaps/win_optimized/layout.png b/keyboards/clueboard/keymaps/win_optimized/layout.png deleted file mode 100644 index 7d8c82da7..000000000 Binary files a/keyboards/clueboard/keymaps/win_optimized/layout.png and /dev/null differ diff --git a/keyboards/clueboard/keymaps/win_optimized/readme.md b/keyboards/clueboard/keymaps/win_optimized/readme.md index cede17ee1..703a37be0 100644 --- a/keyboards/clueboard/keymaps/win_optimized/readme.md +++ b/keyboards/clueboard/keymaps/win_optimized/readme.md @@ -1,13 +1,4 @@ -``` - ___ _____ _ _ _ __ __ _ __ -|__ \ / ____| | | | | | / / / /(_) / / - ||) | | | | |_ _ ___| |__ ___ __ _ _ __ __| | / /_ / /_ / / - |/ / | | | | | | |/ _ \ '_ \ / _ \ / _` | '__/ _` | | '_ \| '_ \ / / - |_| | |____| | |_| | __/ |_) | (_) | (_| | | | (_| | | (_) | (_) / / _ - (_) \_____|_|\__,_|\___|_.__/ \___/ \__,_|_| \__,_| \___/ \___/_/ (_) -``` - -![Clueboard Layout Image](layout.png) +![Clueboard Layout Image](http://i.imgur.com/fsqOqZo.png) # Default Clueboard Layout -- cgit v1.2.3 From a5b5279da91156ed530b43be2cc546df968db6da Mon Sep 17 00:00:00 2001 From: Martin Gondermann Date: Mon, 12 Jun 2017 17:48:01 +0200 Subject: Add MIDI layer to magicmonty keymap (#1386) * Add MIDI layer * Respect brightness level on layer signalling * Add hotkey in control layer for signalling state * Update layout.png * Remove image and replace it with imgur link --- keyboards/clueboard/keymaps/magicmonty/Makefile | 6 ++ keyboards/clueboard/keymaps/magicmonty/config.h | 29 ++++++++ keyboards/clueboard/keymaps/magicmonty/keymap.c | 91 +++++++++++++++++------- keyboards/clueboard/keymaps/magicmonty/readme.md | 8 ++- 4 files changed, 105 insertions(+), 29 deletions(-) create mode 100644 keyboards/clueboard/keymaps/magicmonty/config.h (limited to 'keyboards/clueboard') diff --git a/keyboards/clueboard/keymaps/magicmonty/Makefile b/keyboards/clueboard/keymaps/magicmonty/Makefile index 1ae727708..5b798b7fc 100644 --- a/keyboards/clueboard/keymaps/magicmonty/Makefile +++ b/keyboards/clueboard/keymaps/magicmonty/Makefile @@ -1,2 +1,8 @@ + MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes + +MIDI_ENABLE = yes + +# if MIDI_ENABLE is set to yes, then CONSOLE_ENABLE has to be disabled, because of the firmware size +CONSOLE_ENABLE = false diff --git a/keyboards/clueboard/keymaps/magicmonty/config.h b/keyboards/clueboard/keymaps/magicmonty/config.h new file mode 100644 index 000000000..4b2953499 --- /dev/null +++ b/keyboards/clueboard/keymaps/magicmonty/config.h @@ -0,0 +1,29 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on + #define MIDI_BASIC +*/ + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +#define MIDI_TONE_KEYCODE_OCTAVES 2 + +#endif diff --git a/keyboards/clueboard/keymaps/magicmonty/keymap.c b/keyboards/clueboard/keymaps/magicmonty/keymap.c index 6ca843aab..c7847dfb7 100644 --- a/keyboards/clueboard/keymaps/magicmonty/keymap.c +++ b/keyboards/clueboard/keymaps/magicmonty/keymap.c @@ -3,16 +3,23 @@ // Helpful defines #define GRAVE_MODS (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)|MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) #define _______ KC_TRNS +#define xxxxxxx KC_NO // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _BL 0 -#define _FL 1 -#define _ME 2 -#define _CL 3 -#define _ML 4 +#define _BL 0 // BASE Layer +#define _FL 1 // Function Layer +#define _ME 2 // Media Layer +#define _CL 3 // Control Layer +#define _ML 4 // Mouse Layer +#if defined(MIDI_ENABLE) + #define _MI 5 // MIDI Layer + #define TO_MIDI TO(_MI) +#else + #define TO_MIDI _______ +#endif const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: Base Layer (Default Layer) @@ -24,17 +31,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, KC_RSFT, KC_UP, \ KC_LCTL, KC_LGUI, KC_LALT, _______, LT(_ML, KC_SPC),LT(_ML, KC_SPC), _______, KC_RALT, MO(_ME), MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), - /* Keymap _FL: Function Layer - */ + /* Keymap _FL: Function Layer */ [_FL] = KEYMAP( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_STEP, \ _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,_______, KC_PAUS, _______, _______, _______, _______, \ MO(_FL), _______, MO(_CL),_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RGHT, _______, _______, _______, _______, \ - _______, _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, _______, _______, _______, KC_PGUP, \ + _______, _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, TO_MIDI, _______, _______, KC_PGUP, \ _______, _______, _______,_______, _______,_______, _______, _______, _______, MO(_FL), KC_HOME, KC_PGDN, KC_END), - /* Keymap _ME: Media layer - */ + /* Keymap _ME: Media layer */ [_ME] = KEYMAP( _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, \ _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_VOLD, \ @@ -42,23 +47,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(_FL), _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, _______, _______, MO(_FL), _______, \ _______, _______, _______,_______, _______,_______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,KC_MNXT), - /* Keymap _CL: Control layer - */ + /* Keymap _CL: Control layer */ [_CL] = KEYMAP( - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ + _______, F(1), _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ _______, _______, _______,_______,RESET, _______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_VAD, \ _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, \ MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, MO(_FL), RGB_SAI, \ _______, _______, _______,_______, RGB_MOD,RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), - /* Keymap _ML: Mouse layer - */ + /* Keymap _ML: Mouse layer */ [_ML] = KEYMAP( _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, \ _______, _______, KC_BTN3,KC_BTN2,KC_BTN1,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R, _______, _______, _______, _______, \ _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_MS_U, \ _______, _______, _______,_______, LT(_ML, KC_SPC),LT(_ML, KC_SPC), _______, KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_D,KC_MS_R), + +#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) + /* Keymap _MI: MIDI layer (Advanced)*/ + [_MI] = KEYMAP( + TO(_BL),MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10, MI_CHD, MI_CHU, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, MI_Cs, MI_Ds, xxxxxxx, MI_Fs, MI_Gs, MI_As, xxxxxxx, MI_Cs_1, MI_Ds_1, xxxxxxx, MI_Fs_1, xxxxxxx, xxxxxxx, \ + MI_MOD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, MI_G_1, xxxxxxx, \ + MI_SUS, xxxxxxx, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, MI_TRNSD,MI_TRNSU,MI_TRNS_0, MI_SUS, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx, MI_ALLOFF,MI_ALLOFF, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx), +#elif defined(MIDI_ENABLE) && defined(MIDI_BASIC) + /* Keymap _MI: MIDI layer (Basic)*/ + [_MI] = KEYMAP( + TO(_BL), xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, MI_ON, MI_OFF,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx, xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx), +#endif }; /* This is a list of user defined functions. F(N) corresponds to item N @@ -66,6 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ const uint16_t PROGMEM fn_actions[] = { [0] = ACTION_FUNCTION(0), // Calls action_function() + [1] = ACTION_FUNCTION(1), // Calls action_function() }; void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { @@ -102,6 +124,8 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } } break; + case 1: + rgblight_mode(1); } } @@ -110,26 +134,34 @@ enum layer_id { LAYER_FUNCTION, LAYER_MEDIA, LAYER_CONTROL, - LAYER_MOUSE + LAYER_MOUSE, +#if defined(MIDI_ENABLE) + LAYER_MIDI +#endif }; -void clueboard_set_led(uint8_t id) { +void clueboard_set_led(uint8_t id, uint8_t val) { switch (id) { case LAYER_BASE: - rgblight_sethsv_noeeprom(346, 0, 255); + rgblight_sethsv_noeeprom(346, 0, val); break; case LAYER_FUNCTION: - rgblight_sethsv_noeeprom(46, 255, 255); + rgblight_sethsv_noeeprom(46, 255, val); break; case LAYER_MEDIA: - rgblight_sethsv_noeeprom(86, 255, 255); + rgblight_sethsv_noeeprom(86, 255, val); break; case LAYER_CONTROL: - rgblight_sethsv_noeeprom(346, 255, 255); + rgblight_sethsv_noeeprom(346, 255, val); break; case LAYER_MOUSE: - rgblight_sethsv_noeeprom(206, 255, 255); + rgblight_sethsv_noeeprom(206, 255, val); + break; +#if defined(MIDI_ENABLE) + case LAYER_MIDI: + rgblight_sethsv_noeeprom(316, 255, val); break; +#endif } }; @@ -140,18 +172,23 @@ void matrix_scan_user(void) { if (!rgblight_config.enable || rgblight_config.mode != 1) { return; } uint32_t layer = layer_state; + uint8_t val = rgblight_config.val; if (layer & (1<<_FL)) { if (layer & (1<<_ME)) { - clueboard_set_led(LAYER_MEDIA); + clueboard_set_led(LAYER_MEDIA, val); } else if (layer & (1<<_CL)) { - clueboard_set_led(LAYER_CONTROL); + clueboard_set_led(LAYER_CONTROL, val); } else { - clueboard_set_led(LAYER_FUNCTION); + clueboard_set_led(LAYER_FUNCTION, val); } } else if (layer & (1<<_ML)) { - clueboard_set_led(LAYER_MOUSE); + clueboard_set_led(LAYER_MOUSE, val); +#if defined(MIDI_ENABLE) + } else if (layer & (1<<_MI)) { + clueboard_set_led(LAYER_MIDI, val); +#endif } else { - clueboard_set_led(LAYER_BASE); + clueboard_set_led(LAYER_BASE, val); } }; diff --git a/keyboards/clueboard/keymaps/magicmonty/readme.md b/keyboards/clueboard/keymaps/magicmonty/readme.md index 2959172df..04930311f 100644 --- a/keyboards/clueboard/keymaps/magicmonty/readme.md +++ b/keyboards/clueboard/keymaps/magicmonty/readme.md @@ -1,6 +1,8 @@ -![Clueboard Layout Image](http://i.imgur.com/ngg4EAY.png) +# Layout of @magicmonty -# MouseKeys Layout +[Keyboard Layout Editor File](http://www.keyboard-layout-editor.com/#/gists/f869b8789242a712e0f46eabbd550056) + +![Clueboard Layout Image](http://imgur.com/fXJFlrp.png) This layout is a combination of the `mouse_keys` and the `win_optimized` layouts. This layout is optimized for an ISO layout. @@ -10,6 +12,8 @@ will move your mouse cursor. You can click using the 3 mods to the left of the arrow keys, or the 3 keys under your primary fingers on the home row. The Left, Down, Up and Right for the mouse movement are also VIM-Like on the HJKL keys +There is also a MIDI layer included. + The CapsLock is disabled and works as Function key. There is also a separate media layer with Volume/Play controls -- cgit v1.2.3 From 49cfdb544d65005d2779b19d91432b6cbd278722 Mon Sep 17 00:00:00 2001 From: Martin Gondermann Date: Wed, 14 Jun 2017 16:20:43 +0200 Subject: Added HyperTab and Ctrl/Fn as well as Space cadet parens (#1390) * Added HyperTab and Ctrl/Escape as well as Space cadet parens to magicmonty keymap * Replaced CTL_ESC With FN_ESC --- keyboards/clueboard/keymaps/magicmonty/Makefile | 1 + keyboards/clueboard/keymaps/magicmonty/config.h | 15 ++++ keyboards/clueboard/keymaps/magicmonty/keymap.c | 92 ++++++++++++++---------- keyboards/clueboard/keymaps/magicmonty/readme.md | 13 +++- 4 files changed, 79 insertions(+), 42 deletions(-) (limited to 'keyboards/clueboard') diff --git a/keyboards/clueboard/keymaps/magicmonty/Makefile b/keyboards/clueboard/keymaps/magicmonty/Makefile index 5b798b7fc..289018f34 100644 --- a/keyboards/clueboard/keymaps/magicmonty/Makefile +++ b/keyboards/clueboard/keymaps/magicmonty/Makefile @@ -6,3 +6,4 @@ MIDI_ENABLE = yes # if MIDI_ENABLE is set to yes, then CONSOLE_ENABLE has to be disabled, because of the firmware size CONSOLE_ENABLE = false +COMMAND_ENABLE = no diff --git a/keyboards/clueboard/keymaps/magicmonty/config.h b/keyboards/clueboard/keymaps/magicmonty/config.h index 4b2953499..30b2a171e 100644 --- a/keyboards/clueboard/keymaps/magicmonty/config.h +++ b/keyboards/clueboard/keymaps/magicmonty/config.h @@ -26,4 +26,19 @@ /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ #define MIDI_TONE_KEYCODE_OCTAVES 2 +/* Disabling rollover allows you to use the opposite shift key to cancel the space cadet state in the event + of an erroneous press instead of emitting a pair of parentheses when the keys are released. +*/ +#define DISABLE_SPACE_CADET_ROLLOVER + +/* + Setting the Space Cadet Parens for German layout + + Default is + #define LSPO_KEY KC_9 + #define RSPC_KEY KC_0 +*/ +#define LSPO_KEY KC_8 +#define RSPC_KEY KC_9 + #endif diff --git a/keyboards/clueboard/keymaps/magicmonty/keymap.c b/keyboards/clueboard/keymaps/magicmonty/keymap.c index c7847dfb7..05ea1fa33 100644 --- a/keyboards/clueboard/keymaps/magicmonty/keymap.c +++ b/keyboards/clueboard/keymaps/magicmonty/keymap.c @@ -4,6 +4,8 @@ #define GRAVE_MODS (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)|MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)) #define _______ KC_TRNS #define xxxxxxx KC_NO +#define HPR_TAB ALL_T(KC_TAB) +#define CTL_ESC CTL_T(KC_ESC) // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -21,64 +23,73 @@ #define TO_MIDI _______ #endif +#define TO_BASE TO(_BL) +#define MO_FUNC MO(_FL) +#define MEDIA MO(_ME) +#define MO_CTL MO(_CL) +#define L_MOUSE LT(_ML, KC_SPC) +#define ESC_FUN LT(_FL, KC_ESC) + +#define ESC_GRV F(0) +#define RGB_RST F(1) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap _BL: Base Layer (Default Layer) - */ + /* Keymap _BL: Base Layer (Default Layer) */ [_BL] = KEYMAP( - F(0), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, KC_INS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, \ - MO(_FL), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, _______, LT(_ML, KC_SPC),LT(_ML, KC_SPC), _______, KC_RALT, MO(_ME), MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), + ESC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, KC_INS, \ + HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, \ + ESC_FUN, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \ + KC_LSPO, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, KC_RSPC, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT,_______, L_MOUSE, L_MOUSE, _______, KC_RALT, KC_RCTL, MO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _FL: Function Layer */ [_FL] = KEYMAP( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_STEP, \ - _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,_______, KC_PAUS, _______, _______, _______, _______, \ - MO(_FL), _______, MO(_CL),_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RGHT, _______, _______, _______, _______, \ - _______, _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, TO_MIDI, _______, _______, KC_PGUP, \ - _______, _______, _______,_______, _______,_______, _______, _______, _______, MO(_FL), KC_HOME, KC_PGDN, KC_END), + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_STEP, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_PAUS, _______, _______, _______, _______, \ + _______, _______, MO_CTL, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, MEDIA, _______, _______, TO_MIDI, _______, _______, KC_PGUP, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, MO_FUNC, KC_HOME, KC_PGDN, KC_END), /* Keymap _ME: Media layer */ [_ME] = KEYMAP( - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, \ - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_VOLD, \ - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, \ - MO(_FL), _______, _______,_______,_______,_______,_______,_______,MO(_ME),_______, _______, _______, _______, MO(_FL), _______, \ - _______, _______, _______,_______, _______,_______, _______, _______, _______, _______, KC_MPRV, KC_MPLY,KC_MNXT), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLU, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, MEDIA, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT), /* Keymap _CL: Control layer */ [_CL] = KEYMAP( - _______, F(1), _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ - _______, _______, _______,_______,RESET, _______,_______,_______,_______,_______, _______, _______, _______, _______, RGB_VAD, \ - _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, \ - MO(_FL), _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, MO(_FL), RGB_SAI, \ - _______, _______, _______,_______, RGB_MOD,RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), + _______, RGB_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_VAI, \ + _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, \ + _______, _______, MO_CTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, \ + _______, _______, _______, _______, RGB_MOD, RGB_MOD, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI), /* Keymap _ML: Mouse layer */ [_ML] = KEYMAP( - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, \ - _______, _______, KC_BTN3,KC_BTN2,KC_BTN1,_______,KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R, _______, _______, _______, _______, \ - _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, KC_MS_U, \ - _______, _______, _______,_______, LT(_ML, KC_SPC),LT(_ML, KC_SPC), _______, KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_D,KC_MS_R), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, \ + _______, _______, _______, _______, L_MOUSE, L_MOUSE, _______, KC_BTN1, KC_BTN2, KC_BTN3, KC_MS_L, KC_MS_D, KC_MS_R), #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) /* Keymap _MI: MIDI layer (Advanced)*/ [_MI] = KEYMAP( - TO(_BL),MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10, MI_CHD, MI_CHU, xxxxxxx, xxxxxxx, xxxxxxx, \ - xxxxxxx, xxxxxxx, MI_Cs, MI_Ds, xxxxxxx, MI_Fs, MI_Gs, MI_As, xxxxxxx, MI_Cs_1, MI_Ds_1, xxxxxxx, MI_Fs_1, xxxxxxx, xxxxxxx, \ - MI_MOD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, MI_G_1, xxxxxxx, \ - MI_SUS, xxxxxxx, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, MI_TRNSD,MI_TRNSU,MI_TRNS_0, MI_SUS, xxxxxxx, \ - xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx, MI_ALLOFF,MI_ALLOFF, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx), + TO_BASE,MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10, MI_CHD, MI_CHU, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, MI_Cs, MI_Ds, xxxxxxx, MI_Fs, MI_Gs, MI_As, xxxxxxx, MI_Cs_1, MI_Ds_1, xxxxxxx, MI_Fs_1, xxxxxxx, xxxxxxx, \ + MI_MOD, MI_C, MI_D, MI_E, MI_F, MI_G, MI_A, MI_B, MI_C_1, MI_D_1, MI_E_1, MI_F_1, MI_G_1, xxxxxxx, \ + MI_SUS, xxxxxxx, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, MI_TRNSD,MI_TRNSU,MI_TRNS_0, MI_SUS, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx, MI_ALLOFF, MI_ALLOFF, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx), #elif defined(MIDI_ENABLE) && defined(MIDI_BASIC) /* Keymap _MI: MIDI layer (Basic)*/ [_MI] = KEYMAP( - TO(_BL), xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ - xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ - xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ - xxxxxxx, xxxxxxx, MI_ON, MI_OFF,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ - xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx, xxxxxxx,xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx), + TO_BASE, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, MI_ON, MI_OFF, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, \ + xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx), #endif }; @@ -125,7 +136,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } break; case 1: - rgblight_mode(1); + if (record->event.pressed) { + rgblight_mode(1); + rgblight_sethsv(206, 255, 255); + } } } @@ -143,7 +157,7 @@ enum layer_id { void clueboard_set_led(uint8_t id, uint8_t val) { switch (id) { case LAYER_BASE: - rgblight_sethsv_noeeprom(346, 0, val); + rgblight_sethsv_noeeprom(0, 0, val); break; case LAYER_FUNCTION: rgblight_sethsv_noeeprom(46, 255, val); diff --git a/keyboards/clueboard/keymaps/magicmonty/readme.md b/keyboards/clueboard/keymaps/magicmonty/readme.md index 04930311f..f9cc57311 100644 --- a/keyboards/clueboard/keymaps/magicmonty/readme.md +++ b/keyboards/clueboard/keymaps/magicmonty/readme.md @@ -1,8 +1,8 @@ # Layout of @magicmonty -[Keyboard Layout Editor File](http://www.keyboard-layout-editor.com/#/gists/f869b8789242a712e0f46eabbd550056) +[Keyboard Layout Editor File] -![Clueboard Layout Image](http://imgur.com/fXJFlrp.png) +![Clueboard Layout Image](http://i.imgur.com/WFfJ15k.png) This layout is a combination of the `mouse_keys` and the `win_optimized` layouts. This layout is optimized for an ISO layout. @@ -14,7 +14,9 @@ The Left, Down, Up and Right for the mouse movement are also VIM-Like on the HJK There is also a MIDI layer included. -The CapsLock is disabled and works as Function key. +The CapsLock is disabled and works as Escape when tapped and Fn when Hold. +The Tab key works as Tab when tapped, and [Hyper] (Ctrl + Alt + Shift + Cmd) when hold +The Shift-Keys are configured as [Space Cadet Shift Parentheses] There is also a separate media layer with Volume/Play controls @@ -25,3 +27,8 @@ The different layers are signalled throug setting of the underlight: - Media layer: Green - Mouse layer: Blue - Control layer: Red +- Midi layer: Purple + +[Hyper]: http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/ +[Space Cadet Shift Parentheses]: http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses +[Keyboard Layout Editor File]: http://www.keyboard-layout-editor.com/#/gists/f869b8789242a712e0f46eabbd550056 -- cgit v1.2.3