Get rid of `USB_LED_KANA` and `USB_LED_COMPOSE` (#21366)

This commit is contained in:
Ryan 2023-06-27 09:15:33 +10:00 committed by GitHub
parent fa4ea73bf6
commit 5542f5ede1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 26 additions and 1211 deletions

View File

@ -71,42 +71,11 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _raise, _rgb, _adjust); return update_tri_layer_state(state, _raise, _rgb, _adjust);
} }
// scan matrix
void matrix_scan_user(void) {
}
// support for standard mod state keys (caps lock, scroll lock, etc.) // support for standard mod state keys (caps lock, scroll lock, etc.)
void led_set_user(uint8_t usb_led) { void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
DDRB |= (1 << 2); PORTB &= ~(1 << 2); DDRB |= (1 << 2); PORTB &= ~(1 << 2);
} else { } else {
DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
} }
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
} }

View File

@ -199,9 +199,6 @@ void music_scale_user(void)
#endif #endif
void matrix_scan_user(void) {
}
//Tap Dance Definitions //Tap Dance Definitions
tap_dance_action_t tap_dance_actions[] = { tap_dance_action_t tap_dance_actions[] = {
//Tap once for Esc, twice for Caps Lock //Tap once for Esc, twice for Caps Lock
@ -211,40 +208,3 @@ tap_dance_action_t tap_dance_actions[] = {
[TD_A_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), [TD_A_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB),
[TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC) [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
}; };
// don't know what this is doing...
/*
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
DDRD |= (1 << 5); PORTD &= ~(1 << 5);
} else {
DDRD &= ~(1 << 5); PORTD &= ~(1 << 5);
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
DDRB |= (1 << 0); PORTB &= ~(1 << 0);
} else {
DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}
*/

View File

@ -33,19 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, KC_BSPC, KC_HOME, KC_PGDN, KC_END _______, _______, _______, _______, KC_BSPC, KC_HOME, KC_PGDN, KC_END
) )
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -43,15 +43,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -37,19 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -46,23 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT
), ),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void keyboard_post_init_user(void) {
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -19,15 +19,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "print.h" #include "print.h"
#include "uart.h" #include "uart.h"
void led_set(uint8_t usb_led) bool led_update_kb(led_t led_state)
{ {
uint8_t sun_led = 0; bool res = led_update_user(led_state);
if (usb_led & (1<<USB_LED_NUM_LOCK)) sun_led |= (1<<0); if (res) {
if (usb_led & (1<<USB_LED_COMPOSE)) sun_led |= (1<<1); uint8_t sun_led = 0;
if (usb_led & (1<<USB_LED_SCROLL_LOCK)) sun_led |= (1<<2); if (led_state.num_lock) sun_led |= (1<<0);
if (usb_led & (1<<USB_LED_CAPS_LOCK)) sun_led |= (1<<3); if (led_state.compose) sun_led |= (1<<1);
xprintf("LED: %02X\n", usb_led); if (led_state.scroll_lock) sun_led |= (1<<2);
if (led_state.caps_lock) sun_led |= (1<<3);
uart_write(0x0E); uart_write(0x0E);
uart_write(sun_led); uart_write(sun_led);
}
return res;
} }

View File

@ -65,22 +65,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
), ),
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}
/* /*
* Keymap samples * Keymap samples
*/ */

View File

@ -40,11 +40,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) { void matrix_scan_user(void) {
// escape LED on layer 1 // escape LED on layer 1
if (IS_LAYER_ON(1)) { if (IS_LAYER_ON(1)) {
@ -53,7 +48,3 @@ void matrix_scan_user(void) {
writePinHigh(B0); writePinHigh(B0);
} }
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -26,37 +26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
void led_set_user(uint8_t usb_led) { void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
DDRB |= (1 << 2); PORTB &= ~(1 << 2); DDRB |= (1 << 2); PORTB &= ~(1 << 2);
} else { } else {
DDRB &= ~(1 << 2); PORTB &= ~(1 << 2); DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
} }
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) bool process_record_user(uint16_t keycode, keyrecord_t *record)

View File

@ -145,15 +145,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -236,10 +236,6 @@ void matrix_init_user(void) {
#endif #endif
} }
void matrix_scan_user(void) {
}
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) { switch (get_highest_layer(state)) {
case _BL: case _BL:
@ -263,7 +259,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
} }
return state; return state;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -41,17 +41,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -62,19 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_LSFT, KC_B, KC_SPC, KC_C, _______, _______, _______ _______, KC_LSFT, KC_B, KC_SPC, KC_C, _______, _______, _______
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -25,19 +25,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_APP, KC_PDOT KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_APP, KC_PDOT
), ),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -552,7 +552,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -126,15 +126,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -219,10 +219,6 @@ void matrix_init_user(void) {
#endif #endif
} }
void matrix_scan_user(void) {
}
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) { switch (get_highest_layer(state)) {
case _BL: case _BL:
@ -260,7 +256,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
} }
return state; return state;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -146,15 +146,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -191,15 +191,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -35,48 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG) KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}

View File

@ -163,14 +163,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
void eeconfig_init_user(void) { void eeconfig_init_user(void) {
set_unicode_input_mode(UNICODE_MODE_MACOS); set_unicode_input_mode(UNICODE_MODE_MACOS);
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -85,15 +85,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -35,19 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
) )
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -56,48 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
} else {
}
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
} else {
}
if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
} else {
}
if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) {
} else {
}
if (IS_LED_ON(usb_led, USB_LED_KANA)) {
} else {
}
}

View File

@ -386,28 +386,4 @@ void led_set_user(uint8_t usb_led) {
bnumlock = false; bnumlock = false;
} }
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
} }

View File

@ -112,22 +112,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!process_record_dynamic_macro(keycode, record)) { if (!process_record_dynamic_macro(keycode, record)) {
return false; return false;
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -46,19 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______,_______ ,_______ _______,_______ ,_______
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -273,44 +273,6 @@ void matrix_init_user(void) {
set_layer_led(0); set_layer_led(0);
} }
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}
/* /*
* NOTE: * NOTE:
* *

View File

@ -110,10 +110,6 @@ void matrix_init_user(void) {
#endif #endif
} }
void matrix_scan_user(void) {
}
layer_state_t layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) { switch (get_highest_layer(state)) {
case _L0: case _L0:
@ -152,7 +148,3 @@ layer_state_t layer_state_set_user(layer_state_t state) {
} }
return state; return state;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -74,12 +74,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
//planck like tri layer //planck like tri layer
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
@ -112,37 +106,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}

View File

@ -70,52 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) { void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
}
else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
DDRB |= (1 << 6); PORTB |= (1 << 6); DDRB |= (1 << 6); PORTB |= (1 << 6);
} }
else { else {
DDRB &= ~(1 << 6); PORTB &= ~(1 << 6); DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
} }
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
}
else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
}
else {
}
if (usb_led & (1 << USB_LED_KANA)) {
}
else {
}
} }

View File

@ -172,15 +172,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -120,14 +120,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case M_QWERTY: case M_QWERTY:
@ -157,7 +149,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -48,23 +48,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -63,20 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -15,13 +15,6 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Defines the keycodes used by our macros in process_record_user
//enum custom_keycodes {
// QMKBEST = SAFE_RANGE,
// QMKURL
//};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap BASE: (Base Layer) Default Layer /* Keymap BASE: (Base Layer) Default Layer
* .----.,----------------------------------------------------------------------. * .----.,----------------------------------------------------------------------.
@ -84,40 +77,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL
), ),
}; };
//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// switch (keycode) {
// case QMKBEST:
// if (record->event.pressed) {
// // when keycode QMKBEST is pressed
// SEND_STRING("QMK is the best thing ever!");
// } else {
// // when keycode QMKBEST is released
// }
// break;
// case QMKURL:
// if (record->event.pressed) {
// // when keycode QMKURL is pressed
// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
// } else {
// // when keycode QMKURL is released
// }
// break;
// }
// return true;
//}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -15,13 +15,6 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Defines the keycodes used by our macros in process_record_user
//enum custom_keycodes {
// QMKBEST = SAFE_RANGE,
// QMKURL
//};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap BASE: (Base Layer) Default Layer /* Keymap BASE: (Base Layer) Default Layer
* .----.,----------------------------------------------------------------------. * .----.,----------------------------------------------------------------------.
@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL
), ),
}; };
//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// switch (keycode) {
// case QMKBEST:
// if (record->event.pressed) {
// // when keycode QMKBEST is pressed
// SEND_STRING("QMK is the best thing ever!");
// } else {
// // when keycode QMKBEST is released
// }
// break;
// case QMKURL:
// if (record->event.pressed) {
// // when keycode QMKURL is pressed
// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
// } else {
// // when keycode QMKURL is released
// }
// break;
// }
// return true;
//}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -15,13 +15,6 @@
*/ */
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Defines the keycodes used by our macros in process_record_user
//enum custom_keycodes {
// QMKBEST = SAFE_RANGE,
// QMKURL
//};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap BASE: (Base Layer) Default Layer /* Keymap BASE: (Base Layer) Default Layer
* .----.,----------------------------------------------------------------------. * .----.,----------------------------------------------------------------------.
@ -64,40 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL KC_LCTL, KC_LALT, KC_SPC, _______, KC_SPC, KC_RALT, KC_RCTL
), ),
}; };
//bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// switch (keycode) {
// case QMKBEST:
// if (record->event.pressed) {
// // when keycode QMKBEST is pressed
// SEND_STRING("QMK is the best thing ever!");
// } else {
// // when keycode QMKBEST is released
// }
// break;
// case QMKURL:
// if (record->event.pressed) {
// // when keycode QMKURL is pressed
// SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
// } else {
// // when keycode QMKURL is released
// }
// break;
// }
// return true;
//}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -34,9 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define KC_FUNC MO(2) #define KC_FUNC MO(2)
#define MICMUTE RCTL(KC_LCTL) #define MICMUTE RCTL(KC_LCTL)
enum function_codes {
};
enum layer_names { enum layer_names {
DEFAULT, DEFAULT,
GAMING, GAMING,
@ -144,14 +141,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_german(uint16_t keycode, keyrecord_t *record) { bool process_german(uint16_t keycode, keyrecord_t *record) {
uint16_t send_code = 0; uint16_t send_code = 0;
if (record->event.pressed) { if (record->event.pressed) {
@ -208,7 +197,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
#endif #endif
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -130,14 +130,6 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case MAC: case MAC:
@ -171,7 +163,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -98,22 +98,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}
void td_common(tap_dance_state_t *state, void *user_data) { void td_common(tap_dance_state_t *state, void *user_data) {
switch (state->count) { switch (state->count) {
case 1: case 1:

View File

@ -50,19 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC, KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END KC_LGUI,KC_NO,KC_LALT,KC_INT5,KC_NO,KC_SPC, KC_0,KC_NO,KC_HOME,KC_PGUP,KC_PGDN,KC_END
), ),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void keyboard_post_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -40,20 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -62,14 +62,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
@ -86,7 +78,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -74,47 +74,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) { void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) { if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
DDRA |= (1 << 3); PORTA |= (1 << 3); DDRA |= (1 << 3); PORTA |= (1 << 3);
} else { } else {
DDRA &= ~(1 << 3); PORTA &= ~(1 << 3); DDRA &= ~(1 << 3); PORTA &= ~(1 << 3);
} }
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
} }

View File

@ -61,19 +61,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, KC_MPLY, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, KC_MRWD, KC_MUTE, KC_MFFD), _______, _______, _______, _______, _______, _______, KC_MRWD, KC_MUTE, KC_MFFD),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -98,40 +98,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}
void reset_rgb(void) { void reset_rgb(void) {
// This gets called on init and after the timeout for the answer color // This gets called on init and after the timeout for the answer color
// If you want to change the default color/mode, do it here // If you want to change the default color/mode, do it here

View File

@ -42,46 +42,3 @@ void matrix_init_user(void) {
initialized = 1; initialized = 1;
} }
} }
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
}
return true;
}
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}

View File

@ -41,44 +41,3 @@ void matrix_init_user(void) {
initialized = 1; initialized = 1;
} }
} }
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}

View File

@ -42,46 +42,3 @@ void matrix_init_user(void) {
initialized = 1; initialized = 1;
} }
} }
void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
}
return true;
}
void led_set_user(uint8_t usb_led) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
}

View File

@ -14,10 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_USER_H #pragma once
#define CONFIG_USER_H
#include "../../config.h"
// place overrides here // place overrides here
#define MUSIC_MASK (keycode != KC_NO) #define MUSIC_MASK (keycode != KC_NO)
@ -27,5 +24,3 @@
#define NO_MUSIC_MODE #define NO_MUSIC_MODE
#endif #endif
#endif

View File

@ -26,7 +26,7 @@ extern rgblight_config_t rgblight_config;
#define _DVORAK 2 #define _DVORAK 2
#define _LOWER 3 #define _LOWER 3
#define _RAISE 4 #define _RAISE 4
#define _ADJUST 16 #define _ADJUST 5
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,
@ -214,7 +214,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -14,15 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_USER_H #pragma once
#define CONFIG_USER_H
#include "../../config.h"
// place overrides here // place overrides here
#define MUSIC_MASK (keycode != KC_NO) #define MUSIC_MASK (keycode != KC_NO)
#define AUDIO_PIN C6
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#undef AUDIO_PIN
#define AUDIO_PIN C6
#define STARTUP_SONG SONG(PLANCK_SOUND) #define STARTUP_SONG SONG(PLANCK_SOUND)
// #define STARTUP_SONG SONG(NO_SOUND) // #define STARTUP_SONG SONG(NO_SOUND)
@ -31,5 +29,3 @@
SONG(DVORAK_SOUND) \ SONG(DVORAK_SOUND) \
} }
#endif #endif
#endif

View File

@ -26,7 +26,7 @@ extern rgblight_config_t rgblight_config;
#define _LOWER 3 #define _LOWER 3
#define _RAISE 4 #define _RAISE 4
#define _EMOJI 5 #define _EMOJI 5
#define _ADJUST 16 #define _ADJUST 6
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,
@ -391,6 +391,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -1,24 +0,0 @@
/* Copyright 2017 Cole Markham, WoodKeys.click
*
* 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/>.
*/
#ifndef CONFIG_USER_H
#define CONFIG_USER_H
#include "../../config.h"
// place overrides here
#endif

View File

@ -24,7 +24,7 @@ extern rgblight_config_t rgblight_config;
#define _QWERTY 0 #define _QWERTY 0
#define _LOWER 1 #define _LOWER 1
#define _RAISE 2 #define _RAISE 2
#define _ADJUST 16 #define _ADJUST 3
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,
@ -227,7 +227,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -201,8 +201,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
void matrix_init_user(void) { }
// Rainbow globals // Rainbow globals
int t = 0; int t = 0;
int rc = 0; int rc = 0;
@ -237,5 +235,3 @@ void matrix_scan_user(void) {
} }
rc--; rc--;
} }
void led_set_user(uint8_t usb_led) { }

View File

@ -22,19 +22,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12
), ),
}; };
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
void matrix_init_user(void) {
}
void matrix_scan_user(void) {
}
void led_set_user(uint8_t usb_led) {
}

