From 3749d07bd39efd7fce64906a0a93e9718ffb30c6 Mon Sep 17 00:00:00 2001 From: Ryan Neff Date: Tue, 28 Nov 2023 15:44:07 -0800 Subject: [PATCH] Removed rev1 folder and duplicate rules --- .../sofle_pico/{keymaps/default => }/config.h | 28 ++- keyboards/sofle_pico/{rev1 => }/halconf.h | 0 keyboards/sofle_pico/info.json | 8 + keyboards/sofle_pico/keymaps/default/rules.mk | 24 --- .../sofle_pico/keymaps/jellytitan/config.h | 54 ------ .../sofle_pico/keymaps/jellytitan/rules.mk | 24 +-- keyboards/sofle_pico/keymaps/via/config.h | 87 ---------- keyboards/sofle_pico/keymaps/via/keymap.c | 161 ------------------ keyboards/sofle_pico/keymaps/via/rules.mk | 19 --- keyboards/sofle_pico/{rev1 => }/post_config.h | 0 keyboards/sofle_pico/rev1/config.h | 30 ---- keyboards/sofle_pico/rev1/rev1.c | 63 ------- keyboards/sofle_pico/rev1/rules.mk | 0 keyboards/sofle_pico/rules.mk | 23 +-- 14 files changed, 48 insertions(+), 473 deletions(-) rename keyboards/sofle_pico/{keymaps/default => }/config.h (69%) rename keyboards/sofle_pico/{rev1 => }/halconf.h (100%) delete mode 100644 keyboards/sofle_pico/keymaps/default/rules.mk delete mode 100644 keyboards/sofle_pico/keymaps/via/config.h delete mode 100644 keyboards/sofle_pico/keymaps/via/keymap.c delete mode 100644 keyboards/sofle_pico/keymaps/via/rules.mk rename keyboards/sofle_pico/{rev1 => }/post_config.h (100%) delete mode 100644 keyboards/sofle_pico/rev1/config.h delete mode 100644 keyboards/sofle_pico/rev1/rev1.c delete mode 100644 keyboards/sofle_pico/rev1/rules.mk diff --git a/keyboards/sofle_pico/keymaps/default/config.h b/keyboards/sofle_pico/config.h similarity index 69% rename from keyboards/sofle_pico/keymaps/default/config.h rename to keyboards/sofle_pico/config.h index 35595a3b767..09f9cacb85b 100644 --- a/keyboards/sofle_pico/keymaps/default/config.h +++ b/keyboards/sofle_pico/config.h @@ -1,8 +1,32 @@ -// Copyright 2023 Ryan Neff (@JellyTitan) +// Copyright 2022 Dane Skalski (@Daneski13) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once +// Split Keyboard Stuff +#define EE_HANDS // Sets the keyboard’s handedness using EEPROM +#define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS) +#define SERIAL_USART_TX_PIN GP16 // USART TX pin +#define SERIAL_USART_RX_PIN GP17 // USART RX pin +#define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. (Only available on some MCUs) + +/* RGB Stuff */ +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_LED_COUNT 58 +# define RGB_MATRIX_SPLIT \ + { 29, 29 } // 29 LEDs on each side +#endif + +// I2C for OLEDs +#define I2C_DRIVER I2CD1 +#define I2C1_SDA_PIN GP6 +#define I2C1_SCL_PIN GP7 + +#ifdef OLED_ENABLE + #define OLED_DISPLAY_128X64 + #define OLED_TIMEOUT 30000 +#endif + /* - Encoder settings - */ #ifdef ENCODER_MAP_ENABLE // Key delay for encoders (necessary for some keycodes) @@ -51,4 +75,4 @@ # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON # define ENABLE_RGB_MATRIX_PIXEL_RAIN -#endif +#endif \ No newline at end of file diff --git a/keyboards/sofle_pico/rev1/halconf.h b/keyboards/sofle_pico/halconf.h similarity index 100% rename from keyboards/sofle_pico/rev1/halconf.h rename to keyboards/sofle_pico/halconf.h diff --git a/keyboards/sofle_pico/info.json b/keyboards/sofle_pico/info.json index 7be75855652..5bd06551ce2 100644 --- a/keyboards/sofle_pico/info.json +++ b/keyboards/sofle_pico/info.json @@ -9,6 +9,14 @@ "pid": "0x5350", "device_version": "3.5.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "ws2812": { "pin": "GP0", "driver": "vendor" diff --git a/keyboards/sofle_pico/keymaps/default/rules.mk b/keyboards/sofle_pico/keymaps/default/rules.mk deleted file mode 100644 index 0b1e74fbb57..00000000000 --- a/keyboards/sofle_pico/keymaps/default/rules.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Enables Audio control and System control Keycodes -EXTRAKEY_ENABLE = yes -# Enables Mousekeys -MOUSEKEY_ENABLE = yes -# Encoder Support -ENCODER_ENABLE = yes -# Use Enocoder Mapping -ENCODER_MAP_ENABLE = yes -# Turn on tap dance: -TAP_DANCE_ENABLE = no -# Enables RGB Lighting Effects -RGB_MATRIX_ENABLE = yes -# Dynamic Tapping Term: -DYNAMIC_TAPPING_TERM_ENABLE = yes - - -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes -# OLED_DRIVER = SSD1306 -WPM_ENABLE = yes \ No newline at end of file diff --git a/keyboards/sofle_pico/keymaps/jellytitan/config.h b/keyboards/sofle_pico/keymaps/jellytitan/config.h index 9ddd99b081b..89cda6449de 100644 --- a/keyboards/sofle_pico/keymaps/jellytitan/config.h +++ b/keyboards/sofle_pico/keymaps/jellytitan/config.h @@ -3,61 +3,7 @@ #pragma once -/* - Encoder settings - */ -#ifdef ENCODER_MAP_ENABLE -// Key delay for encoders (necessary for some keycodes) -# define ENCODER_MAP_KEY_DELAY 10 -#endif - -#define SPLIT_HAPTIC_ENABLE -#define SOLENOID_DEFAULT_DWELL 25 -#define SOLENOID_MAX_DWELL 100 -#define SOLENOID_MIN_DWELL 4 -#define HAPTIC_OFF_IN_LOW_POWER 1 -// Prevents thumper on mods like shift/Ctrl/Alt -#define NO_HAPTIC_MOD -#define SOLENOID_PIN GP21 - -/* Allows for the setting of constant mouse speed levels. */ -/* Not all mouse wheel config settings are currently supported in .json config.*/ -/* https://github.com/qmk/qmk_firmware/blob/master/docs/reference_info_json.md */ -/* Step size */ -#define MOUSEKEY_MOVE_DELTA 8 -/* Maximum number of scroll steps per scroll action */ -#define MOUSEKEY_WHEEL_MAX_SPEED 42 -/* Time until maximum scroll speed is reached */ -#define MOUSEKEY_WHEEL_TIME_TO_MAX 15 - #define POINTING_DEVICE_ROTATION_90 #define SPLIT_POINTING_ENABLE #define POINTING_DEVICE_RIGHT #define POINTING_DEVICE_TASK_THROTTLE_MS 8 -/* - - RGB Stuff - - All effects can be found in the QMK docs: - https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -*/ -#ifdef RGB_MATRIX_ENABLE - -# define RGB_DISABLE_WHEN_USB_SUSPENDED -// Decrease decay of heatmap rgb effect -# define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50 -// If you're setting colors per key, this is required. -# define SPLIT_LAYER_STATE_ENABLE - -// Default effect when EEPROM cleared -# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON - -// Turns off RGB effects when there is no longer a USB connection -# define RGB_DISABLE_WHEN_USB_SUSPENDED - -// Key press reactive animations -# define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations -# define RGB_MATRIX_KEYPRESSES // Enables key press effects -# define ENABLE_RGB_MATRIX_MULTISPLASH - -// Normal effects -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -#endif diff --git a/keyboards/sofle_pico/keymaps/jellytitan/rules.mk b/keyboards/sofle_pico/keymaps/jellytitan/rules.mk index b6489e4076d..0debd8cc5e2 100644 --- a/keyboards/sofle_pico/keymaps/jellytitan/rules.mk +++ b/keyboards/sofle_pico/keymaps/jellytitan/rules.mk @@ -1,25 +1,3 @@ -# Enables Audio control and System control Keycodes -EXTRAKEY_ENABLE = yes -# Encoder Support -ENCODER_ENABLE = yes -# Use Enocoder Mapping -ENCODER_MAP_ENABLE = yes -# Turn on tap dance: -TAP_DANCE_ENABLE = yes -# Enables RGB Lighting Effects -RGB_MATRIX_ENABLE = yes -# Dynamic Tapping Term: -DYNAMIC_TAPPING_TERM_ENABLE = yes - - -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes -# OLED_DRIVER = SSD1306 -WPM_ENABLE = yes - +# POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pimoroni_trackball diff --git a/keyboards/sofle_pico/keymaps/via/config.h b/keyboards/sofle_pico/keymaps/via/config.h deleted file mode 100644 index c4ce821594d..00000000000 --- a/keyboards/sofle_pico/keymaps/via/config.h +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2022 Dane Skalski (@Daneski13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Number of Layers that can be used by VIA. -// Change this if you want more layers -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - -/* - Encoder settings - */ -#ifdef ENCODER_ENABLE -# define ENCODER_RESOLUTION 4 -#endif -#ifdef ENCODER_MAP_ENABLE -// Key delay for encoders (necessary for some keycodes) -# define ENCODER_MAP_KEY_DELAY 10 -#endif - -/* - - RGB - - Defines all effects so VIA can properly select them via index -*/ -#ifdef RGB_MATRIX_ENABLE - -// Default effect when EEPROM cleared -# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON - -// Turns off RGB effects when there is no longer a USB connection -# define RGB_DISABLE_WHEN_USB_SUSPENDED - -// Allow keypress reactive animations -# define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations on a split -# define RGB_MATRIX_KEYPRESSES // Enables key press effects - -// Allow frame buffer effects -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Enables frame buffer effects - -// All effect definitions -# define ENABLE_RGB_MATRIX_ALPHAS_MODS // Enables RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Enables RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Enables RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING // Enables RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT // Enables RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL // Enables RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Enables RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Enables RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Enables RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Enables RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL // Enables RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Enables RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Enables RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Enables RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Enables RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Enables RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Enables RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Enables RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON // Enables RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Enables RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Enables RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS // Enables RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Enables RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING // Enables RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM // Enables RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE // Enables RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Enables RGB_MATRIX_PIXEL_FRACTAL -# define ENABLE_RGB_MATRIX_PIXEL_FLOW // Enables RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_RAIN // Enables RGB_MATRIX_PIXEL_RAIN - -// Following need RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP // Enables RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN // Enables RGB_MATRIX_DIGITAL_RAIN - -// Following need RGB_MATRIX_KEYPRESSES -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Enables RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Enables RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Enables RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Enables RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Enables RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Enables RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Enables RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Enables RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH // Enables RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH // Enables RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH // Enables RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Enables RGB_MATRIX_SOLID_MULTISPLASH - -#endif diff --git a/keyboards/sofle_pico/keymaps/via/keymap.c b/keyboards/sofle_pico/keymaps/via/keymap.c deleted file mode 100644 index 2f0ab2e9f90..00000000000 --- a/keyboards/sofle_pico/keymaps/via/keymap.c +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2022 Dane Skalski (@Daneski13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -// Layers enum -enum sofle_pico_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST }; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - // clang-format off - /* - Traditional QWERTY - ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │Tab│ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │Ent│ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │Esc│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ - ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤ - │Sft│ Z │ X │ C │ V │ B │Mut│ │XXX│ N │ M │ , │ . │ / │Sft│ - └───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┴───┘ - ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - │Ctr│Win│Alt│Del│Spc│ │Sft│Bsp│Alt│Win│Ctr│ - └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - For macOS - GUI (cmd) and Alt (opt) swapped - */ - [_QWERTY] = LAYOUT( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENTER, - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC, KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL - ), - - /* - Colemak-DH - ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │Tab│ Q │ W │ F │ P │ B │ │ J │ L │ U │ Y │ ; │Ent│ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │Esc│ A │ R │ S │ T │ G │ │ M │ N │ E │ I │ O │ ' │ - ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤ - │Sft│ Z │ X │ C │ D │ V │Mut│ │XXX│ K │ H │ , │ . │ / │Sft│ - └───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┴───┘ - ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - │Ctr│Win│Alt│Del│Spc│ │Sft│Bsp│Alt│Win│Ctr│ - └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - For macOS - GUI (cmd) and Alt (opt) swapped - */ - [_COLEMAK_DH] = LAYOUT( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, - KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SEMICOLON, KC_ENTER, - KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOTE, - KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_MUTE, KC_NO, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC, KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL - ), - - /* - Symbols/Numpad Layer - ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - │F1 │F2 │F3 │F4 │F5 │F6 │ │F7 │F8 │F9 │F10│F11│F12│ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │Tab│ ! │ @ │ # │ $ │ % │ │ * │ 7 │ 8 │ 9 │ + │Ent│ - ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - │ \ │ _ │ [ │ { │ ( │ ^ │ │ = │ 4 │ 5 │ 6 │ 0 │NUM│ - ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤ - │___│ | │ ] │ } │ ) │ & │___│ │___│ / │ 1 │ 2 │ 3 │ - │___│ - └───┴───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┴───┘ - ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - │___│___│___│___│___│ │___│___│___│___│___│ - └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - */ - [_SYMB] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_PAST, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_ENTER, - KC_BSLS, KC_UNDS, KC_LBRC, KC_LCBR, KC_LPRN, KC_CIRC, KC_PEQL, KC_P4, KC_P5, KC_P6, KC_P0, KC_NUM, - _______, KC_PIPE, KC_RBRC, KC_RCBR, KC_RPRN, KC_AMPR, _______, _______, KC_PSLS, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, - _______, _______, _______, MO(_ADJUST), _______, _______, _______, _______, _______, _______ - ), - - /* - Extension/Function Layer - ┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐ - │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ │ F7 │ F8 │ F9 │ F10│ F11│ F12│ - ├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤ - │ ⇤ │PGUP│End │ ↑ │Home│ │ │BRIU│ F7 │ F8 │ F9 │ F10│____│ - ├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤ - │Cps │PGDN│ ← │ ↓ │ → │ │ │BRID│ F4 │ F5 │ F6 │ F11│____│ - ├────┼────┼────┼────┼────┼────┼────┐ ┌────┼────┼────┼────┼────┼────┼────┤ - │____│ │ │ │ │ │____│ │ ▶⏸ │ │ F1 │ F2 │ F3 │ F12│____│ - └────┴────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┴────┘ - ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - │___│___│___│___│___│ │___│___│___│___│___│ - └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - */ - [_EXT] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - S(KC_TAB), KC_PGUP, KC_END, KC_UP, KC_HOME, _______, KC_BRIU, KC_F7, KC_F8, KC_F9, KC_F10, _______, - KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, _______, KC_BRID, KC_F4, KC_F5, KC_F6, KC_F11, _______, - _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, KC_F1, KC_F2, KC_F3, KC_F12, _______, - _______, _______, _______, _______, _______, _______, MO(_ADJUST), _______, _______, _______ - ), - - /* - Adjust Layer, Keyboard Settings - ┌────┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬────┬────┐ - │ │ │ │ │ │ │ │ │ │ │ │ │ │ - ├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤ - │SpdU│HueU│SatU│ValU│Rnxt│ │ │ │EClr│Rbt │DBUG│BOOT│ │ - ├────┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼────┼────┤ - │SpdD│HueD│SatD│ValD│Rprv│RTgl│ │ │QWRT│COLE│ │ │ │ - ├────┼────┼────┼────┼────┼────┼────┐ ┌────┼────┼────┼────┼────┼────┼────┤ - │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - └────┴────┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴────┴────┴────┘ - ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐ - │___│___│___│___│___│ │___│___│___│___│___│ - └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘ - */ - [_ADJUST] = LAYOUT( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, KC_NO, KC_NO, EE_CLR, QK_RBT, DB_TOGG, QK_BOOT, KC_NO, - RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, RGB_TOG, KC_NO, DF(_QWERTY), DF(_COLEMAK_DH), KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - // clang-format on -}; - -/* - --- Rotary Encoder Mappings --- - - Encoder mappings go from leftmost encoder to rightmost encoder on the physical board. - index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder - on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the - thumb keys), and index 3 is the optional rightmost encoder on the right half. - - If you are only using the 2 required encoders by the thumb keys, you only need to worry about - index 1 and index 2. - - Note that the key to be sent for counter-clockwise rotation (CCW) goes first and then the key for - clockwise (CW) within ENCODER_CCW_CW. -*/ -#ifdef ENCODER_MAP_ENABLE -// clang-format off - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - // Base layer encoder mappings: - // index 0: mouse wheel up (CCW)/down (CW) index 1: volume down/up index 2: mouse wheel up/down index 3: mouse wheel left/right - [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }, - [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - - // Passes through to base layers - [_SYMB] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - // On the extension layer, the right side's left encoder by the thumb keys (mouse wheel up/down) is traded for media previous/next - [_EXT] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - // Passes through - [_ADJUST] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - // clang-format on -}; - -#endif diff --git a/keyboards/sofle_pico/keymaps/via/rules.mk b/keyboards/sofle_pico/keymaps/via/rules.mk deleted file mode 100644 index fd9cd98bcb4..00000000000 --- a/keyboards/sofle_pico/keymaps/via/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Change from yes to no to disable features - -# Enables Audio control and System control Keycodes -EXTRAKEY_ENABLE = yes -# Enables Mousekeys -MOUSEKEY_ENABLE = yes -# Encoder Support -ENCODER_ENABLE = yes -# Use Enocoder Mapping -ENCODER_MAP_ENABLE = yes - -# Enables RGB Matrix -RGB_MATRIX_ENABLE = yes - -# Allows use of `qmk console` for debugging -# CONSOLE_ENABLE = yes - -# Enables VIA -VIA_ENABLE = yes diff --git a/keyboards/sofle_pico/rev1/post_config.h b/keyboards/sofle_pico/post_config.h similarity index 100% rename from keyboards/sofle_pico/rev1/post_config.h rename to keyboards/sofle_pico/post_config.h diff --git a/keyboards/sofle_pico/rev1/config.h b/keyboards/sofle_pico/rev1/config.h deleted file mode 100644 index b2604818294..00000000000 --- a/keyboards/sofle_pico/rev1/config.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 Dane Skalski (@Daneski13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Split Keyboard Stuff -#define EE_HANDS // Sets the keyboard’s handedness using EEPROM -#define SERIAL_USART_FULL_DUPLEX // Use full duplex communication (TRRS) -#define SERIAL_USART_TX_PIN GP16 // USART TX pin -#define SERIAL_USART_RX_PIN GP17 // USART RX pin -#define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. (Only available on some MCUs) - -/* RGB Stuff */ -#ifdef RGB_MATRIX_ENABLE - -# define RGB_MATRIX_LED_COUNT 58 -# define RGB_MATRIX_SPLIT \ - { 29, 29 } // 29 LEDs on each side - -#endif - -// I2C for OLEDs -#define I2C_DRIVER I2CD1 -#define I2C1_SDA_PIN GP6 -#define I2C1_SCL_PIN GP7 - -#ifdef OLED_ENABLE - #define OLED_DISPLAY_128X64 - #define OLED_TIMEOUT 30000 -#endif \ No newline at end of file diff --git a/keyboards/sofle_pico/rev1/rev1.c b/keyboards/sofle_pico/rev1/rev1.c deleted file mode 100644 index 2be1f8a530c..00000000000 --- a/keyboards/sofle_pico/rev1/rev1.c +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2022 Dane Skalski (@Daneski13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "quantum.h" - -/* RGB LED matrix */ -#ifdef RGB_MATRIX_ENABLE - -// clang-format off -led_config_t g_led_config = { - { - // Key Matrix to LED Index - // Left - { 28, 21, 20, 11, 10, 0 }, - { 27, 22, 19, 12, 9, 1 }, - { 26, 23, 18, 13, 8, 2 }, - { 25, 24, 17, 14, 7, 3 }, - { 16, 15, 6, 5, 4, NO_LED }, - - // Right - { 57, 50, 49, 40, 39, 29 }, - { 56, 51, 48, 41, 38, 30 }, - { 55, 52, 47, 42, 37, 31 }, - { 54, 53, 46, 43, 36, 32 }, - { 45, 44, 35, 34, 33, NO_LED } - }, { - // LED Index to Physical Position - // Left - { 95, 7 }, { 95, 21 }, { 95, 36 }, { 95, 50 }, { 115, 64 }, - { 95, 64 }, { 76, 62 }, { 76, 48 }, { 76, 33 }, { 76, 19 }, - { 76, 5 }, { 57, 3 }, { 57, 17 }, { 57, 31 }, { 57, 46 }, - { 57, 62 }, { 38, 64 }, { 38, 48 }, { 38, 33 }, { 38, 19 }, - { 38, 5 }, { 19, 7 }, { 19, 21 }, { 19, 36 }, { 19, 50 }, - { 0, 50 }, { 0, 36 }, { 0, 21 }, { 0, 7 }, - - // Right - { 129, 7 }, { 129, 21 }, { 129, 36 }, { 129, 50 }, { 119, 64 }, - { 129, 64 }, { 148, 62 }, { 148, 48 }, { 148, 33 }, { 148, 19 }, - { 148, 5 }, { 167, 3 }, { 167, 17 }, { 167, 31 }, { 167, 46 }, - { 167, 62 }, { 186, 64 }, { 186, 48 }, { 186, 33 }, { 186, 19 }, - { 186, 5 }, { 209, 7 }, { 209, 21 }, { 209, 36 }, { 209, 50 }, - { 224, 50 }, { 224, 36 }, { 224, 21 }, { 224, 7 } - }, { - // LED Index to Flag - // Left - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, - - // Right - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 1, 1 - } -}; - -#endif diff --git a/keyboards/sofle_pico/rev1/rules.mk b/keyboards/sofle_pico/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/sofle_pico/rules.mk b/keyboards/sofle_pico/rules.mk index af65d89c739..e310b3bbdda 100644 --- a/keyboards/sofle_pico/rules.mk +++ b/keyboards/sofle_pico/rules.mk @@ -1,17 +1,20 @@ # Split Keyboard Stuff SPLIT_KEYBOARD = yes SERIAL_DRIVER = vendor - -# Enable Bootmagic Lite -BOOTMAGIC_ENABLE = yes - -# Default Folder -DEFAULT_FOLDER = sofle_pico/rev1 - # @todo: Move to json # OLED_DRIVER = SSD1306 OLED_TRANSPORT = i2c +# Encoder Support +ENCODER_ENABLE = yes +# Use Enocoder Mapping +ENCODER_MAP_ENABLE = yes +# Turn on tap dance: +TAP_DANCE_ENABLE = no +# Enables RGB Lighting Effects +RGB_MATRIX_ENABLE = yes +# Dynamic Tapping Term: +DYNAMIC_TAPPING_TERM_ENABLE = yes -# Solenoid -# HAPTIC_ENABLE = yes -# HAPTIC_DRIVER += SOLENOID +OLED_ENABLE = yes +# OLED_DRIVER = SSD1306 +WPM_ENABLE = yes \ No newline at end of file