aboutsummaryrefslogtreecommitdiff
path: root/keyboards/sofle/keymaps
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-05-29 14:38:50 -0700
committerGitHub <noreply@github.com>2021-05-29 14:38:50 -0700
commit1646c0f26cfa21a7023d404008e4d0aa4917193d (patch)
tree337ab0498a929285a234518fee34a4d9dcf51656 /keyboards/sofle/keymaps
parentf55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff)
downloadqmk_firmware-1646c0f26cfa21a7023d404008e4d0aa4917193d.tar.gz
qmk_firmware-1646c0f26cfa21a7023d404008e4d0aa4917193d.zip
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536) * LED Matrix: Reactive effect buffers & advanced indicators (#12588) * [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) * [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) * LED Matrix: Split (#12633) * [CI] Format code according to conventions (#12650) * feat: infinite timeout for leader key (#6580) * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs * Format code according to conventions (#12680) * Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403) * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation * Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h * eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671) * Add support for MCU = STM32F446 (#12619) * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. * Format code according to conventions (#12682) * Format code according to conventions (#12687) * Add STM32L433 and L443 support (#12063) * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers * Include L443 in compatible microcontrollers * Update config bootloader jump description * Update ChibiOS define reasoning * Update quantum/mcu_selection.mk * fix git conflict * Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) * Fix bad PR merge for #6580. (#12721) * Change RGB/LED Matrix to use a simple define for USB suspend (#12697) * [CI] Format code according to conventions (#12731) * Fixing transport's led/rgb matrix suspend state logic (#12770) * [CI] Format code according to conventions (#12772) * Fix comment parsing (#12750) * Added OLED fade out support (#12086) * fix some references to bin/qmk that slipped in (#12832) * Resolve a number of warnings in `qmk generate-api` (#12833) * New command: qmk console (#12828) * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review * pyformat * clean up and flesh out KNOWN_BOOTLOADERS * Remove pointless SERIAL_LINK_ENABLE rules (#12846) * Make Swap Hands use PROGMEM (#12284) This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource. * Fix another bin/qmk reference (#12856) * [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) * Fixup build errors on `develop` branch. (#12723) * LED Matrix: Effects! (#12651) * Fix syntax error when compiling for ARM (#12866) * Remove KEYMAP and LAYOUT_kc (#12160) * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc * Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) * Rename `point_t` -> `led_point_t` (#12864) * [Keyboard] updated a vendor name / fixed minor keymap issues (#12881) * Add missing LED Matrix suspend code to suspend.c (#12878) * LED Matrix: Documentation (#12685) * Deprecate `send_unicode_hex_string()` (#12602) * Fix spelling mistake regarding LED Matrix in split_common. (#12888) * [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) * Use milc.subcommand.config instead of qmk.cli.config (#12915) * Use milc.subcommand.config instead * pyformat * remove the config test * Add function to allow repeated blinking of one layer (#12237) * Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time * Update doc * Rework rgblight blinking according to requested change * optimize storage * Fixup housekeeping from being invoked twice per loop. (#12933) * matrix: wait for row signal to go HIGH for every row (#12945) I noticed this discrepancy (last row of the matrix treated differently than the others) when optimizing the input latency of my keyboard controller, see also https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ Before this commit, when tuning the delays I noticed ghost key presses when pressing the F2 key, which is on the last row of the keyboard matrix: the dead_grave key, which is on the first row of the keyboard matrix, would be incorrectly detected as pressed. After this commit, all keyboard matrix rows are interpreted correctly. I suspect that my setup is more susceptible to this nuance than others because I use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask the problem. * ensure we do not conflict with existing keymap aliases (#12976) * Add support for up to 4 IS31FL3733 drivers (#12342) * Convert Encoder callbacks to be boolean functions (#12805) * [Keyboard] Fix Terrazzo build failure (#12977) * Do not hard set config in CPTC files (#11864) * [Keyboard] Corne - Remove legacy revision support (#12226) * [Keymap] Update to Drashna keymap and user code (based on develop) (#12936) * Add Full-duplex serial driver for ARM boards (#9842) * Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987) * Backlight: add defines for default level and breathing state (#12560) * Add dire message about LUFA mass storage bootloader (#13014) * [Keyboard] Remove redundant legacy and common headers for crkbd (#13023) Was causing compiler errors on some systems. * Fix keyboards/keymaps for boolean encoder callback changes (#12985) * `backlight.c`: include `eeprom.h` (#13024) * Add changelog for 2021-05-29 Breaking Changes merge (#12939) * Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version * Add recent develop changes * Sort recent develop changes * Remove sections for ChibiOS changes per tzarc No ChibiOS changes this round. * Add and sort recent develop changes * add notes about keyboard moves/deletions * import changelog for PR 12172 Documents the change to BOOTMAGIC_ENABLE. * update section headings * re-sort changelog * add additional note regarding Bootmagic changes * remove changelog timestamp * update dates in main Breaking Changes docs * fix broken section anchors in previous changelogs * add link to backlight/eeprom patch to changelog * highlight some more changes * link PRs from section headers * Restore standard readme * run: qmk cformat --core-only
Diffstat (limited to 'keyboards/sofle/keymaps')
-rw-r--r--keyboards/sofle/keymaps/default/keymap.c3
-rw-r--r--keyboards/sofle/keymaps/devdev/keymap.c181
-rw-r--r--keyboards/sofle/keymaps/rgb_default/keymap.c181
-rw-r--r--keyboards/sofle/keymaps/via/encoder.c31
4 files changed, 200 insertions, 196 deletions
diff --git a/keyboards/sofle/keymaps/default/keymap.c b/keyboards/sofle/keymaps/default/keymap.c
index 38200bfb7..2360a45d4 100644
--- a/keyboards/sofle/keymaps/default/keymap.c
+++ b/keyboards/sofle/keymaps/default/keymap.c
@@ -373,7 +373,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
373 373
374#ifdef ENCODER_ENABLE 374#ifdef ENCODER_ENABLE
375 375
376void encoder_update_user(uint8_t index, bool clockwise) { 376bool encoder_update_user(uint8_t index, bool clockwise) {
377 if (index == 0) { 377 if (index == 0) {
378 if (clockwise) { 378 if (clockwise) {
379 tap_code(KC_VOLU); 379 tap_code(KC_VOLU);
@@ -387,6 +387,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
387 tap_code(KC_PGUP); 387 tap_code(KC_PGUP);
388 } 388 }
389 } 389 }
390 return true;
390} 391}
391 392
392#endif 393#endif
diff --git a/keyboards/sofle/keymaps/devdev/keymap.c b/keyboards/sofle/keymaps/devdev/keymap.c
index 7d100abb6..681e7dd6a 100644
--- a/keyboards/sofle/keymaps/devdev/keymap.c
+++ b/keyboards/sofle/keymaps/devdev/keymap.c
@@ -1,19 +1,19 @@
1 1
2 /* Copyright 2021 Dane Evans 2 /* Copyright 2021 Dane Evans
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 // SOFLE RGB 17 // SOFLE RGB
18#include <stdio.h> 18#include <stdio.h>
19 19
@@ -21,16 +21,16 @@
21 21
22#define INDICATOR_BRIGHTNESS 30 22#define INDICATOR_BRIGHTNESS 30
23 23
24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override 24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) 25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
26 26
27// Light combinations 27// Light combinations
28#define SET_INDICATORS(hsv) \ 28#define SET_INDICATORS(hsv) \
29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
30 {35+0, 1, hsv} 30 {35+0, 1, hsv}
31#define SET_UNDERGLOW(hsv) \ 31#define SET_UNDERGLOW(hsv) \
32 {1, 5, hsv}, \ 32 {1, 5, hsv}, \
33 {35+1, 5,hsv} 33 {35+1, 5,hsv}
34#define SET_NUMPAD(hsv) \ 34#define SET_NUMPAD(hsv) \
35 {35+15, 5, hsv},\ 35 {35+15, 5, hsv},\
36 {35+22, 3, hsv},\ 36 {35+22, 3, hsv},\
@@ -44,14 +44,14 @@
44 {35+ 30, 2, hsv} 44 {35+ 30, 2, hsv}
45#define SET_INNER_COL(hsv) \ 45#define SET_INNER_COL(hsv) \
46 {33, 4, hsv}, \ 46 {33, 4, hsv}, \
47 {35+ 33, 4, hsv} 47 {35+ 33, 4, hsv}
48 48
49#define SET_OUTER_COL(hsv) \ 49#define SET_OUTER_COL(hsv) \
50 {7, 4, hsv}, \ 50 {7, 4, hsv}, \
51 {35+ 7, 4, hsv} 51 {35+ 7, 4, hsv}
52#define SET_THUMB_CLUSTER(hsv) \ 52#define SET_THUMB_CLUSTER(hsv) \
53 {25, 2, hsv}, \ 53 {25, 2, hsv}, \
54 {35+ 25, 2, hsv} 54 {35+ 25, 2, hsv}
55#define SET_LAYER_ID(hsv) \ 55#define SET_LAYER_ID(hsv) \
56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
@@ -60,14 +60,14 @@
60 {7, 4, hsv}, \ 60 {7, 4, hsv}, \
61 {35+ 7, 4, hsv}, \ 61 {35+ 7, 4, hsv}, \
62 {25, 2, hsv}, \ 62 {25, 2, hsv}, \
63 {35+ 25, 2, hsv} 63 {35+ 25, 2, hsv}
64 64
65 65
66enum sofle_layers { 66enum sofle_layers {
67 _DEFAULTS = 0, 67 _DEFAULTS = 0,
68 _QWERTY = 0, 68 _QWERTY = 0,
69 _COLEMAK, 69 _COLEMAK,
70 _COLEMAKDH, 70 _COLEMAKDH,
71 _LOWER, 71 _LOWER,
72 _RAISE, 72 _RAISE,
73 _ADJUST, 73 _ADJUST,
@@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 [_QWERTY] = LAYOUT( 104 [_QWERTY] = LAYOUT(
105 //,------------------------------------------------. ,---------------------------------------------------. 105 //,------------------------------------------------. ,---------------------------------------------------.
106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV, 106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV,
107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, 112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT 114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT
115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
116), 116),
117 117
118/* 118/*
@@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133[_COLEMAK] = LAYOUT( 133[_COLEMAK] = LAYOUT(
134 //,------------------------------------------------. ,---------------------------------------------------. 134 //,------------------------------------------------. ,---------------------------------------------------.
135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
145), 145),
146 146
147/* 147/*
@@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
162[_COLEMAKDH] = LAYOUT( 162[_COLEMAKDH] = LAYOUT(
163 //,------------------------------------------------. ,---------------------------------------------------. 163 //,------------------------------------------------. ,---------------------------------------------------.
164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
174), 174),
175 175
176/* LOWER 176/* LOWER
@@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190[_LOWER] = LAYOUT( 190[_LOWER] = LAYOUT(
191 //,------------------------------------------------. ,---------------------------------------------------. 191 //,------------------------------------------------. ,---------------------------------------------------.
192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, 196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL,
197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______,
199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
202), 202),
203/* RAISE 203/* RAISE
204 * ,----------------------------------------. ,-----------------------------------------. 204 * ,----------------------------------------. ,-----------------------------------------.
@@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
217[_RAISE] = LAYOUT( 217[_RAISE] = LAYOUT(
218 //,------------------------------------------------. ,---------------------------------------------------. 218 //,------------------------------------------------. ,---------------------------------------------------.
219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, 219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______,
220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, 223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, 225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
229), 229),
230/* ADJUST 230/* ADJUST
231 * ,-----------------------------------------. ,-----------------------------------------. 231 * ,-----------------------------------------. ,-----------------------------------------.
232 * | | | | | | | | | | | | | | 232 * | | | | | | | | | | | | | |
233 * |------+------+------+------+------+------| |------+------+------+------+------+------| 233 * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
244 [_ADJUST] = LAYOUT( 244 [_ADJUST] = LAYOUT(
245 //,------------------------------------------------. ,---------------------------------------------------. 245 //,------------------------------------------------. ,---------------------------------------------------.
246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX, 250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, 252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
256), 256),
257/* NUMPAD 257/* NUMPAD
258 * ,-----------------------------------------. ,-----------------------------------------. 258 * ,-----------------------------------------. ,-----------------------------------------.
@@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
271[_NUMPAD] = LAYOUT( 271[_NUMPAD] = LAYOUT(
272 //,------------------------------------------------. ,---------------------------------------------------. 272 //,------------------------------------------------. ,---------------------------------------------------.
273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, 275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______,
276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, 277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE,
278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, 279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______,
280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ 281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______
282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
283), 283),
284 284
285/* SWITCH 285/* SWITCH
@@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
296 * | | | | |/ / \ \ | | | | | 296 * | | | | |/ / \ \ | | | | |
297 * `----------------------------------' '------''---------------------------' 297 * `----------------------------------' '------''---------------------------'
298 */ 298 */
299 // layer switcher 299 // layer switcher
300[_SWITCH] = LAYOUT( 300[_SWITCH] = LAYOUT(
301 //,------------------------------------------------. ,---------------------------------------------------. 301 //,------------------------------------------------. ,---------------------------------------------------.
302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, 304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET,
305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, 306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST,
307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
312 312
313 ), 313 ),
314}; 314};
315 315
316#ifdef RGBLIGHT_ENABLE 316#ifdef RGBLIGHT_ENABLE
317char layer_state_str[70]; 317char layer_state_str[70];
318// Now define the array of layers. Later layers take precedence 318// Now define the array of layers. Later layers take precedence
319 319
320// QWERTY, 320// QWERTY,
321// Light on inner column and underglow 321// Light on inner column and underglow
322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( 322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
323 SET_LAYER_ID(HSV_RED) 323 SET_LAYER_ID(HSV_RED)
324 324
325); 325);
326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( 326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS(
327 SET_LAYER_ID(HSV_PINK) 327 SET_LAYER_ID(HSV_PINK)
328); 328);
329 329
330// _NUM, 330// _NUM,
331// Light on outer column and underglow 331// Light on outer column and underglow
332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( 332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
333 SET_LAYER_ID(HSV_TEAL) 333 SET_LAYER_ID(HSV_TEAL)
334 334
335); 335);
336// _SYMBOL, 336// _SYMBOL,
337// Light on inner column and underglow 337// Light on inner column and underglow
338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( 338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
339 SET_LAYER_ID(HSV_BLUE) 339 SET_LAYER_ID(HSV_BLUE)
340 340
341 ); 341 );
342// _COMMAND, 342// _COMMAND,
343// Light on inner column and underglow 343// Light on inner column and underglow
344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( 344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
345 SET_LAYER_ID(HSV_PURPLE) 345 SET_LAYER_ID(HSV_PURPLE)
346); 346);
@@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS
356 {35+25, 2, HSV_ORANGE} 356 {35+25, 2, HSV_ORANGE}
357 ); 357 );
358// _SWITCHER // light up top row 358// _SWITCHER // light up top row
359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( 359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(
360 SET_LAYER_ID(HSV_GREEN), 360 SET_LAYER_ID(HSV_GREEN),
361 SET_NUMROW(HSV_GREEN) 361 SET_NUMROW(HSV_GREEN)
362); 362);
363 363
364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
365 365
366 layer_qwerty_lights, 366 layer_qwerty_lights,
367 layer_num_lights,// overrides layer 1 367 layer_num_lights,// overrides layer 1
368 layer_symbol_lights, 368 layer_symbol_lights,
369 layer_command_lights, 369 layer_command_lights,
370 layer_numpad_lights, 370 layer_numpad_lights,
371 layer_switcher_lights, // Overrides other layers 371 layer_switcher_lights, // Overrides other layers
372 layer_colemakdh_lights 372 layer_colemakdh_lights
373); 373);
@@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); 377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH));
378 378
379 379
380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); 380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST)); 382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST));
@@ -387,8 +387,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
387void keyboard_post_init_user(void) { 387void keyboard_post_init_user(void) {
388 // Enable the LED layers 388 // Enable the LED layers
389 rgblight_layers = my_rgb_layers; 389 rgblight_layers = my_rgb_layers;
390 390
391 rgblight_mode(10);// haven't found a way to set this in a more useful way 391 rgblight_mode(10);// haven't found a way to set this in a more useful way
392 392
393} 393}
394#endif 394#endif
@@ -411,9 +411,9 @@ static void print_status_narrow(void) {
411 oled_write_ln_P(PSTR("Dane\nEvans"), false); 411 oled_write_ln_P(PSTR("Dane\nEvans"), false);
412 412
413 oled_write_ln_P(PSTR(""), false); 413 oled_write_ln_P(PSTR(""), false);
414 414
415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) 415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state)
416 416
417 417
418 switch (get_highest_layer(default_layer_state)) { 418 switch (get_highest_layer(default_layer_state)) {
419 case _QWERTY: 419 case _QWERTY:
@@ -424,8 +424,8 @@ static void print_status_narrow(void) {
424 break; 424 break;
425 case _COLEMAKDH: 425 case _COLEMAKDH:
426 oled_write_ln_P(PSTR("CmkDH"), false); 426 oled_write_ln_P(PSTR("CmkDH"), false);
427 break; 427 break;
428 428
429 default: 429 default:
430 oled_write_ln_P(PSTR("Undef"), false); 430 oled_write_ln_P(PSTR("Undef"), false);
431 } 431 }
@@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
486 if (record->event.pressed) { 486 if (record->event.pressed) {
487 set_single_persistent_default_layer(_COLEMAK); 487 set_single_persistent_default_layer(_COLEMAK);
488 } 488 }
489 return false; 489 return false;
490 case KC_COLEMAKDH: 490 case KC_COLEMAKDH:
491 if (record->event.pressed) { 491 if (record->event.pressed) {
492 set_single_persistent_default_layer(_COLEMAKDH); 492 set_single_persistent_default_layer(_COLEMAKDH);
493 } 493 }
494 return false; 494 return false;
495 case KC_LOWER: 495 case KC_LOWER:
496 if (record->event.pressed) { 496 if (record->event.pressed) {
497 layer_on(_LOWER); 497 layer_on(_LOWER);
@@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
531 531
532#ifdef ENCODER_ENABLE 532#ifdef ENCODER_ENABLE
533 533
534void encoder_update_user(uint8_t index, bool clockwise) { 534bool encoder_update_user(uint8_t index, bool clockwise) {
535 if (index == 0) { 535 if (index == 0) {
536 if (clockwise) { 536 if (clockwise) {
537 tap_code(KC_VOLU); 537 tap_code(KC_VOLU);
@@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
566 break; 566 break;
567 } 567 }
568 } 568 }
569 return true;
569} 570}
570 571
571#endif 572#endif
diff --git a/keyboards/sofle/keymaps/rgb_default/keymap.c b/keyboards/sofle/keymaps/rgb_default/keymap.c
index 6b7486c1b..bd0993c99 100644
--- a/keyboards/sofle/keymaps/rgb_default/keymap.c
+++ b/keyboards/sofle/keymaps/rgb_default/keymap.c
@@ -1,19 +1,19 @@
1 1
2 /* Copyright 2021 Dane Evans 2 /* Copyright 2021 Dane Evans
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 // SOFLE RGB 17 // SOFLE RGB
18#include <stdio.h> 18#include <stdio.h>
19 19
@@ -21,16 +21,16 @@
21 21
22#define INDICATOR_BRIGHTNESS 30 22#define INDICATOR_BRIGHTNESS 30
23 23
24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override 24#define HSV_OVERRIDE_HELP(h, s, v, Override) h, s , Override
25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override) 25#define HSV_OVERRIDE(hsv, Override) HSV_OVERRIDE_HELP(hsv,Override)
26 26
27// Light combinations 27// Light combinations
28#define SET_INDICATORS(hsv) \ 28#define SET_INDICATORS(hsv) \
29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 29 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
30 {35+0, 1, hsv} 30 {35+0, 1, hsv}
31#define SET_UNDERGLOW(hsv) \ 31#define SET_UNDERGLOW(hsv) \
32 {1, 6, hsv}, \ 32 {1, 6, hsv}, \
33 {35+1, 6,hsv} 33 {35+1, 6,hsv}
34#define SET_NUMPAD(hsv) \ 34#define SET_NUMPAD(hsv) \
35 {35+15, 5, hsv},\ 35 {35+15, 5, hsv},\
36 {35+22, 3, hsv},\ 36 {35+22, 3, hsv},\
@@ -44,14 +44,14 @@
44 {35+ 30, 2, hsv} 44 {35+ 30, 2, hsv}
45#define SET_INNER_COL(hsv) \ 45#define SET_INNER_COL(hsv) \
46 {33, 4, hsv}, \ 46 {33, 4, hsv}, \
47 {35+ 33, 4, hsv} 47 {35+ 33, 4, hsv}
48 48
49#define SET_OUTER_COL(hsv) \ 49#define SET_OUTER_COL(hsv) \
50 {7, 4, hsv}, \ 50 {7, 4, hsv}, \
51 {35+ 7, 4, hsv} 51 {35+ 7, 4, hsv}
52#define SET_THUMB_CLUSTER(hsv) \ 52#define SET_THUMB_CLUSTER(hsv) \
53 {25, 2, hsv}, \ 53 {25, 2, hsv}, \
54 {35+ 25, 2, hsv} 54 {35+ 25, 2, hsv}
55#define SET_LAYER_ID(hsv) \ 55#define SET_LAYER_ID(hsv) \
56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 56 {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ 57 {35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
@@ -60,14 +60,14 @@
60 {7, 4, hsv}, \ 60 {7, 4, hsv}, \
61 {35+ 7, 4, hsv}, \ 61 {35+ 7, 4, hsv}, \
62 {25, 2, hsv}, \ 62 {25, 2, hsv}, \
63 {35+ 25, 2, hsv} 63 {35+ 25, 2, hsv}
64 64
65 65
66enum sofle_layers { 66enum sofle_layers {
67 _DEFAULTS = 0, 67 _DEFAULTS = 0,
68 _QWERTY = 0, 68 _QWERTY = 0,
69 _COLEMAK, 69 _COLEMAK,
70 _COLEMAKDH, 70 _COLEMAKDH,
71 _LOWER, 71 _LOWER,
72 _RAISE, 72 _RAISE,
73 _ADJUST, 73 _ADJUST,
@@ -104,15 +104,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 [_QWERTY] = LAYOUT( 104 [_QWERTY] = LAYOUT(
105 //,------------------------------------------------. ,---------------------------------------------------. 105 //,------------------------------------------------. ,---------------------------------------------------.
106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV, 106 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_GRV,
107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 107 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 108 LT(_NUMPAD,KC_TAB),KC_Q,KC_W,KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 109 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 110 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 111 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, 112 KC_LCTRL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 113 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT 114 KC_BSPC, KC_LGUI, KC_LOWER, KC_SPC, KC_ENT , KC_SPC, KC_ENT , KC_RAISE, KC_RCTRL, KC_RALT
115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 115 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
116), 116),
117 117
118/* 118/*
@@ -133,15 +133,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
133[_COLEMAK] = LAYOUT( 133[_COLEMAK] = LAYOUT(
134 //,------------------------------------------------. ,---------------------------------------------------. 134 //,------------------------------------------------. ,---------------------------------------------------.
135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 135 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 136 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 137 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 138 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 139 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 140 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 141 KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TRNS, KC_TRNS,KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 142 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 143 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 144 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
145), 145),
146 146
147/* 147/*
@@ -162,15 +162,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
162[_COLEMAKDH] = LAYOUT( 162[_COLEMAKDH] = LAYOUT(
163 //,------------------------------------------------. ,---------------------------------------------------. 163 //,------------------------------------------------. ,---------------------------------------------------.
164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS, 164 KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, LT(_SWITCH,KC_6), KC_7, KC_8, KC_9, KC_0, KC_TRNS,
165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 165 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, 166 KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS,
167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 167 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS, 168 KC_TRNS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_TRNS,
169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 169 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS, 170 KC_TRNS, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_TRNS, KC_TRNS,KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 171 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 172 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 173 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
174), 174),
175 175
176/* LOWER 176/* LOWER
@@ -190,15 +190,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
190[_LOWER] = LAYOUT( 190[_LOWER] = LAYOUT(
191 //,------------------------------------------------. ,---------------------------------------------------. 191 //,------------------------------------------------. ,---------------------------------------------------.
192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 192 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 193 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 194 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 195 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL, 196 _______, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_PGUP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_DEL,
197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 197 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 198 _______, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_PGDN,_______, _______,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______,
199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 199 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 200 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 201 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
202), 202),
203/* RAISE 203/* RAISE
204 * ,----------------------------------------. ,-----------------------------------------. 204 * ,----------------------------------------. ,-----------------------------------------.
@@ -217,17 +217,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
217[_RAISE] = LAYOUT( 217[_RAISE] = LAYOUT(
218 //,------------------------------------------------. ,---------------------------------------------------. 218 //,------------------------------------------------. ,---------------------------------------------------.
219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______, 219 _______, _______ , _______ , _______ , _______ , _______, _______, _______ , _______, _______ , _______ ,_______,
220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 220 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 221 _______, KC_INS, KC_PSCR, KC_APP, XXXXXXX, XXXXXXX, KC_CIRC, KC_AMPR,KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 222 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, 223 _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MINS, KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 224 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD, 225 _______,KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX,_______, _______,KC_UNDS, KC_PLUS,KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 226 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 227 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 228 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
229), 229),
230/* ADJUST 230/* ADJUST
231 * ,-----------------------------------------. ,-----------------------------------------. 231 * ,-----------------------------------------. ,-----------------------------------------.
232 * | | | | | | | | | | | | | | 232 * | | | | | | | | | | | | | |
233 * |------+------+------+------+------+------| |------+------+------+------+------+------| 233 * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -244,15 +244,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
244 [_ADJUST] = LAYOUT( 244 [_ADJUST] = LAYOUT(
245 //,------------------------------------------------. ,---------------------------------------------------. 245 //,------------------------------------------------. ,---------------------------------------------------.
246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 246 EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 247 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 248 RESET, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 249 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX, 250 RGB_TOG, RGB_HUI,RGB_SAI, RGB_VAI, KC_COLEMAKDH,KC_COLEMAK, C(G(KC_LEFT)),KC_NO,KC_NO,C(G(KC_RGHT)),XXXXXXX, XXXXXXX,
251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 251 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, 252 RGB_MOD, RGB_HUD,RGB_SAD, RGB_VAD, XXXXXXX,KC_QWERTY,XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,
253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 253 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 254 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 255 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
256), 256),
257/* NUMPAD 257/* NUMPAD
258 * ,-----------------------------------------. ,-----------------------------------------. 258 * ,-----------------------------------------. ,-----------------------------------------.
@@ -271,15 +271,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
271[_NUMPAD] = LAYOUT( 271[_NUMPAD] = LAYOUT(
272 //,------------------------------------------------. ,---------------------------------------------------. 272 //,------------------------------------------------. ,---------------------------------------------------.
273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 273 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 274 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______, 275 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_ASTR, _______,
276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 276 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE, 277 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_P4, KC_P5, KC_P6, KC_EQL, KC_PIPE,
278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 278 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, 279 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______,
280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 280 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ 281 _______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______
282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 282 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
283), 283),
284 284
285/* SWITCH 285/* SWITCH
@@ -296,51 +296,51 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
296 * | | | | |/ / \ \ | | | | | 296 * | | | | |/ / \ \ | | | | |
297 * `----------------------------------' '------''---------------------------' 297 * `----------------------------------' '------''---------------------------'
298 */ 298 */
299 // layer switcher 299 // layer switcher
300[_SWITCH] = LAYOUT( 300[_SWITCH] = LAYOUT(
301 //,------------------------------------------------. ,---------------------------------------------------. 301 //,------------------------------------------------. ,---------------------------------------------------.
302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, 302 _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,
303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 303 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET, 304 TO(0), TO(1), TO(2), TO(3), TO(4), TO(5), KC_NO, TO(7), KC_NO, KC_NO, KC_NO, RESET,
305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| 305 //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST, 306 KC_NO, KC_NO, KC_BRIU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EEP_RST,
307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 307 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 308 KC_SYSTEM_SLEEP,KC_NO,KC_BRID,KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| 309 //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 310 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ 311 // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
312 312
313 ), 313 ),
314}; 314};
315 315
316#ifdef RGBLIGHT_ENABLE 316#ifdef RGBLIGHT_ENABLE
317char layer_state_str[70]; 317char layer_state_str[70];
318// Now define the array of layers. Later layers take precedence 318// Now define the array of layers. Later layers take precedence
319 319
320// QWERTY, 320// QWERTY,
321// Light on inner column and underglow 321// Light on inner column and underglow
322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS( 322const rgblight_segment_t PROGMEM layer_qwerty_lights[] = RGBLIGHT_LAYER_SEGMENTS(
323 SET_LAYER_ID(HSV_RED) 323 SET_LAYER_ID(HSV_RED)
324 324
325); 325);
326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS( 326const rgblight_segment_t PROGMEM layer_colemakdh_lights[] = RGBLIGHT_LAYER_SEGMENTS(
327 SET_LAYER_ID(HSV_PINK) 327 SET_LAYER_ID(HSV_PINK)
328); 328);
329 329
330// _NUM, 330// _NUM,
331// Light on outer column and underglow 331// Light on outer column and underglow
332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS( 332const rgblight_segment_t PROGMEM layer_num_lights[] = RGBLIGHT_LAYER_SEGMENTS(
333 SET_LAYER_ID(HSV_TEAL) 333 SET_LAYER_ID(HSV_TEAL)
334 334
335); 335);
336// _SYMBOL, 336// _SYMBOL,
337// Light on inner column and underglow 337// Light on inner column and underglow
338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS( 338const rgblight_segment_t PROGMEM layer_symbol_lights[] = RGBLIGHT_LAYER_SEGMENTS(
339 SET_LAYER_ID(HSV_BLUE) 339 SET_LAYER_ID(HSV_BLUE)
340 340
341 ); 341 );
342// _COMMAND, 342// _COMMAND,
343// Light on inner column and underglow 343// Light on inner column and underglow
344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS( 344const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENTS(
345 SET_LAYER_ID(HSV_PURPLE) 345 SET_LAYER_ID(HSV_PURPLE)
346); 346);
@@ -356,18 +356,18 @@ const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS
356 {35+25, 2, HSV_ORANGE} 356 {35+25, 2, HSV_ORANGE}
357 ); 357 );
358// _SWITCHER // light up top row 358// _SWITCHER // light up top row
359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( 359const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(
360 SET_LAYER_ID(HSV_GREEN), 360 SET_LAYER_ID(HSV_GREEN),
361 SET_NUMROW(HSV_GREEN) 361 SET_NUMROW(HSV_GREEN)
362); 362);
363 363
364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 364const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
365 365
366 layer_qwerty_lights, 366 layer_qwerty_lights,
367 layer_num_lights,// overrides layer 1 367 layer_num_lights,// overrides layer 1
368 layer_symbol_lights, 368 layer_symbol_lights,
369 layer_command_lights, 369 layer_command_lights,
370 layer_numpad_lights, 370 layer_numpad_lights,
371 layer_switcher_lights, // Overrides other layers 371 layer_switcher_lights, // Overrides other layers
372 layer_colemakdh_lights 372 layer_colemakdh_lights
373); 373);
@@ -376,7 +376,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY)); 376 rgblight_set_layer_state(0, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_QWERTY));
377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH)); 377 rgblight_set_layer_state(7, layer_state_cmp(state, _DEFAULTS) && layer_state_cmp(default_layer_state,_COLEMAKDH));
378 378
379 379
380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER)); 380 rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE)); 381 rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST)); 382 rgblight_set_layer_state(3, layer_state_cmp(state, _ADJUST));
@@ -387,8 +387,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
387void keyboard_post_init_user(void) { 387void keyboard_post_init_user(void) {
388 // Enable the LED layers 388 // Enable the LED layers
389 rgblight_layers = my_rgb_layers; 389 rgblight_layers = my_rgb_layers;
390 390
391 rgblight_mode(10);// haven't found a way to set this in a more useful way 391 rgblight_mode(10);// haven't found a way to set this in a more useful way
392 392
393} 393}
394#endif 394#endif
@@ -411,9 +411,9 @@ static void print_status_narrow(void) {
411 oled_write_ln_P(PSTR("Dane\nEvans"), false); 411 oled_write_ln_P(PSTR("Dane\nEvans"), false);
412 412
413 oled_write_ln_P(PSTR(""), false); 413 oled_write_ln_P(PSTR(""), false);
414 414
415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state) 415 //snprintf(layer_state_str, sizeof(layer_state_str), "Layer: Undef-%ld", layer_state)
416 416
417 417
418 switch (get_highest_layer(default_layer_state)) { 418 switch (get_highest_layer(default_layer_state)) {
419 case _QWERTY: 419 case _QWERTY:
@@ -424,8 +424,8 @@ static void print_status_narrow(void) {
424 break; 424 break;
425 case _COLEMAKDH: 425 case _COLEMAKDH:
426 oled_write_ln_P(PSTR("CmkDH"), false); 426 oled_write_ln_P(PSTR("CmkDH"), false);
427 break; 427 break;
428 428
429 default: 429 default:
430 oled_write_ln_P(PSTR("Undef"), false); 430 oled_write_ln_P(PSTR("Undef"), false);
431 } 431 }
@@ -486,12 +486,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
486 if (record->event.pressed) { 486 if (record->event.pressed) {
487 set_single_persistent_default_layer(_COLEMAK); 487 set_single_persistent_default_layer(_COLEMAK);
488 } 488 }
489 return false; 489 return false;
490 case KC_COLEMAKDH: 490 case KC_COLEMAKDH:
491 if (record->event.pressed) { 491 if (record->event.pressed) {
492 set_single_persistent_default_layer(_COLEMAKDH); 492 set_single_persistent_default_layer(_COLEMAKDH);
493 } 493 }
494 return false; 494 return false;
495 case KC_LOWER: 495 case KC_LOWER:
496 if (record->event.pressed) { 496 if (record->event.pressed) {
497 layer_on(_LOWER); 497 layer_on(_LOWER);
@@ -531,7 +531,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
531 531
532#ifdef ENCODER_ENABLE 532#ifdef ENCODER_ENABLE
533 533
534void encoder_update_user(uint8_t index, bool clockwise) { 534bool encoder_update_user(uint8_t index, bool clockwise) {
535 if (index == 0) { 535 if (index == 0) {
536 if (clockwise) { 536 if (clockwise) {
537 tap_code(KC_VOLU); 537 tap_code(KC_VOLU);
@@ -566,6 +566,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
566 break; 566 break;
567 } 567 }
568 } 568 }
569 return true;
569} 570}
570 571
571#endif 572#endif
diff --git a/keyboards/sofle/keymaps/via/encoder.c b/keyboards/sofle/keymaps/via/encoder.c
index 8126d077a..f6e267e09 100644
--- a/keyboards/sofle/keymaps/via/encoder.c
+++ b/keyboards/sofle/keymaps/via/encoder.c
@@ -1,25 +1,25 @@
1 /* Copyright 2020 Josef Adamcik 1 /* Copyright 2020 Josef Adamcik
2 * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang 2 * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
3 * 3 *
4 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or 6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version. 7 * (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>. 15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18//Setting up what encoder rotation does. If your encoder can be pressed as a button, that function can be set in Via. 18//Setting up what encoder rotation does. If your encoder can be pressed as a button, that function can be set in Via.
19 19
20#ifdef ENCODER_ENABLE 20#ifdef ENCODER_ENABLE
21 21
22void encoder_update_user(uint8_t index, bool clockwise) { 22bool encoder_update_user(uint8_t index, bool clockwise) {
23 if (index == 0) { 23 if (index == 0) {
24 if (clockwise) { 24 if (clockwise) {
25 tap_code(KC_VOLU); 25 tap_code(KC_VOLU);
@@ -33,6 +33,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
33 tap_code(KC_PGUP); 33 tap_code(KC_PGUP);
34 } 34 }
35 } 35 }
36 return true;
36} 37}
37 38
38#endif \ No newline at end of file 39#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 13:41:47 +0000