Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keymap] Update to Drashna keymap and user code (based on develop) #12936

Merged
merged 42 commits into from
May 25, 2021
Merged

[Keymap] Update to Drashna keymap and user code (based on develop) #12936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4f08594
[CHANGE] Add mouse buttons 6-8 to keymap
drashna Jan 27, 2021
7cf7ce9
[CHANGE] Process on both halves of core
drashna Feb 1, 2021
ae7ad04
[CHANGE] Force enable split transport mirror
drashna Feb 13, 2021
87204c6
[CHANGE] Update config for kyria
drashna Feb 24, 2021
618bef5
Fix Twinkle animation parameters
drashna Feb 25, 2021
7f357ca
Fix issues with split transport
drashna Feb 26, 2021
2083111
[CHANGE] Minor tweaks to dm keymap
drashna Feb 26, 2021
ee31da3
[CHANGE] Add debug scan rate to OLEDs
drashna Feb 27, 2021
213ffde
[CHANGE] Add swap hands info to oled
drashna Mar 1, 2021
2a9eced
[Keyboard] Tweak settings for DM
drashna Mar 1, 2021
3864dac
Call user eeconfig for kb function
drashna Mar 1, 2021
833a5ff
[CHANGE] Remove _MODS layer in favor of OSM_TOG
drashna Nov 16, 2019
bd1ad56
[CHANGE] Show OneShot status on OLED display
drashna Feb 28, 2021
479fe55
Disable Haptic Feedback on corne
drashna Mar 3, 2021
212c19b
[CHANGE] Tweak oleds for compatibility
drashna Mar 3, 2021
3f8d4fd
Change RGB Light settings
drashna Mar 4, 2021
a547cb0
Change mouse layer mode to be less resource intensive
drashna Mar 4, 2021
8f872aa
[CHANGE] RGB modes for layers due to performance issues
drashna Mar 5, 2021
597323b
[CHANGE] Remove multiplier for pointing device dpi sync
drashna Mar 5, 2021
249fc1a
Use sync timer when approriate
drashna Mar 7, 2021
1d4f7d1
More RGBs for DM and tweaks for
drashna Mar 8, 2021
46699ef
[CHANGE] Reduce brightness for oled and rgb
drashna Mar 10, 2021
02288e0
fix edgecase with tap toggle mouse layer
drashna Mar 11, 2021
c33fddc
Decrease number of leds
drashna Mar 13, 2021
5b52780
Enable LTO on ploopy keymap
drashna Mar 19, 2021
a6e7145
Allow more granualar control of userspace
drashna Mar 25, 2021
4ed3d79
Fix make check for split transport in userspace
drashna Mar 25, 2021
80c436e
Make sure everything actually compiles
drashna Mar 27, 2021
b5a85b7
Make pimoroni trackball code hardware agnostic
drashna Mar 27, 2021
f422ca1
Disabled shared endpoint on tm
drashna Apr 23, 2021
877d380
Make sure Tractyl Manufor compiles without pointing device code
drashna Apr 27, 2021
c75e2ca
Improve diablo/gamepad layer stuff
drashna May 6, 2021
efb1e6e
Move where keymap layer set is called
drashna May 6, 2021
2be89e1
Make mouse stuff bettr
drashna May 7, 2021
52ac485
[CHANGE] Disable Audio if not on master
drashna May 8, 2021
a6c3c6d
[CHANGE] Update custom transports
drashna May 14, 2021
026515c
[CHANGE] Reduce size of oled code thanks to sigprof
drashna May 16, 2021
0e14763
Disable solenoid on dm
drashna May 25, 2021
bca5799
Fix up Corne keymap a bit
drashna May 25, 2021
03af943
Remove ssd1306.c file
drashna May 25, 2021
a714bd2
Make sure that oled font is not defined when we define it
drashna May 25, 2021
3ef096a
Disable Tap Dance on Ergodox
drashna May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions keyboards/c39/keymaps/drashna/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@
#define RGBLED_NUM 15

