Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
James Young
commit
80d8c4a483
78 changed files with 2856 additions and 731 deletions
|
|
@ -16,6 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
#include "rgb_matrix_map.h"
|
||||
|
||||
#define ARRAYSIZE(arr) sizeof(arr)/sizeof(arr[0])
|
||||
|
||||
enum custom_layers {
|
||||
_BASE,
|
||||
|
|
@ -27,6 +30,8 @@ enum custom_layers {
|
|||
enum custom_keycodes {
|
||||
KC_00 = SAFE_RANGE,
|
||||
KC_WINLCK, //Toggles Win key on and off
|
||||
RGB_TOI, // Timeout idle time up
|
||||
RGB_TOD, // Timeout idle time down
|
||||
};
|
||||
|
||||
// Tap Dance Definitions
|
||||
|
|
@ -43,31 +48,6 @@ qk_tap_dance_action_t tap_dance_actions[] = {
|
|||
|
||||
bool _isWinKeyDisabled = false;
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case KC_00:
|
||||
if (record->event.pressed) {
|
||||
// when keycode KC_00 is pressed
|
||||
SEND_STRING("00");
|
||||
} else {
|
||||
// when keycode KC_00 is released
|
||||
}
|
||||
break;
|
||||
|
||||
case KC_WINLCK:
|
||||
if (record->event.pressed) {
|
||||
_isWinKeyDisabled = !_isWinKeyDisabled; //toggle status
|
||||
if(_isWinKeyDisabled) {
|
||||
process_magic(GUI_OFF, record);
|
||||
} else {
|
||||
process_magic(GUI_ON, record);
|
||||
}
|
||||
} else unregister_code16(keycode);
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
|
|
@ -93,8 +73,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
|
||||
_______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RESET, KC_HOME,
|
||||
KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
|
||||
_______, _______, RGB_HUI, _______, _______, _______, KC_NLCK, _______, _______, _______, _______, _______, RGB_MOD, _______,
|
||||
_______, KC_WINLCK, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
|
||||
_______, _______, RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______, _______, RGB_MOD, _______,
|
||||
_______, KC_WINLCK, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
|
||||
),
|
||||
|
||||
[_MO2] = LAYOUT(
|
||||
|
|
@ -117,12 +97,93 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
};
|
||||
|
||||
|
||||
// TIMEOUTS
|
||||
#define TIMEOUT_THRESHOLD_DEFAULT 5 // default timeout minutes
|
||||
#define TIMEOUT_THRESHOLD_MAX 140 // upper limits (2 hours and 10 minutes -- no rgb indicators above this value)
|
||||
static uint16_t timeout_timer = 0;
|
||||
static uint16_t timeout_counter = 0; //in minute intervals
|
||||
static uint16_t timeout_threshold = TIMEOUT_THRESHOLD_DEFAULT;
|
||||
|
||||
void timeout_reset_timer(void) {
|
||||
timeout_timer = timer_read();
|
||||
timeout_counter = 0;
|
||||
};
|
||||
|
||||
void timeout_update_threshold(bool increase) {
|
||||
if (increase && timeout_threshold < TIMEOUT_THRESHOLD_MAX) timeout_threshold++;
|
||||
if (!increase && timeout_threshold > 0) timeout_threshold--;
|
||||
};
|
||||
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case KC_00:
|
||||
if (record->event.pressed) {
|
||||
// when keycode KC_00 is pressed
|
||||
SEND_STRING("00");
|
||||
} else {
|
||||
// when keycode KC_00 is released
|
||||
}
|
||||
break;
|
||||
case KC_WINLCK:
|
||||
if (record->event.pressed) {
|
||||
_isWinKeyDisabled = !_isWinKeyDisabled; //toggle status
|
||||
if(_isWinKeyDisabled) {
|
||||
process_magic(GUI_OFF, record);
|
||||
} else {
|
||||
process_magic(GUI_ON, record);
|
||||
}
|
||||
} else unregister_code16(keycode);
|
||||
break;
|
||||
case RGB_TOI:
|
||||
if(record->event.pressed) {
|
||||
timeout_update_threshold(true);
|
||||
} else unregister_code16(keycode);
|
||||
break;
|
||||
case RGB_TOD:
|
||||
if(record->event.pressed) {
|
||||
timeout_update_threshold(false); //decrease timeout
|
||||
} else unregister_code16(keycode);
|
||||
break;
|
||||
default:
|
||||
if (record->event.pressed) { //reset activity timer
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_enable();
|
||||
#endif
|
||||
timeout_reset_timer();
|
||||
}
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
if (timeout_threshold > 0) {
|
||||
if (timer_elapsed(timeout_timer) >= 60000) { // 1 minute tick
|
||||
timeout_counter++;
|
||||
timeout_timer = timer_read();
|
||||
}
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
if (timeout_threshold > 0 && timeout_counter >= timeout_threshold) {
|
||||
rgb_matrix_disable_noeeprom();
|
||||
}
|
||||
#endif
|
||||
} // timeout_threshold = 0 will disable timeout
|
||||
};
|
||||
|
||||
|
||||
#ifdef ENCODER_ENABLE // Encoder Functionality
|
||||
uint8_t selected_layer = 0;
|
||||
|
||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
|
||||
if ( clockwise ) {
|
||||
if (keyboard_report->mods & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, Page up
|
||||
if (keyboard_report->mods & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, encoder changes layers
|
||||
if(selected_layer < 3) {
|
||||
selected_layer ++;
|
||||
layer_move(selected_layer);
|
||||
}
|
||||
} else if (keyboard_report->mods & MOD_BIT(KC_RSFT) ) { // If you are holding R shift, Page up
|
||||
unregister_mods(MOD_BIT(KC_LSFT));
|
||||
register_code(KC_PGDN);
|
||||
register_mods(MOD_BIT(KC_LSFT));
|
||||
|
|
@ -131,10 +192,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
} else if (keyboard_report->mods & MOD_BIT(KC_LALT)) { // if holding Left Alt, change media next track
|
||||
tap_code(KC_MEDIA_NEXT_TRACK);
|
||||
} else {
|
||||
tap_code(KC_VOLU); // Otherwise it just changes volume
|
||||
switch (selected_layer) {
|
||||
case _FN1:
|
||||
timeout_update_threshold(true);
|
||||
break;
|
||||
default:
|
||||
tap_code(KC_VOLU); // Otherwise it just changes volume
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (keyboard_report->mods & MOD_BIT(KC_LSFT) ) {
|
||||
if (selected_layer > 0) {
|
||||
selected_layer --;
|
||||
layer_move(selected_layer);
|
||||
}
|
||||
} else if (keyboard_report->mods & MOD_BIT(KC_RSFT) ) {
|
||||
unregister_mods(MOD_BIT(KC_LSFT));
|
||||
register_code(KC_PGUP);
|
||||
register_mods(MOD_BIT(KC_LSFT));
|
||||
|
|
@ -143,9 +216,93 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
} else if (keyboard_report->mods & MOD_BIT(KC_LALT)) { // if holding Left Alt, change media previous track
|
||||
tap_code(KC_MEDIA_PREV_TRACK);
|
||||
} else {
|
||||
tap_code(KC_VOLD);
|
||||
switch (selected_layer) {
|
||||
case _FN1:
|
||||
timeout_update_threshold(false);
|
||||
break;
|
||||
default:
|
||||
tap_code(KC_VOLD);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
// Capslock, Scroll lock and Numlock indicator on Left side lights.
|
||||
void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
|
||||
if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
|
||||
rgb_matrix_set_color(LED_L1, RGB_GREEN);
|
||||
rgb_matrix_set_color(LED_L2, RGB_GREEN);
|
||||
}
|
||||
if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF
|
||||
rgb_matrix_set_color(LED_L3, RGB_MAGENTA);
|
||||
rgb_matrix_set_color(LED_L4, RGB_MAGENTA);
|
||||
}
|
||||
if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
|
||||
rgb_matrix_set_color(LED_L5, RGB_RED);
|
||||
rgb_matrix_set_color(LED_L6, RGB_RED);
|
||||
rgb_matrix_set_color(LED_L7, RGB_RED);
|
||||
}
|
||||
if (_isWinKeyDisabled) {
|
||||
rgb_matrix_set_color(LED_LWIN, RGB_RED); //light up Win key when disabled
|
||||
}
|
||||
switch(get_highest_layer(layer_state)){ // special handling per layer
|
||||
case _FN1: // on Fn layer select what the encoder does when pressed
|
||||
rgb_matrix_set_color(LED_R2, RGB_RED);
|
||||
rgb_matrix_set_color(LED_R3, RGB_RED);
|
||||
rgb_matrix_set_color(LED_R4, RGB_RED);
|
||||
rgb_matrix_set_color(LED_FN, RGB_RED); //FN key
|
||||
|
||||
// Add RGB Timeout Indicator -- shows 0 to 139 using F row and num row; larger numbers using 16bit code
|
||||
if (timeout_threshold <= 10) rgb_matrix_set_color(LED_LIST_FUNCROW[timeout_threshold], RGB_RED);
|
||||
else if (timeout_threshold < 140) {
|
||||
rgb_matrix_set_color(LED_LIST_FUNCROW[(timeout_threshold / 10)], RGB_RED);
|
||||
rgb_matrix_set_color(LED_LIST_NUMROW[(timeout_threshold % 10)], RGB_RED);
|
||||
} else { // >= 140 minutes, just show these 3 lights
|
||||
rgb_matrix_set_color(LED_LIST_NUMROW[10], RGB_RED);
|
||||
rgb_matrix_set_color(LED_LIST_NUMROW[11], RGB_RED);
|
||||
rgb_matrix_set_color(LED_LIST_NUMROW[12], RGB_RED);
|
||||
}
|
||||
break;
|
||||
case _MO2:
|
||||
for (uint8_t i=0; i<ARRAYSIZE(LED_LIST_NUMPAD); i++) {
|
||||
rgb_matrix_set_color(LED_LIST_NUMPAD[i], RGB_MAGENTA);
|
||||
}
|
||||
rgb_matrix_set_color(LED_R4, RGB_MAGENTA);
|
||||
rgb_matrix_set_color(LED_R5, RGB_MAGENTA);
|
||||
rgb_matrix_set_color(LED_R6, RGB_MAGENTA);
|
||||
break;
|
||||
case _MO3:
|
||||
rgb_matrix_set_color(LED_R6, RGB_GREEN);
|
||||
rgb_matrix_set_color(LED_R7, RGB_GREEN);
|
||||
rgb_matrix_set_color(LED_R8, RGB_GREEN);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void suspend_power_down_user(void) {
|
||||
rgb_matrix_set_suspend_state(true);
|
||||
}
|
||||
|
||||
void suspend_wakeup_init_user(void) {
|
||||
rgb_matrix_set_suspend_state(false);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void keyboard_post_init_user(void) {
|
||||
|
||||
if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // turn on Num lock by defautl so that the numpad layer always has predictable results
|
||||
tap_code(KC_NUMLOCK);
|
||||
}
|
||||
timeout_timer = timer_read(); // set inital time for ide timeout
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_set_color_all(RGB_NAUTILUS); // Default startup colour
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue