Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -142,7 +142,7 @@ void pointing_device_init(void) {
|
||||
trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
|
||||
}
|
||||
|
||||
static bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) {
|
||||
static bool has_report_changed(report_mouse_t new, report_mouse_t old) {
|
||||
return (new.buttons != old.buttons) ||
|
||||
(new.x && new.x != old.x) ||
|
||||
(new.y && new.y != old.y) ||
|
||||
@@ -186,7 +186,7 @@ void pointing_device_send(void) {
|
||||
mouseReport.x = 0;
|
||||
mouseReport.y = 0;
|
||||
process_mouse_user(&mouseReport, x, y);
|
||||
if (has_mouse_report_changed(mouseReport, old_report)) {
|
||||
if (has_report_changed(mouseReport, old_report)) {
|
||||
host_mouse_send(&mouseReport);
|
||||
}
|
||||
} else {
|
||||
|
@@ -65,3 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
|
||||
#define DYNAMIC_KEYMAP_LAYER_COUNT 16
|
||||
|
||||
/* serial.c configuration for split keyboard */
|
||||
#undef SOFT_SERIAL_PIN
|
||||
#define SOFT_SERIAL_PIN D2
|
||||
|
@@ -19,9 +19,4 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#define USE_SERIAL
|
||||
|
||||
#define MASTER_LEFT
|
||||
// #define MASTER_RIGHT
|
||||
//#define EE_HANDS
|
||||
// Rows are doubled-up
|
||||
#include "../drashna/config.h"
|
||||
|
@@ -14,50 +14,4 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
|
||||
#define _QWERTY 0
|
||||
#define _LOWER 1
|
||||
#define _RAISE 2
|
||||
|
||||
#define RAISE MO(_RAISE)
|
||||
#define LOWER MO(_LOWER)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
[_QWERTY] = LAYOUT_5x6_right_trackball(
|
||||
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC,
|
||||
KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS,
|
||||
KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT,
|
||||
KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
|
||||
KC_LBRC,KC_RBRC, KC_EQL,
|
||||
RAISE,KC_SPC, LOWER,
|
||||
KC_TAB,KC_HOME, KC_END, KC_DEL,
|
||||
KC_BSPC, KC_GRV, KC_LGUI, KC_LALT
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT_5x6_right_trackball(
|
||||
|
||||
KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
|
||||
_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
|
||||
_______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
|
||||
_______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
|
||||
_______,KC_PSCR, KC_P0,
|
||||
_______,_______, _______,
|
||||
_______,_______, _______,_______,
|
||||
_______,_______, _______,_______
|
||||
|
||||
),
|
||||
|
||||
[_RAISE] = LAYOUT_5x6_right_trackball(
|
||||
KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
|
||||
_______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
|
||||
_______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
|
||||
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD,
|
||||
_______,_______, _______,
|
||||
_______,_______, _______,
|
||||
_______,_______, _______,_______,
|
||||
_______,_______, _______,_______
|
||||
),
|
||||
};
|
||||
// placeholder
|
||||
|
@@ -0,0 +1,4 @@
|
||||
USER_NAME := drashna
|
||||
SRC += ../drashna/keymap.c
|
||||
|
||||
include $(KEYBOARD_PATH_1)/keymaps/drashna/rules.mk
|
@@ -17,6 +17,8 @@
|
||||
#pragma once
|
||||
|
||||
// #define USE_I2C
|
||||
#define SELECT_SOFT_SERIAL_SPEED 0
|
||||
#define SERIAL_USE_MULTI_TRANSACTION
|
||||
|
||||
#define EE_HANDS
|
||||
#define TRACKBALL_DPI_OPTIONS \
|
||||
@@ -24,5 +26,17 @@
|
||||
|
||||
#define RGBLIGHT_EFFECT_TWINKLE_LIFE 50
|
||||
#define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1/63
|
||||
#define RGBLIGHT_MAX_BRIGHTNESS 100
|
||||
|
||||
#undef DEBOUNCE
|
||||
#define DEBOUNCE 10
|
||||
|
||||
#define SOLENOID_PIN F1
|
||||
#define SOLENOID_DEFAULT_DWELL 8
|
||||
|
||||
#define OLED_DISPLAY_128X64
|
||||
#define OLED_TIMEOUT 0
|
||||
#define OLED_BRIGHTNESS 100
|
||||
#define SPLIT_MODS_ENABLE
|
||||
|
||||
#define MK_KINETIC_SPEED
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include "drashna.h"
|
||||
|
||||
#define TG_DBLO TG(_DIABLO)
|
||||
#define _MOUSE _MEDIA
|
||||
|
||||
|
||||
// clang-format off
|
||||
@@ -172,7 +171,7 @@ void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
|
||||
}
|
||||
|
||||
void matrix_scan_keymap(void) {
|
||||
if (timer_elapsed(mouse_timer) > 750 && layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
|
||||
if (timer_elapsed(mouse_timer) > 650 && layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
|
||||
layer_off(_MOUSE);
|
||||
}
|
||||
}
|
||||
|
@@ -1,2 +1,9 @@
|
||||
RGBLIGHT_STARTUP_ANIMATION = yes
|
||||
HAPTIC_ENABLE = SOLENOID
|
||||
RGBLIGHT_STARTUP_ANIMATION = yes
|
||||
HAPTIC_ENABLE = SOLENOID
|
||||
COMMAND_ENABLE = no
|
||||
AUDIO_ENABLE = yes
|
||||
TAP_DANCE_ENABLE = yes
|
||||
UNICODE_ENABLE = yes
|
||||
OLED_DRIVER_ENABLE = yes
|
||||
|
||||
# DEBOUNCE_TYPE = sym_eager_pk
|
||||
|
@@ -41,6 +41,10 @@ static uint16_t device_cpi = 0;
|
||||
static int8_t split_mouse_x = 0, split_mouse_y = 0;
|
||||
#endif
|
||||
|
||||
#ifdef OLED_DRIVER_ENABLE
|
||||
# include "oled_driver.h"
|
||||
#endif
|
||||
|
||||
#if defined(USE_I2C)
|
||||
|
||||
# include "i2c_master.h"
|
||||
@@ -48,7 +52,16 @@ static int8_t split_mouse_x = 0, split_mouse_y = 0;
|
||||
|
||||
typedef struct _I2C_slave_buffer_t {
|
||||
matrix_row_t smatrix[ROWS_PER_HAND];
|
||||
uint8_t backlight_level;
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
uint8_t real_mods;
|
||||
uint8_t weak_mods;
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
uint8_t oneshot_mods;
|
||||
# endif
|
||||
# endif
|
||||
# ifdef BACKLIGHT_ENABLE
|
||||
uint8_t backlight_level;
|
||||
# endif
|
||||
# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
||||
rgblight_syncinfo_t rgblight_sync;
|
||||
# endif
|
||||
@@ -58,9 +71,12 @@ typedef struct _I2C_slave_buffer_t {
|
||||
# ifdef WPM_ENABLE
|
||||
uint8_t current_wpm;
|
||||
# endif
|
||||
int8_t mouse_x;
|
||||
int8_t mouse_y;
|
||||
uint16_t device_cpi;
|
||||
int8_t mouse_x;
|
||||
int8_t mouse_y;
|
||||
uint16_t device_cpi;
|
||||
bool oled_on;
|
||||
layer_state_t t_layer_state;
|
||||
layer_state_t t_default_layer_state;
|
||||
} I2C_slave_buffer_t;
|
||||
|
||||
static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_reg;
|
||||
@@ -68,11 +84,19 @@ static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_re
|
||||
# define I2C_BACKLIGHT_START offsetof(I2C_slave_buffer_t, backlight_level)
|
||||
# define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync)
|
||||
# define I2C_KEYMAP_START offsetof(I2C_slave_buffer_t, mmatrix)
|
||||
# define I2C_SYNC_TIME_START offsetof(I2C_slave_buffer_t, sync_timer)
|
||||
# define I2C_REAL_MODS_START offsetof(I2C_slave_buffer_t, real_mods)
|
||||
# define I2C_WEAK_MODS_START offsetof(I2C_slave_buffer_t, weak_mods)
|
||||
# define I2C_ONESHOT_MODS_START offsetof(I2C_slave_buffer_t, oneshot_mods)
|
||||
# define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state)
|
||||
# define I2C_WPM_START offsetof(I2C_slave_buffer_t, current_wpm)
|
||||
# define I2C_MOUSE_X_START offsetof(I2C_slave_buffer_t, mouse_x)
|
||||
# define I2C_MOUSE_Y_START offsetof(I2C_slave_buffer_t, mouse_y)
|
||||
# define I2C_MOUSE_DPI_START offsetof(I2C_slave_buffer_t, device_cpi)
|
||||
# define I2C_OLED_ON_START offsetof(I2C_slave_buffent, oled_on)
|
||||
# define I2C_LAYER_STATE_START offsetof(I2C_slave_buffent, t_layer_state)
|
||||
# define I2C_DEFAULT_LAYER_STATE_START offsetof(I2C_slave_buffent, t_default_layer_state)
|
||||
|
||||
# define TIMEOUT 100
|
||||
|
||||
# ifndef SLAVE_I2C_ADDRESS
|
||||
@@ -127,13 +151,58 @@ bool transport_master(matrix_row_t matrix[]) {
|
||||
pointing_device_set_report(temp_report);
|
||||
|
||||
if (device_cpi != i2c_buffer->device_cpi) {
|
||||
if(i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_DPI_START, (void *)&device_cpi, sizeof(device_cpi), TIMEOUT) >= 0) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_DPI_START, (void *)&device_cpi, sizeof(device_cpi), TIMEOUT) >= 0) {
|
||||
i2c_buffer->device_cpi = device_cpi
|
||||
}
|
||||
}
|
||||
}
|
||||
# endif
|
||||
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
uint8_t real_mods = get_mods();
|
||||
if (real_mods != i2c_buffer->real_mods) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_REAL_MODS_START, (void *)&real_mods, sizeof(real_mods), TIMEOUT) >= 0) {
|
||||
i2c_buffer->real_mods = real_mods;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t weak_mods = get_weak_mods();
|
||||
if (weak_mods != i2c_buffer->weak_mods) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_WEAK_MODS_START, (void *)&weak_mods, sizeof(weak_mods), TIMEOUT) >= 0) {
|
||||
i2c_buffer->weak_mods = weak_mods;
|
||||
}
|
||||
}
|
||||
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
uint8_t oneshot_mods = get_oneshot_mods();
|
||||
if (oneshot_mods != i2c_buffer->oneshot_mods) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_ONESHOT_MODS_START, (void *)&oneshot_mods, sizeof(oneshot_mods), TIMEOUT) >= 0) {
|
||||
i2c_buffer->oneshot_mods = oneshot_mods;
|
||||
}
|
||||
}
|
||||
# endif
|
||||
# endif
|
||||
|
||||
if (layer_state != i2c_buffer->t_layer_state) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LAYER_STATE_START, (void *)&layer_state, sizeof(layer_state), TIMEOUT) >= 0) {
|
||||
i2c_buffer->t_layer_state = layer_state;
|
||||
}
|
||||
}
|
||||
|
||||
if (default_layer_state != i2c_buffer->t_default_layer_state) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_DEFAULT_LAYER_STATE_START, (void *)&default_layer_state, sizeof(default_layer_state), TIMEOUT) >= 0) {
|
||||
i2c_buffer->t_default_layer_state = default_layer_state;
|
||||
}
|
||||
}
|
||||
|
||||
# ifdef OLED_DRIVER_ENABLE
|
||||
if (is_oled_on() != i2c_buffer->oled_on) {
|
||||
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_LAYER_STATE_START, (void *)&is_oled_on(), sizeof(bool), TIMEOUT) >= 0) {
|
||||
i2c_buffer->oled_on = is_oled_on();
|
||||
}
|
||||
}
|
||||
# endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -176,6 +245,29 @@ void transport_slave(matrix_row_t matrix[]) {
|
||||
}
|
||||
|
||||
# endif
|
||||
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
set_mods(i2c_buffer->real_mods);
|
||||
set_weak_mods(i2c_buffer->weak_mods);
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
set_oneshot_mods(i2c_buffer->oneshot_mods);
|
||||
# endif
|
||||
# endif
|
||||
|
||||
if (layer_state != i2c_buffer->t_layer_state) {
|
||||
layer_state_set(i2c_buffer->t_layer_state);
|
||||
}
|
||||
if (default_layer_state != i2c_buffer->t_default_layer_state) {
|
||||
default_layer_state_set(i2c_buffer->t_default_layer_state);
|
||||
}
|
||||
|
||||
# ifdef OLED_DRIVER_ENABLE
|
||||
if (i2c_buffer->oled_on) {
|
||||
oled_on();
|
||||
} else {
|
||||
oled_off();
|
||||
}
|
||||
# endif
|
||||
}
|
||||
|
||||
void transport_master_init(void) { i2c_init(); }
|
||||
@@ -190,20 +282,33 @@ typedef struct _Serial_s2m_buffer_t {
|
||||
// TODO: if MATRIX_COLS > 8 change to uint8_t packed_matrix[] for pack/unpack
|
||||
matrix_row_t smatrix[ROWS_PER_HAND];
|
||||
# ifdef ENCODER_ENABLE
|
||||
uint8_t encoder_state[NUMBER_OF_ENCODERS];
|
||||
uint8_t encoder_state[NUMBER_OF_ENCODERS];
|
||||
# endif
|
||||
int8_t mouse_x;
|
||||
int8_t mouse_y;
|
||||
int8_t mouse_x;
|
||||
int8_t mouse_y;
|
||||
} Serial_s2m_buffer_t;
|
||||
|
||||
typedef struct _Serial_m2s_buffer_t {
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
uint8_t real_mods;
|
||||
uint8_t weak_mods;
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
uint8_t oneshot_mods;
|
||||
# endif
|
||||
# endif
|
||||
# ifndef DISABLE_SYNC_TIMER
|
||||
uint32_t sync_timer;
|
||||
# endif
|
||||
# ifdef BACKLIGHT_ENABLE
|
||||
uint8_t backlight_level;
|
||||
uint8_t backlight_level;
|
||||
# endif
|
||||
# ifdef WPM_ENABLE
|
||||
uint8_t current_wpm;
|
||||
uint8_t current_wpm;
|
||||
# endif
|
||||
uint16_t device_cpi;
|
||||
uint16_t device_cpi;
|
||||
bool oled_on;
|
||||
layer_state_t t_layer_state;
|
||||
layer_state_t t_default_layer_state;
|
||||
} Serial_m2s_buffer_t;
|
||||
|
||||
# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
||||
@@ -308,7 +413,15 @@ bool transport_master(matrix_row_t matrix[]) {
|
||||
|
||||
# ifdef WPM_ENABLE
|
||||
// Write wpm to slave
|
||||
serial_m2s_buffer.current_wpm = get_current_wpm();
|
||||
serial_m2s_buffer.current_wpm = get_current_wpm();
|
||||
# endif
|
||||
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
serial_m2s_buffer.real_mods = get_mods();
|
||||
serial_m2s_buffer.weak_mods = get_weak_mods();
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
serial_m2s_buffer.oneshot_mods = get_oneshot_mods();
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef POINTING_DEVICE_ENABLE
|
||||
@@ -321,6 +434,12 @@ bool transport_master(matrix_row_t matrix[]) {
|
||||
}
|
||||
# endif
|
||||
|
||||
serial_m2s_buffer.t_layer_state = layer_state;
|
||||
serial_m2s_buffer.t_default_layer_state = default_layer_state;
|
||||
# ifdef OLED_DRIVER_ENABLE
|
||||
serial_m2s_buffer.oled_on = is_oled_on();
|
||||
# endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -344,6 +463,14 @@ void transport_slave(matrix_row_t matrix[]) {
|
||||
set_current_wpm(serial_m2s_buffer.current_wpm);
|
||||
# endif
|
||||
|
||||
# ifdef SPLIT_MODS_ENABLE
|
||||
set_mods(serial_m2s_buffer.real_mods);
|
||||
set_weak_mods(serial_m2s_buffer.weak_mods);
|
||||
# ifndef NO_ACTION_ONESHOT
|
||||
set_oneshot_mods(serial_m2s_buffer.oneshot_mods);
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef POINTING_DEVICE_ENABLE
|
||||
if (!is_keyboard_left()) {
|
||||
static uint16_t cpi;
|
||||
@@ -354,7 +481,20 @@ void transport_slave(matrix_row_t matrix[]) {
|
||||
serial_s2m_buffer.mouse_x = split_mouse_x;
|
||||
serial_s2m_buffer.mouse_y = split_mouse_y;
|
||||
}
|
||||
# endif
|
||||
|
||||
if (layer_state != serial_m2s_buffer.t_layer_state) {
|
||||
layer_state_set(serial_m2s_buffer.t_layer_state);
|
||||
}
|
||||
if (default_layer_state != serial_m2s_buffer.t_default_layer_state) {
|
||||
default_layer_set(serial_m2s_buffer.t_default_layer_state);
|
||||
}
|
||||
# ifdef OLED_DRIVER_ENABLE
|
||||
if (serial_m2s_buffer.oled_on) {
|
||||
oled_on();
|
||||
} else {
|
||||
oled_off();
|
||||
}
|
||||
# endif
|
||||
}
|
||||
|
||||
|
@@ -35,8 +35,4 @@
|
||||
# define RGBLIGHT_LAYERS
|
||||
#endif
|
||||
|
||||
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
|
||||
#define SPLIT_USB_DETECT
|
||||
#define SPLIT_USB_TIMEOUT 1000
|
||||
|
||||
#define KEYLOGGER_LENGTH 10
|
||||
|
@@ -18,6 +18,6 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
|
||||
|
||||
BOOTLOADER = atmel-dfu
|
||||
|
||||
SPLIT_TRANSPORT = mirror
|
||||
# SPLIT_TRANSPORT = mirror
|
||||
|
||||
TAP_DANCE_ENABLE = yes
|
||||
# TAP_DANCE_ENABLE = yes
|
||||
|
@@ -196,14 +196,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
}
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
# ifndef RGB_MATRIX_INDICATOR_SET_COLOR
|
||||
# define RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b) rgb_matrix_set_color(i, r, g, b)
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
#else
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
# endif
|
||||
if (g_suspend_state || !rgb_matrix_config.enable) return;
|
||||
|
||||
if (layer_state_is(_GAMEPAD)) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(11, 0x00, 0xFF, 0x00); // Q
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(16, 0x00, 0xFF, 0xFF); // W
|
||||
@@ -214,51 +207,51 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(22, 0x00, 0xFF, 0xFF); // D
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(27, 0x7A, 0x00, 0xFF); // F
|
||||
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 10 : 15), 0xFF, 0xFF, 0xFF); // 1
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 15 : 10), 0x00, 0xFF, 0x00); // 2
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 15 : 10), 0xFF, 0xFF, 0xFF); // 1
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 10 : 15), 0x00, 0xFF, 0x00); // 2
|
||||
RGB_MATRIX_INDICATOR_SET_COLOR(20, 0x7A, 0x00, 0xFF); // 3
|
||||
}
|
||||
|
||||
if (userspace_config.rgb_layer_change) {
|
||||
switch (get_highest_layer(layer_state|default_layer_state)) {
|
||||
case _QWERTY:
|
||||
rgb_matrix_layer_helper(HSV_CYAN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_CYAN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _COLEMAK:
|
||||
rgb_matrix_layer_helper(HSV_MAGENTA, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_MAGENTA, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _DVORAK:
|
||||
rgb_matrix_layer_helper(HSV_SPRINGGREEN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_SPRINGGREEN, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _WORKMAN:
|
||||
rgb_matrix_layer_helper(HSV_GOLDENROD, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_GOLDENROD, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _NORMAN:
|
||||
rgb_matrix_layer_helper(HSV_CORAL, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_CORAL, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _MALTRON:
|
||||
rgb_matrix_layer_helper(HSV_YELLOW, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_YELLOW, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _EUCALYN:
|
||||
rgb_matrix_layer_helper(HSV_PINK, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_PINK, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _CARPLAX:
|
||||
rgb_matrix_layer_helper(HSV_BLUE, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_BLUE, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _GAMEPAD:
|
||||
rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _DIABLO:
|
||||
rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _RAISE:
|
||||
rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _LOWER:
|
||||
rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
case _ADJUST:
|
||||
rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
|
||||
rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
24
keyboards/ploopyco/mouse/keymaps/drashna/config.h
Normal file
24
keyboards/ploopyco/mouse/keymaps/drashna/config.h
Normal file
@@ -0,0 +1,24 @@
|
||||
/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
|
||||
* Copyright 2019 Sunjun Kim
|
||||
* Copyright 2020 Ploopy Corporation
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#undef RGBLIGHT_LIMIT_VAL
|
||||
#define RGBLIGHT_LIMIT_VAL 255
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_SLEEP
|
34
keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
Normal file
34
keyboards/ploopyco/mouse/keymaps/drashna/keymap.c
Normal file
@@ -0,0 +1,34 @@
|
||||
/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
|
||||
* Copyright 2019 Sunjun Kim
|
||||
* Copyright 2020 Ploopy Corporation
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(/* Base */
|
||||
C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, MO(1), KC_BTN4, KC_BTN5, DPI_CONFIG),
|
||||
[1] = LAYOUT(/* Base */
|
||||
RGB_HUI, RGB_MOD, RGB_TOG, RGB_RMOD, MO(1), KC_VOLU, KC_VOLD, RESET)
|
||||
|
||||
};
|
||||
|
||||
void eeconkfig_init_user(void) {
|
||||
rgblight_enable();
|
||||
rgblight_mode(RGBLIGHT_MODE_TWINKLE+5);
|
||||
rgblight_sethsv(HSV_MAGENTA);
|
||||
}
|
4
keyboards/ploopyco/mouse/keymaps/drashna/rules.mk
Normal file
4
keyboards/ploopyco/mouse/keymaps/drashna/rules.mk
Normal file
@@ -0,0 +1,4 @@
|
||||
USER_NAME := not_drashna
|
||||
|
||||
RGBLIGHT_ENABLE = yes
|
||||
CONSOLE_ENABLE = no
|
Reference in New Issue
Block a user