diff options
author | jack <[email protected]> | 2022-12-19 14:50:36 -0700 |
---|---|---|
committer | jack <[email protected]> | 2022-12-19 14:50:36 -0700 |
commit | ed2402f7061d02b0fa376af4886f2d4308d35646 (patch) | |
tree | 1b5cf0b3811bcb113cfd88eb6249755ef6aa9606 | |
parent | 104ae45622bfeb79e196fc127397e3a582844714 (diff) | |
download | qmk_me-ed2402f7061d02b0fa376af4886f2d4308d35646.tar.gz qmk_me-ed2402f7061d02b0fa376af4886f2d4308d35646.zip |
fixup vault35
misc cleanup
-rw-r--r-- | keyboards/vault35/info.json | 17 | ||||
-rw-r--r-- | keyboards/vault35/keymaps/waffle/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/vault35/readme.md | 3 | ||||
-rw-r--r-- | keymaps/kyria/config.h | 2 | ||||
-rw-r--r-- | keymaps/kyria/keymap.c | 5 | ||||
-rw-r--r-- | waffle/unicode.c | 6 |
6 files changed, 23 insertions, 16 deletions
diff --git a/keyboards/vault35/info.json b/keyboards/vault35/info.json index b018fb1..acfc63a 100644 --- a/keyboards/vault35/info.json +++ b/keyboards/vault35/info.json @@ -9,9 +9,7 @@ "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"], "rows": ["B4", "D4", "B0", "C7"] }, - "features": { - "rgblight": true - }, + "features": { "rgblight": true }, "usb": { "vid": "0x6A73", "pid": "0x3335", @@ -20,10 +18,7 @@ "rgblight": { "led_count": 12, "pin": "D5", - "animations": { - "twinkle": true, - "static_gradient": true - } + "sleep": true }, "layouts": { "LAYOUT": { @@ -38,7 +33,7 @@ {"label": "i", "matrix": [0, 7], "x": 7, "y": 0}, {"label": "o", "matrix": [0, 8], "x": 8, "y": 0}, {"label": "p", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "", "matrix": [0, 10], "x": 10, "y": 0}, {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, @@ -60,11 +55,11 @@ {"label": ".", "matrix": [2, 8], "x": 8.75, "y": 2}, {"label": "/", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25}, {"label": "../", "matrix": [3, 1], "x": 1.5, "y": 3}, - {"label": "", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, {"label": "spc", "matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, {"label": "bspc", "matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75}, - {"label": "", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25}, - {"label": "", "matrix": [3, 7], "x": 8.5, "y": 3} + {"label": "", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25}, + {"label": "", "matrix": [3, 7], "x": 8.5, "y": 3} ] } } diff --git a/keyboards/vault35/keymaps/waffle/keymap.c b/keyboards/vault35/keymaps/waffle/keymap.c index 091091e..fbf7df3 100644 --- a/keyboards/vault35/keymaps/waffle/keymap.c +++ b/keyboards/vault35/keymaps/waffle/keymap.c @@ -4,7 +4,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, KC_NO, ___BASE2___, ___BASE3___, - ___BASE4___ + UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP ), [_LOWER] = LAYOUT_waffle( @@ -20,3 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___RAISE4___ ) }; + +void keyboard_post_init_user(void) { + rgblight_sethsv_noeeprom(104,255,255); +} diff --git a/keyboards/vault35/readme.md b/keyboards/vault35/readme.md new file mode 100644 index 0000000..15d1db4 --- /dev/null +++ b/keyboards/vault35/readme.md @@ -0,0 +1,3 @@ +### vault35 +![w/o keycaps](https://i.imgur.com/AHwhQdDh.jpeg) +![w/ keycaps](https://i.imgur.com/lXP50ITh.jpeg) diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h index 1f014a6..5cb4d4a 100644 --- a/keymaps/kyria/config.h +++ b/keymaps/kyria/config.h @@ -5,7 +5,9 @@ #define POINTING_DEVICE_RIGHT #define CIRQUE_PINNACLE_CURVED_OVERLAY #define CIRQUE_PINNACLE_TAP_ENABLE +#define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE #define CIRQUE_PINNACLE_DIAMETER_MM 35 +#define SPLIT_WATCHDOG_ENABLE #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED #ifdef RGBLIGHT_ENABLE diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index cad95a6..b4d2bf9 100644 --- a/keymaps/kyria/keymap.c +++ b/keymaps/kyria/keymap.c @@ -55,3 +55,8 @@ bool oled_task_keymap(void) { return false; } #endif + +#ifdef RGBLIGHT_ENABLE +void suspend_power_down_user(void) { rgblight_disable(); } +void suspend_wakeup_init_user(void) { rgblight_enable(); } +#endif diff --git a/waffle/unicode.c b/waffle/unicode.c index 138efbb..a1d9998 100644 --- a/waffle/unicode.c +++ b/waffle/unicode.c @@ -40,9 +40,8 @@ void tap_code16_nomods(uint16_t kc) { static inline uint32_t translator_name(bool is_shifted, uint32_t keycode) { \ static const uint32_t translation[] = {__VA_ARGS__}; \ uint32_t ret = keycode; \ - if ((keycode - KC_A) < (sizeof(translation) / sizeof(uint32_t))) { \ + if ((keycode - KC_A) < ARRAY_SIZE(translation)) \ ret = translation[keycode - KC_A]; \ - } \ return ret; \ } @@ -155,12 +154,11 @@ DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_super, bool process_record_aussie(uint16_t keycode, keyrecord_t *record) { bool is_shifted = (get_mods()) & MOD_MASK_SHIFT; if ((KC_A <= keycode) && (keycode <= KC_0)) { - if (record->event.pressed) { + if (record->event.pressed) if (!process_record_glyph_replacement(keycode, record, unicode_lut_translator_aussie)) { tap_code16_nomods(KC_LEFT); return false; } - } } else if (record->event.pressed && keycode == KC_SPACE) { tap_code16_nomods(KC_SPACE); tap_code16_nomods(KC_LEFT); |