From c53ccf385942bad944dfcc40dc190d126befcbd4 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 1 Apr 2024 22:40:56 -0500 Subject: [PATCH 01/12] Fixed typos in README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23440147..0d41959d 100644 --- a/README.md +++ b/README.md @@ -206,10 +206,13 @@ Notes: ## Target Keyboards +All boards use my keymaps unless noted + +- Ploopy Nano: `lkbm` keymap - Bastardkb Charybdis Nano 3x5 - Crkbd 3x6 - Planck Rev6 -- DZRGB60v2 (combing) +- DZRGB60v2 (coming) - Ferris Swoop (coming) - Geist KLOR (coming) @@ -217,4 +220,3 @@ Notes: - [qmk documentation](https://docs.qmk.fm/#/) - [qmk/awesome-userspaces Github](https://github.com/qmk/awesome-userspaces?tab=readme-ov-file). Links to fantastic userspaces to draw inspiration from, such as Drashna's - From fb08d4f393c8e44e27c2d0ce130bb69f0645ce27 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 2 Apr 2024 18:56:34 -0500 Subject: [PATCH 02/12] Making the swoop use RP2040 --- keyboards/bluebell/swoop/keymaps/t4corun/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk index 58ed4dbb..533bdc82 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk +++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk @@ -1,4 +1,5 @@ # override userspace defaults # override keyboard defaults -# qmk_firmware\keyboards\bluebell\swoop\rules.mk \ No newline at end of file +# qmk_firmware\keyboards\bluebell\swoop\rules.mk +BOOTLOADER = rp2040 \ No newline at end of file From 0e737700c7ddd7c6f90e9cb4cf464a3fbf921372 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 2 Apr 2024 19:10:57 -0500 Subject: [PATCH 03/12] trying info.json to convert to rp2040 --- keyboards/bluebell/swoop/keymaps/t4corun/info.json | 4 ++++ keyboards/bluebell/swoop/keymaps/t4corun/rules.mk | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 keyboards/bluebell/swoop/keymaps/t4corun/info.json diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/info.json b/keyboards/bluebell/swoop/keymaps/t4corun/info.json new file mode 100644 index 00000000..b86d9f8e --- /dev/null +++ b/keyboards/bluebell/swoop/keymaps/t4corun/info.json @@ -0,0 +1,4 @@ +{ + "processor": "RP2040", + "bootloader": "rp2040" +} \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk index 533bdc82..58ed4dbb 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk +++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk @@ -1,5 +1,4 @@ # override userspace defaults # override keyboard defaults -# qmk_firmware\keyboards\bluebell\swoop\rules.mk -BOOTLOADER = rp2040 \ No newline at end of file +# qmk_firmware\keyboards\bluebell\swoop\rules.mk \ No newline at end of file From 3bee254545bba3a36e4ee8d10b5368909270ad87 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 2 Apr 2024 19:15:25 -0500 Subject: [PATCH 04/12] Drasha said to add serial vendor --- keyboards/bluebell/swoop/keymaps/t4corun/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk index 58ed4dbb..f845feb2 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk +++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk @@ -1,4 +1,5 @@ # override userspace defaults # override keyboard defaults -# qmk_firmware\keyboards\bluebell\swoop\rules.mk \ No newline at end of file +# qmk_firmware\keyboards\bluebell\swoop\rules.mk +SERIAL_DRIVER = vendor From 2c0e2a49ba067cea59e03053635eab7051b990ad Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 2 Apr 2024 19:24:02 -0500 Subject: [PATCH 05/12] Trying the converter in rules.mk for RP2040 --- keyboards/bluebell/swoop/keymaps/t4corun/info.json | 4 ---- keyboards/bluebell/swoop/keymaps/t4corun/rules.mk | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 keyboards/bluebell/swoop/keymaps/t4corun/info.json diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/info.json b/keyboards/bluebell/swoop/keymaps/t4corun/info.json deleted file mode 100644 index b86d9f8e..00000000 --- a/keyboards/bluebell/swoop/keymaps/t4corun/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "RP2040", - "bootloader": "rp2040" -} \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk index f845feb2..a7d60f6d 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk +++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk @@ -2,4 +2,4 @@ # override keyboard defaults # qmk_firmware\keyboards\bluebell\swoop\rules.mk -SERIAL_DRIVER = vendor +CONVERT_TO=blok \ No newline at end of file From d997b1aa0b51788f2d49240f6d5b432bfafaf89a Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 20:06:26 -0500 Subject: [PATCH 06/12] - Enabled Encoder Mapping, added basic map - fixed oled orientation, maybe this time will work - added macro to toggle base layer to save keys on config layer --- .../bluebell/swoop/keymaps/t4corun/keymap.c | 14 +++++++------- .../bluebell/swoop/keymaps/t4corun/rules.mk | 3 ++- users/t4corun/features/encoder.c | 16 ++++++++++++++++ users/t4corun/features/encoder.h | 2 ++ users/t4corun/features/oled.c | 3 ++- users/t4corun/rules.mk | 4 ++++ users/t4corun/t4corun.c | 11 +++++++++++ users/t4corun/t4corun.h | 17 +++++++---------- 8 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 users/t4corun/features/encoder.c create mode 100644 users/t4corun/features/encoder.h diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 632ceb31..69c9e654 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -22,12 +22,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_DEFAULT_LAYER_1 ] = SWOOP(LAYER_QWERTY), [_DEFAULT_LAYER_2 ] = SWOOP(LAYER_COLEMAK_DH), [_DEFAULT_LAYER_3 ] = SWOOP(LAYER_GAME), - [_NAVIGATION] = SWOOP(LAYER_NAVIGATION), - [_NUMBER] = SWOOP(LAYER_NUMBER), - [_SYMBOL] = SWOOP(LAYER_SYMBOL), - [_FUNCTION] = SWOOP(LAYER_FUNCTION), - [_MOUSE] = SWOOP(LAYER_MOUSE), - [_GAME_NUM] = SWOOP(LAYER_GAME_NUM), - [_CONFIG] = SWOOP(LAYER_CONFIG) + [_NAVIGATION] = SWOOP(LAYER_NAVIGATION), + [_NUMBER] = SWOOP(LAYER_NUMBER), + [_SYMBOL] = SWOOP(LAYER_SYMBOL), + [_FUNCTION] = SWOOP(LAYER_FUNCTION), + [_MOUSE] = SWOOP(LAYER_MOUSE), + [_GAME_NUM] = SWOOP(LAYER_GAME_NUM), + [_CONFIG] = SWOOP(LAYER_CONFIG) }; \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk index a7d60f6d..1088abef 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk +++ b/keyboards/bluebell/swoop/keymaps/t4corun/rules.mk @@ -2,4 +2,5 @@ # override keyboard defaults # qmk_firmware\keyboards\bluebell\swoop\rules.mk -CONVERT_TO=blok \ No newline at end of file +ENCODER_MAP_ENABLE = yes +CONVERT_TO = blok \ No newline at end of file diff --git a/users/t4corun/features/encoder.c b/users/t4corun/features/encoder.c new file mode 100644 index 00000000..932a2ef1 --- /dev/null +++ b/users/t4corun/features/encoder.c @@ -0,0 +1,16 @@ +#include "encoder.h" + + +/* may have to swap the hands in this array since we do right side master*/ +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_DEFAULT_LAYER_1 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down + [_DEFAULT_LAYER_2 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down + [_DEFAULT_LAYER_3 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx + [_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx + [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right + [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx + [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down + [_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,?? + [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx + [_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality? +}; \ No newline at end of file diff --git a/users/t4corun/features/encoder.h b/users/t4corun/features/encoder.h new file mode 100644 index 00000000..2a576cc3 --- /dev/null +++ b/users/t4corun/features/encoder.h @@ -0,0 +1,2 @@ +#pragma once +#include "t4corun.h" \ No newline at end of file diff --git a/users/t4corun/features/oled.c b/users/t4corun/features/oled.c index 6c7ad583..c90dee5c 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -99,7 +99,8 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) { return OLED_ROTATION_270; } else { - return OLED_ROTATION_270; + return OLED_ROTATION_90; } } +a \ No newline at end of file diff --git a/users/t4corun/rules.mk b/users/t4corun/rules.mk index 2a2c0487..de74299a 100644 --- a/users/t4corun/rules.mk +++ b/users/t4corun/rules.mk @@ -22,6 +22,7 @@ RGB_MATRIX_ENABLE ?= no RGBLIGHT_ENABLE ?= no POINTING_DEVICE_ENABLE ?= no OLED_ENABLE ?= no +ENCODER_MAP_ENABLE ?= no # qmk features we will force AUDIO_ENABLE = no @@ -59,6 +60,9 @@ ifeq ($(strip $(OLED_ENABLE)), yes) SRC += features/oled.c endif +ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes) + SRC += features/encoders.c +endif ifeq ($(strip $(COMBO_ENABLE)), yes) INTROSPECTION_KEYMAP_C += features/combo.c diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index 81542922..ab3d0106 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -1,5 +1,7 @@ #include "t4corun.h" +static uint8_t current_base_layer = _DEFAULT_LAYER_1; + layer_state_t layer_state_set_user(layer_state_t state) { state = update_tri_layer_state(state, _NAVIGATION, _NUMBER, _SYMBOL); @@ -10,7 +12,15 @@ layer_state_t layer_state_set_user(layer_state_t state) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { + + case BASELYR: + if (record->event.pressed) { + current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; + set_single_persistent_default_layer(current_base_layer); + } + return false + /* case QWERTY: if (record->event.pressed) { set_single_persistent_default_layer(_QWERTY); } //default_layer_set(1UL<<_QWERTY); } return false; @@ -22,6 +32,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case GAME: if (record->event.pressed) { set_single_persistent_default_layer(_GAME); } //default_layer_set(1UL<<_COLEMAK_DH); } return false; + */ case PN_DRGS: if (record->event.pressed) { diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index 984f99b7..b9e1b7b9 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -39,7 +39,9 @@ enum keycodes { TH_QUOT, PN_DRGS, - PN_PDPI + PN_PDPI, + + BASELYR }; #define ___x___ KC_NO @@ -186,15 +188,10 @@ enum keycodes { - - - - - - #define _DEFAULT_LAYER_1 FIRST_DEFAULT_LAYER #define _DEFAULT_LAYER_2 (FIRST_DEFAULT_LAYER + 1) #define _DEFAULT_LAYER_3 (FIRST_DEFAULT_LAYER + 2) +#define NUM_BASE_LAYER 3 #define _NONE_3__________________ ___x___, ___x___, ___x___ #define _NONE_5____________________________________ ___x___, ___x___, ___x___, ___x___, ___x___ @@ -283,6 +280,6 @@ enum keycodes { #define LAYER_CONFIG \ ___x___, ___x___, ___x___, ___x___, ___x___, EE_CLR, QK_RBT, QK_BOOT, ___x___, _______, \ - TR_RTOG, TR_RMOD, ___x___, ___x___, ___x___, ___x___, _SCAG_MODS________________________, \ - TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, GAME, _NONE_5____________________________________, \ - CLMAKDH, QWERTY, _LAYER_TRANS_R__ + TR_RTOG, TR_RMOD, ___x___, ___x___, ___x___, BASELYR, _SCAG_MODS________________________, \ + TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, _NONE_5____________________________________, \ + ___x___, ___x___, _LAYER_TRANS_R__ From 8e29b0b71a53f890bff41946ae5c7801b64a8a79 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 20:11:36 -0500 Subject: [PATCH 07/12] Forgot a semicolon!!! --- users/t4corun/t4corun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index ab3d0106..c6f5509b 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -18,7 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; set_single_persistent_default_layer(current_base_layer); } - return false + return false; /* case QWERTY: From 02381c18aa373b85d32137f6d35060c8b4639318 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 20:15:15 -0500 Subject: [PATCH 08/12] fixing more typos - rules.mk named the encoder file wrong - extra characters in oled.c --- users/t4corun/features/oled.c | 4 +--- users/t4corun/rules.mk | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/users/t4corun/features/oled.c b/users/t4corun/features/oled.c index c90dee5c..1d00fea0 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -101,6 +101,4 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { } else { return OLED_ROTATION_90; } -} - -a \ No newline at end of file +} \ No newline at end of file diff --git a/users/t4corun/rules.mk b/users/t4corun/rules.mk index de74299a..9891d399 100644 --- a/users/t4corun/rules.mk +++ b/users/t4corun/rules.mk @@ -61,7 +61,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes) endif ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes) - SRC += features/encoders.c + SRC += features/encoder.c endif ifeq ($(strip $(COMBO_ENABLE)), yes) From 75c58a22eb597d257025ddae4c5c2585275afde9 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 20:42:32 -0500 Subject: [PATCH 09/12] had to move all my encoder mappings to the specific keyboard - documentation was right that it had to be in the keymap --- .../bluebell/swoop/keymaps/t4corun/keymap.c | 20 ++++++++++++++++++- users/t4corun/features/encoder.c | 14 +------------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 69c9e654..f2fd9848 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -30,4 +30,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_GAME_NUM] = SWOOP(LAYER_GAME_NUM), [_CONFIG] = SWOOP(LAYER_CONFIG) -}; \ No newline at end of file +}; + + +#if defined(ENCODER_MAP_ENABLE) + +/* may have to swap the hands in this array since we do right side master*/ +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_DEFAULT_LAYER_1 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down + [_DEFAULT_LAYER_2 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down + [_DEFAULT_LAYER_3 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx + [_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx + [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right + [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx + [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down + [_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,?? + [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx + [_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality? +}; +#endif \ No newline at end of file diff --git a/users/t4corun/features/encoder.c b/users/t4corun/features/encoder.c index 932a2ef1..d095058d 100644 --- a/users/t4corun/features/encoder.c +++ b/users/t4corun/features/encoder.c @@ -1,16 +1,4 @@ #include "encoder.h" -/* may have to swap the hands in this array since we do right side master*/ -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_DEFAULT_LAYER_1 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_2 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, vol up and down - [_DEFAULT_LAYER_3 ] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx - [_NAVIGATION] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, xx,xx - [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, //xx,xx left and right - [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, //xx,xx xx,xx - [_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, //xx,xx up and down - [_MOUSE] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //wheel up, wheel down, ??,?? - [_GAME_NUM] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, //wheel up, wheel down, xx,xx - [_CONFIG] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(___x___, ___x___) }, //maybe rgb functionality? -}; \ No newline at end of file + From dff092e0a5ae60ca6e6ed8cb80e2f2b626d59f3e Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 21:03:43 -0500 Subject: [PATCH 10/12] - removed all old base layer change code - trying 0 degrees on oled --- users/t4corun/features/oled.c | 2 +- users/t4corun/t4corun.c | 16 +--------------- users/t4corun/t4corun.h | 6 +----- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/users/t4corun/features/oled.c b/users/t4corun/features/oled.c index 1d00fea0..8a56638d 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -99,6 +99,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) { return OLED_ROTATION_270; } else { - return OLED_ROTATION_90; + return OLED_ROTATION; } } \ No newline at end of file diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index c6f5509b..defa790b 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -18,21 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; set_single_persistent_default_layer(current_base_layer); } - return false; - - /* - case QWERTY: - if (record->event.pressed) { set_single_persistent_default_layer(_QWERTY); } //default_layer_set(1UL<<_QWERTY); } - return false; - - case CLMAKDH: - if (record->event.pressed) { set_single_persistent_default_layer(_COLEMAK_DH); } //default_layer_set(1UL<<_COLEMAK_DH); } - return false; - - case GAME: - if (record->event.pressed) { set_single_persistent_default_layer(_GAME); } //default_layer_set(1UL<<_COLEMAK_DH); } - return false; - */ + return false case PN_DRGS: if (record->event.pressed) { diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index b9e1b7b9..fd6a9653 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -18,12 +18,8 @@ enum layers { }; enum keycodes { - QWERTY = QK_USER, - CLMAKDH, - GAME, - //These are only here to make the case statements unique in taphold.c - TH_LCBR, + TH_LCBR = QK_USER, TH_LABK, TH_LBRC, TH_SQUO, From 39b1461def7d8a60fec9fdf827706d2bb66ef3d6 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 21:08:02 -0500 Subject: [PATCH 11/12] missing a semicolon again --- users/t4corun/t4corun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index defa790b..f3c98efb 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -18,7 +18,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; set_single_persistent_default_layer(current_base_layer); } - return false + return false; case PN_DRGS: if (record->event.pressed) { From f62cfc7fa350e0685605209d43c163e78f91df27 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 5 Apr 2024 21:14:54 -0500 Subject: [PATCH 12/12] trying oled rotation 0 --- users/t4corun/features/oled.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/t4corun/features/oled.c b/users/t4corun/features/oled.c index 8a56638d..800ade05 100644 --- a/users/t4corun/features/oled.c +++ b/users/t4corun/features/oled.c @@ -99,6 +99,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) { if (is_keyboard_master()) { return OLED_ROTATION_270; } else { - return OLED_ROTATION; + return OLED_ROTATION_0; } } \ No newline at end of file