View File

@ -19,13 +19,6 @@
/* #define CBRACK 3 // key ] or left alt */ /* #define CBRACK 3 // key ] or left alt */
/* #define CAPS 4 // caps lock */ /* #define CAPS 4 // caps lock */
// LEDS
#define USB_LED_NUM_LOCK 0
#define USB_LED_CAPS_LOCK 1
#define USB_LED_SCROLL_LOCK 2
#define USB_LED_COMPOSE 3
#define USB_LED_KANA 4
// TIMERS // TIMERS
#define KEY_TAP_FAST 85 #define KEY_TAP_FAST 85
#define KEY_TAP_SLOW 95 #define KEY_TAP_SLOW 95

View File

@ -20,13 +20,6 @@
/* #define CBRACK 3 // key ] or left alt */ /* #define CBRACK 3 // key ] or left alt */
/* #define CAPS 4 // caps lock */ /* #define CAPS 4 // caps lock */
// LEDS
#define USB_LED_NUM_LOCK 0
#define USB_LED_CAPS_LOCK 1
#define USB_LED_SCROLL_LOCK 2
#define USB_LED_COMPOSE 3
#define USB_LED_KANA 4
// TIMERS // TIMERS
#define KEY_TAP_FAST 85 #define KEY_TAP_FAST 85
#define KEY_TAP_SLOW 95 #define KEY_TAP_SLOW 95

View File

@ -96,7 +96,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
void led_set_user(uint8_t usb_led) {
}

View File

@ -26,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USB_LED_NUM_LOCK 0 #define USB_LED_NUM_LOCK 0
#define USB_LED_CAPS_LOCK 1 #define USB_LED_CAPS_LOCK 1
#define USB_LED_SCROLL_LOCK 2 #define USB_LED_SCROLL_LOCK 2
#define USB_LED_COMPOSE 3
#define USB_LED_KANA 4
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -347,24 +347,24 @@ static void flush(void) {
} }
void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) { void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) {
uint8_t kbled = keyboard_leds(); led_t led_state = host_keyboard_led_state();
if (kbled && rgb_matrix_config.enable) { if (led_state.raw && rgb_matrix_config.enable) {
for (uint8_t i = led_min; i < led_max; i++) { for (uint8_t i = led_min; i < led_max; i++) {
if ( if (
# if USB_LED_NUM_LOCK_SCANCODE != 255 # if USB_LED_NUM_LOCK_SCANCODE != 255
(led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) || (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && led_state.num_lock) ||
# endif // NUM LOCK # endif // NUM LOCK
# if USB_LED_CAPS_LOCK_SCANCODE != 255 # if USB_LED_CAPS_LOCK_SCANCODE != 255
(led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && (kbled & (1 << USB_LED_CAPS_LOCK))) || (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && led_state.caps_lock) ||
# endif // CAPS LOCK # endif // CAPS LOCK
# if USB_LED_SCROLL_LOCK_SCANCODE != 255 # if USB_LED_SCROLL_LOCK_SCANCODE != 255
(led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && (kbled & (1 << USB_LED_SCROLL_LOCK))) || (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && led_state.scroll_lock) ||
# endif // SCROLL LOCK # endif // SCROLL LOCK
# if USB_LED_COMPOSE_SCANCODE != 255 # if USB_LED_COMPOSE_SCANCODE != 255
(led_map[i].scan == USB_LED_COMPOSE_SCANCODE && (kbled & (1 << USB_LED_COMPOSE))) || (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && led_state.compose) ||
# endif // COMPOSE # endif // COMPOSE
# if USB_LED_KANA_SCANCODE != 255 # if USB_LED_KANA_SCANCODE != 255
(led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) || (led_map[i].scan == USB_LED_KANA_SCANCODE && led_state.kana) ||
# endif // KANA # endif // KANA
(0)) { (0)) {
if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) { if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {