aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorla-ninpre <aaoth@aaoth.xyz>2024-01-04 00:34:03 +0300
committerla-ninpre <aaoth@aaoth.xyz>2024-01-04 00:34:03 +0300
commit2c4639a23e6f22119f190a08fb44af427b6fad60 (patch)
tree418a94a1ea1fe169ef51b520910cc5d3af9d39fc
parent32eb37bc3e68a3cd0203b149d6de537346df2f1b (diff)
downloadqmk-userspace-2c4639a23e6f22119f190a08fb44af427b6fad60.tar.gz
qmk-userspace-2c4639a23e6f22119f190a08fb44af427b6fad60.zip
keymap: swap caps lock and escape, use macros for indicators
-rw-r--r--keymap.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/keymap.c b/keymap.c
index be09f34..90e1696 100644
--- a/keymap.c
+++ b/keymap.c
@@ -20,10 +20,10 @@ enum {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_ansi_82(
- KC_ESC, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), KC_MPLY, KC_VOLD, KC_VOLU, KC_DEL, KC_HOME,
+ KC_CAPS, G(KC_1), G(KC_2), G(KC_3), G(KC_4), G(KC_5), G(KC_6), G(KC_7), G(KC_8), G(KC_9), KC_MPLY, KC_VOLD, KC_VOLU, KC_DEL, KC_HOME,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 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_LCTL, KC_LGUI, KC_LALT, LT(EXTR,KC_SPC), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[EXTR] = LAYOUT_ansi_82(
@@ -60,24 +60,22 @@ dip_switch_update_user(uint8_t index, bool active)
// top-right key for numpad status
#define IND_NUMPAD 14
-#define IND_CAPSLK 45
-#define IND_R 0xcc
-#define IND_G 0x33
-#define IND_B 0x33
+#define IND_CAPSLK 0
+#define IND_COLOUR 0xCC, 0x33, 0x33
bool
rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max)
{
if(rgb_matrix_is_enabled()){
led_t led_state = host_keyboard_led_state();
if(led_state.num_lock){
- rgb_matrix_set_color(IND_NUMPAD, IND_R, IND_G, IND_G);
+ rgb_matrix_set_color(IND_NUMPAD, IND_COLOUR);
}else{
- rgb_matrix_set_color(IND_NUMPAD, 0, 0, 0);
+ rgb_matrix_set_color(IND_NUMPAD, RGB_BLACK);
}
if(led_state.caps_lock){
- rgb_matrix_set_color(IND_CAPSLK, IND_R, IND_G, IND_G);
+ rgb_matrix_set_color(IND_CAPSLK, IND_COLOUR);
}else{
- rgb_matrix_set_color(IND_CAPSLK, 0, 0, 0);
+ rgb_matrix_set_color(IND_CAPSLK, RGB_BLACK);
}
}
return false;