Tweak reset process / indicators for kemonine stuff

This commit is contained in:
kemonine 2020-11-20 15:47:22 -05:00
parent 8da57c50be
commit 5152f05c10
8 changed files with 2618 additions and 2611 deletions

File diff suppressed because it is too large Load diff

View file

@ -29,6 +29,7 @@ enum {
enum { enum {
ACCEL = SAFE_RANGE, ACCEL = SAFE_RANGE,
ACCEL_ADJ, ACCEL_ADJ,
PROG,
}; };
static uint8_t acceleration_level = ACCEL_0; static uint8_t acceleration_level = ACCEL_0;
void change_accel(void) { void change_accel(void) {
@ -53,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi(KC_GRV, 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_DEL, KC_DEL, [1] = LAYOUT_65_ansi(KC_GRV, 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_DEL, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, PROG, KC_INS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI),
@ -145,6 +146,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
else { else {
change_accel(); change_accel();
} }
case PROG:
if (record->event.pressed) {
rgblight_disable_noeeprom();
reset_keyboard();
}
default: default:
return true; // Process all other keycodes normally return true; // Process all other keycodes normally
} }

View file

@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
set_bitc_LED(LED_ON); set_bitc_LED(LED_ON);
rgblight_disable_noeeprom(); rgblight_disable_noeeprom();
bootloader_jump(); //jump to bootloader reset_keyboard();
} }
break; break;
case ACCEL: case ACCEL:
@ -126,13 +126,6 @@ void encoder_update_user(uint8_t index, bool clockwise) {
} }
} }
void led_set_kb(uint8_t usb_led) {
if (usb_led & (1<<USB_LED_NUM_LOCK))
set_bitc_LED(LED_ON);
else
set_bitc_LED(LED_DIM);
}
// Customized HSV values for layer highlights // Customized HSV values for layer highlights
#define HSV_KMN_PURPLE 191, 255, 120 #define HSV_KMN_PURPLE 191, 255, 120
#define HSV_KMN_GREEN 85, 255, 120 #define HSV_KMN_GREEN 85, 255, 120
@ -154,6 +147,7 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
// Layer color init // Layer color init
void keyboard_post_init_user(void) { void keyboard_post_init_user(void) {
rgblight_layers = my_rgb_layers; rgblight_layers = my_rgb_layers;
set_bitc_LED(LED_DIM);
layer_clear(); layer_clear();
layer_on(0); layer_on(0);
rgblight_sethsv_noeeprom(HSV_KMN_PURPLE); rgblight_sethsv_noeeprom(HSV_KMN_PURPLE);

View file

@ -43,6 +43,7 @@ void dance_layer_boot_finished(qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { if (state->count == 1) {
layer_on(1); layer_on(1);
} else { } else {
rgblight_disable_noeeprom();
reset_keyboard(); reset_keyboard();
} }
} }
@ -107,6 +108,7 @@ void keyboard_post_init_user(void) {
rgblight_layers = my_rgb_layers; rgblight_layers = my_rgb_layers;
layer_clear(); layer_clear();
layer_on(0); layer_on(0);
rgblight_enable();
rgblight_sethsv_noeeprom(HSV_KMN_PURPLE); rgblight_sethsv_noeeprom(HSV_KMN_PURPLE);
} }

File diff suppressed because it is too large Load diff

View file

@ -29,6 +29,7 @@ enum {
enum { enum {
ACCEL = SAFE_RANGE, ACCEL = SAFE_RANGE,
ACCEL_ADJ, ACCEL_ADJ,
PROG,
}; };
static uint8_t acceleration_level = ACCEL_0; static uint8_t acceleration_level = ACCEL_0;
void change_accel(void) { void change_accel(void) {
@ -53,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi(KC_GRV, 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_DEL, KC_DEL, [1] = LAYOUT_65_ansi(KC_GRV, 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_DEL, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, PROG, KC_INS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI),
@ -145,6 +146,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
else { else {
change_accel(); change_accel();
} }
case PROG:
if (record->event.pressed) {
rgblight_disable_noeeprom();
reset_keyboard();
}
default: default:
return true; // Process all other keycodes normally return true; // Process all other keycodes normally
} }

View file

@ -65,7 +65,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
set_bitc_LED(LED_ON); set_bitc_LED(LED_ON);
rgblight_disable_noeeprom(); rgblight_disable_noeeprom();
bootloader_jump(); //jump to bootloader reset_keyboard();
} }
break; break;
case ACCEL: case ACCEL:
@ -126,13 +126,6 @@ void encoder_update_user(uint8_t index, bool clockwise) {
} }
} }
void led_set_kb(uint8_t usb_led) {
if (usb_led & (1<<USB_LED_NUM_LOCK))
set_bitc_LED(LED_ON);
else
set_bitc_LED(LED_DIM);
}
// Customized HSV values for layer highlights // Customized HSV values for layer highlights
#define HSV_KMN_PURPLE 191, 255, 120 #define HSV_KMN_PURPLE 191, 255, 120
#define HSV_KMN_GREEN 85, 255, 120 #define HSV_KMN_GREEN 85, 255, 120
@ -154,6 +147,7 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
// Layer color init // Layer color init
void keyboard_post_init_user(void) { void keyboard_post_init_user(void) {
rgblight_layers = my_rgb_layers; rgblight_layers = my_rgb_layers;
set_bitc_LED(LED_DIM);
layer_clear(); layer_clear();
layer_on(0); layer_on(0);
rgblight_sethsv_noeeprom(HSV_KMN_PURPLE); rgblight_sethsv_noeeprom(HSV_KMN_PURPLE);

View file

@ -43,6 +43,7 @@ void dance_layer_boot_finished(qk_tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { if (state->count == 1) {
layer_on(1); layer_on(1);
} else { } else {
rgblight_disable_noeeprom();
reset_keyboard(); reset_keyboard();
} }
} }
@ -107,6 +108,7 @@ void keyboard_post_init_user(void) {
rgblight_layers = my_rgb_layers; rgblight_layers = my_rgb_layers;
layer_clear(); layer_clear();
layer_on(0); layer_on(0);
rgblight_enable();
rgblight_sethsv_noeeprom(HSV_KMN_PURPLE); rgblight_sethsv_noeeprom(HSV_KMN_PURPLE);
} }