#define SOLENOID_PIN B11

#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4
#define AUDIO_PIN_ALT_AS_NEGATIVE
6 changes: 0 additions & 6 deletions keyboards/c39/keymaps/drashna/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
),

[_MODS] = LAYOUT_wrapper(
_______, ___________________BLANK___________________, _______, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, _______, ___________________BLANK___________________, _______,
KC_LSFT, ___________________BLANK___________________, _______, ___________________BLANK___________________, _______
),

[_LOWER] = LAYOUT_wrapper(
KC_TILD, _________________LOWER_L1__________________, _______, _________________LOWER_R1__________________, KC_BSPC,
KC_DEL, _________________LOWER_L2__________________, _______, _________________LOWER_R2__________________, KC_PIPE,
Expand Down
6 changes: 0 additions & 6 deletions keyboards/gergo/keymaps/drashna/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
),

[_MODS] = LAYOUT_gergo_wrapper(
_______, ___________________BLANK___________________, ___________________BLANK___________________, _______,
_______, ___________________BLANK___________________, _______, _______, ___________________BLANK___________________, _______,
KC_LSFT, ___________________BLANK___________________, _______, _______, _______, _______, ___________________BLANK___________________, KC_RSFT,
_______, _______, _______, _______, _______, _______, _______, _______
),
[_LOWER] = LAYOUT_gergo_wrapper(
KC_F12, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_F11,
_______, _________________LOWER_L2__________________, _______, _______, _________________LOWER_R2__________________, KC_PIPE,
Expand Down
3 changes: 3 additions & 0 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,11 @@ void pointing_device_task(void) {

void eeconfig_init_kb(void) {
keyboard_config.dpi_config = TRACKBALL_DPI_DEFAULT;
#ifdef POINTING_DEVICE_ENABLE
trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
#endif
eeconfig_update_kb(keyboard_config.raw);
eeconfig_init_user();
}

void matrix_init_kb(void) {
Expand Down
10 changes: 5 additions & 5 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW

// WS2812 RGB LED strip input and number of LEDs
#define RGB_DI_PIN D3
#define RGBLED_NUM 8
#define RGB_DI_PIN E7
#define RGBLED_NUM 58
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 0 , 8 }
#define RGBLED_SPLIT { 30 , 28 }
#define RGBLIGHT_SLEEP
#define RGBW
#define RGBLIGHT_LIMIT_VAL 150
// #define RGBW
#define RGBLIGHT_LIMIT_VAL 100
/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST

Expand Down
6 changes: 2 additions & 4 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
#define TRACKBALL_DPI_OPTIONS \
{ 1200, 1800, 2600, 3400 }

#define RGBLIGHT_EFFECT_TWINKLE_LIFE 50
#define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1/63
#define RGBLIGHT_MAX_BRIGHTNESS 100
#define RGBLIGHT_MAX_BRIGHTNESS 60

#undef DEBOUNCE
#define DEBOUNCE 10
Expand All @@ -36,6 +34,6 @@
#define SOLENOID_DEFAULT_DWELL 8

#define OLED_DISPLAY_128X64
#define OLED_BRIGHTNESS 100
#define OLED_BRIGHTNESS 50

#define MK_KINETIC_SPEED
54 changes: 38 additions & 16 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
OS_LSFT, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), OS_RSFT, \
OS_LALT, OS_LGUI, TG_GAME, TG_DBLO, \
OS_LGUI, KC_GRV, OS_RGUI, \
KC_SPC, TT(_MOUSE), KC_ENT, \
BK_LWER, MO(_MOUSE), MO(_MOUSE), DL_RAIS \
KC_SPC, OS_LGUI, KC_ENT, \
BK_LWER, TT(_MOUSE), TT(_MOUSE), DL_RAIS \
)
#define LAYOUT_5x6_right_trackball_base_wrapper(...) LAYOUT_5x6_right_trackball_base(__VA_ARGS__)

Expand Down Expand Up @@ -88,32 +88,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MOUSE] = LAYOUT_5x6_right_trackball(
_______, _______, _______, _______, _______, _______, DPI_CONFIG, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_BTN4, KC_BTN5, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
_______, _______, _______, _______, _______, _______, KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
_______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______
),
[_GAMEPAD] = LAYOUT_5x6_right_trackball(
KC_ESC, KC_NO, KC_1, KC_2, KC_3, KC_4, DPI_CONFIG, _______, _______, _______, _______, _______,
KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_WH_U, _______, _______, _______, _______, _______,
KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_H, _______, KC_BTN4, KC_BTN5, _______, _______, _______,
KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, _______, _______, _______, _______, _______, _______,
KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, _______, _______, _______, _______, _______, _______,
KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_H, _______, _______, _______, _______, _______, _______,
KC_I, KC_T, TG_GAME, KC_NO,
KC_V, KC_O, _______,
KC_SPC, KC_P, _______,
KC_H, KC_LGUI, _______, _______
),
[_DIABLO] = LAYOUT_5x6_right_trackball(
KC_ESC, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO,
KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, _______, _______, _______, _______, _______, _______,
KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, _______, _______, _______, _______, _______, _______,
KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, _______, _______, _______, _______, _______, _______,
KC_F, KC_L, KC_NO, TG_DBLO,
SFT_T(KC_SPC), KC_F, _______,
ALT_T(KC_Q), KC_J, _______,
KC_DIABLO_CLEAR, KC_LGUI, _______, _______
KC_DIABLO_CLEAR, KC_F, _______,
SFT_T(KC_SPC), KC_J, _______,
ALT_T(KC_Q), KC_LGUI, _______, _______
),
[_LOWER] = LAYOUT_5x6_right_trackball_wrapper(
KC_F12, _________________FUNC_LEFT_________________, _________________FUNC_RIGHT________________, KC_F11,
Expand Down Expand Up @@ -157,7 +157,7 @@ bool tap_toggling = false;
void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
if ((x || y) && timer_elapsed(mouse_timer) > 125) {
mouse_timer = timer_read();
if (!layer_state_is(_MOUSE) && !layer_state_is(_GAMEPAD) && timer_elapsed(mouse_debounce_timer) > 125) {
if (!layer_state_is(_MOUSE) && !(layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO)) && timer_elapsed(mouse_debounce_timer) > 125) {
layer_on(_MOUSE);
}
}
Expand All @@ -167,7 +167,7 @@ void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
# else
if (timer_elapsed(mouse_debounce_timer) > TAPPING_TERM
# endif
|| layer_state_is(_GAMEPAD)) {
|| (layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO))) {
mouse_report->x = x;
mouse_report->y = y;
}
Expand Down Expand Up @@ -218,11 +218,33 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
default:
if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
layer_off(_MOUSE);
mouse_keycode_tracker = 0;
}
mouse_keycode_tracker = 0;
mouse_debounce_timer = timer_read();
break;
}
return true;
}

layer_state_t layer_state_set_keymap(layer_state_t state) {
if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO)) {
state |= (1UL << _MOUSE);
}
return state;
}
#endif

void matrix_init_keymap(void) {
#ifdef AUDIO_ENABLE
extern audio_config_t audio_config;

if (!is_keyboard_master()) {
audio_stop_all();
audio_config.enable = false;
}
#endif
}

void keyboard_post_init_keymap(void) {
matrix_init_keymap();
}
1 change: 0 additions & 1 deletion keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
RGBLIGHT_STARTUP_ANIMATION = yes
HAPTIC_ENABLE = SOLENOID
COMMAND_ENABLE = no
AUDIO_ENABLE = yes
TAP_DANCE_ENABLE = yes
Expand Down
3 changes: 3 additions & 0 deletions keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifdef POINTING_DEVICE_ENABLE

#include "pmw3360.h"
#include "pmw3360_firmware.h"
Expand Down Expand Up @@ -223,3 +224,5 @@ report_pmw_t pmw_read_burst(void) {

return data;
}

#endif
Loading