From 6e026a036cb833e5c4e6f46a1c838494d1b8cb0d Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 1 Sep 2022 10:38:49 +0200 Subject: [PATCH 01/76] Add ciaanh boards --- keyboards/ciaanh/kanagawa/config.h | 3 + keyboards/ciaanh/kanagawa/kanagawa.c | 1 + keyboards/ciaanh/kanagawa/kanagawa.h | 5 + .../ciaanh/kanagawa/keymaps/default/config.h | 3 + .../kanagawa/keymaps/default/keycodes.h | 23 + .../ciaanh/kanagawa/keymaps/default/keymap.c | 258 ++++++ .../ciaanh/kanagawa/keymaps/default/rules.mk | 6 + .../ciaanh/kanagawa/keymaps/via/keycodes.h | 23 + .../ciaanh/kanagawa/keymaps/via/keymap.c | 211 +++++ .../ciaanh/kanagawa/keymaps/via/rules.mk | 7 + keyboards/ciaanh/kanagawa/lib/oledfont.c | 277 ++++++ keyboards/ciaanh/kanagawa/readme.md | 16 + keyboards/ciaanh/kanagawa/rev1/config.h | 46 + keyboards/ciaanh/kanagawa/rev1/kanagawa.json | 21 + keyboards/ciaanh/kanagawa/rev1/rev1.c | 17 + keyboards/ciaanh/kanagawa/rev1/rev1.h | 29 + keyboards/ciaanh/kanagawa/rev1/rules.mk | 3 + keyboards/ciaanh/kanagawa/rules.mk | 33 + keyboards/ciaanh/kanagawa2040/config.h | 131 +++ keyboards/ciaanh/kanagawa2040/halconf.h | 28 + keyboards/ciaanh/kanagawa2040/info.json | 30 + .../kanagawa2040/keymaps/default/keymap.c | 114 +++ .../kanagawa2040/keymaps/default/rules.mk | 1 + .../ciaanh/kanagawa2040/keymaps/via/keymap.c | 138 +++ .../ciaanh/kanagawa2040/keymaps/via/rules.mk | 2 + .../ciaanh/kanagawa2040/lib/oled_driver_spi.h | 29 + .../ciaanh/kanagawa2040/lib/ssd1306_sh1106.c | 827 ++++++++++++++++++ keyboards/ciaanh/kanagawa2040/macropad.c | 56 ++ keyboards/ciaanh/kanagawa2040/macropad.h | 38 + keyboards/ciaanh/kanagawa2040/mcuconf.h | 22 + keyboards/ciaanh/kanagawa2040/readme.md | 42 + keyboards/ciaanh/kanagawa2040/rules.mk | 26 + keyboards/ciaanh/pallas/config.h | 3 + keyboards/ciaanh/pallas/lib/oledfont.c | 282 ++++++ keyboards/ciaanh/pallas/pallas.c | 1 + keyboards/ciaanh/pallas/pallas.h | 7 + keyboards/ciaanh/pallas/readme.md | 16 + keyboards/ciaanh/pallas/rev1/config.h | 56 ++ keyboards/ciaanh/pallas/rev1/info.json | 89 ++ .../pallas/rev1/keymaps/default/config.h | 3 + .../pallas/rev1/keymaps/default/keycodes.h | 46 + .../pallas/rev1/keymaps/default/keymap.c | 327 +++++++ .../pallas/rev1/keymaps/default/rules.mk | 3 + keyboards/ciaanh/pallas/rev1/rev1.c | 17 + keyboards/ciaanh/pallas/rev1/rev1.h | 24 + keyboards/ciaanh/pallas/rev1/rules.mk | 5 + keyboards/ciaanh/pallas/rules.mk | 32 + 47 files changed, 3377 insertions(+) create mode 100644 keyboards/ciaanh/kanagawa/config.h create mode 100644 keyboards/ciaanh/kanagawa/kanagawa.c create mode 100644 keyboards/ciaanh/kanagawa/kanagawa.h create mode 100644 keyboards/ciaanh/kanagawa/keymaps/default/config.h create mode 100644 keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h create mode 100644 keyboards/ciaanh/kanagawa/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h create mode 100644 keyboards/ciaanh/kanagawa/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/keymaps/via/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/lib/oledfont.c create mode 100644 keyboards/ciaanh/kanagawa/readme.md create mode 100644 keyboards/ciaanh/kanagawa/rev1/config.h create mode 100644 keyboards/ciaanh/kanagawa/rev1/kanagawa.json create mode 100644 keyboards/ciaanh/kanagawa/rev1/rev1.c create mode 100644 keyboards/ciaanh/kanagawa/rev1/rev1.h create mode 100644 keyboards/ciaanh/kanagawa/rev1/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/rules.mk create mode 100644 keyboards/ciaanh/kanagawa2040/config.h create mode 100644 keyboards/ciaanh/kanagawa2040/halconf.h create mode 100644 keyboards/ciaanh/kanagawa2040/info.json create mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk create mode 100644 keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h create mode 100644 keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c create mode 100644 keyboards/ciaanh/kanagawa2040/macropad.c create mode 100644 keyboards/ciaanh/kanagawa2040/macropad.h create mode 100644 keyboards/ciaanh/kanagawa2040/mcuconf.h create mode 100644 keyboards/ciaanh/kanagawa2040/readme.md create mode 100644 keyboards/ciaanh/kanagawa2040/rules.mk create mode 100644 keyboards/ciaanh/pallas/config.h create mode 100644 keyboards/ciaanh/pallas/lib/oledfont.c create mode 100644 keyboards/ciaanh/pallas/pallas.c create mode 100644 keyboards/ciaanh/pallas/pallas.h create mode 100644 keyboards/ciaanh/pallas/readme.md create mode 100644 keyboards/ciaanh/pallas/rev1/config.h create mode 100644 keyboards/ciaanh/pallas/rev1/info.json create mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/config.h create mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h create mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/pallas/rev1/rev1.c create mode 100644 keyboards/ciaanh/pallas/rev1/rev1.h create mode 100644 keyboards/ciaanh/pallas/rev1/rules.mk create mode 100644 keyboards/ciaanh/pallas/rules.mk diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h new file mode 100644 index 00000000000..b8c5759db6b --- /dev/null +++ b/keyboards/ciaanh/kanagawa/config.h @@ -0,0 +1,3 @@ +#pragma once + +#include "config_common.h" diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c new file mode 100644 index 00000000000..2b7f0847711 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/kanagawa.c @@ -0,0 +1 @@ +#include "kanagawa.h" diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h new file mode 100644 index 00000000000..ab445c721e4 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/kanagawa.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_ciaanh_kanagawa_rev1 + #include "rev1.h" +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/config.h b/keyboards/ciaanh/kanagawa/keymaps/default/config.h new file mode 100644 index 00000000000..271f48d0011 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/default/config.h @@ -0,0 +1,3 @@ +#pragma once + +// place overrides here diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h new file mode 100644 index 00000000000..f77fe122b44 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h @@ -0,0 +1,23 @@ +#pragma once + +enum layers +{ + _BASE, + _LOWER, + _UPPER, + _CODE +}; + +enum custom_keycodes +{ + ENCODER = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_CODE TG(_CODE) + +#define L_UP MO(_UPPER) +#define L_DWN MO(_LOWER) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/keymaps/default/keymap.c new file mode 100644 index 00000000000..69e3b515a3a --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/default/keymap.c @@ -0,0 +1,258 @@ +#include QMK_KEYBOARD_H +#include "keycodes.h" + +/* Keyboard layout + ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. + | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | + `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' + ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. + | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| + | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| + | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' + | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | + | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. + |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | + `---------+---------' `---------+---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* +* +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' +* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | +* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------+---------' `---------+---------' `---------+---------+---------' +* +* +*/ + [_BASE] = LAYOUT_84_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + + [_CODE] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_LOWER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_UPPER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) + + + +}; + + + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + // oled_rotation_t oled_init_user(oled_rotation_t rotation) { + // return OLED_ROTATION_180; + // } + + static void render_status(void) { + // 21 characters per line + // 16 cols / 8 rows + + oled_write_P(PSTR(" Kanagawa rev 1.1 "), false); + //oled_write_ln("", false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _LOWER: + oled_write_P(PSTR("[Low]\n"), false); + break; + case _UPPER: + oled_write_P(PSTR("[Up]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(PSTR(" "), false); + + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + } + + // static void render_kanagawa_logo(void) { + // static const char PROGMEM kanagawa_logo[] = { + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, + // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, + // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, + // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, + // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, + // }; + // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); + // } + + // static void render_kanagawa_logo(void) { + // //oled_set_cursor(0, 5); + + // static const char PROGMEM kanagawa_logo[] = { + // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + // }; + + // oled_write_P(kanagawa_logo, false); + // } + + bool oled_task_user(void) { + // switch (get_highest_layer(layer_state)) { + // case _UPPER: + // render_kanagawa_logo(); + // break; + // default: + // render_status(); + // } + + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ENCODER: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#ifdef ENCODER_ENABLE + bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case _CODE: + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + break; + default: + if (clockwise) { + tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); + } + break; + } + } + return true; + } +#endif diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa/keymaps/default/rules.mk new file mode 100644 index 00000000000..84b40dd3533 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/default/rules.mk @@ -0,0 +1,6 @@ +ENCODER_ENABLE = yes +OLED_ENABLE = yes + +CONSOLE_ENABLE = no +LTO_ENABLE = yes +MOUSEKEY_ENABLE = no \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h b/keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h new file mode 100644 index 00000000000..f77fe122b44 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h @@ -0,0 +1,23 @@ +#pragma once + +enum layers +{ + _BASE, + _LOWER, + _UPPER, + _CODE +}; + +enum custom_keycodes +{ + ENCODER = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_CODE TG(_CODE) + +#define L_UP MO(_UPPER) +#define L_DWN MO(_LOWER) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/keymaps/via/keymap.c new file mode 100644 index 00000000000..cdd5efa4a7f --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/via/keymap.c @@ -0,0 +1,211 @@ +#include QMK_KEYBOARD_H +#include "keycodes.h" + +/* Keyboard layout + ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. + | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | + `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' + ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. + | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| + | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| + | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' + | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | + | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. + |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | + `---------+---------' `---------+---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* +* +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' +* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | +* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------+---------' `---------+---------' `---------+---------+---------' +* +* +*/ + [_BASE] = LAYOUT_84_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + + [_CODE] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_LOWER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_UPPER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) + + + +}; + + + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + static void render_status(void) { + oled_write_P(PSTR(" Kanagawa rev 1.1v "), false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _LOWER: + oled_write_P(PSTR("[Low]\n"), false); + break; + case _UPPER: + oled_write_P(PSTR("[Up]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + } + + bool oled_task_user(void) { + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ENCODER: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#ifdef ENCODER_ENABLE + bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case _CODE: + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + break; + default: + if (clockwise) { + tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); + } + break; + } + } + return true; + } +#endif diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa/keymaps/via/rules.mk new file mode 100644 index 00000000000..d43b4d8b5d4 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/keymaps/via/rules.mk @@ -0,0 +1,7 @@ +ENCODER_ENABLE = yes +OLED_ENABLE = yes + +VIA_ENABLE = yes +BOOTMAGIC_ENABLE = lite +LTO_ENABLE = yes +MOUSEKEY_ENABLE = no \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/lib/oledfont.c b/keyboards/ciaanh/kanagawa/lib/oledfont.c new file mode 100644 index 00000000000..153007ef1a3 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/lib/oledfont.c @@ -0,0 +1,277 @@ +#include "progmem.h" + + + +const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => + + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / + + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? + + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O + + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ + + 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o + + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => + 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => + 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => + 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => + 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => + 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => + 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => + 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => + 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => + 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => + + 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => + 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => + 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => + 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => + 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => + 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => + 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => + 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => + 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => + 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => + 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => + 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => + 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => + 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => + 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => + 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => + 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => + 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => + 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => + + 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => + 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => + 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => + 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => + 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => + 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => + 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => + 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => + 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => + 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => + 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => + 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => + 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => + 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => + 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => + 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => + 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => + 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => + 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => + 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => + 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => + 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => + 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => + 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => + + 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => + 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => + 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => + 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => +}; diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md new file mode 100644 index 00000000000..086f1353b41 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -0,0 +1,16 @@ +# Kanagawa + +A 75% keyboard with oled and rotary encoder for Elite-C + + Keyboard Maintainer : Ciaanh + + Hardware Supported : Kanagawa PCB + + Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa + + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb ciaanh/kanagawa -km default + +Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader diff --git a/keyboards/ciaanh/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawa/rev1/config.h new file mode 100644 index 00000000000..91a5f367b31 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rev1/config.h @@ -0,0 +1,46 @@ +#pragma once + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xC1E0 +#define PRODUCT_ID 0x0010 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Ciaanh +#define PRODUCT Kanagawa +#define DESCRIPTION 75 with features + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS { B2, B3, B1, F7, F6, F5 } +#define MATRIX_COL_PINS { B6, F0, F1, C7, D5, B7, B5, B4, E6, D7, C6, D4, D2, D3 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#ifdef OLED_ENABLE +# define OLED_DISPLAY_128X64 +# define OLED_FONT_H "lib/oledfont.c" +# define OLED_FONT_END 255 +// # define OLED_DISPLAY_ADDRESS 0x78 +#endif + +/* encoder support */ +#define ENCODERS_PAD_A \ + { B0 } +#define ENCODERS_PAD_B \ + { F4 } +#define ENCODERS_PAD_A_RIGHT \ + { F4 } +#define ENCODERS_PAD_B_RIGHT \ + { B0 } +#define ENCODER_RESOLUTION 2 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ciaanh/kanagawa/rev1/kanagawa.json b/keyboards/ciaanh/kanagawa/rev1/kanagawa.json new file mode 100644 index 00000000000..0551efec13d --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rev1/kanagawa.json @@ -0,0 +1,21 @@ +{ + "name": "Kanagawa", + "vendorId": "0xC1E0", + "productId": "0x0010", + "lighting": "none", + "matrix": { "rows": 6, "cols": 14 }, + "layouts": { + "keymap": [ + [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], + [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], + [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], + [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], + [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], + [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], + [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], + [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], + [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], + [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] + ] + } +} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rev1/rev1.c b/keyboards/ciaanh/kanagawa/rev1/rev1.c new file mode 100644 index 00000000000..fd021581d38 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rev1/rev1.c @@ -0,0 +1,17 @@ +#include "kanagawa.h" + +#ifdef SSD1306OLED +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + led_set_user(usb_led); +} +#endif + + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { return encoder_update_user(index, clockwise); } +#endif + +void matrix_init_kb(void) { matrix_init_user(); }; + +void shutdown_user(void) { } \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rev1/rev1.h b/keyboards/ciaanh/kanagawa/rev1/rev1.h new file mode 100644 index 00000000000..ca8c09b2804 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rev1/rev1.h @@ -0,0 +1,29 @@ +#pragma once +#include "quantum.h" + + +/* This a shortcut to help you visually see your layout. +* +* The first section contains all of the arguments representing the physical +* layout of the board and position of the K4ys. +* +* The second converts the arguments into a two-dimensional array which +* represents the switch matrix. +*/ +#define LAYOUT_84_ansi( \ + K00, K01,K02,K03,K04, K05,K06,K07,K08, K09,K010,K011,K012, K013, \ + \ + K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K110,K111,K112, K113 , K313, \ + K20 ,K21,K22,K23,K24,K25,K26,K27,K28,K29,K210,K211,K212, K213 , K413, \ + K30 ,K31,K32,K33,K34,K35,K36,K37,K38,K39,K310,K311, K312 , K513, \ + K40 ,K41,K42,K43,K44,K45,K46,K47,K48,K49,K410, K411 , K412, \ + K50 ,K51,K52 , K53,K54 , K55,K56, K57 ,K58,K59 , K510, K511, K512 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412, K413 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K510, K511, K512, K513 } \ +} diff --git a/keyboards/ciaanh/kanagawa/rev1/rules.mk b/keyboards/ciaanh/kanagawa/rev1/rules.mk new file mode 100644 index 00000000000..df78121d9c3 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rev1/rules.mk @@ -0,0 +1,3 @@ +ENCODER_ENABLE = no +OLED_ENABLE = no + diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk new file mode 100644 index 00000000000..731daafcd52 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = qmk-dfu + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +OLED_ENABLE = no + +DEFAULT_FOLDER = ciaanh/kanagawa/rev1 diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h new file mode 100644 index 00000000000..cc4cbc940cb --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -0,0 +1,131 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#pragma once + +#include "config_common.h" + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 3 + +/* Keyboard Matrix Assignments */ +// clang-format off +#define DIRECT_PINS { \ + { NO_PIN, NO_PIN, GP0 }, \ + { GP1, GP2, GP3 }, \ + { GP4, GP5, GP6 }, \ + { GP7, GP8, GP9 }, \ + { GP10, GP11, GP12 } \ +} +// clang-format on + +/* OLED SPI Defines */ +#define OLED_DISPLAY_128X64 +#define OLED_IC OLED_IC_SH1106 + +/* OLED SPI Pins */ +#define OLED_DC_PIN GP24 +#define OLED_CS_PIN GP22 +#define OLED_RST_PIN GP23 + +/* Shift OLED columns by 2 pixels */ +#define OLED_COLUMN_OFFSET 2 + +/* Divisor for OLED */ +#define OLED_SPI_DIVISOR 4 + +/* ChibiOS SPI definitions */ +#define SPI_DRIVER SPID1 +#define SPI_SCK_PIN GP26 +#define SPI_MOSI_PIN GP27 +#define SPI_MISO_PIN GP28 + +/* Encoders */ +#define ENCODERS_PAD_A { GP18 } +#define ENCODERS_PAD_B { GP17 } + +#define DEBOUNCE 5 + +/* Bootmagic lite */ +/* (Press the key bellow the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ +#define BOOTMAGIC_LITE_ROW 1 +#define BOOTMAGIC_LITE_COLUMN 2 + +/* Double tap the side button to enter bootloader */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +/* Audio (Unsupported for now)*/ +// #define AUDIO_PIN GP16 +// #define SPEAKER_SHUTDOWN GP14 + +#ifdef RGB_MATRIX_ENABLE + + /* RGB Defines */ +# define RGB_DI_PIN GP19 +# define DRIVER_LED_TOTAL 12 +# define RGBLED_NUM 12 + + /* Enable Framebuffer and keypress effects */ +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif diff --git a/keyboards/ciaanh/kanagawa2040/halconf.h b/keyboards/ciaanh/kanagawa2040/halconf.h new file mode 100644 index 00000000000..6cd66fd5207 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/halconf.h @@ -0,0 +1,28 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#pragma once + +#include_next + +#undef HAL_USE_SPI +#define HAL_USE_SPI TRUE + +#undef SPI_USE_WAIT +#define SPI_USE_WAIT TRUE + +#undef SPI_SELECT_MODE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json new file mode 100644 index 00000000000..e9bd7d85b19 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/info.json @@ -0,0 +1,30 @@ +{ + "keyboard_name": "Macropad RP2040", + "manufacturer": "Adafruit", + "url": "https://learn.adafruit.com/adafruit-macropad-rp2040", + "maintainer": "Jpe230", + "usb": { + "vid": "0x239A", + "pid": "0x0108", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"Mute", "x":2, "y":0}, + {"label":"Enter", "x":0, "y":1}, + {"label":"KC_0", "x":1, "y":1}, + {"label":"BackSpace", "x":2, "y":1}, + {"label":"KC_7", "x":0, "y":2}, + {"label":"KC_8", "x":1, "y":2}, + {"label":"KC_9", "x":2, "y":2}, + {"label":"KC_4", "x":0, "y":3}, + {"label":"KC_5", "x":1, "y":3}, + {"label":"KC_6", "x":2, "y":3}, + {"label":"KC_1", "x":0, "y":4}, + {"label":"KC_2", "x":1, "y":4}, + {"label":"KC_3", "x":2, "y":4} + ] + } + } +} diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c new file mode 100644 index 00000000000..34989ea0b60 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c @@ -0,0 +1,114 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_MUTE, + KC_ENT, KC_0, KC_BSPC, + KC_7, KC_8, KC_9, + KC_4, KC_5, KC_6, + KC_1, KC_2, KC_3 + ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif + + +#ifdef OLED_ENABLE +static void render_qmk_logo(void) { + static const char PROGMEM qmk_logo[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, + 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, + 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, + 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff, + 0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, + 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + + oled_write_raw_P(qmk_logo, sizeof(qmk_logo)); +} + +bool oled_task_user(void) { + render_qmk_logo(); + return true; +} + +#endif + diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c new file mode 100644 index 00000000000..6ef3d3e29dd --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c @@ -0,0 +1,138 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_MUTE, + KC_ENT, KC_0, KC_BSPC, + KC_7, KC_8, KC_9, + KC_4, KC_5, KC_6, + KC_1, KC_2, KC_3 + ), + [1] = LAYOUT( + _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), + [2] = LAYOUT( + _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), + [3] = LAYOUT( + _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______, + _______, _______, _______ + ), +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) }, + [2] = { ENCODER_CCW_CW(_______, _______) }, + [3] = { ENCODER_CCW_CW(_______, _______) } +}; +#endif + + +#ifdef OLED_ENABLE +static void render_qmk_logo(void) { + static const char PROGMEM qmk_logo[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, + 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, + 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, + 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff, + 0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, + 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }; + + oled_write_raw_P(qmk_logo, sizeof(qmk_logo)); +} + +bool oled_task_user(void) { + render_qmk_logo(); + return true; +} + +#endif + diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk new file mode 100644 index 00000000000..715838ecc5d --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h b/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h new file mode 100644 index 00000000000..c8a2cd7d9a4 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h @@ -0,0 +1,29 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ +#pragma once + +#ifndef OLED_DC_PIN +# error "The OLED driver in SPI needs a D/C pin defined" +#endif +#ifndef OLED_CS_PIN +# error "The OLED driver in SPI needs a CS pin defined" +#endif +#ifndef OLED_SPI_MODE +# define OLED_SPI_MODE 3 +#endif +#ifndef OLED_SPI_DIVISOR +# define OLED_SPI_DIVISOR 2 +#endif diff --git a/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c b/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c new file mode 100644 index 00000000000..dc1289fdb13 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c @@ -0,0 +1,827 @@ +/* +Copyright 2019 Ryan Caltabiano +Copyright 2022 Jose Pablo Ramirez +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 . +*/ +#include "oled_driver.h" +#include "oled_driver_spi.h" + +#include "spi_master.h" + +#include +#include OLED_FONT_H +#include "timer.h" +#include "print.h" + +#include + +#include "progmem.h" + +#include "keyboard.h" + +// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf +// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf + +// Fundamental Commands +#define CONTRAST 0x81 +#define DISPLAY_ALL_ON 0xA5 +#define DISPLAY_ALL_ON_RESUME 0xA4 +#define NORMAL_DISPLAY 0xA6 +#define INVERT_DISPLAY 0xA7 +#define DISPLAY_ON 0xAF +#define DISPLAY_OFF 0xAE +#define NOP 0xE3 + +// Scrolling Commands +#define ACTIVATE_SCROLL 0x2F +#define DEACTIVATE_SCROLL 0x2E +#define SCROLL_RIGHT 0x26 +#define SCROLL_LEFT 0x27 +#define SCROLL_RIGHT_UP 0x29 +#define SCROLL_LEFT_UP 0x2A + +// Addressing Setting Commands +#define MEMORY_MODE 0x20 +#define COLUMN_ADDR 0x21 +#define PAGE_ADDR 0x22 +#define PAM_SETCOLUMN_LSB 0x00 +#define PAM_SETCOLUMN_MSB 0x10 +#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7 + +// Hardware Configuration Commands +#define DISPLAY_START_LINE 0x40 +#define SEGMENT_REMAP 0xA0 +#define SEGMENT_REMAP_INV 0xA1 +#define MULTIPLEX_RATIO 0xA8 +#define COM_SCAN_INC 0xC0 +#define COM_SCAN_DEC 0xC8 +#define DISPLAY_OFFSET 0xD3 +#define COM_PINS 0xDA +#define COM_PINS_SEQ 0x02 +#define COM_PINS_ALT 0x12 +#define COM_PINS_SEQ_LR 0x22 +#define COM_PINS_ALT_LR 0x32 + +// Timing & Driving Commands +#define DISPLAY_CLOCK 0xD5 +#define PRE_CHARGE_PERIOD 0xD9 +#define VCOM_DETECT 0xDB + +// Advance Graphic Commands +#define FADE_BLINK 0x23 +#define ENABLE_FADE 0x20 +#define ENABLE_BLINK 0x30 + +// Charge Pump Commands +#define CHARGE_PUMP 0x8D + +// Misc defines +#ifndef OLED_BLOCK_COUNT +# define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) +#endif +#ifndef OLED_BLOCK_SIZE +# define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) +#endif + +#define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1) + +#define ARRAY_SIZE(arr) sizeof(arr)/sizeof(arr[0]) + +// spi defines +#define OLED_STATUS_SUCCESS SPI_STATUS_SUCCESS + +void oled_spi_init(void) { + spi_init(); + + setPinOutput(OLED_CS_PIN); + writePinHigh(OLED_CS_PIN); + + setPinOutput(OLED_DC_PIN); + writePinLow(OLED_DC_PIN); +} + +void oled_spi_start(void) { + spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR); +} + +void oled_spi_stop(void) { + spi_stop(); +} + +// Transmit/Write Funcs. +bool oled_cmd(const uint8_t *data, uint16_t size) { + oled_spi_start(); + // Command Mode + writePinLow(OLED_DC_PIN); + // Send the commands + if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){ + oled_spi_stop(); + return false; + } + oled_spi_stop(); + return true; +} + +bool oled_cmd_p(const uint8_t *data, uint16_t size) { + return oled_cmd(data, size); +} + +bool oled_write_reg(const uint8_t *data, uint16_t size) +{ + oled_spi_start(); + // Command Mode + writePinHigh(OLED_DC_PIN); + // Send the commands + if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){ + oled_spi_stop(); + return false; + } + oled_spi_stop(); + return true; +} + +#define HAS_FLAGS(bits, flags) ((bits & flags) == flags) + +// Display buffer's is the same as the OLED memory layout +// this is so we don't end up with rounding errors with +// parts of the display unusable or don't get cleared correctly +// and also allows for drawing & inverting +uint8_t oled_buffer[OLED_MATRIX_SIZE]; +uint8_t * oled_cursor; +OLED_BLOCK_TYPE oled_dirty = 0; +bool oled_initialized = false; +bool oled_active = false; +bool oled_scrolling = false; +bool oled_inverted = false; +uint8_t oled_brightness = OLED_BRIGHTNESS; +oled_rotation_t oled_rotation = 0; +uint8_t oled_rotation_width = 0; +uint8_t oled_scroll_speed = 0; // this holds the speed after being remapped to ssd1306 internal values +uint8_t oled_scroll_start = 0; +uint8_t oled_scroll_end = 7; +#if OLED_TIMEOUT > 0 +uint32_t oled_timeout; +#endif +#if OLED_SCROLL_TIMEOUT > 0 +uint32_t oled_scroll_timeout; +#endif +#if OLED_UPDATE_INTERVAL > 0 +uint16_t oled_update_timeout; +#endif + +// Flips the rendering bits for a character at the current cursor position +static void InvertCharacter(uint8_t *cursor) { + const uint8_t *end = cursor + OLED_FONT_WIDTH; + while (cursor < end) { + *cursor = ~(*cursor); + cursor++; + } +} + +bool oled_init(oled_rotation_t rotation) { + oled_rotation = oled_init_user(oled_init_kb(rotation)); + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + oled_rotation_width = OLED_DISPLAY_WIDTH; + } else { + oled_rotation_width = OLED_DISPLAY_HEIGHT; + } + + oled_spi_init(); + +#ifdef OLED_RST_PIN + /* Reset device */ + setPinOutput(OLED_RST_PIN); + writePinLow(OLED_RST_PIN); + wait_ms(20); + writePinHigh(OLED_RST_PIN); + wait_ms(20); +#endif + + static const uint8_t PROGMEM display_setup1[] = { + DISPLAY_OFF, + DISPLAY_CLOCK, + 0x80, + MULTIPLEX_RATIO, + OLED_DISPLAY_HEIGHT - 1, + DISPLAY_OFFSET, + 0x00, + DISPLAY_START_LINE | 0x00, + CHARGE_PUMP, + 0x14, +#if (OLED_IC != OLED_IC_SH1106) + // MEMORY_MODE is unsupported on SH1106 (Page Addressing only) + MEMORY_MODE, + 0x00, // Horizontal addressing mode +#endif + }; + + if (!oled_cmd_p(display_setup1, ARRAY_SIZE(display_setup1))) { + print("oled_init cmd set 1 failed\n"); + return false; + } + + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) { + static const uint8_t PROGMEM display_normal[] = {SEGMENT_REMAP_INV, COM_SCAN_DEC}; + if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) { + print("oled_init cmd normal rotation failed\n"); + return false; + } + } else { + static const uint8_t PROGMEM display_flipped[] = {SEGMENT_REMAP, COM_SCAN_INC}; + if (!oled_cmd_p(display_flipped, ARRAY_SIZE(display_flipped))) { + print("display_flipped failed\n"); + return false; + } + } + + static const uint8_t PROGMEM display_setup2[] = {COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0xF1, VCOM_DETECT, 0x20, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON}; + if (!oled_cmd_p(display_setup2, ARRAY_SIZE(display_setup2))) { + print("display_setup2 failed\n"); + return false; + } + +#if OLED_TIMEOUT > 0 + oled_timeout = timer_read32() + OLED_TIMEOUT; +#endif +#if OLED_SCROLL_TIMEOUT > 0 + oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT; +#endif + + oled_clear(); + oled_initialized = true; + oled_active = true; + oled_scrolling = false; + return true; +} + +__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return rotation; +} +__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { + return rotation; +} + +void oled_clear(void) { + memset(oled_buffer, 0, sizeof(oled_buffer)); + oled_cursor = &oled_buffer[0]; + oled_dirty = OLED_ALL_BLOCKS_MASK; +} + +static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) { + // Calculate commands to set memory addressing bounds. + uint8_t start_page = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH; + uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH; +#if (OLED_IC == OLED_IC_SH1106) + // Commands for Page Addressing Mode. Sets starting page and column; has no end bound. + // Column value must be split into high and low nybble and sent as two commands. + cmd_array[0] = PAM_PAGE_ADDR | start_page; + cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f); + cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f); + cmd_array[3] = NOP; + cmd_array[4] = NOP; + cmd_array[5] = NOP; +#else + // Commands for use in Horizontal Addressing mode. + cmd_array[1] = start_column; + cmd_array[4] = start_page; + cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1]; + cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1; +#endif +} + +static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) { + cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8; + cmd_array[4] = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT; + cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1]; + ; + cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8; +} + +uint8_t crot(uint8_t a, int8_t n) { + const uint8_t mask = 0x7; + n &= mask; + return a << n | a >> (-n & mask); +} + +static void rotate_90(const uint8_t *src, uint8_t *dest) { + for (uint8_t i = 0, shift = 7; i < 8; ++i, --shift) { + uint8_t selector = (1 << i); + for (uint8_t j = 0; j < 8; ++j) { + dest[i] |= crot(src[j] & selector, shift - (int8_t)j); + } + } +} + +void oled_render(void) { + if (!oled_initialized) { + return; + } + + // Do we have work to do? + oled_dirty &= OLED_ALL_BLOCKS_MASK; + if (!oled_dirty || oled_scrolling) { + return; + } + + // Find first dirty block + uint8_t update_start = 0; + while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) { + ++update_start; + } + + // Set column & page position + static uint8_t display_start[] = {COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1}; + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + calc_bounds(update_start, display_start); + } else { + calc_bounds_90(update_start, display_start); + } + + // Send column & page position + if (!oled_cmd(display_start, ARRAY_SIZE(display_start))) { + print("oled_render offset command failed\n"); + return; + } + + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + // Send render data chunk as is + if (!oled_write_reg(&oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE)) { + print("oled_render data failed\n"); + return; + } + } else { + // Rotate the render chunks + const static uint8_t source_map[] = OLED_SOURCE_MAP; + const static uint8_t target_map[] = OLED_TARGET_MAP; + + static uint8_t temp_buffer[OLED_BLOCK_SIZE]; + memset(temp_buffer, 0, sizeof(temp_buffer)); + for (uint8_t i = 0; i < sizeof(source_map); ++i) { + rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]); + } + + // Send render data chunk after rotating + if (!oled_write_reg(temp_buffer, OLED_BLOCK_SIZE)) { + print("oled_render90 data failed\n"); + return; + } + } + + // Turn on display if it is off + oled_on(); + + // Clear dirty flag + oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start); +} + +void oled_set_cursor(uint8_t col, uint8_t line) { + uint16_t index = line * oled_rotation_width + col * OLED_FONT_WIDTH; + + // Out of bounds? + if (index >= OLED_MATRIX_SIZE) { + index = 0; + } + + oled_cursor = &oled_buffer[index]; +} + +void oled_advance_page(bool clearPageRemainder) { + uint16_t index = oled_cursor - &oled_buffer[0]; + uint8_t remaining = oled_rotation_width - (index % oled_rotation_width); + + if (clearPageRemainder) { + // Remaining Char count + remaining = remaining / OLED_FONT_WIDTH; + + // Write empty character until next line + while (remaining--) + oled_write_char(' ', false); + } else { + // Next page index out of bounds? + if (index + remaining >= OLED_MATRIX_SIZE) { + index = 0; + remaining = 0; + } + + oled_cursor = &oled_buffer[index + remaining]; + } +} + +void oled_advance_char(void) { + uint16_t nextIndex = oled_cursor - &oled_buffer[0] + OLED_FONT_WIDTH; + uint8_t remainingSpace = oled_rotation_width - (nextIndex % oled_rotation_width); + + // Do we have enough space on the current line for the next character + if (remainingSpace < OLED_FONT_WIDTH) { + nextIndex += remainingSpace; + } + + // Did we go out of bounds + if (nextIndex >= OLED_MATRIX_SIZE) { + nextIndex = 0; + } + + // Update cursor position + oled_cursor = &oled_buffer[nextIndex]; +} + +// Main handler that writes character data to the display buffer +void oled_write_char(const char data, bool invert) { + // Advance to the next line if newline + if (data == '\n') { + // Old source wrote ' ' until end of line... + oled_advance_page(true); + return; + } + + if (data == '\r') { + oled_advance_page(false); + return; + } + + // copy the current render buffer to check for dirty after + static uint8_t oled_temp_buffer[OLED_FONT_WIDTH]; + memcpy(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH); + + _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array"); + + // set the reder buffer data + uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index + if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) { + memset(oled_cursor, 0x00, OLED_FONT_WIDTH); + } else { + const uint8_t *glyph = &font[(cast_data - OLED_FONT_START) * OLED_FONT_WIDTH]; + memcpy_P(oled_cursor, glyph, OLED_FONT_WIDTH); + } + + // Invert if needed + if (invert) { + InvertCharacter(oled_cursor); + } + + // Dirty check + if (memcmp(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH)) { + uint16_t index = oled_cursor - &oled_buffer[0]; + oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); + // Edgecase check if the written data spans the 2 chunks + oled_dirty |= ((OLED_BLOCK_TYPE)1 << ((index + OLED_FONT_WIDTH - 1) / OLED_BLOCK_SIZE)); + } + + // Finally move to the next char + oled_advance_char(); +} + +void oled_write(const char *data, bool invert) { + const char *end = data + strlen(data); + while (data < end) { + oled_write_char(*data, invert); + data++; + } +} + +void oled_write_ln(const char *data, bool invert) { + oled_write(data, invert); + oled_advance_page(true); +} + +void oled_pan(bool left) { + uint16_t i = 0; + for (uint16_t y = 0; y < OLED_DISPLAY_HEIGHT / 8; y++) { + if (left) { + for (uint16_t x = 0; x < OLED_DISPLAY_WIDTH - 1; x++) { + i = y * OLED_DISPLAY_WIDTH + x; + oled_buffer[i] = oled_buffer[i + 1]; + } + } else { + for (uint16_t x = OLED_DISPLAY_WIDTH - 1; x > 0; x--) { + i = y * OLED_DISPLAY_WIDTH + x; + oled_buffer[i] = oled_buffer[i - 1]; + } + } + } + oled_dirty = OLED_ALL_BLOCKS_MASK; +} + +oled_buffer_reader_t oled_read_raw(uint16_t start_index) { + if (start_index > OLED_MATRIX_SIZE) start_index = OLED_MATRIX_SIZE; + oled_buffer_reader_t ret_reader; + ret_reader.current_element = &oled_buffer[start_index]; + ret_reader.remaining_element_count = OLED_MATRIX_SIZE - start_index; + return ret_reader; +} + +void oled_write_raw_byte(const char data, uint16_t index) { + if (index > OLED_MATRIX_SIZE) index = OLED_MATRIX_SIZE; + if (oled_buffer[index] == data) return; + oled_buffer[index] = data; + oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); +} + +void oled_write_raw(const char *data, uint16_t size) { + uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; + if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; + for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { + uint8_t c = *data++; + if (oled_buffer[i] == c) continue; + oled_buffer[i] = c; + oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); + } +} + +void oled_write_pixel(uint8_t x, uint8_t y, bool on) { + if (x >= oled_rotation_width) { + return; + } + uint16_t index = x + (y / 8) * oled_rotation_width; + if (index >= OLED_MATRIX_SIZE) { + return; + } + uint8_t data = oled_buffer[index]; + if (on) { + data |= (1 << (y % 8)); + } else { + data &= ~(1 << (y % 8)); + } + if (oled_buffer[index] != data) { + oled_buffer[index] = data; + oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); + } +} + +#if defined(__AVR__) +void oled_write_P(const char *data, bool invert) { + uint8_t c = pgm_read_byte(data); + while (c != 0) { + oled_write_char(c, invert); + c = pgm_read_byte(++data); + } +} + +void oled_write_ln_P(const char *data, bool invert) { + oled_write_P(data, invert); + oled_advance_page(true); +} + +void oled_write_raw_P(const char *data, uint16_t size) { + uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; + if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; + for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { + uint8_t c = pgm_read_byte(data++); + if (oled_buffer[i] == c) continue; + oled_buffer[i] = c; + oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); + } +} +#endif // defined(__AVR__) + +bool oled_on(void) { + if (!oled_initialized) { + return oled_active; + } + +#if OLED_TIMEOUT > 0 + oled_timeout = timer_read32() + OLED_TIMEOUT; +#endif + + static const uint8_t PROGMEM display_on[] = +#ifdef OLED_FADE_OUT + {FADE_BLINK, 0x00}; +#else + {DISPLAY_ON}; +#endif + + if (!oled_active) { + if (!oled_cmd_p(display_on, ARRAY_SIZE(display_on))) { + print("oled_on cmd failed\n"); + return oled_active; + } + oled_active = true; + } + return oled_active; +} + +bool oled_off(void) { + if (!oled_initialized) { + return !oled_active; + } + + static const uint8_t PROGMEM display_off[] = +#ifdef OLED_FADE_OUT + {FADE_BLINK, ENABLE_FADE | OLED_FADE_OUT_INTERVAL}; +#else + {DISPLAY_OFF}; +#endif + + if (oled_active) { + if (!oled_cmd_p(display_off, ARRAY_SIZE(display_off))) { + print("oled_off cmd failed\n"); + return oled_active; + } + oled_active = false; + } + return !oled_active; +} + +bool is_oled_on(void) { + return oled_active; +} + +uint8_t oled_set_brightness(uint8_t level) { + if (!oled_initialized) { + return oled_brightness; + } + + uint8_t set_contrast[] = { CONTRAST, level}; + if (oled_brightness != level) { + if (!oled_cmd(set_contrast, ARRAY_SIZE(set_contrast))) { + print("set_brightness cmd failed\n"); + return oled_brightness; + } + oled_brightness = level; + } + return oled_brightness; +} + +uint8_t oled_get_brightness(void) { + return oled_brightness; +} + +// Set the specific 8 lines rows of the screen to scroll. +// 0 is the default for start, and 7 for end, which is the entire +// height of the screen. For 128x32 screens, rows 4-7 are not used. +void oled_scroll_set_area(uint8_t start_line, uint8_t end_line) { + oled_scroll_start = start_line; + oled_scroll_end = end_line; +} + +void oled_scroll_set_speed(uint8_t speed) { + // Sets the speed for scrolling... does not take effect + // until scrolling is either started or restarted + // the ssd1306 supports 8 speeds + // FrameRate2 speed = 7 + // FrameRate3 speed = 4 + // FrameRate4 speed = 5 + // FrameRate5 speed = 0 + // FrameRate25 speed = 6 + // FrameRate64 speed = 1 + // FrameRate128 speed = 2 + // FrameRate256 speed = 3 + // for ease of use these are remaped here to be in order + static const uint8_t scroll_remap[8] = {7, 4, 5, 0, 6, 1, 2, 3}; + oled_scroll_speed = scroll_remap[speed]; +} + +bool oled_scroll_right(void) { + if (!oled_initialized) { + return oled_scrolling; + } + + // Dont enable scrolling if we need to update the display + // This prevents scrolling of bad data from starting the scroll too early after init + if (!oled_dirty && !oled_scrolling) { + uint8_t display_scroll_right[] = {SCROLL_RIGHT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL}; + if (!oled_cmd(display_scroll_right, ARRAY_SIZE(display_scroll_right))) { + print("oled_scroll_right cmd failed\n"); + return oled_scrolling; + } + oled_scrolling = true; + } + return oled_scrolling; +} + +bool oled_scroll_left(void) { + if (!oled_initialized) { + return oled_scrolling; + } + + // Dont enable scrolling if we need to update the display + // This prevents scrolling of bad data from starting the scroll too early after init + if (!oled_dirty && !oled_scrolling) { + uint8_t display_scroll_left[] = {SCROLL_LEFT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL}; + if (!oled_cmd(display_scroll_left, ARRAY_SIZE(display_scroll_left))) { + print("oled_scroll_left cmd failed\n"); + return oled_scrolling; + } + oled_scrolling = true; + } + return oled_scrolling; +} + +bool oled_scroll_off(void) { + if (!oled_initialized) { + return !oled_scrolling; + } + + if (oled_scrolling) { + static const uint8_t PROGMEM display_scroll_off[] = {DEACTIVATE_SCROLL}; + if (!oled_cmd_p(display_scroll_off, ARRAY_SIZE(display_scroll_off))) { + print("oled_scroll_off cmd failed\n"); + return oled_scrolling; + } + oled_scrolling = false; + oled_dirty = OLED_ALL_BLOCKS_MASK; + } + return !oled_scrolling; +} + +bool is_oled_scrolling(void) { + return oled_scrolling; +} + +bool oled_invert(bool invert) { + if (!oled_initialized) { + return oled_inverted; + } + + if (invert && !oled_inverted) { + static const uint8_t PROGMEM display_inverted[] = {INVERT_DISPLAY}; + if (!oled_cmd_p(display_inverted, ARRAY_SIZE(display_inverted))) { + print("oled_invert cmd failed\n"); + return oled_inverted; + } + oled_inverted = true; + } else if (!invert && oled_inverted) { + static const uint8_t PROGMEM display_normal[] = {NORMAL_DISPLAY}; + if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) { + print("oled_invert cmd failed\n"); + return oled_inverted; + } + oled_inverted = false; + } + + return oled_inverted; +} + +uint8_t oled_max_chars(void) { + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + return OLED_DISPLAY_WIDTH / OLED_FONT_WIDTH; + } + return OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH; +} + +uint8_t oled_max_lines(void) { + if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { + return OLED_DISPLAY_HEIGHT / OLED_FONT_HEIGHT; + } + return OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT; +} + +void oled_task(void) { + if (!oled_initialized) { + return; + } + +#if OLED_UPDATE_INTERVAL > 0 + if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) { + oled_update_timeout = timer_read(); + oled_set_cursor(0, 0); + oled_task_kb(); + } +#else + oled_set_cursor(0, 0); + oled_task_kb(); +#endif + +#if OLED_SCROLL_TIMEOUT > 0 + if (oled_dirty && oled_scrolling) { + oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT; + oled_scroll_off(); + } +#endif + + // Smart render system, no need to check for dirty + oled_render(); + + // Display timeout check +#if OLED_TIMEOUT > 0 + if (oled_active && timer_expired32(timer_read32(), oled_timeout)) { + oled_off(); + } +#endif + +#if OLED_SCROLL_TIMEOUT > 0 + if (!oled_scrolling && timer_expired32(timer_read32(), oled_scroll_timeout)) { +# ifdef OLED_SCROLL_TIMEOUT_RIGHT + oled_scroll_right(); +# else + oled_scroll_left(); +# endif + } +#endif +} + +__attribute__((weak)) bool oled_task_kb(void) { + return oled_task_user(); +} +__attribute__((weak)) bool oled_task_user(void) { + return true; +} diff --git a/keyboards/ciaanh/kanagawa2040/macropad.c b/keyboards/ciaanh/kanagawa2040/macropad.c new file mode 100644 index 00000000000..a82a2dabb1f --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/macropad.c @@ -0,0 +1,56 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#include "macropad.h" + +#ifdef RGB_MATRIX_ENABLE + +#define NA NO_LED + +/* RGB Positioning */ +led_config_t g_led_config = { { + { NA, NA, NA }, + { 0, 1, 2 }, + { 3, 4, 5 }, + { 6, 7, 8 }, + { 9, 10, 11 } +}, { + { 0, 0 }, { 112, 0 }, { 224, 0}, + { 0, 21 }, { 112, 21 }, { 224, 21}, + { 0, 42 }, { 112, 42 }, { 224, 42}, + { 0, 64 }, { 112, 64 }, { 224, 64} +}, { + 4, 4, 4, + 4, 4, 4, + 4, 4, 4, + 4, 4, 4 +} }; + +#endif + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } + return true; +} +#endif diff --git a/keyboards/ciaanh/kanagawa2040/macropad.h b/keyboards/ciaanh/kanagawa2040/macropad.h new file mode 100644 index 00000000000..6e2e3524b7d --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/macropad.h @@ -0,0 +1,38 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define ___ KC_NO + +// clang-format off + #define LAYOUT( \ + K02, \ + K10, K11, K12, \ + K20, K21, K22, \ + K30, K31, K32, \ + K40, K41, K42 \ + ) \ + { \ + { ___, ___, K02 }, \ + { K10, K11, K12 }, \ + { K20, K21, K22 }, \ + { K30, K31, K32 }, \ + { K40, K41, K42 } \ + } +// clang-format on diff --git a/keyboards/ciaanh/kanagawa2040/mcuconf.h b/keyboards/ciaanh/kanagawa2040/mcuconf.h new file mode 100644 index 00000000000..198a2eea697 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2022 Jose Pablo Ramirez + * + * 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 . + */ + +#pragma once + +#include_next + +#undef RP_SPI_USE_SPI1 +#define RP_SPI_USE_SPI1 TRUE diff --git a/keyboards/ciaanh/kanagawa2040/readme.md b/keyboards/ciaanh/kanagawa2040/readme.md new file mode 100644 index 00000000000..46b3f5ddb72 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/readme.md @@ -0,0 +1,42 @@ +https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk + +qmk compile -kb ciaanh/kanagawa2040 -km default + +# Adafruit MacroPad RP2040 + +![AdafruitMacropad](https://i.imgur.com/dSBSwcJh.jpeg) + +A RP2040-powered Macropad with a 3x4 layout. + +- Keyboard Maintainer: [Jpe230](https://github.com/jpe230/) +- Hardware Supported: Adafruit MacroPad RP2040 +- Hardware Availability: [Barebones kit](https://www.adafruit.com/product/5100) [Starter Kit](https://www.adafruit.com/product/5128) + +Make example for this board (after setting up your build environment): + +```sh +qmk compile -kb adafruit/macropad -km default +``` + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Features + +- Raspberry Pi RP2040 Chip + 8MB Flash memory - Dual-core Cortex M0+ at ~130MHz with 264KB of RAM. +- 3x4 Mechanical key switch sockets - accepts any Cherry MX-compatible switches. Individually tied to GPIO pins (not matrix wired) +- One NeoPixel RGB LED per switch, on north side. +- Rotary encoder, 20 detents per rotation, with push-switch on GPIO pin. Push switch is also used for entering bootloader mode when held down on power-up or reset. +- 128x64 SH1106 Monochrome OLED display - On high-speed hardware SPI port for quick updates. +- 8mm Speaker/Buzzer - With Class D amplifier and RC filter, can be used to make simple beeps and sounds effects. (Unsupported for now) +- STEMMA QT Connector - Allows adding any I2C sensors/displays/devices with plug-and-play cables. +- Reset button - On the side, for quick restarting, press it twice to enter bootloader. +- Four M3 mounting bosses - Make custom enclosures easily. + +## Bootloader + +Enter the bootloader in 4 ways: + +* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up. +* **Physical reset button**: Press twice the button on the side while the board is connected. +* **BOOT button** Hold down the rotary encoder push-button on power-up or reset. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk new file mode 100644 index 00000000000..3636424a714 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -0,0 +1,26 @@ +# MCU name +MCU = RP2040 +# Bootloader selection +BOOTLOADER = rp2040 +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +# AUDIO_DRIVER = pwm_software +ENCODER_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 +WS2812_DRIVER = vendor +OLED_ENABLE = yes +OLED_DRIVER = custom +# Project specific files +SRC += lib/ssd1306_sh1106.c +QUANTUM_LIB_SRC += spi_master.c diff --git a/keyboards/ciaanh/pallas/config.h b/keyboards/ciaanh/pallas/config.h new file mode 100644 index 00000000000..e465a5b4f21 --- /dev/null +++ b/keyboards/ciaanh/pallas/config.h @@ -0,0 +1,3 @@ +#pragma once + +#include "config_common.h" \ No newline at end of file diff --git a/keyboards/ciaanh/pallas/lib/oledfont.c b/keyboards/ciaanh/pallas/lib/oledfont.c new file mode 100644 index 00000000000..bc10ba86aa4 --- /dev/null +++ b/keyboards/ciaanh/pallas/lib/oledfont.c @@ -0,0 +1,282 @@ +#include "progmem.h" + + + + + + + + +const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => + + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / + + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? + + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O + + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ + + 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o + + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => + 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => + 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => + 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => + 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => + 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => + 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => + 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => + 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => + 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => + + 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => + 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => + 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => + 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => + 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => + 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => + 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => + 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => + 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => + 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => + 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => + 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => + 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => + 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => + 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => + 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => + 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => + 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => + 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => + + 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => + 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => + 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => + 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => + 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => + 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => + 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => + 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => + 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => + 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => + 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => + 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => + 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => + 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => + 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => + 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => + 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => + 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => + 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => + 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => + 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => + 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => + 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => + 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => + + 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => + 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => + 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => + 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => +}; diff --git a/keyboards/ciaanh/pallas/pallas.c b/keyboards/ciaanh/pallas/pallas.c new file mode 100644 index 00000000000..a1b7c5e68a4 --- /dev/null +++ b/keyboards/ciaanh/pallas/pallas.c @@ -0,0 +1 @@ +#include "pallas.h" diff --git a/keyboards/ciaanh/pallas/pallas.h b/keyboards/ciaanh/pallas/pallas.h new file mode 100644 index 00000000000..e292e5ee745 --- /dev/null +++ b/keyboards/ciaanh/pallas/pallas.h @@ -0,0 +1,7 @@ +#pragma once + +#include "quantum.h" + +#ifdef KEYBOARD_ciaanh_pallas_rev1 +# include "rev1.h" +#endif diff --git a/keyboards/ciaanh/pallas/readme.md b/keyboards/ciaanh/pallas/readme.md new file mode 100644 index 00000000000..79b85c79e8a --- /dev/null +++ b/keyboards/ciaanh/pallas/readme.md @@ -0,0 +1,16 @@ +# Pallas + +A 75 key variant of the Alice keyboard designed for Elite-C + + Keyboard Maintainer : Ciaanh + + Hardware Supported : Pallas PCB + + Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Pallas + + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb ciaanh/pallas -km default + +Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader diff --git a/keyboards/ciaanh/pallas/rev1/config.h b/keyboards/ciaanh/pallas/rev1/config.h new file mode 100644 index 00000000000..ea3f9742bfc --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/config.h @@ -0,0 +1,56 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ + +#define VENDOR_ID 0xC1E0 +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Ciaanh +#define PRODUCT Pallas +#define DESCRIPTION Extended Alice + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +// wiring of each half +#define MATRIX_ROW_PINS { B7, D5, C7, F1, F0 } +#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#ifdef OLED_ENABLE + #define OLED_DISPLAY_128X64 + #define OLED_FONT_H "lib/oledfont.c" + #define OLED_FONT_END 255 +#endif + +#ifdef BACKLIGHT_ENABLE + #define BACKLIGHT_PIN B5 + #define BACKLIGHT_LEVELS 4 +#endif + +#ifdef RGBLIGHT_ENABLE + /* ws2812 RGB LED */ + #define RGB_DI_PIN B0 + #define RGBLED_NUM 4 + #define RGBLIGHT_LED_MAP { 0, 1, 2, 3} + + #define RGBLIGHT_ANIMATIONS + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 +#endif + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ciaanh/pallas/rev1/info.json b/keyboards/ciaanh/pallas/rev1/info.json new file mode 100644 index 00000000000..0cf50600121 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/info.json @@ -0,0 +1,89 @@ +{ + "keyboard_name": "Pallas rev 0", + "url": "", + "maintainer": "ciaanh", + "width": 25.25, + "height": 10.2, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "0.2", "x": 3.75, "y": 0.89 }, + { "label": "0.11", "x": 20.25, "y": 0.89 }, + { "label": "0.14", "x": 23.5, "y": 0.89 }, + { "label": "0.0", "x": 1.75, "y": 1 }, + { "label": "0.1", "x": 2.75, "y": 1 }, + { "label": "0.12", "x": 21.25, "y": 1 }, + { "label": "0.13", "x": 22.25, "y": 1 }, + { "label": "1.0", "x": 1.5, "y": 2, "w": 1.5 }, + { "label": "1.1", "x": 3, "y": 2 }, + { "label": "1.12", "x": 21, "y": 2 }, + { "label": "1.13", "x": 22, "y": 2 }, + { "label": "1.14", "x": 23, "y": 2 }, + { "label": "2.0", "x": 1.25, "y": 3, "w": 1.75 }, + { "label": "2.1", "x": 3, "y": 3 }, + { "label": "2.12", "x": 21, "y": 3 }, + { "label": "2.13", "x": 22, "y": 3 }, + { "label": "2.14", "x": 23, "y": 3, "w": 2.25 }, + { "label": "2.14", "x": 23.5, "y": 3, "w": 1.25, "h": 2 }, + { "label": "1.6", "x": 11, "y": 3.25 }, + { "label": "1.7", "x": 12, "y": 3.25 }, + { "label": "3.8", "x": 13, "y": 3.25 }, + { "label": "3,0", "x": 1, "y": 4, "w": 2.25 }, + { "label": "3.1", "x": 3.25, "y": 4 }, + { "label": "3.13", "x": 20.75, "y": 4 }, + { "label": "3.14", "x": 21.75, "y": 4, "w": 1.75 }, + { "label": "2.6", "x": 11, "y": 4.25 }, + { "label": "2.7", "x": 12, "y": 4.25 }, + { "label": "4.8", "x": 13, "y": 4.25 }, + { "label": "4.1", "x": 2.5, "y": 5, "w": 1.25 }, + { "label": "4.0", "x": 1, "y": 5.25, "w": 1.25 }, + { "label": "3.6", "x": 11, "y": 5.25 }, + { "label": "3.7", "x": 12, "y": 5.25 }, + { "label": "4.9", "x": 13, "y": 5.25 }, + { "label": "4.14", "x": 22.75, "y": 5.25, "w": 1.25 }, + { "label": "4.6", "x": 11, "y": 6.25 }, + { "label": "4.7", "x": 12, "y": 6.25 }, + { "label": "4.10", "x": 13, "y": 6.25 }, + { "label": "0.3", "x": 5.1, "y": 0 }, + { "label": "0.4", "x": 6.1, "y": 0 }, + { "label": "0.5", "x": 7.1, "y": 0 }, + { "label": "0.6", "x": 8.1, "y": 0 }, + { "label": "1.2", "x": 4.55, "y": 1 }, + { "label": "1.3", "x": 5.55, "y": 1 }, + { "label": "1.4", "x": 6.55, "y": 1 }, + { "label": "1.5", "x": 7.55, "y": 1 }, + { "label": "2.2", "x": 4.75, "y": 2 }, + { "label": "2.3", "x": 5.75, "y": 2 }, + { "label": "2.4", "x": 6.75, "y": 2 }, + { "label": "2.5", "x": 7.75, "y": 2 }, + { "label": "3.2", "x": 5.22, "y": 3 }, + { "label": "3.3", "x": 6.22, "y": 3 }, + { "label": "3.4", "x": 7.22, "y": 3 }, + { "label": "3.5", "x": 8.22, "y": 3 }, + { "label": "4.3", "x": 6.5, "y": 4 }, + { "label": "4.4", "x": 7.75, "y": 4, "w": 2 }, + { "label": "4.2", "x": 5, "y": 4.1, "w": 1.25 }, + { "label": "4.5", "x": 0.25, "y": 4.1, "w": 1.25 }, + { "label": "4.11", "x": -1.5, "y": 4.1, "w": 1.25 }, + { "label": "0.7", "x": -9.1, "y": 5.1 }, + { "label": "0.8", "x": -8.1, "y": 5.1 }, + { "label": "0.9", "x": -7.1, "y": 5.1 }, + { "label": "0.10", "x": -6.1, "y": 5.1 }, + { "label": "1.8", "x": -8.55, "y": 6.1 }, + { "label": "1.9", "x": -7.550000000000001, "y": 6.1 }, + { "label": "1.10", "x": -6.550000000000001, "y": 6.1 }, + { "label": "1.11", "x": -5.550000000000001, "y": 6.1 }, + { "label": "2.8", "x": -8.75, "y": 7.1 }, + { "label": "2.9", "x": -7.75, "y": 7.1 }, + { "label": "2.10", "x": -6.75, "y": 7.1 }, + { "label": "2.11", "x": -5.75, "y": 7.1 }, + { "label": "3.9", "x": -9.22, "y": 8.1 }, + { "label": "3.10", "x": -8.22, "y": 8.1 }, + { "label": "3.11", "x": -7.220000000000001, "y": 8.1 }, + { "label": "3.12", "x": -6.220000000000001, "y": 8.1 }, + { "label": "4.12", "x": -9.75, "y": 9.1, "w": 2.75 }, + { "label": "4.13", "x": -6.25, "y": 9.2, "w": 1.25 } + ] + } + } +} diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h b/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h new file mode 100644 index 00000000000..271f48d0011 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h @@ -0,0 +1,3 @@ +#pragma once + +// place overrides here diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h b/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h new file mode 100644 index 00000000000..6951774fd53 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h @@ -0,0 +1,46 @@ +#pragma once + +enum layers +{ + _BASE, + _FN, + _VS, + _CODE, + _TOOLS, + _LEFT, + _RIGHT +}; + +enum custom_keycodes +{ + VS_FRM = SAFE_RANGE, + COMM, + UNCOMM, + NEW_SAFE_RANGE, +}; + + +#define _SAVE LCTL(KC_S) + +#define VSC_FRM LSFT(LALT(KC_F)) +#define VSC_TRM LCTL(KC_GRV) +#define VSC_COM LCTL(KC_P) + +#define VS_INT LCTL(KC_J) +#define VS_QW LSFT(KC_F9) +#define VS_PEEK LALT(KC_F12) +#define VS_GREF LCTL(KC_F12) + +#define SC_SF12 LSFT(KC_F12) + +#define TO_BASE TO(_BASE) +#define TO_FN TG(_FN) +#define TO_VS TG(_VS) +#define TO_CODE TG(_CODE) + +#define L_TOOLS MO(_TOOLS) + +#define L_LFT MO(_LEFT) +#define L_RGT MO(_RIGHT) + +#define _SCREENSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c b/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c new file mode 100644 index 00000000000..8f013a15f6c --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c @@ -0,0 +1,327 @@ +#include QMK_KEYBOARD_H +#include "keycodes.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Keymap: BASE + * + * ,---------------------------------------------------- ------------------------------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | \ | ` | + * |--------+-------+------+------+------+------+------+ ,-------+-------+-------. +------+------+------+------+------+------+--------+--------| + * | Tab | Q | W | E | R | T | | Pad_7 | Pad_8 | Pad_9 | | Y | U | I | O | P | [ | ] | + * |--------+-------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+--------+--------| + * | CapsL | A | S | D | F | G | | Pad_4 | Pad_5 | Pad_6 | | H | J | K | L | ; | ' | | + * |--------+-------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+--------+ Enter | + * | LShift | Z | X | C | V | B | | Pad_1 | Pad_2 | Pad_3 | | N | M | , | . | / | RShift | | + * |--------+-------+------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+------+--------+--------| + * | LCtrl | GUI | LAlt | RAlt | Del | | L_LFT| |KC_NLCK| Pad_0 |KC_PDOT| | L_RGT| | Space| | TO_FN| | _TOOLS | + * `-------------------------------------' `------' `-----------------------' `------' `------' `------' `--------' + * + */ + + [_BASE] = LAYOUT_Pallas( \ + KC_ESC , 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_BSLS, KC_GRV , \ + KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P1, KC_P2, KC_P3, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ + KC_LCTL, KC_LGUI, KC_LALT, KC_RALT, KC_BSPC, L_LFT, KC_NLCK, KC_P0,KC_PDOT, L_RGT, KC_SPC, TO_FN, L_TOOLS \ + ), + + + /* Keymap: FN + * + * ,---------------------------------------------------- ------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |--------+-------+------+------+------+------+------+ ,------+------+------. +------+------+------+------+------+------+--------+--------| + * | | | | | | | |KC_F10|KC_F11|KC_F12| | | | | | | | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+--------| + * | | | | | | | |KC_F7 |KC_F8 |KC_F9 | | | | | | | | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+ | + * | | | | | | | |KC_F4 |KC_F5 |KC_F6 | | | | | | | | | + * |--------+-------+------+------+------+------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+--------| + * | | | | | | | | |KC_F1 |KC_F2 |KC_F3 | | | | | | TO_VS| | | + * `-------------------------------------' `-----' `--------------------' `-----' `------' `------' `--------' + * + */ + + [_FN] = LAYOUT_Pallas( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, _______, _______, TO_VS, _______ \ + ), + + + + /* Keymap: VS + + Visual Studio + KC_F9 => add breakpoint + VS_QW => quick view + VS_PEEK => peek definition + VS_GREF => go to implementation + VS_INT => force show intellisense + VS_FRM => format code CTL+K,D CTL+K,E + + KC_F12 => go to definition + SC_SF12 => find references + + _SAVE => save CTL+S + + * + * ,------------------------------------------------------ -------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |--------+-------+------+------+------+------+--------+ ,------+------+-------. +------+------+------+------+-------+------+--------+--------| + * | | | | | | | | KC_F5|KC_F10| KC_F11| | | | | | | | | + * |--------+-------+------+------+------+------+ +------+------+-------+ +------+------+------+-------+------+--------+--------| + * | | | | | | | | KC_F9| VS_QW|SC_SF12| | | | | | | | | + * |--------+-------+------+------+------+------+ +------+------+-------+ +------+------+------+-------+------+--------+ | + * | | | | | | | |VS_INT| | KC_F12| | | | | | | | | + * |--------+-------+------+------+------+------+-------+ +------+------+-------+ +------+------+------+------+-------+------+--------+--------| + * | | | | | | | | |VS_FRM| _SAVE|VS_GREF| | | | | |TO_CODE| | | + * `-------------------------------------' `-------' `---------------------' `------' `------' `-------' `--------' + * + */ + [_VS] = LAYOUT_Pallas( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F5, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, KC_F9, VS_QW, SC_SF12, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, VS_INT, XXXXXXX, KC_F12, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, VS_FRM, _SAVE, VS_GREF, _______, _______, TO_CODE, _______ \ + ), + + + + + + /* Keymap: CODE + + VS Code + VSC_COM => Command palette + VSC_FRM => format code ALT+SHIFT+F + VSC_TRM => open terminal + + KC_F12 => go to definition + SC_SF12 => find references + + _SAVE => save CTL+S + + * + * ,----------------------------------------------------- --------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |--------+-------+------+------+------+------+-------+ ,-------+------+-------. +-------+------+------+------+-------+------+--------+--------| + * | | | | | | | |VSC_TRM| |VSC_COM| | | | | | | | | + * |--------+-------+------+------+------+------+ +-------+------+-------+ +------+------+------+-------+------+--------+--------| + * | | | | | | | | | |SC_SF12| | | | | | | | | + * |--------+-------+------+------+------+------+ +-------+------+-------+ +------+------+------+-------+------+--------+ | + * | | | | | | | | | | KC_F12| | | | | | | | | + * |--------+-------+------+------+------+------+-------+ +-------+------+-------+ +------+------+------+------+-------+------+--------+--------| + * | | | | | | | | |VSC_FRM| _SAVE| | | | | | |TO_BASE| | | + * `-------------------------------------' `-------' `----------------------' `------' `------' `-------' `--------' + * + */ + [_CODE] = LAYOUT_Pallas( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, VSC_TRM, XXXXXXX, VSC_COM, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, SC_SF12, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, KC_F12, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, VSC_FRM, _SAVE, XXXXXXX, _______, _______, TO_BASE, _______ \ + ), + + + + + /* Keymap: TOOLS + * + * ,---------------------------------------------------- -----------------------------------------------------------------. + * | | | | | | | | |TD_PSCR| | | |BLToggle|RGBToggl| RGB_MOD| | + * |--------+-------+------+------+------+------+------+ ,------+------+------. +-------+------+------+------+--------+--------+--------+--------| + * | | | | | | | | | | | | | | | Step |Hue Inc |Hue Dec | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+--------+--------+--------+--------| + * | | | | | | | | | | | | | | | Inc |Sat Inc |Sat Dec | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+--------+--------+--------+ | + * | | | | | | | | | | | | | | | Dec |Bright +|Bright -| | + * |--------+-------+------+------+------+------+-------+ +------+------+------+ +------+------+------+------+--------+--------+--------+--------| + * | | | |_TOOLS| | | | | | | | | | | | | Britg | | | + * `-------------------------------------' `-------' `--------------------' `------' `------' `--------' `--------' + * + */ + [_TOOLS] = LAYOUT_Pallas( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_MOD, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_STEP, RGB_HUI, RGB_HUD, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_INC, RGB_SAI, RGB_SAD, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, RGB_VAI, RGB_SPD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_BRTG, L_TOOLS \ + ), + + + + + /* Keymap: LEFT + * + * ,------------------------------------------------------ ------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |--------+-------+------+-------+------+-------+------+ ,------+------+------. +------+------+------+------+------+------+--------+--------| + * | | | UP | | |KC_HOME| | | | | | | | | | | | | + * |--------+-------+------+-------+------+-------+ +------+------+------+ +------+------+------+------+------+--------+--------| + * | | LEFT | DOWN | RIGHT | | KC_END| | | | | | | | | | | | | + * |--------+-------+------+-------+------+-------+ +------+------+------+ +------+------+------+------+------+--------+ | + * | | < > | | | | | | | | | | | | | | | | | + * |--------+-------+------+-------+------+-------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+--------| + * | | | COMM| UNCOMM| F DEL| | | | | | | | | | | | | | | + * `--------------------------------------' `-----' `--------------------' `-----' `------' `------' `--------' + * + */ + + [_LEFT] = LAYOUT_Pallas( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, KC_UP , _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, KC_NUBS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, COMM, UNCOMM, KC_DEL, L_LFT, _______, _______, _______, L_RGT, _______, _______, _______ \ + ), + + + + /* Keymap: RIGHT + * + * ,---------------------------------------------------- ---------------------------------------------------------------. + * | | | | | | | | | | PREV | Play | NEXT | | |KC_PSCR| _SCREENSHOT| + * |--------+-------+------+------+------+------+------+ ,------+------+------. +------+------+------+------+------+------+--------+-----------| + * | | | | | | | | | | | |VOL DW| MUTE |VOL UP| | | | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+-----------| + * | | | | | | | | | | | | | | | | | | | + * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+ | + * | | | | | | | | | | | | | | | | | | | + * |--------+-------+------+------+------+------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+-----------| + * | | | | | | | | | | | | | | | | | | | | + * `-------------------------------------' `-----' `--------------------' `-----' `------' `------' `-----------' + * + */ + + [_RIGHT] = LAYOUT_Pallas( + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR,_SCREENSHOT, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, L_LFT, _______, _______, _______, L_RGT, _______, _______, _______ \ + ) +}; + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case VS_FRM: + if (record->event.pressed) { + SEND_STRING(SS_LCTL("kdke")); + } else { + } + break; + + case COMM: + if (record->event.pressed) { + SEND_STRING(SS_LCTL("kc")); + } else { + } + break; + + case UNCOMM: + if (record->event.pressed) { + SEND_STRING(SS_LCTL("ku")); + } else { + } + break; + } + return true; +} + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + return OLED_ROTATION_180; +} + + +static void render_status(void) { + // 21 characters per line + // 16 cols / 8 rows + + oled_write_P(PSTR(" Pallas rev 0.3 "), false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("Default\n"), false); + break; + case _FN: + oled_write_P(PSTR("[F]\n"), false); + break; + case _VS: + oled_write_P(PSTR("Visual Studio\n"), false); + break; + case _CODE: + oled_write_P(PSTR("VS Code\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_P(PSTR(" "), false); + oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); +} + +static void render_pallas_logo(void) { + oled_set_cursor(0, 5); + + static const char PROGMEM pallas_logo[] = { + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + }; + + oled_write_P(pallas_logo, false); +} + + +bool oled_task_user(void) { + switch (get_highest_layer(layer_state)) { + case _TOOLS: + render_pallas_logo(); + break; + default: + render_status(); + } + + return false; +} +#endif diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk b/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk new file mode 100644 index 00000000000..e41cb07da6d --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes +OLED_ENABLE = yes diff --git a/keyboards/ciaanh/pallas/rev1/rev1.c b/keyboards/ciaanh/pallas/rev1/rev1.c new file mode 100644 index 00000000000..e1dc05329e5 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/rev1.c @@ -0,0 +1,17 @@ +#include "pallas.h" + + +#ifdef SSD1306OLED +void led_set_kb(uint8_t usb_led) { + // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + led_set_user(usb_led); +} +#endif + +void matrix_init_kb(void) { + matrix_init_user(); +}; + +void shutdown_user(void) { + +} diff --git a/keyboards/ciaanh/pallas/rev1/rev1.h b/keyboards/ciaanh/pallas/rev1/rev1.h new file mode 100644 index 00000000000..7f462616476 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/rev1.h @@ -0,0 +1,24 @@ +#include "quantum.h" + +/* This a shortcut to help you visually see your layout. +* +* The first section contains all of the arguments representing the physical +* layout of the board and position of the keys. +* +* The second converts the arguments into a two-dimensional array which +* represents the switch matrix. +*/ +#define LAYOUT_Pallas( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k38, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k48, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k49, k39, k3a, k3b, k3c, k3d, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k4a, k4b, k4c, k4d, k4e \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e } \ +} diff --git a/keyboards/ciaanh/pallas/rev1/rules.mk b/keyboards/ciaanh/pallas/rev1/rules.mk new file mode 100644 index 00000000000..03c4a826250 --- /dev/null +++ b/keyboards/ciaanh/pallas/rev1/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +OLED_ENABLE = no + + diff --git a/keyboards/ciaanh/pallas/rules.mk b/keyboards/ciaanh/pallas/rules.mk new file mode 100644 index 00000000000..c926ee2fb93 --- /dev/null +++ b/keyboards/ciaanh/pallas/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = qmk-dfu + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +DEFAULT_FOLDER = ciaanh/pallas/rev1 From a738485264815bab4c711b543bfecf38fd76b80e Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 1 Sep 2022 14:27:12 +0200 Subject: [PATCH 02/76] Edit kanagawa 2040 --- keyboards/ciaanh/kanagawa2040/config.h | 27 +- keyboards/ciaanh/kanagawa2040/halconf.h | 28 - keyboards/ciaanh/kanagawa2040/info.json | 17 +- .../{macropad.c => kanagawa2040.c} | 2 +- .../{macropad.h => kanagawa2040.h} | 0 .../ciaanh/kanagawa2040/lib/oled_driver_spi.h | 29 - .../ciaanh/kanagawa2040/lib/ssd1306_sh1106.c | 827 ------------------ keyboards/ciaanh/kanagawa2040/mcuconf.h | 20 +- keyboards/ciaanh/kanagawa2040/rules.mk | 9 +- 9 files changed, 20 insertions(+), 939 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa2040/halconf.h rename keyboards/ciaanh/kanagawa2040/{macropad.c => kanagawa2040.c} (98%) rename keyboards/ciaanh/kanagawa2040/{macropad.h => kanagawa2040.h} (100%) delete mode 100644 keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h delete mode 100644 keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index cc4cbc940cb..29d9056caed 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -34,25 +34,12 @@ // clang-format on /* OLED SPI Defines */ -#define OLED_DISPLAY_128X64 -#define OLED_IC OLED_IC_SH1106 +#define OLED_DISPLAY_128X32 -/* OLED SPI Pins */ -#define OLED_DC_PIN GP24 -#define OLED_CS_PIN GP22 -#define OLED_RST_PIN GP23 - -/* Shift OLED columns by 2 pixels */ -#define OLED_COLUMN_OFFSET 2 - -/* Divisor for OLED */ -#define OLED_SPI_DIVISOR 4 - -/* ChibiOS SPI definitions */ -#define SPI_DRIVER SPID1 -#define SPI_SCK_PIN GP26 -#define SPI_MOSI_PIN GP27 -#define SPI_MISO_PIN GP28 +/* I2C Conf */ +#define I2C_DRIVER I2CD1 +#define I2C1_SDA_PIN GP12 +#define I2C1_SCL_PIN GP13 /* Encoders */ #define ENCODERS_PAD_A { GP18 } @@ -70,10 +57,6 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U -/* Audio (Unsupported for now)*/ -// #define AUDIO_PIN GP16 -// #define SPEAKER_SHUTDOWN GP14 - #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ diff --git a/keyboards/ciaanh/kanagawa2040/halconf.h b/keyboards/ciaanh/kanagawa2040/halconf.h deleted file mode 100644 index 6cd66fd5207..00000000000 --- a/keyboards/ciaanh/kanagawa2040/halconf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - -#pragma once - -#include_next - -#undef HAL_USE_SPI -#define HAL_USE_SPI TRUE - -#undef SPI_USE_WAIT -#define SPI_USE_WAIT TRUE - -#undef SPI_SELECT_MODE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json index e9bd7d85b19..74c62aa3a19 100644 --- a/keyboards/ciaanh/kanagawa2040/info.json +++ b/keyboards/ciaanh/kanagawa2040/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "Macropad RP2040", - "manufacturer": "Adafruit", - "url": "https://learn.adafruit.com/adafruit-macropad-rp2040", - "maintainer": "Jpe230", + "keyboard_name": "Kanagawa2040", + "manufacturer": "Ciaanh", + "url": "", + "maintainer": "Ciaanh", "usb": { - "vid": "0x239A", - "pid": "0x0108", - "device_version": "0.0.1" + "vid": "0xC1E0", + "pid": "0x0011", + "device_version": "0.2.0" }, "layouts": { "LAYOUT": { @@ -24,7 +24,6 @@ {"label":"KC_1", "x":0, "y":4}, {"label":"KC_2", "x":1, "y":4}, {"label":"KC_3", "x":2, "y":4} - ] - } + ]} } } diff --git a/keyboards/ciaanh/kanagawa2040/macropad.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c similarity index 98% rename from keyboards/ciaanh/kanagawa2040/macropad.c rename to keyboards/ciaanh/kanagawa2040/kanagawa2040.c index a82a2dabb1f..f124546f093 100644 --- a/keyboards/ciaanh/kanagawa2040/macropad.c +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "macropad.h" +#include "kanagawa2040.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ciaanh/kanagawa2040/macropad.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h similarity index 100% rename from keyboards/ciaanh/kanagawa2040/macropad.h rename to keyboards/ciaanh/kanagawa2040/kanagawa2040.h diff --git a/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h b/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h deleted file mode 100644 index c8a2cd7d9a4..00000000000 --- a/keyboards/ciaanh/kanagawa2040/lib/oled_driver_spi.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ -#pragma once - -#ifndef OLED_DC_PIN -# error "The OLED driver in SPI needs a D/C pin defined" -#endif -#ifndef OLED_CS_PIN -# error "The OLED driver in SPI needs a CS pin defined" -#endif -#ifndef OLED_SPI_MODE -# define OLED_SPI_MODE 3 -#endif -#ifndef OLED_SPI_DIVISOR -# define OLED_SPI_DIVISOR 2 -#endif diff --git a/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c b/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c deleted file mode 100644 index dc1289fdb13..00000000000 --- a/keyboards/ciaanh/kanagawa2040/lib/ssd1306_sh1106.c +++ /dev/null @@ -1,827 +0,0 @@ -/* -Copyright 2019 Ryan Caltabiano -Copyright 2022 Jose Pablo Ramirez -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 . -*/ -#include "oled_driver.h" -#include "oled_driver_spi.h" - -#include "spi_master.h" - -#include -#include OLED_FONT_H -#include "timer.h" -#include "print.h" - -#include - -#include "progmem.h" - -#include "keyboard.h" - -// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf -// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf - -// Fundamental Commands -#define CONTRAST 0x81 -#define DISPLAY_ALL_ON 0xA5 -#define DISPLAY_ALL_ON_RESUME 0xA4 -#define NORMAL_DISPLAY 0xA6 -#define INVERT_DISPLAY 0xA7 -#define DISPLAY_ON 0xAF -#define DISPLAY_OFF 0xAE -#define NOP 0xE3 - -// Scrolling Commands -#define ACTIVATE_SCROLL 0x2F -#define DEACTIVATE_SCROLL 0x2E -#define SCROLL_RIGHT 0x26 -#define SCROLL_LEFT 0x27 -#define SCROLL_RIGHT_UP 0x29 -#define SCROLL_LEFT_UP 0x2A - -// Addressing Setting Commands -#define MEMORY_MODE 0x20 -#define COLUMN_ADDR 0x21 -#define PAGE_ADDR 0x22 -#define PAM_SETCOLUMN_LSB 0x00 -#define PAM_SETCOLUMN_MSB 0x10 -#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7 - -// Hardware Configuration Commands -#define DISPLAY_START_LINE 0x40 -#define SEGMENT_REMAP 0xA0 -#define SEGMENT_REMAP_INV 0xA1 -#define MULTIPLEX_RATIO 0xA8 -#define COM_SCAN_INC 0xC0 -#define COM_SCAN_DEC 0xC8 -#define DISPLAY_OFFSET 0xD3 -#define COM_PINS 0xDA -#define COM_PINS_SEQ 0x02 -#define COM_PINS_ALT 0x12 -#define COM_PINS_SEQ_LR 0x22 -#define COM_PINS_ALT_LR 0x32 - -// Timing & Driving Commands -#define DISPLAY_CLOCK 0xD5 -#define PRE_CHARGE_PERIOD 0xD9 -#define VCOM_DETECT 0xDB - -// Advance Graphic Commands -#define FADE_BLINK 0x23 -#define ENABLE_FADE 0x20 -#define ENABLE_BLINK 0x30 - -// Charge Pump Commands -#define CHARGE_PUMP 0x8D - -// Misc defines -#ifndef OLED_BLOCK_COUNT -# define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) -#endif -#ifndef OLED_BLOCK_SIZE -# define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) -#endif - -#define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1) - -#define ARRAY_SIZE(arr) sizeof(arr)/sizeof(arr[0]) - -// spi defines -#define OLED_STATUS_SUCCESS SPI_STATUS_SUCCESS - -void oled_spi_init(void) { - spi_init(); - - setPinOutput(OLED_CS_PIN); - writePinHigh(OLED_CS_PIN); - - setPinOutput(OLED_DC_PIN); - writePinLow(OLED_DC_PIN); -} - -void oled_spi_start(void) { - spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR); -} - -void oled_spi_stop(void) { - spi_stop(); -} - -// Transmit/Write Funcs. -bool oled_cmd(const uint8_t *data, uint16_t size) { - oled_spi_start(); - // Command Mode - writePinLow(OLED_DC_PIN); - // Send the commands - if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){ - oled_spi_stop(); - return false; - } - oled_spi_stop(); - return true; -} - -bool oled_cmd_p(const uint8_t *data, uint16_t size) { - return oled_cmd(data, size); -} - -bool oled_write_reg(const uint8_t *data, uint16_t size) -{ - oled_spi_start(); - // Command Mode - writePinHigh(OLED_DC_PIN); - // Send the commands - if(spi_transmit(data, size) != OLED_STATUS_SUCCESS){ - oled_spi_stop(); - return false; - } - oled_spi_stop(); - return true; -} - -#define HAS_FLAGS(bits, flags) ((bits & flags) == flags) - -// Display buffer's is the same as the OLED memory layout -// this is so we don't end up with rounding errors with -// parts of the display unusable or don't get cleared correctly -// and also allows for drawing & inverting -uint8_t oled_buffer[OLED_MATRIX_SIZE]; -uint8_t * oled_cursor; -OLED_BLOCK_TYPE oled_dirty = 0; -bool oled_initialized = false; -bool oled_active = false; -bool oled_scrolling = false; -bool oled_inverted = false; -uint8_t oled_brightness = OLED_BRIGHTNESS; -oled_rotation_t oled_rotation = 0; -uint8_t oled_rotation_width = 0; -uint8_t oled_scroll_speed = 0; // this holds the speed after being remapped to ssd1306 internal values -uint8_t oled_scroll_start = 0; -uint8_t oled_scroll_end = 7; -#if OLED_TIMEOUT > 0 -uint32_t oled_timeout; -#endif -#if OLED_SCROLL_TIMEOUT > 0 -uint32_t oled_scroll_timeout; -#endif -#if OLED_UPDATE_INTERVAL > 0 -uint16_t oled_update_timeout; -#endif - -// Flips the rendering bits for a character at the current cursor position -static void InvertCharacter(uint8_t *cursor) { - const uint8_t *end = cursor + OLED_FONT_WIDTH; - while (cursor < end) { - *cursor = ~(*cursor); - cursor++; - } -} - -bool oled_init(oled_rotation_t rotation) { - oled_rotation = oled_init_user(oled_init_kb(rotation)); - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - oled_rotation_width = OLED_DISPLAY_WIDTH; - } else { - oled_rotation_width = OLED_DISPLAY_HEIGHT; - } - - oled_spi_init(); - -#ifdef OLED_RST_PIN - /* Reset device */ - setPinOutput(OLED_RST_PIN); - writePinLow(OLED_RST_PIN); - wait_ms(20); - writePinHigh(OLED_RST_PIN); - wait_ms(20); -#endif - - static const uint8_t PROGMEM display_setup1[] = { - DISPLAY_OFF, - DISPLAY_CLOCK, - 0x80, - MULTIPLEX_RATIO, - OLED_DISPLAY_HEIGHT - 1, - DISPLAY_OFFSET, - 0x00, - DISPLAY_START_LINE | 0x00, - CHARGE_PUMP, - 0x14, -#if (OLED_IC != OLED_IC_SH1106) - // MEMORY_MODE is unsupported on SH1106 (Page Addressing only) - MEMORY_MODE, - 0x00, // Horizontal addressing mode -#endif - }; - - if (!oled_cmd_p(display_setup1, ARRAY_SIZE(display_setup1))) { - print("oled_init cmd set 1 failed\n"); - return false; - } - - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) { - static const uint8_t PROGMEM display_normal[] = {SEGMENT_REMAP_INV, COM_SCAN_DEC}; - if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) { - print("oled_init cmd normal rotation failed\n"); - return false; - } - } else { - static const uint8_t PROGMEM display_flipped[] = {SEGMENT_REMAP, COM_SCAN_INC}; - if (!oled_cmd_p(display_flipped, ARRAY_SIZE(display_flipped))) { - print("display_flipped failed\n"); - return false; - } - } - - static const uint8_t PROGMEM display_setup2[] = {COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0xF1, VCOM_DETECT, 0x20, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON}; - if (!oled_cmd_p(display_setup2, ARRAY_SIZE(display_setup2))) { - print("display_setup2 failed\n"); - return false; - } - -#if OLED_TIMEOUT > 0 - oled_timeout = timer_read32() + OLED_TIMEOUT; -#endif -#if OLED_SCROLL_TIMEOUT > 0 - oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT; -#endif - - oled_clear(); - oled_initialized = true; - oled_active = true; - oled_scrolling = false; - return true; -} - -__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { - return rotation; -} -__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return rotation; -} - -void oled_clear(void) { - memset(oled_buffer, 0, sizeof(oled_buffer)); - oled_cursor = &oled_buffer[0]; - oled_dirty = OLED_ALL_BLOCKS_MASK; -} - -static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) { - // Calculate commands to set memory addressing bounds. - uint8_t start_page = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH; - uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH; -#if (OLED_IC == OLED_IC_SH1106) - // Commands for Page Addressing Mode. Sets starting page and column; has no end bound. - // Column value must be split into high and low nybble and sent as two commands. - cmd_array[0] = PAM_PAGE_ADDR | start_page; - cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f); - cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f); - cmd_array[3] = NOP; - cmd_array[4] = NOP; - cmd_array[5] = NOP; -#else - // Commands for use in Horizontal Addressing mode. - cmd_array[1] = start_column; - cmd_array[4] = start_page; - cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1]; - cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1; -#endif -} - -static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) { - cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8; - cmd_array[4] = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT; - cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1]; - ; - cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8; -} - -uint8_t crot(uint8_t a, int8_t n) { - const uint8_t mask = 0x7; - n &= mask; - return a << n | a >> (-n & mask); -} - -static void rotate_90(const uint8_t *src, uint8_t *dest) { - for (uint8_t i = 0, shift = 7; i < 8; ++i, --shift) { - uint8_t selector = (1 << i); - for (uint8_t j = 0; j < 8; ++j) { - dest[i] |= crot(src[j] & selector, shift - (int8_t)j); - } - } -} - -void oled_render(void) { - if (!oled_initialized) { - return; - } - - // Do we have work to do? - oled_dirty &= OLED_ALL_BLOCKS_MASK; - if (!oled_dirty || oled_scrolling) { - return; - } - - // Find first dirty block - uint8_t update_start = 0; - while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) { - ++update_start; - } - - // Set column & page position - static uint8_t display_start[] = {COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1}; - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - calc_bounds(update_start, display_start); - } else { - calc_bounds_90(update_start, display_start); - } - - // Send column & page position - if (!oled_cmd(display_start, ARRAY_SIZE(display_start))) { - print("oled_render offset command failed\n"); - return; - } - - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - // Send render data chunk as is - if (!oled_write_reg(&oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE)) { - print("oled_render data failed\n"); - return; - } - } else { - // Rotate the render chunks - const static uint8_t source_map[] = OLED_SOURCE_MAP; - const static uint8_t target_map[] = OLED_TARGET_MAP; - - static uint8_t temp_buffer[OLED_BLOCK_SIZE]; - memset(temp_buffer, 0, sizeof(temp_buffer)); - for (uint8_t i = 0; i < sizeof(source_map); ++i) { - rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]); - } - - // Send render data chunk after rotating - if (!oled_write_reg(temp_buffer, OLED_BLOCK_SIZE)) { - print("oled_render90 data failed\n"); - return; - } - } - - // Turn on display if it is off - oled_on(); - - // Clear dirty flag - oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start); -} - -void oled_set_cursor(uint8_t col, uint8_t line) { - uint16_t index = line * oled_rotation_width + col * OLED_FONT_WIDTH; - - // Out of bounds? - if (index >= OLED_MATRIX_SIZE) { - index = 0; - } - - oled_cursor = &oled_buffer[index]; -} - -void oled_advance_page(bool clearPageRemainder) { - uint16_t index = oled_cursor - &oled_buffer[0]; - uint8_t remaining = oled_rotation_width - (index % oled_rotation_width); - - if (clearPageRemainder) { - // Remaining Char count - remaining = remaining / OLED_FONT_WIDTH; - - // Write empty character until next line - while (remaining--) - oled_write_char(' ', false); - } else { - // Next page index out of bounds? - if (index + remaining >= OLED_MATRIX_SIZE) { - index = 0; - remaining = 0; - } - - oled_cursor = &oled_buffer[index + remaining]; - } -} - -void oled_advance_char(void) { - uint16_t nextIndex = oled_cursor - &oled_buffer[0] + OLED_FONT_WIDTH; - uint8_t remainingSpace = oled_rotation_width - (nextIndex % oled_rotation_width); - - // Do we have enough space on the current line for the next character - if (remainingSpace < OLED_FONT_WIDTH) { - nextIndex += remainingSpace; - } - - // Did we go out of bounds - if (nextIndex >= OLED_MATRIX_SIZE) { - nextIndex = 0; - } - - // Update cursor position - oled_cursor = &oled_buffer[nextIndex]; -} - -// Main handler that writes character data to the display buffer -void oled_write_char(const char data, bool invert) { - // Advance to the next line if newline - if (data == '\n') { - // Old source wrote ' ' until end of line... - oled_advance_page(true); - return; - } - - if (data == '\r') { - oled_advance_page(false); - return; - } - - // copy the current render buffer to check for dirty after - static uint8_t oled_temp_buffer[OLED_FONT_WIDTH]; - memcpy(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH); - - _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array"); - - // set the reder buffer data - uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index - if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) { - memset(oled_cursor, 0x00, OLED_FONT_WIDTH); - } else { - const uint8_t *glyph = &font[(cast_data - OLED_FONT_START) * OLED_FONT_WIDTH]; - memcpy_P(oled_cursor, glyph, OLED_FONT_WIDTH); - } - - // Invert if needed - if (invert) { - InvertCharacter(oled_cursor); - } - - // Dirty check - if (memcmp(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH)) { - uint16_t index = oled_cursor - &oled_buffer[0]; - oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); - // Edgecase check if the written data spans the 2 chunks - oled_dirty |= ((OLED_BLOCK_TYPE)1 << ((index + OLED_FONT_WIDTH - 1) / OLED_BLOCK_SIZE)); - } - - // Finally move to the next char - oled_advance_char(); -} - -void oled_write(const char *data, bool invert) { - const char *end = data + strlen(data); - while (data < end) { - oled_write_char(*data, invert); - data++; - } -} - -void oled_write_ln(const char *data, bool invert) { - oled_write(data, invert); - oled_advance_page(true); -} - -void oled_pan(bool left) { - uint16_t i = 0; - for (uint16_t y = 0; y < OLED_DISPLAY_HEIGHT / 8; y++) { - if (left) { - for (uint16_t x = 0; x < OLED_DISPLAY_WIDTH - 1; x++) { - i = y * OLED_DISPLAY_WIDTH + x; - oled_buffer[i] = oled_buffer[i + 1]; - } - } else { - for (uint16_t x = OLED_DISPLAY_WIDTH - 1; x > 0; x--) { - i = y * OLED_DISPLAY_WIDTH + x; - oled_buffer[i] = oled_buffer[i - 1]; - } - } - } - oled_dirty = OLED_ALL_BLOCKS_MASK; -} - -oled_buffer_reader_t oled_read_raw(uint16_t start_index) { - if (start_index > OLED_MATRIX_SIZE) start_index = OLED_MATRIX_SIZE; - oled_buffer_reader_t ret_reader; - ret_reader.current_element = &oled_buffer[start_index]; - ret_reader.remaining_element_count = OLED_MATRIX_SIZE - start_index; - return ret_reader; -} - -void oled_write_raw_byte(const char data, uint16_t index) { - if (index > OLED_MATRIX_SIZE) index = OLED_MATRIX_SIZE; - if (oled_buffer[index] == data) return; - oled_buffer[index] = data; - oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); -} - -void oled_write_raw(const char *data, uint16_t size) { - uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; - if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; - for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { - uint8_t c = *data++; - if (oled_buffer[i] == c) continue; - oled_buffer[i] = c; - oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); - } -} - -void oled_write_pixel(uint8_t x, uint8_t y, bool on) { - if (x >= oled_rotation_width) { - return; - } - uint16_t index = x + (y / 8) * oled_rotation_width; - if (index >= OLED_MATRIX_SIZE) { - return; - } - uint8_t data = oled_buffer[index]; - if (on) { - data |= (1 << (y % 8)); - } else { - data &= ~(1 << (y % 8)); - } - if (oled_buffer[index] != data) { - oled_buffer[index] = data; - oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE)); - } -} - -#if defined(__AVR__) -void oled_write_P(const char *data, bool invert) { - uint8_t c = pgm_read_byte(data); - while (c != 0) { - oled_write_char(c, invert); - c = pgm_read_byte(++data); - } -} - -void oled_write_ln_P(const char *data, bool invert) { - oled_write_P(data, invert); - oled_advance_page(true); -} - -void oled_write_raw_P(const char *data, uint16_t size) { - uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; - if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; - for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { - uint8_t c = pgm_read_byte(data++); - if (oled_buffer[i] == c) continue; - oled_buffer[i] = c; - oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); - } -} -#endif // defined(__AVR__) - -bool oled_on(void) { - if (!oled_initialized) { - return oled_active; - } - -#if OLED_TIMEOUT > 0 - oled_timeout = timer_read32() + OLED_TIMEOUT; -#endif - - static const uint8_t PROGMEM display_on[] = -#ifdef OLED_FADE_OUT - {FADE_BLINK, 0x00}; -#else - {DISPLAY_ON}; -#endif - - if (!oled_active) { - if (!oled_cmd_p(display_on, ARRAY_SIZE(display_on))) { - print("oled_on cmd failed\n"); - return oled_active; - } - oled_active = true; - } - return oled_active; -} - -bool oled_off(void) { - if (!oled_initialized) { - return !oled_active; - } - - static const uint8_t PROGMEM display_off[] = -#ifdef OLED_FADE_OUT - {FADE_BLINK, ENABLE_FADE | OLED_FADE_OUT_INTERVAL}; -#else - {DISPLAY_OFF}; -#endif - - if (oled_active) { - if (!oled_cmd_p(display_off, ARRAY_SIZE(display_off))) { - print("oled_off cmd failed\n"); - return oled_active; - } - oled_active = false; - } - return !oled_active; -} - -bool is_oled_on(void) { - return oled_active; -} - -uint8_t oled_set_brightness(uint8_t level) { - if (!oled_initialized) { - return oled_brightness; - } - - uint8_t set_contrast[] = { CONTRAST, level}; - if (oled_brightness != level) { - if (!oled_cmd(set_contrast, ARRAY_SIZE(set_contrast))) { - print("set_brightness cmd failed\n"); - return oled_brightness; - } - oled_brightness = level; - } - return oled_brightness; -} - -uint8_t oled_get_brightness(void) { - return oled_brightness; -} - -// Set the specific 8 lines rows of the screen to scroll. -// 0 is the default for start, and 7 for end, which is the entire -// height of the screen. For 128x32 screens, rows 4-7 are not used. -void oled_scroll_set_area(uint8_t start_line, uint8_t end_line) { - oled_scroll_start = start_line; - oled_scroll_end = end_line; -} - -void oled_scroll_set_speed(uint8_t speed) { - // Sets the speed for scrolling... does not take effect - // until scrolling is either started or restarted - // the ssd1306 supports 8 speeds - // FrameRate2 speed = 7 - // FrameRate3 speed = 4 - // FrameRate4 speed = 5 - // FrameRate5 speed = 0 - // FrameRate25 speed = 6 - // FrameRate64 speed = 1 - // FrameRate128 speed = 2 - // FrameRate256 speed = 3 - // for ease of use these are remaped here to be in order - static const uint8_t scroll_remap[8] = {7, 4, 5, 0, 6, 1, 2, 3}; - oled_scroll_speed = scroll_remap[speed]; -} - -bool oled_scroll_right(void) { - if (!oled_initialized) { - return oled_scrolling; - } - - // Dont enable scrolling if we need to update the display - // This prevents scrolling of bad data from starting the scroll too early after init - if (!oled_dirty && !oled_scrolling) { - uint8_t display_scroll_right[] = {SCROLL_RIGHT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL}; - if (!oled_cmd(display_scroll_right, ARRAY_SIZE(display_scroll_right))) { - print("oled_scroll_right cmd failed\n"); - return oled_scrolling; - } - oled_scrolling = true; - } - return oled_scrolling; -} - -bool oled_scroll_left(void) { - if (!oled_initialized) { - return oled_scrolling; - } - - // Dont enable scrolling if we need to update the display - // This prevents scrolling of bad data from starting the scroll too early after init - if (!oled_dirty && !oled_scrolling) { - uint8_t display_scroll_left[] = {SCROLL_LEFT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL}; - if (!oled_cmd(display_scroll_left, ARRAY_SIZE(display_scroll_left))) { - print("oled_scroll_left cmd failed\n"); - return oled_scrolling; - } - oled_scrolling = true; - } - return oled_scrolling; -} - -bool oled_scroll_off(void) { - if (!oled_initialized) { - return !oled_scrolling; - } - - if (oled_scrolling) { - static const uint8_t PROGMEM display_scroll_off[] = {DEACTIVATE_SCROLL}; - if (!oled_cmd_p(display_scroll_off, ARRAY_SIZE(display_scroll_off))) { - print("oled_scroll_off cmd failed\n"); - return oled_scrolling; - } - oled_scrolling = false; - oled_dirty = OLED_ALL_BLOCKS_MASK; - } - return !oled_scrolling; -} - -bool is_oled_scrolling(void) { - return oled_scrolling; -} - -bool oled_invert(bool invert) { - if (!oled_initialized) { - return oled_inverted; - } - - if (invert && !oled_inverted) { - static const uint8_t PROGMEM display_inverted[] = {INVERT_DISPLAY}; - if (!oled_cmd_p(display_inverted, ARRAY_SIZE(display_inverted))) { - print("oled_invert cmd failed\n"); - return oled_inverted; - } - oled_inverted = true; - } else if (!invert && oled_inverted) { - static const uint8_t PROGMEM display_normal[] = {NORMAL_DISPLAY}; - if (!oled_cmd_p(display_normal, ARRAY_SIZE(display_normal))) { - print("oled_invert cmd failed\n"); - return oled_inverted; - } - oled_inverted = false; - } - - return oled_inverted; -} - -uint8_t oled_max_chars(void) { - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - return OLED_DISPLAY_WIDTH / OLED_FONT_WIDTH; - } - return OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH; -} - -uint8_t oled_max_lines(void) { - if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { - return OLED_DISPLAY_HEIGHT / OLED_FONT_HEIGHT; - } - return OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT; -} - -void oled_task(void) { - if (!oled_initialized) { - return; - } - -#if OLED_UPDATE_INTERVAL > 0 - if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) { - oled_update_timeout = timer_read(); - oled_set_cursor(0, 0); - oled_task_kb(); - } -#else - oled_set_cursor(0, 0); - oled_task_kb(); -#endif - -#if OLED_SCROLL_TIMEOUT > 0 - if (oled_dirty && oled_scrolling) { - oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT; - oled_scroll_off(); - } -#endif - - // Smart render system, no need to check for dirty - oled_render(); - - // Display timeout check -#if OLED_TIMEOUT > 0 - if (oled_active && timer_expired32(timer_read32(), oled_timeout)) { - oled_off(); - } -#endif - -#if OLED_SCROLL_TIMEOUT > 0 - if (!oled_scrolling && timer_expired32(timer_read32(), oled_scroll_timeout)) { -# ifdef OLED_SCROLL_TIMEOUT_RIGHT - oled_scroll_right(); -# else - oled_scroll_left(); -# endif - } -#endif -} - -__attribute__((weak)) bool oled_task_kb(void) { - return oled_task_user(); -} -__attribute__((weak)) bool oled_task_user(void) { - return true; -} diff --git a/keyboards/ciaanh/kanagawa2040/mcuconf.h b/keyboards/ciaanh/kanagawa2040/mcuconf.h index 198a2eea697..d3ca0baab50 100644 --- a/keyboards/ciaanh/kanagawa2040/mcuconf.h +++ b/keyboards/ciaanh/kanagawa2040/mcuconf.h @@ -1,22 +1,6 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - #pragma once #include_next -#undef RP_SPI_USE_SPI1 -#define RP_SPI_USE_SPI1 TRUE +#undef RP_I2C_USE_I2C0 +#define RP_I2C_USE_I2C0 TRUE diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index 3636424a714..6f054586b6e 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -2,6 +2,7 @@ MCU = RP2040 # Bootloader selection BOOTLOADER = rp2040 + # Build Options # change yes to no to disable # @@ -14,13 +15,11 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -# AUDIO_DRIVER = pwm_software + ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor OLED_ENABLE = yes -OLED_DRIVER = custom -# Project specific files -SRC += lib/ssd1306_sh1106.c -QUANTUM_LIB_SRC += spi_master.c + +OPT_DEFS += -DHAL_USE_I2C=TRUE From e3b3d2b2632de8c87c054124a0890a6970e5581f Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Tue, 10 Jan 2023 22:56:16 +0100 Subject: [PATCH 03/76] kanagawa 2040 --- keyboards/ciaanh/kanagawa/rev1/config.h | 5 +- keyboards/ciaanh/kanagawa2040/config.h | 45 ++- keyboards/ciaanh/kanagawa2040/kanagawa2040.c | 26 +- keyboards/ciaanh/kanagawa2040/kanagawa2040.h | 31 +- .../kanagawa2040/keymaps/default/keymap.c | 344 +++++++++++++----- .../kanagawa2040/keymaps/default/rules.mk | 4 +- .../ciaanh/kanagawa2040/keymaps/via/keymap.c | 138 ------- .../ciaanh/kanagawa2040/keymaps/via/rules.mk | 2 - keyboards/ciaanh/kanagawa2040/lib/oledfont.c | 277 ++++++++++++++ keyboards/ciaanh/kanagawa2040/readme.md | 39 +- keyboards/ciaanh/kanagawa2040/rules.mk | 1 + 11 files changed, 605 insertions(+), 307 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c delete mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk create mode 100644 keyboards/ciaanh/kanagawa2040/lib/oledfont.c diff --git a/keyboards/ciaanh/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawa/rev1/config.h index 91a5f367b31..47f3b4be6e2 100644 --- a/keyboards/ciaanh/kanagawa/rev1/config.h +++ b/keyboards/ciaanh/kanagawa/rev1/config.h @@ -14,7 +14,6 @@ #define MATRIX_ROW_PINS { B2, B3, B1, F7, F6, F5 } #define MATRIX_COL_PINS { B6, F0, F1, C7, D5, B7, B5, B4, E6, D7, C6, D4, D2, D3 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -41,6 +40,6 @@ #define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE +// #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +// #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index 29d9056caed..159105caa7d 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -19,31 +19,42 @@ #include "config_common.h" /* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 3 +#define MATRIX_ROWS 6 +#define MATRIX_COLS 14 /* Keyboard Matrix Assignments */ // clang-format off -#define DIRECT_PINS { \ - { NO_PIN, NO_PIN, GP0 }, \ - { GP1, GP2, GP3 }, \ - { GP4, GP5, GP6 }, \ - { GP7, GP8, GP9 }, \ - { GP10, GP11, GP12 } \ -} +// #define DIRECT_PINS { \ +// { NO_PIN, NO_PIN, GP0 }, \ +// { GP1, GP2, GP3 }, \ +// { GP4, GP5, GP6 }, \ +// { GP7, GP8, GP9 }, \ +// { GP10, GP11, GP12 } \ +// } + +#define DIODE_DIRECTION COL2ROW +#define MATRIX_ROW_PINS { GP27, GP26, GP21, GP20, GP19, GP18 } +#define MATRIX_COL_PINS { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15 } // clang-format on +#define DIODE_DIRECTION COL2ROW + /* OLED SPI Defines */ -#define OLED_DISPLAY_128X32 +#ifdef OLED_ENABLE +# define OLED_DISPLAY_128X32 +# define OLED_FONT_H "lib/oledfont.c" +# define OLED_FONT_END 255 +// # define OLED_DISPLAY_ADDRESS 0x78 +#endif /* I2C Conf */ #define I2C_DRIVER I2CD1 -#define I2C1_SDA_PIN GP12 -#define I2C1_SCL_PIN GP13 +#define I2C1_SDA_PIN GP16 +#define I2C1_SCL_PIN GP17 /* Encoders */ -#define ENCODERS_PAD_A { GP18 } -#define ENCODERS_PAD_B { GP17 } +#define ENCODERS_PAD_A { GP1 } +#define ENCODERS_PAD_B { GP0 } #define DEBOUNCE 5 @@ -60,9 +71,9 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ -# define RGB_DI_PIN GP19 -# define DRIVER_LED_TOTAL 12 -# define RGBLED_NUM 12 +# define RGB_DI_PIN GP28 +# define DRIVER_LED_TOTAL 6 +# define RGBLED_NUM 6 /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c index f124546f093..0cb1efe3498 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c @@ -21,18 +21,24 @@ #define NA NO_LED /* RGB Positioning */ -led_config_t g_led_config = { { - { NA, NA, NA }, - { 0, 1, 2 }, - { 3, 4, 5 }, - { 6, 7, 8 }, - { 9, 10, 11 } +led_config_t g_led_config = { { + // Key Matrix to LED Index + { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NO_LED, NO_LED }, + { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 66 }, + { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 67 }, + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, 68 }, + { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, NO_LED, 70, NO_LED }, + { 82, 81, 80, 79, 78, NO_LED, 77, 76, 75, 74, 73, NO_LED, 72, 71, 69 } }, { - { 0, 0 }, { 112, 0 }, { 224, 0}, - { 0, 21 }, { 112, 21 }, { 224, 21}, - { 0, 42 }, { 112, 42 }, { 224, 42}, - { 0, 64 }, { 112, 64 }, { 224, 64} + // LED Index to Physical Position + { 0, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 224, 0}, + { 0, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 224, 21}, + { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, + { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, + { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, + { 0, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 224, 64} }, { + // LED Index to Flag 4, 4, 4, 4, 4, 4, 4, 4, 4, diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h index 6e2e3524b7d..3358e7be547 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h @@ -21,18 +21,21 @@ #define ___ KC_NO // clang-format off - #define LAYOUT( \ - K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32, \ - K40, K41, K42 \ - ) \ - { \ - { ___, ___, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ - { K40, K41, K42 } \ - } +#define LAYOUT_84_ansi( \ + K00, K01,K02,K03,K04, K05,K06,K07,K08, K09,K010,K011,K012, K013, \ + \ + K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K110,K111,K112, K113 , K313, \ + K20 ,K21,K22,K23,K24,K25,K26,K27,K28,K29,K210,K211,K212, K213 , K413, \ + K30 ,K31,K32,K33,K34,K35,K36,K37,K38,K39,K310,K311, K312 , K513, \ + K40 ,K41,K42,K43,K44,K45,K46,K47,K48,K49,K410, K411 , K412, \ + K50 ,K51,K52 , K53,K54 , K55,K56, K57 ,K58,K59 , K510, K511, K512 \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412, K413 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K510, K511, K512, K513 } \ +} // clang-format on diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c index 34989ea0b60..69e3b515a3a 100644 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c @@ -1,114 +1,258 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - #include QMK_KEYBOARD_H +#include "keycodes.h" +/* Keyboard layout + ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. + | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | + `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' + ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. + | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| + | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| + | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' + | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. + |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | + | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. + |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | + `---------+---------' `---------+---------' `---------+---------+---------' +*/ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MUTE, - KC_ENT, KC_0, KC_BSPC, - KC_7, KC_8, KC_9, - KC_4, KC_5, KC_6, - KC_1, KC_2, KC_3 - ) + +/* Keymap: BASE +* +* +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' +* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | +* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------+---------' `---------+---------' `---------+---------+---------' +* +* +*/ + [_BASE] = LAYOUT_84_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + + [_CODE] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_LOWER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_UPPER] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ) + + + }; -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, -}; -#endif + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + #ifdef OLED_ENABLE -static void render_qmk_logo(void) { - static const char PROGMEM qmk_logo[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, - 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, - 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, - 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff, - 0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, - 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; + // oled_rotation_t oled_init_user(oled_rotation_t rotation) { + // return OLED_ROTATION_180; + // } - oled_write_raw_P(qmk_logo, sizeof(qmk_logo)); -} + static void render_status(void) { + // 21 characters per line + // 16 cols / 8 rows -bool oled_task_user(void) { - render_qmk_logo(); + oled_write_P(PSTR(" Kanagawa rev 1.1 "), false); + //oled_write_ln("", false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _LOWER: + oled_write_P(PSTR("[Low]\n"), false); + break; + case _UPPER: + oled_write_P(PSTR("[Up]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(PSTR(" "), false); + + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + oled_write_ln("", false); + } + + // static void render_kanagawa_logo(void) { + // static const char PROGMEM kanagawa_logo[] = { + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, + // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, + // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, + // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, + // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, + // }; + // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); + // } + + // static void render_kanagawa_logo(void) { + // //oled_set_cursor(0, 5); + + // static const char PROGMEM kanagawa_logo[] = { + // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + // }; + + // oled_write_P(kanagawa_logo, false); + // } + + bool oled_task_user(void) { + // switch (get_highest_layer(layer_state)) { + // case _UPPER: + // render_kanagawa_logo(); + // break; + // default: + // render_status(); + // } + + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case ENCODER: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } return true; } +#ifdef ENCODER_ENABLE + bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + switch (get_highest_layer(layer_state)) { + case _CODE: + if (clockwise) { + tap_code(KC_PGDN); + } else { + tap_code(KC_PGUP); + } + break; + default: + if (clockwise) { + tap_code(KC_VOLD); + } else { + tap_code(KC_VOLU); + } + break; + } + } + return true; + } #endif - diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk index ee325681483..0838e25e098 100644 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk @@ -1 +1,3 @@ -ENCODER_MAP_ENABLE = yes +LTO_ENABLE = yes + +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c deleted file mode 100644 index 6ef3d3e29dd..00000000000 --- a/keyboards/ciaanh/kanagawa2040/keymaps/via/keymap.c +++ /dev/null @@ -1,138 +0,0 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( - KC_MUTE, - KC_ENT, KC_0, KC_BSPC, - KC_7, KC_8, KC_9, - KC_4, KC_5, KC_6, - KC_1, KC_2, KC_3 - ), - [1] = LAYOUT( - _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______ - ), - [2] = LAYOUT( - _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______ - ), - [3] = LAYOUT( - _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______, - _______, _______, _______ - ), -}; - -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(_______, _______) }, - [2] = { ENCODER_CCW_CW(_______, _______) }, - [3] = { ENCODER_CCW_CW(_______, _______) } -}; -#endif - - -#ifdef OLED_ENABLE -static void render_qmk_logo(void) { - static const char PROGMEM qmk_logo[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, - 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x03, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, - 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x83, 0x83, 0x83, 0x83, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x83, 0x83, 0x83, 0x83, 0x81, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0x7e, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, - 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0xff, - 0xff, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc0, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, - 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - - oled_write_raw_P(qmk_logo, sizeof(qmk_logo)); -} - -bool oled_task_user(void) { - render_qmk_logo(); - return true; -} - -#endif - diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk deleted file mode 100644 index 715838ecc5d..00000000000 --- a/keyboards/ciaanh/kanagawa2040/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_MAP_ENABLE = yes -VIA_ENABLE = yes diff --git a/keyboards/ciaanh/kanagawa2040/lib/oledfont.c b/keyboards/ciaanh/kanagawa2040/lib/oledfont.c new file mode 100644 index 00000000000..153007ef1a3 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/lib/oledfont.c @@ -0,0 +1,277 @@ +#include "progmem.h" + + + +const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => + + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / + + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? + + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O + + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ + + 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o + + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => + 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => + 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => + 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => + 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => + 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => + 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => + 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => + 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => + 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => + + 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => + 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => + 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => + 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => + 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => + 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => + 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => + 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => + 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => + 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => + 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => + 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => + 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => + 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => + 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => + 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => + 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => + 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => + 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => + + 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => + 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => + 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => + 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => + 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => + 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => + 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => + 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => + 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => + 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => + 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => + 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => + 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => + 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => + 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => + 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => + 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => + 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => + 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => + 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => + 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => + 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => + 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => + 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => + + 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => + 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => + 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => + 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => +}; diff --git a/keyboards/ciaanh/kanagawa2040/readme.md b/keyboards/ciaanh/kanagawa2040/readme.md index 46b3f5ddb72..f4c50935169 100644 --- a/keyboards/ciaanh/kanagawa2040/readme.md +++ b/keyboards/ciaanh/kanagawa2040/readme.md @@ -2,35 +2,30 @@ https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropa qmk compile -kb ciaanh/kanagawa2040 -km default -# Adafruit MacroPad RP2040 +# Ciaanh Kanagawa2040 -![AdafruitMacropad](https://i.imgur.com/dSBSwcJh.jpeg) - -A RP2040-powered Macropad with a 3x4 layout. - -- Keyboard Maintainer: [Jpe230](https://github.com/jpe230/) -- Hardware Supported: Adafruit MacroPad RP2040 -- Hardware Availability: [Barebones kit](https://www.adafruit.com/product/5100) [Starter Kit](https://www.adafruit.com/product/5128) - -Make example for this board (after setting up your build environment): ```sh -qmk compile -kb adafruit/macropad -km default +qmk compile -kb ciaanh/kanagawa2040 -km default ``` -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). +# Kanagawa -## Features +A 75% keyboard with oled and rotary encoder for Elite-C + + Keyboard Maintainer : Ciaanh + + Hardware Supported : Kanagawa PCB + + Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa + + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb ciaanh/kanagawa -km default + +Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader -- Raspberry Pi RP2040 Chip + 8MB Flash memory - Dual-core Cortex M0+ at ~130MHz with 264KB of RAM. -- 3x4 Mechanical key switch sockets - accepts any Cherry MX-compatible switches. Individually tied to GPIO pins (not matrix wired) -- One NeoPixel RGB LED per switch, on north side. -- Rotary encoder, 20 detents per rotation, with push-switch on GPIO pin. Push switch is also used for entering bootloader mode when held down on power-up or reset. -- 128x64 SH1106 Monochrome OLED display - On high-speed hardware SPI port for quick updates. -- 8mm Speaker/Buzzer - With Class D amplifier and RC filter, can be used to make simple beeps and sounds effects. (Unsupported for now) -- STEMMA QT Connector - Allows adding any I2C sensors/displays/devices with plug-and-play cables. -- Reset button - On the side, for quick restarting, press it twice to enter bootloader. -- Four M3 mounting bosses - Make custom enclosures easily. ## Bootloader diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index 6f054586b6e..f84186e6564 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -15,6 +15,7 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes From f6cf33747d3015aadbcb684a5358da6dc0089296 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Wed, 11 Jan 2023 17:01:42 +0100 Subject: [PATCH 04/76] working kanagawa 2040 --- keyboards/ciaanh/kanagawa/rev1/config.h | 1 - keyboards/ciaanh/kanagawa2040/config.h | 81 +++++++---------- keyboards/ciaanh/kanagawa2040/info.json | 29 ------ keyboards/ciaanh/kanagawa2040/kanagawa2040.c | 88 ++++++++----------- keyboards/ciaanh/kanagawa2040/kanagawa2040.h | 16 ---- .../kanagawa2040/keymaps/default/keycodes.h | 23 +++++ .../kanagawa2040/keymaps/default/keymap.c | 81 ++++++++--------- .../kanagawa2040/keymaps/default/rules.mk | 3 - keyboards/ciaanh/kanagawa2040/rules.mk | 14 ++- 9 files changed, 140 insertions(+), 196 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa2040/info.json create mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h delete mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk diff --git a/keyboards/ciaanh/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawa/rev1/config.h index 47f3b4be6e2..d2e6b04e41e 100644 --- a/keyboards/ciaanh/kanagawa/rev1/config.h +++ b/keyboards/ciaanh/kanagawa/rev1/config.h @@ -6,7 +6,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER Ciaanh #define PRODUCT Kanagawa -#define DESCRIPTION 75 with features /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index 159105caa7d..b958fd32652 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -1,79 +1,58 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - #pragma once #include "config_common.h" +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xC1E0 +#define PRODUCT_ID 0x0010 +#define DEVICE_VER 0x0002 +#define MANUFACTURER Ciaanh +#define PRODUCT Kanagawa + /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 14 -/* Keyboard Matrix Assignments */ -// clang-format off -// #define DIRECT_PINS { \ -// { NO_PIN, NO_PIN, GP0 }, \ -// { GP1, GP2, GP3 }, \ -// { GP4, GP5, GP6 }, \ -// { GP7, GP8, GP9 }, \ -// { GP10, GP11, GP12 } \ -// } - -#define DIODE_DIRECTION COL2ROW -#define MATRIX_ROW_PINS { GP27, GP26, GP21, GP20, GP19, GP18 } -#define MATRIX_COL_PINS { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15 } -// clang-format on +#define MATRIX_ROW_PINS { GP28, GP27, GP26, GP22, GP21, GP20 } +#define MATRIX_COL_PINS { GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP16, GP17, GP18 } +// #define DEBUG_MATRIX_SCAN_RATE #define DIODE_DIRECTION COL2ROW /* OLED SPI Defines */ #ifdef OLED_ENABLE -# define OLED_DISPLAY_128X32 -# define OLED_FONT_H "lib/oledfont.c" -# define OLED_FONT_END 255 -// # define OLED_DISPLAY_ADDRESS 0x78 -#endif +# define OLED_DISPLAY_128X32 +# define OLED_FONT_H "lib/oledfont.c" +# define OLED_FONT_END 255 +# define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ -#define I2C_DRIVER I2CD1 -#define I2C1_SDA_PIN GP16 -#define I2C1_SCL_PIN GP17 +# define I2C_DRIVER I2CD1 +# define I2C1_SDA_PIN GP0 +# define I2C1_SCL_PIN GP1 +#endif -/* Encoders */ -#define ENCODERS_PAD_A { GP1 } -#define ENCODERS_PAD_B { GP0 } +/* Encoder */ +#define ENCODERS_PAD_A { GP2 } +#define ENCODERS_PAD_B { GP3 } #define DEBOUNCE 5 /* Bootmagic lite */ -/* (Press the key bellow the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ -#define BOOTMAGIC_LITE_ROW 1 -#define BOOTMAGIC_LITE_COLUMN 2 +/* (Press the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 13 /* Double tap the side button to enter bootloader */ -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U +// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 +// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #ifdef RGB_MATRIX_ENABLE - /* RGB Defines */ -# define RGB_DI_PIN GP28 -# define DRIVER_LED_TOTAL 6 -# define RGBLED_NUM 6 +# define RGB_DI_PIN GP4 +# define DRIVER_LED_TOTAL 83 +# define RGBLED_NUM 83 /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json deleted file mode 100644 index 74c62aa3a19..00000000000 --- a/keyboards/ciaanh/kanagawa2040/info.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "keyboard_name": "Kanagawa2040", - "manufacturer": "Ciaanh", - "url": "", - "maintainer": "Ciaanh", - "usb": { - "vid": "0xC1E0", - "pid": "0x0011", - "device_version": "0.2.0" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Mute", "x":2, "y":0}, - {"label":"Enter", "x":0, "y":1}, - {"label":"KC_0", "x":1, "y":1}, - {"label":"BackSpace", "x":2, "y":1}, - {"label":"KC_7", "x":0, "y":2}, - {"label":"KC_8", "x":1, "y":2}, - {"label":"KC_9", "x":2, "y":2}, - {"label":"KC_4", "x":0, "y":3}, - {"label":"KC_5", "x":1, "y":3}, - {"label":"KC_6", "x":2, "y":3}, - {"label":"KC_1", "x":0, "y":4}, - {"label":"KC_2", "x":1, "y":4}, - {"label":"KC_3", "x":2, "y":4} - ]} - } -} diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c index 0cb1efe3498..a9b5c7dc56a 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c @@ -1,19 +1,3 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - #include "kanagawa2040.h" #ifdef RGB_MATRIX_ENABLE @@ -21,42 +5,42 @@ #define NA NO_LED /* RGB Positioning */ -led_config_t g_led_config = { { - // Key Matrix to LED Index - { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NO_LED, NO_LED }, - { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 66 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 67 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED, 68 }, - { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, NO_LED, 70, NO_LED }, - { 82, 81, 80, 79, 78, NO_LED, 77, 76, 75, 74, 73, NO_LED, 72, 71, 69 } -}, { - // LED Index to Physical Position - { 0, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 112, 0 }, { 224, 0}, - { 0, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 112, 21 }, { 224, 21}, - { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, - { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, - { 0, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 112, 42 }, { 224, 42}, - { 0, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 112, 64 }, { 224, 64} -}, { - // LED Index to Flag - 4, 4, 4, - 4, 4, 4, - 4, 4, 4, - 4, 4, 4 -} }; +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NO_LED }, + { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, + { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, + { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 70, 67 }, + { 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 69, 68 } + }, + { + // LED Index to Physical Position + { 206, 0 }, { 189, 0 }, { 172, 0 }, { 155, 0 }, { 137, 0 }, { 120, 0 }, { 103, 0 }, { 86, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, + { 224, 12 }, { 206, 12 }, { 189, 12 }, { 172, 12 }, { 155, 12 }, { 137, 12 }, { 120, 12 }, { 103, 12 }, { 86, 12 }, { 68, 12 }, { 51, 12 }, { 34, 12 }, { 17, 12 }, { 0, 12 }, + { 224, 25 }, { 206, 25 }, { 189, 25 }, { 172, 25 }, { 155, 25 }, { 137, 25 }, { 120, 25 }, { 103, 25 }, { 86, 25 }, { 68, 25 }, { 51, 25 }, { 34, 25 }, { 17, 25 }, { 0, 25 }, + { 206, 38 }, { 189, 38 }, { 172, 38 }, { 155, 38 }, { 137, 38 }, { 120, 38 }, { 103, 38 }, { 86, 38 }, { 68, 38 }, { 51, 38 }, { 34, 38 }, { 17, 38 }, { 0, 38 }, + { 189, 51 }, { 172, 51 }, { 155, 51 }, { 137, 51 }, { 120, 51 }, { 103, 51 }, { 86, 51 }, { 68, 51 }, { 51, 51 }, { 34, 51 }, { 17, 51 }, { 0, 51 }, + { 224, 38 }, + { 224, 51 }, + { 224, 64 }, { 206, 64 }, { 206, 51 }, + { 189, 64 }, { 172, 64 }, { 155, 64 }, { 137, 64 }, { 120, 64 }, { 103, 64 }, { 86, 64 }, { 68, 64 }, { 51, 64 }, { 34, 64 }, { 17, 64 }, { 0, 64 }, + }, + + { + // LED Index to Flag + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, + 4, + 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + }}; #endif -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif + diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h index 3358e7be547..7177108630a 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h @@ -1,19 +1,3 @@ -/* Copyright 2022 Jose Pablo Ramirez - * - * 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 . - */ - #pragma once #include "quantum.h" diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h new file mode 100644 index 00000000000..34cc0798c31 --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h @@ -0,0 +1,23 @@ +#pragma once + +enum layers +{ + _BASE, + _LOWER, + _UPPER, + _CODE +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_CODE TG(_CODE) + +#define L_UP MO(_UPPER) +#define L_DWN MO(_LOWER) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c index 69e3b515a3a..1fa09e427eb 100644 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * */ [_BASE] = LAYOUT_84_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ + KC_ESC, 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_MPLY, \ 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_DEL, \ 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_HOME, \ @@ -51,18 +51,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - - [_CODE] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - [_LOWER] = LAYOUT_84_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -82,9 +70,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ) + ), + [_CODE] = LAYOUT_84_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), }; @@ -106,9 +102,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { static void render_status(void) { // 21 characters per line - // 16 cols / 8 rows + // 16 cols / 4 rows - oled_write_P(PSTR(" Kanagawa rev 1.1 "), false); + oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); //oled_write_ln("", false); // Host Keyboard Layer Status @@ -140,10 +136,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); } // static void render_kanagawa_logo(void) { @@ -196,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case ENCODER: + case CUSTOMKEY: if (record->event.pressed) { if (get_mods() & MOD_MASK_SHIFT) { tap_code16(G(A(KC_K))); @@ -233,26 +229,25 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -#ifdef ENCODER_ENABLE - bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case _CODE: - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - break; - default: - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - break; - } - } - return true; - } +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_LOWER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_UPPER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, +}; #endif + +// #ifdef ENCODER_ENABLE +// bool encoder_update_kb(uint8_t index, bool clockwise) { +// if (!encoder_update_user(index, clockwise)) { return false; } +// if (index == 0) { +// if (clockwise) { +// tap_code_delay(KC_VOLU, 10); +// } else { +// tap_code_delay(KC_VOLD, 10); +// } +// } +// return true; +// } +// #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk deleted file mode 100644 index 0838e25e098..00000000000 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -LTO_ENABLE = yes - -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index f84186e6564..8e5f8981a75 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -1,8 +1,13 @@ # MCU name MCU = RP2040 + # Bootloader selection BOOTLOADER = rp2040 +# RP2040-specific options +ALLOW_WARNINGS = yes +PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. + # Build Options # change yes to no to disable # @@ -11,16 +16,23 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover +NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID ENCODER_ENABLE = yes + RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor + OLED_ENABLE = yes +OLED_DRIVER = SSD1306 OPT_DEFS += -DHAL_USE_I2C=TRUE + +ENCODER_MAP_ENABLE = yes + +LTO_ENABLE = no # reduce size \ No newline at end of file From 5bd4130a2e6cec9c2e77cd5deb88aa8c04e342c4 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 12 Jan 2023 16:01:55 +0100 Subject: [PATCH 05/76] adjust rgb coords --- keyboards/ciaanh/kanagawa2040/kanagawa2040.c | 20 +++++++------ .../kanagawa2040/keymaps/default/keymap.c | 28 +++++++++---------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c index a9b5c7dc56a..8cc28eb14f3 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c @@ -18,15 +18,17 @@ led_config_t g_led_config = { { // LED Index to Physical Position - { 206, 0 }, { 189, 0 }, { 172, 0 }, { 155, 0 }, { 137, 0 }, { 120, 0 }, { 103, 0 }, { 86, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, - { 224, 12 }, { 206, 12 }, { 189, 12 }, { 172, 12 }, { 155, 12 }, { 137, 12 }, { 120, 12 }, { 103, 12 }, { 86, 12 }, { 68, 12 }, { 51, 12 }, { 34, 12 }, { 17, 12 }, { 0, 12 }, - { 224, 25 }, { 206, 25 }, { 189, 25 }, { 172, 25 }, { 155, 25 }, { 137, 25 }, { 120, 25 }, { 103, 25 }, { 86, 25 }, { 68, 25 }, { 51, 25 }, { 34, 25 }, { 17, 25 }, { 0, 25 }, - { 206, 38 }, { 189, 38 }, { 172, 38 }, { 155, 38 }, { 137, 38 }, { 120, 38 }, { 103, 38 }, { 86, 38 }, { 68, 38 }, { 51, 38 }, { 34, 38 }, { 17, 38 }, { 0, 38 }, - { 189, 51 }, { 172, 51 }, { 155, 51 }, { 137, 51 }, { 120, 51 }, { 103, 51 }, { 86, 51 }, { 68, 51 }, { 51, 51 }, { 34, 51 }, { 17, 51 }, { 0, 51 }, - { 224, 38 }, - { 224, 51 }, - { 224, 64 }, { 206, 64 }, { 206, 51 }, - { 189, 64 }, { 172, 64 }, { 155, 64 }, { 137, 64 }, { 120, 64 }, { 103, 64 }, { 86, 64 }, { 68, 64 }, { 51, 64 }, { 34, 64 }, { 17, 64 }, { 0, 64 }, + {182, 0}, {168, 0}, {154, 0}, {140, 0}, {123, 0}, {109, 0}, { 95, 0}, { 81, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, + {189,12}, {168,12}, {154,12}, {140,12}, {126,12}, {112,12}, { 98,12}, { 84,12}, { 70,12}, { 56,12}, { 42,12}, { 28,12}, { 14,12}, { 0,12}, + {193,23}, {175,23}, {161,23}, {147,23}, {133,23}, {119,23}, {105,23}, { 91,23}, { 77,23}, { 63,23}, { 49,23}, { 35,23}, { 21,23}, { 4,23}, + {186,35}, {165,35}, {151,35}, {137,35}, {123,35}, {109,35}, { 95,35}, { 81,35}, { 67,35}, { 53,35}, { 39,35}, { 25,35}, { 5,35}, + {177,47}, {158,47}, {144,47}, {130,47}, {116,47}, {102,47}, { 88,47}, { 74,47}, { 60,47}, { 46,47}, { 32,47}, { 9,47}, + {224,12}, + {224,23}, + {224,35}, + {217,64}, {203,52}, + {203,64}, {189,64}, {168,58}, {154,58}, {140,58}, {123,60}, {102,64}, { 74,64}, { 53,60}, { 32,58}, { 16,58}, { 2,58} + }, { diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c index 1fa09e427eb..e15b427f843 100644 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c @@ -42,12 +42,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * */ [_BASE] = LAYOUT_84_ansi( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, \ - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), @@ -73,13 +73,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_CODE] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ ), }; @@ -231,10 +231,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_BASE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_LOWER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_UPPER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_UPPER] = { ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }, + [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif From 3490b0268f52482cc10f3adc37a647ddde838eca Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 14 Apr 2023 01:22:54 +0200 Subject: [PATCH 06/76] Edit new revision for Kanagawa --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 43 +++ keyboards/ciaanh/kanagawa/ansi/ansi.h | 1 + .../kanagawa/ansi/keymaps/default/keymap.c | 234 +++++++++++++++ keyboards/ciaanh/kanagawa/ansi/rules.mk | 0 keyboards/ciaanh/kanagawa/config.h | 77 ++++- keyboards/ciaanh/kanagawa/info.json | 235 +++++++++++++++ keyboards/ciaanh/kanagawa/iso/iso.c | 44 +++ keyboards/ciaanh/kanagawa/iso/iso.h | 1 + .../kanagawa/iso/keymaps/default/keymap.c | 234 +++++++++++++++ keyboards/ciaanh/kanagawa/iso/rules.mk | 0 keyboards/ciaanh/kanagawa/kanagawa.h | 35 ++- keyboards/ciaanh/kanagawa/mcuconf.h | 6 + keyboards/ciaanh/kanagawa/readme.md | 21 ++ keyboards/ciaanh/kanagawa/rules.mk | 45 ++- keyboards/ciaanh/kanagawa2040/config.h | 39 +-- keyboards/ciaanh/kanagawa2040/info.json | 133 +++++++++ keyboards/ciaanh/kanagawa2040/kanagawa2040.h | 20 -- keyboards/ciaanh/kanagawa2040/rules.mk | 16 - keyboards/ciaanh/old/kanagawa/config.h | 3 + keyboards/ciaanh/old/kanagawa/kanagawa.c | 1 + keyboards/ciaanh/old/kanagawa/kanagawa.h | 5 + .../kanagawa/keymaps/default/config.h | 0 .../kanagawa/keymaps/default/keycodes.h | 0 .../kanagawa/keymaps/default/keymap.c | 0 .../kanagawa/keymaps/default/rules.mk | 0 .../{ => old}/kanagawa/keymaps/via/keycodes.h | 0 .../{ => old}/kanagawa/keymaps/via/keymap.c | 0 .../{ => old}/kanagawa/keymaps/via/rules.mk | 0 keyboards/ciaanh/old/kanagawa/lib/oledfont.c | 277 ++++++++++++++++++ keyboards/ciaanh/old/kanagawa/readme.md | 16 + .../ciaanh/{ => old}/kanagawa/rev1/config.h | 0 .../{ => old}/kanagawa/rev1/kanagawa.json | 0 .../ciaanh/{ => old}/kanagawa/rev1/rev1.c | 0 .../ciaanh/{ => old}/kanagawa/rev1/rev1.h | 0 .../ciaanh/{ => old}/kanagawa/rev1/rules.mk | 0 keyboards/ciaanh/old/kanagawa/rules.mk | 33 +++ 36 files changed, 1416 insertions(+), 103 deletions(-) create mode 100644 keyboards/ciaanh/kanagawa/ansi/ansi.c create mode 100644 keyboards/ciaanh/kanagawa/ansi/ansi.h create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/ansi/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/info.json create mode 100644 keyboards/ciaanh/kanagawa/iso/iso.c create mode 100644 keyboards/ciaanh/kanagawa/iso/iso.h create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/iso/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/mcuconf.h create mode 100644 keyboards/ciaanh/kanagawa2040/info.json create mode 100644 keyboards/ciaanh/old/kanagawa/config.h create mode 100644 keyboards/ciaanh/old/kanagawa/kanagawa.c create mode 100644 keyboards/ciaanh/old/kanagawa/kanagawa.h rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/default/config.h (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/default/keycodes.h (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/default/keymap.c (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/default/rules.mk (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/via/keycodes.h (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/via/keymap.c (100%) rename keyboards/ciaanh/{ => old}/kanagawa/keymaps/via/rules.mk (100%) create mode 100644 keyboards/ciaanh/old/kanagawa/lib/oledfont.c create mode 100644 keyboards/ciaanh/old/kanagawa/readme.md rename keyboards/ciaanh/{ => old}/kanagawa/rev1/config.h (100%) rename keyboards/ciaanh/{ => old}/kanagawa/rev1/kanagawa.json (100%) rename keyboards/ciaanh/{ => old}/kanagawa/rev1/rev1.c (100%) rename keyboards/ciaanh/{ => old}/kanagawa/rev1/rev1.h (100%) rename keyboards/ciaanh/{ => old}/kanagawa/rev1/rules.mk (100%) create mode 100644 keyboards/ciaanh/old/kanagawa/rules.mk diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c new file mode 100644 index 00000000000..0d27baa54d3 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -0,0 +1,43 @@ +#include "kanagawa.h" + +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_LED_COUNT 82 + + led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, + { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, + { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 65 }, + { 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 68, 66 }, + { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 67 } + }, + + { + // LED Index to Physical Position + {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, + {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, + {28,157}, {28,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, + {42,156}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, + {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,7}, + {14,186}, + {28,186}, + {42,186}, + {60,166}, {56,147}, + {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + }, + + { + // LED Index to Flag + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, + 4, + 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + }}; +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.h b/keyboards/ciaanh/kanagawa/ansi/ansi.h new file mode 100644 index 00000000000..6f70f09beec --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.h @@ -0,0 +1 @@ +#pragma once diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c new file mode 100644 index 00000000000..f3cba10cda3 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -0,0 +1,234 @@ +#include QMK_KEYBOARD_H + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + [_BASE] = LAYOUT_ansi( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, L_FNC, KC_SPC, KC_SPC, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + [_FUNC] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_CODE] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ), + +}; + + + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + // oled_rotation_t oled_init_user(oled_rotation_t rotation) { + // return OLED_ROTATION_180; + // } + + static void render_status(void) { + // 21 characters per line + // 16 cols / 4 rows + + oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); + //oled_write_ln("", false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _FUNC: + oled_write_P(PSTR("[Fn]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(PSTR(" "), false); + + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + } + + // static void render_kanagawa_logo(void) { + // static const char PROGMEM kanagawa_logo[] = { + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, + // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, + // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, + // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, + // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, + // }; + // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); + // } + + // static void render_kanagawa_logo(void) { + // //oled_set_cursor(0, 5); + + // static const char PROGMEM kanagawa_logo[] = { + // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + // }; + + // oled_write_P(kanagawa_logo, false); + // } + + bool oled_task_user(void) { + // switch (get_highest_layer(layer_state)) { + // case _UPPER: + // render_kanagawa_logo(); + // break; + // default: + // render_status(); + // } + + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case CUSTOMKEY: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FUNC] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, +}; +#endif + +// #ifdef ENCODER_ENABLE +// bool encoder_update_kb(uint8_t index, bool clockwise) { +// if (!encoder_update_user(index, clockwise)) { return false; } +// if (index == 0) { +// if (clockwise) { +// tap_code_delay(KC_VOLU, 10); +// } else { +// tap_code_delay(KC_VOLD, 10); +// } +// } +// return true; +// } +// #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/rules.mk b/keyboards/ciaanh/kanagawa/ansi/rules.mk new file mode 100644 index 00000000000..e69de29bb2d diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index b8c5759db6b..495ea65c7dc 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -1,3 +1,78 @@ #pragma once -#include "config_common.h" +/* OLED SPI Defines */ +#ifdef OLED_ENABLE +# define OLED_DISPLAY_128X32 +# define OLED_FONT_H "lib/oledfont.c" +# define OLED_FONT_END 255 +# define OLED_DISPLAY_ADDRESS 0x3C + +/* I2C Conf */ +# define I2C_DRIVER I2CD1 +# define I2C1_SDA_PIN GP0 +# define I2C1_SCL_PIN GP1 +#endif + +#ifdef RGB_MATRIX_ENABLE + /* RGB Defines */ +# define RGB_DI_PIN GP4 + +#ifdef KEYBOARD_ciaanh_kanagawa_ansi +# define RGB_MATRIX_LED_COUNT 82 +#endif + +#ifdef KEYBOARD_ciaanh_kanagawa_iso +# define RGB_MATRIX_LED_COUNT 83 +#endif + + /* Enable Framebuffer and keypress effects */ +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES + +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif + + + diff --git a/keyboards/ciaanh/kanagawa/info.json b/keyboards/ciaanh/kanagawa/info.json new file mode 100644 index 00000000000..45a70539801 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/info.json @@ -0,0 +1,235 @@ +{ + "keyboard_name": "Kanagawa", + "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", + "manufacturer": "Ciaanh", + "maintainer": "Ciaanh", + "usb": { + "vid": "0xC1E0", + "pid": "0x0010", + "device_version": "2.1.0" + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": false + }, + "bootmagic": { + "matrix": [0, 13] + }, + "encoder": { + "rotary": [ + {"pin_a": "GP2", "pin_b": "GP3"} + ] + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + }, + "processor": "RP2040", + "bootloader": "rp2040", + + "layouts": { + "LAYOUT_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, + { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, + + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1 }, + { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, + + { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, + + { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2 }, + { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, + + { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3 }, + { "label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25 }, + + { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, + + { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25 }, + { "label": "", "matrix": [4, 1], "x": 1.25, "y": 4 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4 }, + { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4 }, + { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4 }, + { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4 }, + { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, + + { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, + + { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, + { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, + { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, + { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, + { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, + { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, + { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, + { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, + { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, + { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } + ] + }, + + "LAYOUT_iso": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, + { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, + + { "label": "²", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "&", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "é", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "\"", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "'", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "(", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "-", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "è", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "_", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "ç", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": "à", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": ")", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "=", "matrix": [1, 12], "x": 12, "y": 1 }, + { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, + + { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, + + { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, + { "label": "A", "matrix": [2, 1], "x": 1.5, "y": 2 }, + { "label": "Z", "matrix": [2, 2], "x": 2.5, "y": 2 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, + { "label": "^", "matrix": [2, 11], "x": 11.5, "y": 2 }, + { "label": "$", "matrix": [2, 12], "x": 12.5, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, + + { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, + { "label": "Q", "matrix": [3, 1], "x": 1.75, "y": 3 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, + { "label": "M", "matrix": [3, 10], "x": 10.75, "y": 3 }, + { "label": "ù", "matrix": [3, 11], "x": 11.75, "y": 3 }, + { "label": "*", "matrix": [3, 12], "x": 12.75, "y": 3 }, + + { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, + + { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, + { "label": "<", "matrix": [4, 1], "x": 1.25, "y": 4 }, + { "label": "W", "matrix": [4, 2], "x": 2.25, "y": 4 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, + { "label": ",", "matrix": [4, 8], "x": 8.25, "y": 4 }, + { "label": ";", "matrix": [4, 9], "x": 9.25, "y": 4 }, + { "label": ":", "matrix": [4, 10], "x": 10.25, "y": 4 }, + { "label": "!", "matrix": [4, 11], "x": 11.25, "y": 4 }, + { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, + + { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, + + { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, + { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, + { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, + { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, + { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, + { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, + { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, + { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, + { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, + { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } + ] + } + } +} diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c new file mode 100644 index 00000000000..5ff386809ba --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -0,0 +1,44 @@ +#include "kanagawa.h" + +#ifdef RGB_MATRIX_ENABLE + + led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, + { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, + { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, + { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 69, 67 }, + { 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 68 } + }, + + { + // LED Index to Physical Position + {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, +{14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, +{28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, + {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, + {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, +{14,186}, +{28,186}, +{42,186}, + {60,166}, {56,147}, + {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + + + }, + + { + // LED Index to Flag + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, + 4, + 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + }}; +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/iso.h b/keyboards/ciaanh/kanagawa/iso/iso.h new file mode 100644 index 00000000000..7b9637ef9c2 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/iso.h @@ -0,0 +1 @@ +#pragma once \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c new file mode 100644 index 00000000000..743ed5fbb14 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -0,0 +1,234 @@ +#include QMK_KEYBOARD_H + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+ kc13 | |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+ ENTER | |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | NUHS * | | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + [_BASE] = LAYOUT_iso( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_ENT, KC_HOME, \ + KC_CAPS, KC_A, LT(0,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END, \ + KC_LSFT, KC_NUBS, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, L_FNC, KC_SPC, KC_SPC, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + [_FUNC] = LAYOUT_iso( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + + [_CODE] = LAYOUT_iso( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ), + +}; + + + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + // oled_rotation_t oled_init_user(oled_rotation_t rotation) { + // return OLED_ROTATION_180; + // } + + static void render_status(void) { + // 21 characters per line + // 16 cols / 4 rows + + oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); + //oled_write_ln("", false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _FUNC: + oled_write_P(PSTR("[Fn]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(PSTR(" "), false); + + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + } + + // static void render_kanagawa_logo(void) { + // static const char PROGMEM kanagawa_logo[] = { + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, + // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, + // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, + // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, + // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, + // }; + // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); + // } + + // static void render_kanagawa_logo(void) { + // //oled_set_cursor(0, 5); + + // static const char PROGMEM kanagawa_logo[] = { + // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + // }; + + // oled_write_P(kanagawa_logo, false); + // } + + bool oled_task_user(void) { + // switch (get_highest_layer(layer_state)) { + // case _UPPER: + // render_kanagawa_logo(); + // break; + // default: + // render_status(); + // } + + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case CUSTOMKEY: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FUNC] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, +}; +#endif + +// #ifdef ENCODER_ENABLE +// bool encoder_update_kb(uint8_t index, bool clockwise) { +// if (!encoder_update_user(index, clockwise)) { return false; } +// if (index == 0) { +// if (clockwise) { +// tap_code_delay(KC_VOLU, 10); +// } else { +// tap_code_delay(KC_VOLD, 10); +// } +// } +// return true; +// } +// #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/rules.mk b/keyboards/ciaanh/kanagawa/iso/rules.mk new file mode 100644 index 00000000000..e69de29bb2d diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h index ab445c721e4..f5740062425 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.h +++ b/keyboards/ciaanh/kanagawa/kanagawa.h @@ -1,5 +1,34 @@ #pragma once -#ifdef KEYBOARD_ciaanh_kanagawa_rev1 - #include "rev1.h" -#endif \ No newline at end of file +#include "quantum.h" + +#ifdef KEYBOARD_ciaanh_kanagawa_ansi + #include "ansi.h" +#endif + +#ifdef KEYBOARD_ciaanh_kanagawa_iso + #include "iso.h" +#endif + +#define ___ KC_NO +#define NA NO_LED + +enum layers +{ + _BASE, + _FUNC, + _CODE +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_CODE TG(_CODE) + +#define L_FNC MO(_FUNC) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/mcuconf.h b/keyboards/ciaanh/kanagawa/mcuconf.h new file mode 100644 index 00000000000..d3ca0baab50 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/mcuconf.h @@ -0,0 +1,6 @@ +#pragma once + +#include_next + +#undef RP_I2C_USE_I2C0 +#define RP_I2C_USE_I2C0 TRUE diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md index 086f1353b41..f4c50935169 100644 --- a/keyboards/ciaanh/kanagawa/readme.md +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -1,3 +1,14 @@ +https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk + +qmk compile -kb ciaanh/kanagawa2040 -km default + +# Ciaanh Kanagawa2040 + + +```sh +qmk compile -kb ciaanh/kanagawa2040 -km default +``` + # Kanagawa A 75% keyboard with oled and rotary encoder for Elite-C @@ -14,3 +25,13 @@ Make example for this keyboard (after setting up your build environment): qmk compile -kb ciaanh/kanagawa -km default Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader + + +## Bootloader + +Enter the bootloader in 4 ways: + +* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up. +* **Physical reset button**: Press twice the button on the side while the board is connected. +* **BOOT button** Hold down the rotary encoder push-button on power-up or reset. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 731daafcd52..96c6b71a3f5 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,33 +1,22 @@ # MCU name -MCU = atmega32u4 +MCU = RP2040 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = qmk-dfu +BOOTLOADER = rp2040 -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -OLED_ENABLE = no +# RP2040-specific options +ALLOW_WARNINGS = yes +PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. -DEFAULT_FOLDER = ciaanh/kanagawa/rev1 +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 +WS2812_DRIVER = vendor + +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 + +OPT_DEFS += -DHAL_USE_I2C=TRUE + +ENCODER_MAP_ENABLE = yes + +LTO_ENABLE = no # reduce size diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index b958fd32652..dc409bf96d8 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -1,24 +1,5 @@ #pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC1E0 -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Ciaanh -#define PRODUCT Kanagawa - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 14 - -#define MATRIX_ROW_PINS { GP28, GP27, GP26, GP22, GP21, GP20 } -#define MATRIX_COL_PINS { GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP16, GP17, GP18 } -// #define DEBUG_MATRIX_SCAN_RATE - -#define DIODE_DIRECTION COL2ROW - /* OLED SPI Defines */ #ifdef OLED_ENABLE # define OLED_DISPLAY_128X32 @@ -32,27 +13,12 @@ # define I2C1_SCL_PIN GP1 #endif -/* Encoder */ -#define ENCODERS_PAD_A { GP2 } -#define ENCODERS_PAD_B { GP3 } -#define DEBOUNCE 5 - -/* Bootmagic lite */ -/* (Press the encoder button while plugging the keyboard to enter the bootloader and clear flash) */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 13 - -/* Double tap the side button to enter bootloader */ -// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET -// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13 -// #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ # define RGB_DI_PIN GP4 -# define DRIVER_LED_TOTAL 83 -# define RGBLED_NUM 83 +# define RGB_MATRIX_LED_COUNT 83 /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS @@ -102,3 +68,6 @@ # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif + + + diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json new file mode 100644 index 00000000000..7b2011ce7dd --- /dev/null +++ b/keyboards/ciaanh/kanagawa2040/info.json @@ -0,0 +1,133 @@ +{ + "keyboard_name": "Kanagawa", + "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", + "manufacturer": "Ciaanh", + "maintainer": "Ciaanh", + "usb": { + "vid": "0xC1E0", + "pid": "0x0010", + "device_version": "2.1.0" + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": false + }, + "bootmagic": { + "matrix": [0, 13] + }, + "encoder": { + "rotary": [ + {"pin_a": "GP2", "pin_b": "GP3"} + ] + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + }, + "processor": "RP2040", + "bootloader": "rp2040", + + "layouts": { + "LAYOUT_84_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, + { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, + + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1 }, + { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, + { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, + + { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2 }, + { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, + { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3 }, + { "label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25 }, + { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, + + { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25 }, + { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4 }, + { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4 }, + { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4 }, + { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4 }, + { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4 }, + { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4 }, + { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4 }, + { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4 }, + { "label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75 }, + { "label": "Up", "matrix": [4, 12], "x": 14.25, "y": 4.25}, + + { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25 }, + { "label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5 }, + { "label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25 }, + { "label": "Dwn", "matrix": [5, 3], "x": 4, "y": 5 }, + { "label": "LSpace", "matrix": [5, 4], "x": 5, "y": 5.5, "w": 2 }, + { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2 }, + { "label": "Up", "matrix": [5, 6], "x": 9, "y": 5 }, + { "label": "RAlt", "matrix": [5, 7], "x": 10, "y": 5 }, + { "label": "Code", "matrix": [5, 8], "x": 11, "y": 5 }, + { "label": "Ctrl", "matrix": [5, 9], "x": 12, "y": 5 }, + { "label": "Left", "matrix": [5, 10], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 12], "x": 15.25, "y": 5.25 } + ] + } + } +} diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h index 7177108630a..a786461d2a2 100644 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h +++ b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h @@ -3,23 +3,3 @@ #include "quantum.h" #define ___ KC_NO - -// clang-format off -#define LAYOUT_84_ansi( \ - K00, K01,K02,K03,K04, K05,K06,K07,K08, K09,K010,K011,K012, K013, \ - \ - K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K110,K111,K112, K113 , K313, \ - K20 ,K21,K22,K23,K24,K25,K26,K27,K28,K29,K210,K211,K212, K213 , K413, \ - K30 ,K31,K32,K33,K34,K35,K36,K37,K38,K39,K310,K311, K312 , K513, \ - K40 ,K41,K42,K43,K44,K45,K46,K47,K48,K49,K410, K411 , K412, \ - K50 ,K51,K52 , K53,K54 , K55,K56, K57 ,K58,K59 , K510, K511, K512 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412, K413 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K510, K511, K512, K513 } \ -} -// clang-format on diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index 8e5f8981a75..7cbb07d3e3e 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -8,22 +8,6 @@ BOOTLOADER = rp2040 ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - -ENCODER_ENABLE = yes - RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor diff --git a/keyboards/ciaanh/old/kanagawa/config.h b/keyboards/ciaanh/old/kanagawa/config.h new file mode 100644 index 00000000000..b8c5759db6b --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/config.h @@ -0,0 +1,3 @@ +#pragma once + +#include "config_common.h" diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.c b/keyboards/ciaanh/old/kanagawa/kanagawa.c new file mode 100644 index 00000000000..2b7f0847711 --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/kanagawa.c @@ -0,0 +1 @@ +#include "kanagawa.h" diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.h b/keyboards/ciaanh/old/kanagawa/kanagawa.h new file mode 100644 index 00000000000..ab445c721e4 --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/kanagawa.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_ciaanh_kanagawa_rev1 + #include "rev1.h" +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/config.h b/keyboards/ciaanh/old/kanagawa/keymaps/default/config.h similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/default/config.h rename to keyboards/ciaanh/old/kanagawa/keymaps/default/config.h diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h b/keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/default/keycodes.h rename to keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/keymap.c b/keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/default/keymap.c rename to keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c diff --git a/keyboards/ciaanh/kanagawa/keymaps/default/rules.mk b/keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/default/rules.mk rename to keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h b/keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/via/keycodes.h rename to keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/keymap.c b/keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/via/keymap.c rename to keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c diff --git a/keyboards/ciaanh/kanagawa/keymaps/via/rules.mk b/keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk similarity index 100% rename from keyboards/ciaanh/kanagawa/keymaps/via/rules.mk rename to keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/lib/oledfont.c b/keyboards/ciaanh/old/kanagawa/lib/oledfont.c new file mode 100644 index 00000000000..153007ef1a3 --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/lib/oledfont.c @@ -0,0 +1,277 @@ +#include "progmem.h" + + + +const unsigned char font[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => + + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / + + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? + + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O + + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ + + 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o + + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => + 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => + 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => + 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => + 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => + 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => + 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => + 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => + 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => + 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => + 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => + + 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => + 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => + 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => + 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => + 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => + 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => + 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => + 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => + 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => + 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => + 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => + 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => + 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => + 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => + 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => + 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => + 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => + 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => + 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => + 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => + 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => + + 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => + 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => + 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => + 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => + 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => + 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => + 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => + 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => + 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => + 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => + 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => + 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => + 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => + 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => + 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => + 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => + 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => + 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => + 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => + 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => + 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => + 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => + 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => + 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => + + 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => + 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => + 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => + 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => +}; diff --git a/keyboards/ciaanh/old/kanagawa/readme.md b/keyboards/ciaanh/old/kanagawa/readme.md new file mode 100644 index 00000000000..086f1353b41 --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/readme.md @@ -0,0 +1,16 @@ +# Kanagawa + +A 75% keyboard with oled and rotary encoder for Elite-C + + Keyboard Maintainer : Ciaanh + + Hardware Supported : Kanagawa PCB + + Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa + + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb ciaanh/kanagawa -km default + +Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader diff --git a/keyboards/ciaanh/kanagawa/rev1/config.h b/keyboards/ciaanh/old/kanagawa/rev1/config.h similarity index 100% rename from keyboards/ciaanh/kanagawa/rev1/config.h rename to keyboards/ciaanh/old/kanagawa/rev1/config.h diff --git a/keyboards/ciaanh/kanagawa/rev1/kanagawa.json b/keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json similarity index 100% rename from keyboards/ciaanh/kanagawa/rev1/kanagawa.json rename to keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json diff --git a/keyboards/ciaanh/kanagawa/rev1/rev1.c b/keyboards/ciaanh/old/kanagawa/rev1/rev1.c similarity index 100% rename from keyboards/ciaanh/kanagawa/rev1/rev1.c rename to keyboards/ciaanh/old/kanagawa/rev1/rev1.c diff --git a/keyboards/ciaanh/kanagawa/rev1/rev1.h b/keyboards/ciaanh/old/kanagawa/rev1/rev1.h similarity index 100% rename from keyboards/ciaanh/kanagawa/rev1/rev1.h rename to keyboards/ciaanh/old/kanagawa/rev1/rev1.h diff --git a/keyboards/ciaanh/kanagawa/rev1/rules.mk b/keyboards/ciaanh/old/kanagawa/rev1/rules.mk similarity index 100% rename from keyboards/ciaanh/kanagawa/rev1/rules.mk rename to keyboards/ciaanh/old/kanagawa/rev1/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/rules.mk b/keyboards/ciaanh/old/kanagawa/rules.mk new file mode 100644 index 00000000000..731daafcd52 --- /dev/null +++ b/keyboards/ciaanh/old/kanagawa/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = qmk-dfu + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +OLED_ENABLE = no + +DEFAULT_FOLDER = ciaanh/kanagawa/rev1 From fd162b261cf4914fdf55b07a4fe050b51d97672c Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Wed, 26 Apr 2023 16:36:50 +0200 Subject: [PATCH 07/76] Update Kanagawa --- .../kanagawa.c => ergodash/ergodash.c} | 2 +- keyboards/ciaanh/ergodash/ergodash.h | 7 + keyboards/ciaanh/ergodash/info.json | 4 + keyboards/ciaanh/ergodash/readme.md | 32 ++ keyboards/ciaanh/ergodash/rev1/config.h | 67 ++++ keyboards/ciaanh/ergodash/rev1/info.json | 377 ++++++++++++++++++ .../ergodash/rev1/keymaps/default/config.h | 27 ++ .../ergodash/rev1/keymaps/default/keymap.c | 154 +++++++ .../ergodash/rev1/keymaps/default/rules.mk | 3 + keyboards/ciaanh/ergodash/rev1/rev1.c | 32 ++ keyboards/ciaanh/ergodash/rev1/rev1.h | 139 +++++++ keyboards/ciaanh/ergodash/rev1/rules.mk | 3 + keyboards/ciaanh/ergodash/rules.mk | 16 + keyboards/ciaanh/kanagawa/ansi/ansi.c | 48 ++- keyboards/ciaanh/kanagawa/iso/iso.c | 46 ++- keyboards/ciaanh/kanagawa/readme.md | 18 +- .../{old/kanagawa => kanagawalegacy}/config.h | 0 .../ciaanh/kanagawalegacy/kanagawalegacy.c | 1 + .../ciaanh/kanagawalegacy/kanagawalegacy.h | 5 + .../keymaps/default/config.h | 0 .../keymaps/default/keycodes.h | 0 .../keymaps/default/keymap.c | 0 .../keymaps/default/rules.mk | 0 .../keymaps/via/keycodes.h | 0 .../keymaps/via/keymap.c | 0 .../keymaps/via/rules.mk | 0 .../lib/oledfont.c | 0 .../kanagawa => kanagawalegacy}/readme.md | 0 .../kanagawa => kanagawalegacy}/rev1/config.h | 0 .../rev1/kanagawa.json | 0 .../kanagawa => kanagawalegacy}/rev1/rev1.c | 0 .../kanagawa => kanagawalegacy}/rev1/rev1.h | 0 .../kanagawa => kanagawalegacy}/rev1/rules.mk | 0 .../{old/kanagawa => kanagawalegacy}/rules.mk | 0 keyboards/ciaanh/old/kanagawa/kanagawa.h | 5 - 35 files changed, 947 insertions(+), 39 deletions(-) rename keyboards/ciaanh/{old/kanagawa/kanagawa.c => ergodash/ergodash.c} (100%) create mode 100644 keyboards/ciaanh/ergodash/ergodash.h create mode 100644 keyboards/ciaanh/ergodash/info.json create mode 100644 keyboards/ciaanh/ergodash/readme.md create mode 100644 keyboards/ciaanh/ergodash/rev1/config.h create mode 100644 keyboards/ciaanh/ergodash/rev1/info.json create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/ergodash/rev1/rev1.c create mode 100644 keyboards/ciaanh/ergodash/rev1/rev1.h create mode 100644 keyboards/ciaanh/ergodash/rev1/rules.mk create mode 100644 keyboards/ciaanh/ergodash/rules.mk rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/config.h (100%) create mode 100644 keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c create mode 100644 keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/default/config.h (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/default/keycodes.h (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/default/keymap.c (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/default/rules.mk (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/via/keycodes.h (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/via/keymap.c (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/keymaps/via/rules.mk (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/lib/oledfont.c (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/readme.md (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rev1/config.h (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rev1/kanagawa.json (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rev1/rev1.c (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rev1/rev1.h (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rev1/rules.mk (100%) rename keyboards/ciaanh/{old/kanagawa => kanagawalegacy}/rules.mk (100%) delete mode 100644 keyboards/ciaanh/old/kanagawa/kanagawa.h diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.c b/keyboards/ciaanh/ergodash/ergodash.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/kanagawa.c rename to keyboards/ciaanh/ergodash/ergodash.c index 2b7f0847711..51e6dbf08fc 100644 --- a/keyboards/ciaanh/old/kanagawa/kanagawa.c +++ b/keyboards/ciaanh/ergodash/ergodash.c @@ -1 +1 @@ -#include "kanagawa.h" +#include "ergodash.h" diff --git a/keyboards/ciaanh/ergodash/ergodash.h b/keyboards/ciaanh/ergodash/ergodash.h new file mode 100644 index 00000000000..6b7a9ea6d55 --- /dev/null +++ b/keyboards/ciaanh/ergodash/ergodash.h @@ -0,0 +1,7 @@ +#pragma once + +#include "quantum.h" + +#ifdef KEYBOARD_ciaanh_ergodash_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/ciaanh/ergodash/info.json b/keyboards/ciaanh/ergodash/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/ciaanh/ergodash/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/ciaanh/ergodash/readme.md b/keyboards/ciaanh/ergodash/readme.md new file mode 100644 index 00000000000..4260397a990 --- /dev/null +++ b/keyboards/ciaanh/ergodash/readme.md @@ -0,0 +1,32 @@ +# ErgoDash + +![ErgoDash](https://github.com/omkbd/picture/blob/master/Ergodash.jpg) + +Keyboard Maintainer: [omkbd](https://github.com/omkbd) [@omkbd](https://twitter.com/omkbd) +Hardware Supported: ErgoDash PCB, Pro Micro ATmega32u4 +Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDash) + + +Make example for this keyboard (after setting up your build environment): + + make omkbd/ergodash/rev1:default + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. + +Install Example: (for pro micro) + `make omkbd/ergodash/rev1:default:avrdude` + +Note: + "rev1" is for PCB ver 1.0,1.1,1.2 + **The original Rev 1 was owned only by the designer. Therefore, Rev1 has been removed. Since the current PCB is Rev1, we changed Rev2 to Rev1 to match the firmware version.** + + +# Layout +![layout](https://github.com/omkbd/picture/blob/master/ergodash-layout.png) + +Layout Note: +- In thumb cluster, it is not possible to use all 5 positions as small keys. (as pictured) +- The top 2 1u keys in the thumb cluster share the same connection. +- 2u key (center) position shares with the lower 1u key position + +![PCB](https://github.com/omkbd/picture/blob/master/Ergodash_PCB.jpg) diff --git a/keyboards/ciaanh/ergodash/rev1/config.h b/keyboards/ciaanh/ergodash/rev1/config.h new file mode 100644 index 00000000000..21bd3d4f7bd --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/config.h @@ -0,0 +1,67 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + + +// wiring of each half +#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } +// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order + +#define DIODE_DIRECTION COL2ROW + +/* define tapping term */ +#define TAPPING_TERM 120 + +#define AUDIO_PIN C6 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* ws2812 RGB LED */ +#define RGB_DI_PIN D3 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLED_NUM 24 +#define RGBLIGHT_SPLIT +#define RGBLED_SPLIT { 12, 12 } // Number of LEDs + +// The LEDs on the slave half go in reverse order +#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, \ + 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12} + +#define SELECT_SOFT_SERIAL_SPEED 1 +/*Sets the protocol speed when using serial communication*/ +//Speeds: +//0: about 189kbps (Experimental only) +//1: about 137kbps (default) +//2: about 75kbps +//3: about 39kbps +//4: about 26kbps +//5: about 20kbps diff --git a/keyboards/ciaanh/ergodash/rev1/info.json b/keyboards/ciaanh/ergodash/rev1/info.json new file mode 100644 index 00000000000..d11b84b733e --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/info.json @@ -0,0 +1,377 @@ +{ + "keyboard_name": "ErgoDash rev1.2", + "manufacturer": "Omkbd", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, + "backlight": { + "pin": "B6", + "levels": 7 + }, + "split": { + "soft_serial_pin": "D0" + }, + "layouts": { + "LAYOUT_4key": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 6.5, "label": "L36"}, + {"y": 4, "x": 12, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"y": 5, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, + {"h": 2, "y": 4, "x": 11, "label": "R40"}, + {"y": 5, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_4key_2u_inner": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 7.5, "label": "L36"}, + {"y": 4, "x": 11, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"y": 5, "x": 7.5, "label": "L46"}, + {"y": 5, "x": 11, "label": "R40"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_3key_2us": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, + {"h": 2, "y": 4, "x": 11, "label": "R40"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_3key_1us": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 6.5, "label": "L36"}, + {"y": 4, "x": 12, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"y": 5, "x": 6.5, "label": "L45"}, + {"y": 5, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_2key": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + } + } +} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h b/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h new file mode 100644 index 00000000000..a597d848e2e --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h @@ -0,0 +1,27 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c b/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c new file mode 100644 index 00000000000..16e88db3455 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c @@ -0,0 +1,154 @@ +#include QMK_KEYBOARD_H + + +enum layer_names { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST +}; + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Qwerty + * ,----------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ` | Q | W | E | R | T | - | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | A | S | D | F | G | Del | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | Space| | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | Ctrl | GUI | ALt | EISU |||||||| Lower| Space| Del |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_QWERTY] = LAYOUT( + KC_ESC, C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), C(KC_F5), C(KC_F10), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, C(KC_F11), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, C(KC_F6), C(KC_F7), C(KC_F8), C(KC_F9), KC_B, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, KC_LALT, XXXXXXX, XXXXXXX, LOWER, KC_DOWN, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Lower + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Raise + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Adjust + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | Reset|RGB ON| MODE| HUE-| HUE+| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | BL ON| BRTG| INC| DEC| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_ADJUST] = LAYOUT( + _______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______, _______,_______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +#endif + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + print("mode just switched to qwerty and this is a huge string\n"); + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk b/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk new file mode 100644 index 00000000000..11b62b9bffe --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes +AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.c b/keyboards/ciaanh/ergodash/rev1/rev1.c new file mode 100644 index 00000000000..00f81cae117 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rev1.c @@ -0,0 +1,32 @@ +#include "ergodash.h" + +#ifdef AUDIO_ENABLE + float tone_startup[][2] = SONG(STARTUP_SOUND); + float tone_goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + +void matrix_init_kb(void) { + + #ifdef AUDIO_ENABLE + _delay_ms(20); // gets rid of tick + PLAY_SONG(tone_startup); + #endif + + // // green led on + // DDRD |= (1<<5); + // PORTD &= ~(1<<5); + + // // orange led on + // DDRB |= (1<<0); + // PORTB &= ~(1<<0); + + matrix_init_user(); +}; + +void shutdown_user(void) { + #ifdef AUDIO_ENABLE + PLAY_SONG(tone_goodbye); + _delay_ms(150); + stop_all_notes(); + #endif +} diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.h b/keyboards/ciaanh/ergodash/rev1/rev1.h new file mode 100644 index 00000000000..7f094534cc3 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rev1.h @@ -0,0 +1,139 @@ +#pragma once + +#include "ergodash.h" + +#include "quantum.h" + +#ifdef USE_I2C +#include +#ifdef __AVR__ + #include + #include +#endif +#endif + +#define XXX KC_NO + +#ifndef FLIP_HALF +// Standard Keymap +// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) +# define LAYOUT_4key( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +// Just defined for configurator support, the matrix is identical to LAYOUT_4key +# define LAYOUT_4key_2u_inner( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +# define LAYOUT_3key_2us( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, XXX }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, XXX }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +# define LAYOUT_3key_1us( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, XXX }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, XXX } \ +} + +# define LAYOUT_2key( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, XXX }, \ + { L40, L41, L42, L43, L44, L45, XXX }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, XXX }, \ + { R46, R45, R44, R43, R42, R41, XXX } \ +} + +#define LAYOUT LAYOUT_4key + +#else +// Keymap with right side flipped +// (TRRS jack on both halves are to the right) +# define LAYOUT( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R00, R01, R02, R03, R04, R05, R06 }, \ + { R10, R11, R12, R13, R14, R15, R16 }, \ + { R20, R21, R22, R23, R24, R25, R26 }, \ + { R30, R31, R32, R33, R34, R35, R36 }, \ + { R40, R41, R42, R43, R44, R45, R46 } \ +} +#endif diff --git a/keyboards/ciaanh/ergodash/rev1/rules.mk b/keyboards/ciaanh/ergodash/rev1/rules.mk new file mode 100644 index 00000000000..bb9e33b0829 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rules.mk b/keyboards/ciaanh/ergodash/rules.mk new file mode 100644 index 00000000000..29aa64f49f1 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rules.mk @@ -0,0 +1,16 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. + +SPLIT_KEYBOARD = yes # Enables split keyboard support + +DEFAULT_FOLDER = ciaanh/ergodash/rev1 diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index 0d27baa54d3..9eef1c8015c 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -9,23 +9,45 @@ { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 65 }, - { 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 68, 66 }, - { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 67 } + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, + { 65, NA, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 67 }, + { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68 } }, { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, - {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, - {28,157}, {28,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,156}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,7}, - {14,186}, - {28,186}, - {42,186}, - {60,166}, {56,147}, - {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + + /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, + /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, + /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, + + /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, + /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, + /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, + + + /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, + /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, + /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, + + + /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, + /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, + /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, + + + /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, + /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, + /*64*/{ 56, 26}, /*65*/{ 56, 7}, + + /*66*/{ 14,186}, + /*67*/{ 28,186}, + /*68*/{ 42,186}, + + /*69*/{ 74,177}, + /*70*/{ 60,166}, /*71*/{ 74,166}, /*72*/{ 74,154}, /*73*/{ 70,140}, /*74*/{ 70,128}, + /*75*/{ 70,116}, /*76*/{ 77, 95}, /*77*/{ 77, 68}, /*78*/{ 70, 58}, /*79*/{ 70, 26}, + /*80*/{ 70, 13}, /*81*/{ 70, 0} }, { diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 5ff386809ba..02210c2f752 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -15,18 +15,50 @@ { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, -{14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, -{28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, + {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, + {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, + {28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, + {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, + {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, {14,186}, {28,186}, {42,186}, - {60,166}, {56,147}, - {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + {60,166}, {56,147}, +{74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + + // LED Index to Physical Position + + /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, + /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, + /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, + + /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, + /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, + /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, + + + /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, + /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, + /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, + + + /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, + /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, + /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, + /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, + /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, + /*64*/{ 56, 26}, /*65*/{ 56, 15}, /*66*/{ 56, 1}, + + /*67*/{ 14,186}, + /*68*/{ 28,186}, + /*69*/{ 42,186}, + + /*70*/{ 74,177}, + /*71*/{ 60,166}, /*72*/{ 74,166}, /*73*/{ 74,154}, /*74*/{ 70,140}, /*75*/{ 70,128}, + /*76*/{ 70,116}, /*77*/{ 77, 95}, /*78*/{ 77, 68}, /*79*/{ 70, 58}, /*80*/{ 70, 26}, + /*81*/{ 70, 13}, /*82*/{ 70, 0} }, { diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md index f4c50935169..af466f9cf1f 100644 --- a/keyboards/ciaanh/kanagawa/readme.md +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -1,31 +1,23 @@ https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk -qmk compile -kb ciaanh/kanagawa2040 -km default - -# Ciaanh Kanagawa2040 - - -```sh -qmk compile -kb ciaanh/kanagawa2040 -km default -``` - # Kanagawa A 75% keyboard with oled and rotary encoder for Elite-C Keyboard Maintainer : Ciaanh - Hardware Supported : Kanagawa PCB + Hardware Supported : Kanagawa PCB rev 2.1 Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa Make example for this keyboard (after setting up your build environment): - qmk compile -kb ciaanh/kanagawa -km default - -Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader +```sh +qmk compile -kb ciaanh/kanagawa/iso -km default +qmk compile -kb ciaanh/kanagawa/ansi -km default +``` ## Bootloader diff --git a/keyboards/ciaanh/old/kanagawa/config.h b/keyboards/ciaanh/kanagawalegacy/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/config.h rename to keyboards/ciaanh/kanagawalegacy/config.h diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c new file mode 100644 index 00000000000..335e9a9ca03 --- /dev/null +++ b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c @@ -0,0 +1 @@ +#include "kanagawalegacy.h" diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h new file mode 100644 index 00000000000..ba5fde6eaff --- /dev/null +++ b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_ciaanh_kanagawalegacy_rev1 + #include "rev1.h" +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/config.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/config.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/lib/oledfont.c b/keyboards/ciaanh/kanagawalegacy/lib/oledfont.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/lib/oledfont.c rename to keyboards/ciaanh/kanagawalegacy/lib/oledfont.c diff --git a/keyboards/ciaanh/old/kanagawa/readme.md b/keyboards/ciaanh/kanagawalegacy/readme.md similarity index 100% rename from keyboards/ciaanh/old/kanagawa/readme.md rename to keyboards/ciaanh/kanagawalegacy/readme.md diff --git a/keyboards/ciaanh/old/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawalegacy/rev1/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/config.h rename to keyboards/ciaanh/kanagawalegacy/rev1/config.h diff --git a/keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json b/keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json rename to keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rev1.c b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rev1.c rename to keyboards/ciaanh/kanagawalegacy/rev1/rev1.c diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rev1.h b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rev1.h rename to keyboards/ciaanh/kanagawalegacy/rev1/rev1.h diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rules.mk b/keyboards/ciaanh/kanagawalegacy/rev1/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rules.mk rename to keyboards/ciaanh/kanagawalegacy/rev1/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/rules.mk b/keyboards/ciaanh/kanagawalegacy/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rules.mk rename to keyboards/ciaanh/kanagawalegacy/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.h b/keyboards/ciaanh/old/kanagawa/kanagawa.h deleted file mode 100644 index ab445c721e4..00000000000 --- a/keyboards/ciaanh/old/kanagawa/kanagawa.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_ciaanh_kanagawa_rev1 - #include "rev1.h" -#endif \ No newline at end of file From 2d8b621854786836907cac403ca6e3dc8c50a150 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 27 Apr 2023 00:19:46 +0200 Subject: [PATCH 08/76] Fix LED mapping --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 53 +++++++--------------- keyboards/ciaanh/kanagawa/config.h | 14 +++--- keyboards/ciaanh/kanagawa/iso/iso.c | 63 +++++++-------------------- 3 files changed, 39 insertions(+), 91 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index 9eef1c8015c..879f68dc186 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -16,50 +16,29 @@ { // LED Index to Physical Position - - /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, - /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, - /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, - - /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, - /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, - /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, - - - /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, - /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, - /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, - - - /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, - /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, - /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, - - - /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, - /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, - /*64*/{ 56, 26}, /*65*/{ 56, 7}, - - /*66*/{ 14,186}, - /*67*/{ 28,186}, - /*68*/{ 42,186}, - - /*69*/{ 74,177}, - /*70*/{ 60,166}, /*71*/{ 74,166}, /*72*/{ 74,154}, /*73*/{ 70,140}, /*74*/{ 70,128}, - /*75*/{ 70,116}, /*76*/{ 77, 95}, /*77*/{ 77, 68}, /*78*/{ 70, 58}, /*79*/{ 70, 26}, - /*80*/{ 70, 13}, /*81*/{ 70, 0} + {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, + {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, + {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, + {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, + {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 9, 47}, +{224, 12}, +{224, 23}, +{224, 35}, + {214, 61}, + {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, + }, { // LED Index to Flag 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, - 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, + 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, }}; #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 495ea65c7dc..d35884fb1b4 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -17,13 +17,15 @@ /* RGB Defines */ # define RGB_DI_PIN GP4 -#ifdef KEYBOARD_ciaanh_kanagawa_ansi -# define RGB_MATRIX_LED_COUNT 82 -#endif +# ifdef KEYBOARD_ciaanh_kanagawa_ansi +# define RGB_MATRIX_LED_COUNT 82 +# endif -#ifdef KEYBOARD_ciaanh_kanagawa_iso -# define RGB_MATRIX_LED_COUNT 83 -#endif +# ifdef KEYBOARD_ciaanh_kanagawa_iso +# define RGB_MATRIX_LED_COUNT 83 +# endif + +# define RGB_MATRIX_CENTER { 73, 32 } /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 02210c2f752..43fd253b96b 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -15,62 +15,29 @@ { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, - {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, - {28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, -{14,186}, -{28,186}, -{42,186}, - {60,166}, {56,147}, -{74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, + {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, + {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, + {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, + {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 18, 47}, { 2, 47}, +{224, 12}, +{224, 23}, +{224, 35}, + {214, 61}, + {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, - // LED Index to Physical Position - - /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, - /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, - /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, - - /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, - /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, - /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, - - - /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, - /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, - /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, - - - /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, - /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, - /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, - - - /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, - /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, - /*64*/{ 56, 26}, /*65*/{ 56, 15}, /*66*/{ 56, 1}, - - /*67*/{ 14,186}, - /*68*/{ 28,186}, - /*69*/{ 42,186}, - - /*70*/{ 74,177}, - /*71*/{ 60,166}, /*72*/{ 74,166}, /*73*/{ 74,154}, /*74*/{ 70,140}, /*75*/{ 70,128}, - /*76*/{ 70,116}, /*77*/{ 77, 95}, /*78*/{ 77, 68}, /*79*/{ 70, 58}, /*80*/{ 70, 26}, - /*81*/{ 70, 13}, /*82*/{ 70, 0} }, { // LED Index to Flag 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, - 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, + 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, }}; #endif \ No newline at end of file From 47db2ea409c8c2222219d5af42389804b0462c2d Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 28 Apr 2023 01:48:40 +0200 Subject: [PATCH 09/76] fix Oled config --- keyboards/ciaanh/kanagawa/config.h | 2 +- keyboards/ciaanh/kanagawa/info.json | 11 ----------- keyboards/ciaanh/kanagawa/mcuconf.h | 3 +++ keyboards/ciaanh/kanagawa/rules.mk | 19 +++++++++++++------ keyboards/ciaanh/kanagawa2040/config.h | 2 +- keyboards/ciaanh/kanagawa2040/info.json | 13 +------------ keyboards/ciaanh/kanagawa2040/mcuconf.h | 3 +++ keyboards/ciaanh/kanagawa2040/rules.mk | 19 +++++++++++++------ 8 files changed, 35 insertions(+), 37 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index d35884fb1b4..912da2c1ba0 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -8,7 +8,7 @@ # define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ -# define I2C_DRIVER I2CD1 +# define I2C_DRIVER I2CD0 # define I2C1_SDA_PIN GP0 # define I2C1_SCL_PIN GP1 #endif diff --git a/keyboards/ciaanh/kanagawa/info.json b/keyboards/ciaanh/kanagawa/info.json index 45a70539801..d0da504a473 100644 --- a/keyboards/ciaanh/kanagawa/info.json +++ b/keyboards/ciaanh/kanagawa/info.json @@ -8,17 +8,6 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "rgblight": false - }, "bootmagic": { "matrix": [0, 13] }, diff --git a/keyboards/ciaanh/kanagawa/mcuconf.h b/keyboards/ciaanh/kanagawa/mcuconf.h index d3ca0baab50..f6378664da8 100644 --- a/keyboards/ciaanh/kanagawa/mcuconf.h +++ b/keyboards/ciaanh/kanagawa/mcuconf.h @@ -4,3 +4,6 @@ #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 FALSE diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 96c6b71a3f5..f1c870e1b2a 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,13 +1,20 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +ENCODER_ENABLE = yes + RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index dc409bf96d8..8600fa9a31e 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -8,7 +8,7 @@ # define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ -# define I2C_DRIVER I2CD1 +# define I2C_DRIVER I2CD0 # define I2C1_SDA_PIN GP0 # define I2C1_SCL_PIN GP1 #endif diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json index 7b2011ce7dd..9c124ae684f 100644 --- a/keyboards/ciaanh/kanagawa2040/info.json +++ b/keyboards/ciaanh/kanagawa2040/info.json @@ -8,18 +8,7 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "rgblight": false - }, - "bootmagic": { + "bootmagic": { "matrix": [0, 13] }, "encoder": { diff --git a/keyboards/ciaanh/kanagawa2040/mcuconf.h b/keyboards/ciaanh/kanagawa2040/mcuconf.h index d3ca0baab50..f6378664da8 100644 --- a/keyboards/ciaanh/kanagawa2040/mcuconf.h +++ b/keyboards/ciaanh/kanagawa2040/mcuconf.h @@ -4,3 +4,6 @@ #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 FALSE diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index 7cbb07d3e3e..20fcc9172ab 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -1,13 +1,20 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +ENCODER_ENABLE = yes + RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor From b9b7b5c43ab280a3411783f5d9e5c8e9f4c626c6 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sat, 29 Apr 2023 01:03:38 +0200 Subject: [PATCH 10/76] adjust rgb --- .../ciaanh/kanagawa/ansi/keymaps/default/keymap.c | 14 +++++++------- keyboards/ciaanh/kanagawa/config.h | 2 +- .../ciaanh/kanagawa/iso/keymaps/default/keymap.c | 12 ++++++------ keyboards/ciaanh/kanagawa/kanagawa.h | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index f3cba10cda3..d2493b4fc5a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -43,10 +43,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_FNC, KC_SPC, KC_SPC, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, TO_FUNC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_FUNC] = LAYOUT_ansi( + [_CODE] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -57,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - [_CODE] = LAYOUT_ansi( + [_FUNC] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, TO_BASE, RGB_SPD, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI \ ), }; @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 21 characters per line // 16 cols / 4 rows - oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); + oled_write_P(PSTR(" Kanagawa rev 2.1 "), false); //oled_write_ln("", false); // Host Keyboard Layer Status @@ -214,8 +214,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FUNC] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 912da2c1ba0..11e86063449 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -25,7 +25,7 @@ # define RGB_MATRIX_LED_COUNT 83 # endif -# define RGB_MATRIX_CENTER { 73, 32 } +# define RGB_MATRIX_CENTER { 90, 28 } /* Enable Framebuffer and keypress effects */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 743ed5fbb14..721ddf8c3a2 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -43,10 +43,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_ENT, KC_HOME, \ KC_CAPS, KC_A, LT(0,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END, \ KC_LSFT, KC_NUBS, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_FNC, KC_SPC, KC_SPC, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, TO_FUNC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_FUNC] = LAYOUT_iso( + [_CODE] = LAYOUT_iso( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -57,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - [_CODE] = LAYOUT_iso( + [_FUNC] = LAYOUT_iso( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ ), }; @@ -214,8 +214,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FUNC] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h index f5740062425..f9de4447fa1 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.h +++ b/keyboards/ciaanh/kanagawa/kanagawa.h @@ -16,8 +16,8 @@ enum layers { _BASE, - _FUNC, - _CODE + _CODE, + _FUNC }; enum custom_keycodes @@ -27,8 +27,8 @@ enum custom_keycodes }; #define TO_BASE TO(_BASE) -#define TO_CODE TG(_CODE) +#define TO_FUNC TG(_FUNC) -#define L_FNC MO(_FUNC) +#define L_CODE MO(_CODE) #define _SCRNSHOT LSFT(LGUI(KC_S)) \ No newline at end of file From e0eb2b680551415062b355cb0687ab88eef1366e Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Thu, 18 May 2023 08:49:58 +0200 Subject: [PATCH 11/76] edit kanagawa keymap --- .../kanagawa/ansi/keymaps/default/keymap.c | 17 ---- .../ansi/keymaps/default/rgb_matrix_user.inc | 40 +++++++++ keyboards/ciaanh/kanagawa/ansi/rules.mk | 1 + keyboards/ciaanh/kanagawa/config.h | 86 +++++++++---------- 4 files changed, 84 insertions(+), 60 deletions(-) create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index d2493b4fc5a..22738b88dd9 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -81,10 +81,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ #ifdef OLED_ENABLE - // oled_rotation_t oled_init_user(oled_rotation_t rotation) { - // return OLED_ROTATION_180; - // } - static void render_status(void) { // 21 characters per line // 16 cols / 4 rows @@ -219,16 +215,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { }; #endif -// #ifdef ENCODER_ENABLE -// bool encoder_update_kb(uint8_t index, bool clockwise) { -// if (!encoder_update_user(index, clockwise)) { return false; } -// if (index == 0) { -// if (clockwise) { -// tap_code_delay(KC_VOLU, 10); -// } else { -// tap_code_delay(KC_VOLD, 10); -// } -// } -// return true; -// } -// #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc new file mode 100644 index 00000000000..ed2ed30106f --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc @@ -0,0 +1,40 @@ +// !!! DO NOT ADD #pragma once !!! // + +// Step 1. +// Declare custom effects using the RGB_MATRIX_EFFECT macro +// (note the lack of semicolon after the macro!) +RGB_MATRIX_EFFECT(my_cool_effect) +RGB_MATRIX_EFFECT(my_cool_effect2) + +// Step 2. +// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block +#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS + +// e.g: A simple effect, self-contained within a single method +static bool my_cool_effect(effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + for (uint8_t i = led_min; i < led_max; i++) { + rgb_matrix_set_color(i, 0xff, 0xff, 0x00); + } + return rgb_matrix_check_finished_leds(led_max); +} + +// e.g: A more complex effect, relying on external methods and state, with +// dedicated init and run methods +static uint8_t some_global_state; +static void my_cool_effect2_complex_init(effect_params_t* params) { + some_global_state = 1; +} +static bool my_cool_effect2_complex_run(effect_params_t* params) { + RGB_MATRIX_USE_LIMITS(led_min, led_max); + for (uint8_t i = led_min; i < led_max; i++) { + rgb_matrix_set_color(i, 0xff, some_global_state++, 0xff); + } + return rgb_matrix_check_finished_leds(led_max); +} +static bool my_cool_effect2(effect_params_t* params) { + if (params->init) my_cool_effect2_complex_init(params); + return my_cool_effect2_complex_run(params); +} + +#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/rules.mk b/keyboards/ciaanh/kanagawa/ansi/rules.mk index e69de29bb2d..14ace897304 100644 --- a/keyboards/ciaanh/kanagawa/ansi/rules.mk +++ b/keyboards/ciaanh/kanagawa/ansi/rules.mk @@ -0,0 +1 @@ +RGB_MATRIX_CUSTOM_USER = no diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 11e86063449..0b2fae383f6 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -31,49 +31,49 @@ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_KEYPRESSES -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_BREATHING +// # define ENABLE_RGB_MATRIX_BAND_SAT +// # define ENABLE_RGB_MATRIX_BAND_VAL +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +// # define ENABLE_RGB_MATRIX_CYCLE_ALL +// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +// # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +// # define ENABLE_RGB_MATRIX_DUAL_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// # define ENABLE_RGB_MATRIX_RAINDROPS +// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// # define ENABLE_RGB_MATRIX_HUE_BREATHING +// # define ENABLE_RGB_MATRIX_HUE_PENDULUM +// # define ENABLE_RGB_MATRIX_HUE_WAVE +// # define ENABLE_RGB_MATRIX_PIXEL_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +// # define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +// # define ENABLE_RGB_MATRIX_SOLID_SPLASH +// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif From 62f38f68e49e2551f903bae7e07a2ea76db943e4 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 19 May 2023 14:31:05 +0200 Subject: [PATCH 12/76] test via --- .../ciaanh/ergodash/rev1/keymaps/via/config.h | 27 ++ .../ciaanh/ergodash/rev1/keymaps/via/keymap.c | 154 ++++++++++++ .../ciaanh/ergodash/rev1/keymaps/via/rules.mk | 5 + keyboards/ciaanh/ergodash/rules.mk | 1 + keyboards/ciaanh/kanagawa/ansi/kanagawa.json | 22 ++ .../kanagawa/ansi/keymaps/default/keymap.c | 4 +- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 238 ++++++++++++++++++ .../ciaanh/kanagawa/ansi/keymaps/via/rules.mk | 1 + keyboards/ciaanh/kanagawa/config.h | 84 +++---- keyboards/ciaanh/kanagawa/iso/kanagawa.json | 22 ++ .../kanagawa/iso/keymaps/default/keymap.c | 4 +- keyboards/ciaanh/kanagawa/kanagawa.h | 3 +- 12 files changed, 518 insertions(+), 47 deletions(-) create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/ansi/kanagawa.json create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/iso/kanagawa.json diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h b/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h new file mode 100644 index 00000000000..a597d848e2e --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h @@ -0,0 +1,27 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c b/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c new file mode 100644 index 00000000000..16e88db3455 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c @@ -0,0 +1,154 @@ +#include QMK_KEYBOARD_H + + +enum layer_names { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST +}; + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Qwerty + * ,----------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ` | Q | W | E | R | T | - | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | A | S | D | F | G | Del | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | Space| | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | Ctrl | GUI | ALt | EISU |||||||| Lower| Space| Del |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_QWERTY] = LAYOUT( + KC_ESC, C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), C(KC_F5), C(KC_F10), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, C(KC_F11), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, C(KC_F6), C(KC_F7), C(KC_F8), C(KC_F9), KC_B, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, KC_LALT, XXXXXXX, XXXXXXX, LOWER, KC_DOWN, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Lower + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Raise + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Adjust + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | Reset|RGB ON| MODE| HUE-| HUE+| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | BL ON| BRTG| INC| DEC| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_ADJUST] = LAYOUT( + _______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______, _______,_______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +#endif + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + print("mode just switched to qwerty and this is a huge string\n"); + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk b/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk new file mode 100644 index 00000000000..43e9f70e3d5 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk @@ -0,0 +1,5 @@ +BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes +AUDIO_ENABLE = no + +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/ergodash/rules.mk b/keyboards/ciaanh/ergodash/rules.mk index 29aa64f49f1..a09b78c5280 100644 --- a/keyboards/ciaanh/ergodash/rules.mk +++ b/keyboards/ciaanh/ergodash/rules.mk @@ -14,3 +14,4 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes # Enables split keyboard support DEFAULT_FOLDER = ciaanh/ergodash/rev1 + diff --git a/keyboards/ciaanh/kanagawa/ansi/kanagawa.json b/keyboards/ciaanh/kanagawa/ansi/kanagawa.json new file mode 100644 index 00000000000..dac98fd7bbd --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/kanagawa.json @@ -0,0 +1,22 @@ +{ + "name": "Kanagawa", + "vendorId": "0xC1E0", + "productId": "0x0010", + "menus": [ "qmk_rgb_matrix" ], + "matrix": { "rows": 6, "cols": 14 }, + "keycodes": [ "qmk_lighting" ], + "layouts": { + "keymap": [ + [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], + [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], + [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], + [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], + [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], + [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], + [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], + [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], + [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], + [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] + ] + } +} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 22738b88dd9..73833d4f89c 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, \ KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, TO_FUNC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), [_CODE] = LAYOUT_ansi( @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, TO_BASE, RGB_SPD, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), }; diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c new file mode 100644 index 00000000000..032f8524783 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -0,0 +1,238 @@ +#include QMK_KEYBOARD_H + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ + +#define TO_0 TO(0) +#define MO_1 MO(1) +#define TG_2 TG(2) + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + // BASE + [0] = LAYOUT_ansi( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, MO_1, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TG_2, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + // CODE + [1] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + // FUNCTION + [2] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_0, RGB_SAD, RGB_HUD, RGB_SAI \ + ), + + // EMPTY + [3] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + +}; + + + + + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +#ifdef OLED_ENABLE + static void render_status(void) { + // 21 characters per line + // 16 cols / 4 rows + + oled_write_P(PSTR(" Kanagawa rev 2.1 "), false); + //oled_write_ln("", false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case _BASE: + oled_write_P(PSTR("_\n"), false); + break; + case _FUNC: + oled_write_P(PSTR("[Fn]\n"), false); + break; + case _CODE: + oled_write_P(PSTR("[Code]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(PSTR(" "), false); + + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + // oled_write_ln("", false); + } + + // static void render_kanagawa_logo(void) { + // static const char PROGMEM kanagawa_logo[] = { + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, + // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, + // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, + // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, + // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, + // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, + // }; + // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); + // } + + // static void render_kanagawa_logo(void) { + // //oled_set_cursor(0, 5); + + // static const char PROGMEM kanagawa_logo[] = { + // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, + // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, + // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 + // }; + + // oled_write_P(kanagawa_logo, false); + // } + + bool oled_task_user(void) { + // switch (get_highest_layer(layer_state)) { + // case _UPPER: + // render_kanagawa_logo(); + // break; + // default: + // render_status(); + // } + + render_status(); + + return false; + } +#endif + +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case CUSTOMKEY: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, +}; +#endif + diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 0b2fae383f6..c85bd4c2bc6 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -32,48 +32,48 @@ # define RGB_MATRIX_KEYPRESSES # define ENABLE_RGB_MATRIX_ALPHAS_MODS -// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -// # define ENABLE_RGB_MATRIX_BREATHING -// # define ENABLE_RGB_MATRIX_BAND_SAT -// # define ENABLE_RGB_MATRIX_BAND_VAL -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -// # define ENABLE_RGB_MATRIX_CYCLE_ALL -// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -// # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -// # define ENABLE_RGB_MATRIX_DUAL_BEACON -// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON -// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -// # define ENABLE_RGB_MATRIX_RAINDROPS -// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// # define ENABLE_RGB_MATRIX_HUE_BREATHING -// # define ENABLE_RGB_MATRIX_HUE_PENDULUM -// # define ENABLE_RGB_MATRIX_HUE_WAVE -// # define ENABLE_RGB_MATRIX_PIXEL_RAIN -// # define ENABLE_RGB_MATRIX_PIXEL_FLOW -// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP -// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -// # define ENABLE_RGB_MATRIX_SPLASH -// # define ENABLE_RGB_MATRIX_MULTISPLASH -// # define ENABLE_RGB_MATRIX_SOLID_SPLASH -// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif diff --git a/keyboards/ciaanh/kanagawa/iso/kanagawa.json b/keyboards/ciaanh/kanagawa/iso/kanagawa.json new file mode 100644 index 00000000000..dac98fd7bbd --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/kanagawa.json @@ -0,0 +1,22 @@ +{ + "name": "Kanagawa", + "vendorId": "0xC1E0", + "productId": "0x0010", + "menus": [ "qmk_rgb_matrix" ], + "matrix": { "rows": 6, "cols": 14 }, + "keycodes": [ "qmk_lighting" ], + "layouts": { + "keymap": [ + [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], + [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], + [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], + [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], + [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], + [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], + [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], + [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], + [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], + [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] + ] + } +} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 721ddf8c3a2..d7924911a0b 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_ENT, KC_HOME, \ KC_CAPS, KC_A, LT(0,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END, \ KC_LSFT, KC_NUBS, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, TO_FUNC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), [_CODE] = LAYOUT_iso( @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), }; diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h index f9de4447fa1..52b8acc89bc 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.h +++ b/keyboards/ciaanh/kanagawa/kanagawa.h @@ -17,7 +17,8 @@ enum layers { _BASE, _CODE, - _FUNC + _FUNC, + _TOP }; enum custom_keycodes From 235162566e1c53d8ada8828ddbae1c7447928e1d Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 15:27:50 +0200 Subject: [PATCH 13/76] edit via conf --- keyboards/ciaanh/kanagawa/ansi/kanagawa.json | 22 ------------------- keyboards/ciaanh/kanagawa/iso/kanagawa.json | 22 ------------------- keyboards/ciaanh/kanagawa/kanagawa.json | 23 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/kanagawa.json delete mode 100644 keyboards/ciaanh/kanagawa/iso/kanagawa.json create mode 100644 keyboards/ciaanh/kanagawa/kanagawa.json diff --git a/keyboards/ciaanh/kanagawa/ansi/kanagawa.json b/keyboards/ciaanh/kanagawa/ansi/kanagawa.json deleted file mode 100644 index dac98fd7bbd..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/kanagawa.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Kanagawa", - "vendorId": "0xC1E0", - "productId": "0x0010", - "menus": [ "qmk_rgb_matrix" ], - "matrix": { "rows": 6, "cols": 14 }, - "keycodes": [ "qmk_lighting" ], - "layouts": { - "keymap": [ - [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], - [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], - [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], - [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], - [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], - [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], - [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], - [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], - [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], - [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] - ] - } -} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/kanagawa.json b/keyboards/ciaanh/kanagawa/iso/kanagawa.json deleted file mode 100644 index dac98fd7bbd..00000000000 --- a/keyboards/ciaanh/kanagawa/iso/kanagawa.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Kanagawa", - "vendorId": "0xC1E0", - "productId": "0x0010", - "menus": [ "qmk_rgb_matrix" ], - "matrix": { "rows": 6, "cols": 14 }, - "keycodes": [ "qmk_lighting" ], - "layouts": { - "keymap": [ - [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], - [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], - [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], - [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], - [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], - [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], - [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], - [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], - [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], - [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] - ] - } -} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/kanagawa.json b/keyboards/ciaanh/kanagawa/kanagawa.json new file mode 100644 index 00000000000..82e887b9c3b --- /dev/null +++ b/keyboards/ciaanh/kanagawa/kanagawa.json @@ -0,0 +1,23 @@ +{ + "name": "Kanagawa", + "vendorId": "0xC1E0", + "productId": "0x0010", + "matrix": { "rows": 6, "cols": 14 }, + "menus": [ "qmk_rgb_matrix" ], + "keycodes": [ "qmk_lighting" ], + "layouts": { + "keymap": [ + [{"x":2.75,"c":"#777777"},"0,0",{"x":0.5,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.25},"0,5","0,6","0,7","0,8",{"x":0.25},"0,9","0,10","0,11","0,12",{"x":2.25,"c":"#777777"},"0,13\n\n\n\n\n\n\n\n\ne0"], + [{"y":0.25,"x":2.75,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13",{"x":1.25,"c":"#777777"},"3,13"], + [{"x":2.75,"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13\n\n\n1,0",{"x":1.25,"c":"#777777"},"4,13",{"x":1.75,"c":"#cccccc","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n1,1"], + [{"x":2.75,"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,12\n\n\n1,0",{"x":1.25},"5,13",{"x":0.75},"3,12\n\n\n1,1"], + [{"c":"#aaaaaa","w":1.25},"4,0\n\n\n0,1",{"c":"#cccccc"},"4,1\n\n\n0,1",{"x":0.5,"c":"#aaaaaa","w":2.25},"4,0\n\n\n0,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":1.75},"4,12"], + [{"y":-0.75,"x":17,"c":"#777777"},"5,12"], + [{"y":-0.25,"x":2.75,"c":"#aaaaaa"},"5,0","5,1","5,2",{"x":7},"5,6","5,7","5,8"], + [{"y":-0.75,"x":16,"c":"#777777"},"5,9","5,10","5,11"], + [{"ry":5.5,"y":-0.25,"x":5.75},"5,3"], + [{"r":15,"rx":6.5,"y":-0.25,"x":0.75,"w":2.25},"5,4"], + [{"r":-15,"rx":12.5,"y":-0.25,"x":-3,"w":2.75},"5,5"] + ] + } +} \ No newline at end of file From fe2b63016aa3f2bc435b3d8fbdfa8584993836a2 Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 15:33:35 +0200 Subject: [PATCH 14/76] Clean ciaanh folder --- keyboards/ciaanh/ergodash/ergodash.c | 1 - keyboards/ciaanh/ergodash/ergodash.h | 7 - keyboards/ciaanh/ergodash/info.json | 4 - keyboards/ciaanh/ergodash/readme.md | 32 -- keyboards/ciaanh/ergodash/rev1/config.h | 67 ---- keyboards/ciaanh/ergodash/rev1/info.json | 377 ------------------ .../ergodash/rev1/keymaps/default/config.h | 27 -- .../ergodash/rev1/keymaps/default/keymap.c | 154 ------- .../ergodash/rev1/keymaps/default/rules.mk | 3 - .../ciaanh/ergodash/rev1/keymaps/via/config.h | 27 -- .../ciaanh/ergodash/rev1/keymaps/via/keymap.c | 154 ------- .../ciaanh/ergodash/rev1/keymaps/via/rules.mk | 5 - keyboards/ciaanh/ergodash/rev1/rev1.c | 32 -- keyboards/ciaanh/ergodash/rev1/rev1.h | 139 ------- keyboards/ciaanh/ergodash/rev1/rules.mk | 3 - keyboards/ciaanh/ergodash/rules.mk | 17 - keyboards/ciaanh/kanagawa/readme.md | 12 +- keyboards/ciaanh/kanagawa2040/config.h | 73 ---- keyboards/ciaanh/kanagawa2040/info.json | 122 ------ keyboards/ciaanh/kanagawa2040/kanagawa2040.c | 48 --- keyboards/ciaanh/kanagawa2040/kanagawa2040.h | 5 - .../kanagawa2040/keymaps/default/keycodes.h | 23 -- .../kanagawa2040/keymaps/default/keymap.c | 253 ------------ keyboards/ciaanh/kanagawa2040/lib/oledfont.c | 277 ------------- keyboards/ciaanh/kanagawa2040/mcuconf.h | 9 - keyboards/ciaanh/kanagawa2040/readme.md | 37 -- keyboards/ciaanh/kanagawa2040/rules.mk | 29 -- keyboards/ciaanh/kanagawalegacy/config.h | 3 - .../ciaanh/kanagawalegacy/kanagawalegacy.c | 1 - .../ciaanh/kanagawalegacy/kanagawalegacy.h | 5 - .../kanagawalegacy/keymaps/default/config.h | 3 - .../kanagawalegacy/keymaps/default/keycodes.h | 23 -- .../kanagawalegacy/keymaps/default/keymap.c | 258 ------------ .../kanagawalegacy/keymaps/default/rules.mk | 6 - .../kanagawalegacy/keymaps/via/keycodes.h | 23 -- .../kanagawalegacy/keymaps/via/keymap.c | 211 ---------- .../kanagawalegacy/keymaps/via/rules.mk | 7 - .../ciaanh/kanagawalegacy/lib/oledfont.c | 277 ------------- keyboards/ciaanh/kanagawalegacy/readme.md | 16 - keyboards/ciaanh/kanagawalegacy/rev1/config.h | 44 -- .../ciaanh/kanagawalegacy/rev1/kanagawa.json | 21 - keyboards/ciaanh/kanagawalegacy/rev1/rev1.c | 17 - keyboards/ciaanh/kanagawalegacy/rev1/rev1.h | 29 -- keyboards/ciaanh/kanagawalegacy/rev1/rules.mk | 3 - keyboards/ciaanh/kanagawalegacy/rules.mk | 33 -- keyboards/ciaanh/pallas/config.h | 3 - keyboards/ciaanh/pallas/lib/oledfont.c | 282 ------------- keyboards/ciaanh/pallas/pallas.c | 1 - keyboards/ciaanh/pallas/pallas.h | 7 - keyboards/ciaanh/pallas/readme.md | 16 - keyboards/ciaanh/pallas/rev1/config.h | 56 --- keyboards/ciaanh/pallas/rev1/info.json | 89 ----- .../pallas/rev1/keymaps/default/config.h | 3 - .../pallas/rev1/keymaps/default/keycodes.h | 46 --- .../pallas/rev1/keymaps/default/keymap.c | 327 --------------- .../pallas/rev1/keymaps/default/rules.mk | 3 - keyboards/ciaanh/pallas/rev1/rev1.c | 17 - keyboards/ciaanh/pallas/rev1/rev1.h | 24 -- keyboards/ciaanh/pallas/rev1/rules.mk | 5 - keyboards/ciaanh/pallas/rules.mk | 32 -- 60 files changed, 3 insertions(+), 3825 deletions(-) delete mode 100644 keyboards/ciaanh/ergodash/ergodash.c delete mode 100644 keyboards/ciaanh/ergodash/ergodash.h delete mode 100644 keyboards/ciaanh/ergodash/info.json delete mode 100644 keyboards/ciaanh/ergodash/readme.md delete mode 100644 keyboards/ciaanh/ergodash/rev1/config.h delete mode 100644 keyboards/ciaanh/ergodash/rev1/info.json delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c delete mode 100644 keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk delete mode 100644 keyboards/ciaanh/ergodash/rev1/rev1.c delete mode 100644 keyboards/ciaanh/ergodash/rev1/rev1.h delete mode 100644 keyboards/ciaanh/ergodash/rev1/rules.mk delete mode 100644 keyboards/ciaanh/ergodash/rules.mk delete mode 100644 keyboards/ciaanh/kanagawa2040/config.h delete mode 100644 keyboards/ciaanh/kanagawa2040/info.json delete mode 100644 keyboards/ciaanh/kanagawa2040/kanagawa2040.c delete mode 100644 keyboards/ciaanh/kanagawa2040/kanagawa2040.h delete mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h delete mode 100644 keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c delete mode 100644 keyboards/ciaanh/kanagawa2040/lib/oledfont.c delete mode 100644 keyboards/ciaanh/kanagawa2040/mcuconf.h delete mode 100644 keyboards/ciaanh/kanagawa2040/readme.md delete mode 100644 keyboards/ciaanh/kanagawa2040/rules.mk delete mode 100644 keyboards/ciaanh/kanagawalegacy/config.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c delete mode 100644 keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c delete mode 100644 keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk delete mode 100644 keyboards/ciaanh/kanagawalegacy/lib/oledfont.c delete mode 100644 keyboards/ciaanh/kanagawalegacy/readme.md delete mode 100644 keyboards/ciaanh/kanagawalegacy/rev1/config.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json delete mode 100644 keyboards/ciaanh/kanagawalegacy/rev1/rev1.c delete mode 100644 keyboards/ciaanh/kanagawalegacy/rev1/rev1.h delete mode 100644 keyboards/ciaanh/kanagawalegacy/rev1/rules.mk delete mode 100644 keyboards/ciaanh/kanagawalegacy/rules.mk delete mode 100644 keyboards/ciaanh/pallas/config.h delete mode 100644 keyboards/ciaanh/pallas/lib/oledfont.c delete mode 100644 keyboards/ciaanh/pallas/pallas.c delete mode 100644 keyboards/ciaanh/pallas/pallas.h delete mode 100644 keyboards/ciaanh/pallas/readme.md delete mode 100644 keyboards/ciaanh/pallas/rev1/config.h delete mode 100644 keyboards/ciaanh/pallas/rev1/info.json delete mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/config.h delete mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h delete mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c delete mode 100644 keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk delete mode 100644 keyboards/ciaanh/pallas/rev1/rev1.c delete mode 100644 keyboards/ciaanh/pallas/rev1/rev1.h delete mode 100644 keyboards/ciaanh/pallas/rev1/rules.mk delete mode 100644 keyboards/ciaanh/pallas/rules.mk diff --git a/keyboards/ciaanh/ergodash/ergodash.c b/keyboards/ciaanh/ergodash/ergodash.c deleted file mode 100644 index 51e6dbf08fc..00000000000 --- a/keyboards/ciaanh/ergodash/ergodash.c +++ /dev/null @@ -1 +0,0 @@ -#include "ergodash.h" diff --git a/keyboards/ciaanh/ergodash/ergodash.h b/keyboards/ciaanh/ergodash/ergodash.h deleted file mode 100644 index 6b7a9ea6d55..00000000000 --- a/keyboards/ciaanh/ergodash/ergodash.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_ciaanh_ergodash_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/ciaanh/ergodash/info.json b/keyboards/ciaanh/ergodash/info.json deleted file mode 100644 index 4369a041038..00000000000 --- a/keyboards/ciaanh/ergodash/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "atmega32u4", - "bootloader": "caterina" -} diff --git a/keyboards/ciaanh/ergodash/readme.md b/keyboards/ciaanh/ergodash/readme.md deleted file mode 100644 index 4260397a990..00000000000 --- a/keyboards/ciaanh/ergodash/readme.md +++ /dev/null @@ -1,32 +0,0 @@ -# ErgoDash - -![ErgoDash](https://github.com/omkbd/picture/blob/master/Ergodash.jpg) - -Keyboard Maintainer: [omkbd](https://github.com/omkbd) [@omkbd](https://twitter.com/omkbd) -Hardware Supported: ErgoDash PCB, Pro Micro ATmega32u4 -Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDash) - - -Make example for this keyboard (after setting up your build environment): - - make omkbd/ergodash/rev1:default - -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. - -Install Example: (for pro micro) - `make omkbd/ergodash/rev1:default:avrdude` - -Note: - "rev1" is for PCB ver 1.0,1.1,1.2 - **The original Rev 1 was owned only by the designer. Therefore, Rev1 has been removed. Since the current PCB is Rev1, we changed Rev2 to Rev1 to match the firmware version.** - - -# Layout -![layout](https://github.com/omkbd/picture/blob/master/ergodash-layout.png) - -Layout Note: -- In thumb cluster, it is not possible to use all 5 positions as small keys. (as pictured) -- The top 2 1u keys in the thumb cluster share the same connection. -- 2u key (center) position shares with the lower 1u key position - -![PCB](https://github.com/omkbd/picture/blob/master/Ergodash_PCB.jpg) diff --git a/keyboards/ciaanh/ergodash/rev1/config.h b/keyboards/ciaanh/ergodash/rev1/config.h deleted file mode 100644 index 21bd3d4f7bd..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/config.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ - -#pragma once - - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } -// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order - -#define DIODE_DIRECTION COL2ROW - -/* define tapping term */ -#define TAPPING_TERM 120 - -#define AUDIO_PIN C6 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 24 -#define RGBLIGHT_SPLIT -#define RGBLED_SPLIT { 12, 12 } // Number of LEDs - -// The LEDs on the slave half go in reverse order -#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, \ - 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12} - -#define SELECT_SOFT_SERIAL_SPEED 1 -/*Sets the protocol speed when using serial communication*/ -//Speeds: -//0: about 189kbps (Experimental only) -//1: about 137kbps (default) -//2: about 75kbps -//3: about 39kbps -//4: about 26kbps -//5: about 20kbps diff --git a/keyboards/ciaanh/ergodash/rev1/info.json b/keyboards/ciaanh/ergodash/rev1/info.json deleted file mode 100644 index d11b84b733e..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/info.json +++ /dev/null @@ -1,377 +0,0 @@ -{ - "keyboard_name": "ErgoDash rev1.2", - "manufacturer": "Omkbd", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0x6060", - "device_version": "1.0.0" - }, - "backlight": { - "pin": "B6", - "levels": 7 - }, - "split": { - "soft_serial_pin": "D0" - }, - "layouts": { - "LAYOUT_4key": { - "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] - }, - "LAYOUT_4key_2u_inner": { - "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 7.5, "label": "L36"}, - {"y": 4, "x": 11, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 7.5, "label": "L46"}, - {"y": 5, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] - }, - "LAYOUT_3key_2us": { - "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, - {"h": 2, "y": 4, "x": 11, "label": "R40"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] - }, - "LAYOUT_3key_1us": { - "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 4, "x": 6.5, "label": "L36"}, - {"y": 4, "x": 12, "label": "R30"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"y": 5, "x": 6.5, "label": "L45"}, - {"y": 5, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] - }, - "LAYOUT_2key": { - "layout": [ - {"y": 0.375, "x": 0.5, "label": "L00"}, - {"y": 0.375, "x": 1.5, "label": "L01"}, - {"y": 0.125, "x": 2.5, "label": "L02"}, - {"y": 0, "x": 3.5, "label": "L03"}, - {"y": 0.125, "x": 4.5, "label": "L04"}, - {"y": 0.25, "x": 5.5, "label": "L05"}, - {"y": 0.75, "x": 6.5, "label": "L06"}, - {"y": 0.75, "x": 12, "label": "R00"}, - {"y": 0.25, "x": 13, "label": "R01"}, - {"y": 0.125, "x": 14, "label": "R02"}, - {"y": 0, "x": 15, "label": "R03"}, - {"y": 0.125, "x": 16, "label": "R04"}, - {"y": 0.375, "x": 17, "label": "R05"}, - {"y": 0.375, "x": 18, "label": "R06"}, - {"y": 1.375, "x": 0.5, "label": "L10"}, - {"y": 1.375, "x": 1.5, "label": "L11"}, - {"y": 1.125, "x": 2.5, "label": "L12"}, - {"y": 1, "x": 3.5, "label": "L13"}, - {"y": 1.125, "x": 4.5, "label": "L14"}, - {"y": 1.25, "x": 5.5, "label": "L15"}, - {"y": 1.75, "x": 6.5, "label": "L16"}, - {"y": 1.75, "x": 12, "label": "R10"}, - {"y": 1.25, "x": 13, "label": "R11"}, - {"y": 1.125, "x": 14, "label": "R12"}, - {"y": 1, "x": 15, "label": "R13"}, - {"y": 1.125, "x": 16, "label": "R14"}, - {"y": 1.375, "x": 17, "label": "R15"}, - {"y": 1.375, "x": 18, "label": "R16"}, - {"y": 2.375, "x": 0.5, "label": "L20"}, - {"y": 2.375, "x": 1.5, "label": "L21"}, - {"y": 2.125, "x": 2.5, "label": "L22"}, - {"y": 2, "x": 3.5, "label": "L23"}, - {"y": 2.125, "x": 4.5, "label": "L24"}, - {"y": 2.25, "x": 5.5, "label": "L25"}, - {"y": 2.75, "x": 6.5, "label": "L26"}, - {"y": 2.75, "x": 12, "label": "R20"}, - {"y": 2.25, "x": 13, "label": "R21"}, - {"y": 2.125, "x": 14, "label": "R22"}, - {"y": 2, "x": 15, "label": "R23"}, - {"y": 2.125, "x": 16, "label": "R24"}, - {"y": 2.375, "x": 17, "label": "R25"}, - {"y": 2.375, "x": 18, "label": "R26"}, - {"y": 3.375, "x": 0.5, "label": "L30"}, - {"y": 3.375, "x": 1.5, "label": "L31"}, - {"y": 3.125, "x": 2.5, "label": "L32"}, - {"y": 3, "x": 3.5, "label": "L33"}, - {"y": 3.125, "x": 4.5, "label": "L34"}, - {"y": 3.25, "x": 5.5, "label": "L35"}, - {"y": 3.25, "x": 13, "label": "R31"}, - {"y": 3.125, "x": 14, "label": "R32"}, - {"y": 3, "x": 15, "label": "R33"}, - {"y": 3.125, "x": 16, "label": "R34"}, - {"y": 3.375, "x": 17, "label": "R35"}, - {"y": 3.375, "x": 18, "label": "R36"}, - {"y": 4.375, "x": 0.5, "label": "L40"}, - {"y": 4.375, "x": 1.5, "label": "L41"}, - {"y": 4.125, "x": 2.5, "label": "L42"}, - {"y": 4, "x": 3.5, "label": "L43"}, - {"y": 5, "x": 5.5, "label": "L44"}, - {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, - {"h": 2, "y": 4, "x": 12, "label": "R41"}, - {"y": 5, "x": 13, "label": "R42"}, - {"y": 4, "x": 15, "label": "R43"}, - {"y": 4.125, "x": 16, "label": "R44"}, - {"y": 4.375, "x": 17, "label": "R45"}, - {"y": 4.375, "x": 18, "label": "R46"}] - } - } -} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h b/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h deleted file mode 100644 index a597d848e2e..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ - -#pragma once - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c b/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c deleted file mode 100644 index 16e88db3455..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c +++ /dev/null @@ -1,154 +0,0 @@ -#include QMK_KEYBOARD_H - - -enum layer_names { - _QWERTY, - _LOWER, - _RAISE, - _ADJUST -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, - ADJUST, -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Qwerty - * ,----------------------------------------------------------------------------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ` | Q | W | E | R | T | - | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | A | S | D | F | G | Del | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | Space| | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | Ctrl | GUI | ALt | EISU |||||||| Lower| Space| Del |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_QWERTY] = LAYOUT( - KC_ESC, C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), C(KC_F5), C(KC_F10), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, C(KC_F11), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, C(KC_F6), C(KC_F7), C(KC_F8), C(KC_F9), KC_B, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LCTL, KC_LALT, XXXXXXX, XXXXXXX, LOWER, KC_DOWN, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Lower - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Raise - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Adjust - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | Reset|RGB ON| MODE| HUE-| HUE+| | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | BL ON| BRTG| INC| DEC| | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_ADJUST] = LAYOUT( - _______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,_______, _______, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______,_______,_______, _______,_______, _______, _______, _______, _______, _______ - ) -}; - -#ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -#endif - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - } - return true; -} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk b/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk deleted file mode 100644 index 11b62b9bffe..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h b/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h deleted file mode 100644 index a597d848e2e..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/via/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ - -#pragma once - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c b/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c deleted file mode 100644 index 16e88db3455..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/via/keymap.c +++ /dev/null @@ -1,154 +0,0 @@ -#include QMK_KEYBOARD_H - - -enum layer_names { - _QWERTY, - _LOWER, - _RAISE, - _ADJUST -}; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, - ADJUST, -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Qwerty - * ,----------------------------------------------------------------------------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | ` | Q | W | E | R | T | - | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | Tab | A | S | D | F | G | Del | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | Space| | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | Ctrl | GUI | ALt | EISU |||||||| Lower| Space| Del |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_QWERTY] = LAYOUT( - KC_ESC, C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), C(KC_F5), C(KC_F10), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, C(KC_F11), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, C(KC_F6), C(KC_F7), C(KC_F8), C(KC_F9), KC_B, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LCTL, KC_LALT, XXXXXXX, XXXXXXX, LOWER, KC_DOWN, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Lower - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Raise - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - /* Adjust - * ,----------------------------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | Reset|RGB ON| MODE| HUE-| HUE+| | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | BL ON| BRTG| INC| DEC| | | | | | | | | | - * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| - * | | | | |||||||| | | |||||||| | | |||||||| | | | | - * ,----------------------------------------------------------------------------------------------------------------------. - */ - [_ADJUST] = LAYOUT( - _______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,_______, _______, _______, _______, _______, _______, _______, _______, - _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______,_______,_______, _______,_______, _______, _______, _______, _______, _______ - ) -}; - -#ifdef AUDIO_ENABLE -float tone_qwerty[][2] = SONG(QWERTY_SOUND); -#endif - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; - case LOWER: - if (record->event.pressed) { - layer_on(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_LOWER); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case RAISE: - if (record->event.pressed) { - layer_on(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } else { - layer_off(_RAISE); - update_tri_layer(_LOWER, _RAISE, _ADJUST); - } - return false; - break; - case ADJUST: - if (record->event.pressed) { - layer_on(_ADJUST); - } else { - layer_off(_ADJUST); - } - return false; - break; - } - return true; -} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk b/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk deleted file mode 100644 index 43e9f70e3d5..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/keymaps/via/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -AUDIO_ENABLE = no - -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.c b/keyboards/ciaanh/ergodash/rev1/rev1.c deleted file mode 100644 index 00f81cae117..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/rev1.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "ergodash.h" - -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - -void matrix_init_kb(void) { - - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - - // // green led on - // DDRD |= (1<<5); - // PORTD &= ~(1<<5); - - // // orange led on - // DDRB |= (1<<0); - // PORTB &= ~(1<<0); - - matrix_init_user(); -}; - -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.h b/keyboards/ciaanh/ergodash/rev1/rev1.h deleted file mode 100644 index 7f094534cc3..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/rev1.h +++ /dev/null @@ -1,139 +0,0 @@ -#pragma once - -#include "ergodash.h" - -#include "quantum.h" - -#ifdef USE_I2C -#include -#ifdef __AVR__ - #include - #include -#endif -#endif - -#define XXX KC_NO - -#ifndef FLIP_HALF -// Standard Keymap -// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -# define LAYOUT_4key( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -// Just defined for configurator support, the matrix is identical to LAYOUT_4key -# define LAYOUT_4key_2u_inner( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -# define LAYOUT_3key_2us( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, XXX }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} - -# define LAYOUT_3key_1us( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, XXX }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, XXX } \ -} - -# define LAYOUT_2key( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, XXX }, \ - { L40, L41, L42, L43, L44, L45, XXX }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, XXX }, \ - { R46, R45, R44, R43, R42, R41, XXX } \ -} - -#define LAYOUT LAYOUT_4key - -#else -// Keymap with right side flipped -// (TRRS jack on both halves are to the right) -# define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} -#endif diff --git a/keyboards/ciaanh/ergodash/rev1/rules.mk b/keyboards/ciaanh/ergodash/rev1/rules.mk deleted file mode 100644 index bb9e33b0829..00000000000 --- a/keyboards/ciaanh/ergodash/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rules.mk b/keyboards/ciaanh/ergodash/rules.mk deleted file mode 100644 index a09b78c5280..00000000000 --- a/keyboards/ciaanh/ergodash/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes # Enables split keyboard support - -DEFAULT_FOLDER = ciaanh/ergodash/rev1 - diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md index af466f9cf1f..25d925dc550 100644 --- a/keyboards/ciaanh/kanagawa/readme.md +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -1,8 +1,6 @@ -https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk - # Kanagawa -A 75% keyboard with oled and rotary encoder for Elite-C +A 75% keyboard with oled and rotary encoder for Raspberry Pico Keyboard Maintainer : Ciaanh @@ -21,9 +19,5 @@ qmk compile -kb ciaanh/kanagawa/ansi -km default ## Bootloader -Enter the bootloader in 4 ways: - -* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up. -* **Physical reset button**: Press twice the button on the side while the board is connected. -* **BOOT button** Hold down the rotary encoder push-button on power-up or reset. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. +* **Bootmagic reset**: Hold down the rotary encoder push-button on power-up. +* **Physical buttons**: Press both the reset and the Bootsel button on the back while the board is connected. diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h deleted file mode 100644 index 8600fa9a31e..00000000000 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ /dev/null @@ -1,73 +0,0 @@ -#pragma once - -/* OLED SPI Defines */ -#ifdef OLED_ENABLE -# define OLED_DISPLAY_128X32 -# define OLED_FONT_H "lib/oledfont.c" -# define OLED_FONT_END 255 -# define OLED_DISPLAY_ADDRESS 0x3C - -/* I2C Conf */ -# define I2C_DRIVER I2CD0 -# define I2C1_SDA_PIN GP0 -# define I2C1_SCL_PIN GP1 -#endif - - - -#ifdef RGB_MATRIX_ENABLE - /* RGB Defines */ -# define RGB_DI_PIN GP4 -# define RGB_MATRIX_LED_COUNT 83 - - /* Enable Framebuffer and keypress effects */ -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_KEYPRESSES - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif - - - diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json deleted file mode 100644 index 9c124ae684f..00000000000 --- a/keyboards/ciaanh/kanagawa2040/info.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "keyboard_name": "Kanagawa", - "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", - "manufacturer": "Ciaanh", - "maintainer": "Ciaanh", - "usb": { - "vid": "0xC1E0", - "pid": "0x0010", - "device_version": "2.1.0" - }, - "bootmagic": { - "matrix": [0, 13] - }, - "encoder": { - "rotary": [ - {"pin_a": "GP2", "pin_b": "GP3"} - ] - }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], - "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] - }, - "processor": "RP2040", - "bootloader": "rp2040", - - "layouts": { - "LAYOUT_84_ansi": { - "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, - { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, - - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1 }, - { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, - { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, - - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2 }, - { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, - { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3 }, - { "label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, - - { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25 }, - { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4 }, - { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4 }, - { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4 }, - { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4 }, - { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4 }, - { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4 }, - { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4 }, - { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4 }, - { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4 }, - { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4 }, - { "label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75 }, - { "label": "Up", "matrix": [4, 12], "x": 14.25, "y": 4.25}, - - { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25 }, - { "label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5 }, - { "label": "Alt", "matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25 }, - { "label": "Dwn", "matrix": [5, 3], "x": 4, "y": 5 }, - { "label": "LSpace", "matrix": [5, 4], "x": 5, "y": 5.5, "w": 2 }, - { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2 }, - { "label": "Up", "matrix": [5, 6], "x": 9, "y": 5 }, - { "label": "RAlt", "matrix": [5, 7], "x": 10, "y": 5 }, - { "label": "Code", "matrix": [5, 8], "x": 11, "y": 5 }, - { "label": "Ctrl", "matrix": [5, 9], "x": 12, "y": 5 }, - { "label": "Left", "matrix": [5, 10], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 12], "x": 15.25, "y": 5.25 } - ] - } - } -} diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c b/keyboards/ciaanh/kanagawa2040/kanagawa2040.c deleted file mode 100644 index 8cc28eb14f3..00000000000 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "kanagawa2040.h" - -#ifdef RGB_MATRIX_ENABLE - -#define NA NO_LED - -/* RGB Positioning */ -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NO_LED }, - { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, - { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 70, 67 }, - { 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 69, 68 } - }, - - { - // LED Index to Physical Position - {182, 0}, {168, 0}, {154, 0}, {140, 0}, {123, 0}, {109, 0}, { 95, 0}, { 81, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, - {189,12}, {168,12}, {154,12}, {140,12}, {126,12}, {112,12}, { 98,12}, { 84,12}, { 70,12}, { 56,12}, { 42,12}, { 28,12}, { 14,12}, { 0,12}, - {193,23}, {175,23}, {161,23}, {147,23}, {133,23}, {119,23}, {105,23}, { 91,23}, { 77,23}, { 63,23}, { 49,23}, { 35,23}, { 21,23}, { 4,23}, - {186,35}, {165,35}, {151,35}, {137,35}, {123,35}, {109,35}, { 95,35}, { 81,35}, { 67,35}, { 53,35}, { 39,35}, { 25,35}, { 5,35}, - {177,47}, {158,47}, {144,47}, {130,47}, {116,47}, {102,47}, { 88,47}, { 74,47}, { 60,47}, { 46,47}, { 32,47}, { 9,47}, - {224,12}, - {224,23}, - {224,35}, - {217,64}, {203,52}, - {203,64}, {189,64}, {168,58}, {154,58}, {140,58}, {123,60}, {102,64}, { 74,64}, { 53,60}, { 32,58}, { 16,58}, { 2,58} - - }, - - { - // LED Index to Flag - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, - 4, - 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - }}; -#endif - - diff --git a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h b/keyboards/ciaanh/kanagawa2040/kanagawa2040.h deleted file mode 100644 index a786461d2a2..00000000000 --- a/keyboards/ciaanh/kanagawa2040/kanagawa2040.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h deleted file mode 100644 index 34cc0798c31..00000000000 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keycodes.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -enum layers -{ - _BASE, - _LOWER, - _UPPER, - _CODE -}; - -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, - NEW_SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_CODE TG(_CODE) - -#define L_UP MO(_UPPER) -#define L_DWN MO(_LOWER) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c deleted file mode 100644 index e15b427f843..00000000000 --- a/keyboards/ciaanh/kanagawa2040/keymaps/default/keymap.c +++ /dev/null @@ -1,253 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keycodes.h" - -/* Keyboard layout - ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. - | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | - `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' - ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. - | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| - | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| - | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' - | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | - | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. - |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | - `---------+---------' `---------+---------' `---------+---------+---------' -*/ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Keymap: BASE -* -* -* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. -* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | -* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' -* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. -* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| -* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| -* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' -* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | -* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. -* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | -* `---------+---------' `---------+---------' `---------+---------+---------' -* -* -*/ - [_BASE] = LAYOUT_84_ansi( - KC_ESC, 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_MPLY, \ - - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - - [_LOWER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - - [_UPPER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - [_CODE] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ - ), - -}; - - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -#ifdef OLED_ENABLE - // oled_rotation_t oled_init_user(oled_rotation_t rotation) { - // return OLED_ROTATION_180; - // } - - static void render_status(void) { - // 21 characters per line - // 16 cols / 4 rows - - oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); - //oled_write_ln("", false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _LOWER: - oled_write_P(PSTR("[Low]\n"), false); - break; - case _UPPER: - oled_write_P(PSTR("[Up]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - // oled_write_P(PSTR(" "), false); - - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - } - - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } - - bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_UPPER] = { ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }, - [_CODE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, -}; -#endif - -// #ifdef ENCODER_ENABLE -// bool encoder_update_kb(uint8_t index, bool clockwise) { -// if (!encoder_update_user(index, clockwise)) { return false; } -// if (index == 0) { -// if (clockwise) { -// tap_code_delay(KC_VOLU, 10); -// } else { -// tap_code_delay(KC_VOLD, 10); -// } -// } -// return true; -// } -// #endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa2040/lib/oledfont.c b/keyboards/ciaanh/kanagawa2040/lib/oledfont.c deleted file mode 100644 index 153007ef1a3..00000000000 --- a/keyboards/ciaanh/kanagawa2040/lib/oledfont.c +++ /dev/null @@ -1,277 +0,0 @@ -#include "progmem.h" - - - -const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => - - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / - - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? - - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O - - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ - - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o - - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => - 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => - 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => - 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => - 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => - 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => - 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => - 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => - 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => - 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => - 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => - - 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => - 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => - 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => - 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => - 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => - 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => - 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => - 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => - 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => - 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => - 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => - 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => - 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => - 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => - 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => - - 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => - 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => - 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => - 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => - 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => - 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => - 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => - 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => - 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => - 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => - 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => - 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => - 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => - 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => - 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => - 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => - 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => - 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => - - 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => - 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => - 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => - 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => -}; diff --git a/keyboards/ciaanh/kanagawa2040/mcuconf.h b/keyboards/ciaanh/kanagawa2040/mcuconf.h deleted file mode 100644 index f6378664da8..00000000000 --- a/keyboards/ciaanh/kanagawa2040/mcuconf.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include_next - -#undef RP_I2C_USE_I2C0 -#define RP_I2C_USE_I2C0 TRUE - -#undef RP_I2C_USE_I2C1 -#define RP_I2C_USE_I2C1 FALSE diff --git a/keyboards/ciaanh/kanagawa2040/readme.md b/keyboards/ciaanh/kanagawa2040/readme.md deleted file mode 100644 index f4c50935169..00000000000 --- a/keyboards/ciaanh/kanagawa2040/readme.md +++ /dev/null @@ -1,37 +0,0 @@ -https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk - -qmk compile -kb ciaanh/kanagawa2040 -km default - -# Ciaanh Kanagawa2040 - - -```sh -qmk compile -kb ciaanh/kanagawa2040 -km default -``` - -# Kanagawa - -A 75% keyboard with oled and rotary encoder for Elite-C - - Keyboard Maintainer : Ciaanh - - Hardware Supported : Kanagawa PCB - - Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa - - -Make example for this keyboard (after setting up your build environment): - - qmk compile -kb ciaanh/kanagawa -km default - -Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader - - -## Bootloader - -Enter the bootloader in 4 ways: - -* **Bootmagic reset**: Hold down the key just bellow the rotary encoder push-button on power-up. -* **Physical reset button**: Press twice the button on the side while the board is connected. -* **BOOT button** Hold down the rotary encoder push-button on power-up or reset. -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk deleted file mode 100644 index 20fcc9172ab..00000000000 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ /dev/null @@ -1,29 +0,0 @@ -# RP2040-specific options -ALLOW_WARNINGS = yes -PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. - -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - -ENCODER_ENABLE = yes - -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 -WS2812_DRIVER = vendor - -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 - -OPT_DEFS += -DHAL_USE_I2C=TRUE - -ENCODER_MAP_ENABLE = yes - -LTO_ENABLE = no # reduce size \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/config.h b/keyboards/ciaanh/kanagawalegacy/config.h deleted file mode 100644 index b8c5759db6b..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "config_common.h" diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c deleted file mode 100644 index 335e9a9ca03..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c +++ /dev/null @@ -1 +0,0 @@ -#include "kanagawalegacy.h" diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h deleted file mode 100644 index ba5fde6eaff..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_ciaanh_kanagawalegacy_rev1 - #include "rev1.h" -#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h deleted file mode 100644 index 271f48d0011..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -// place overrides here diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h deleted file mode 100644 index f77fe122b44..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -enum layers -{ - _BASE, - _LOWER, - _UPPER, - _CODE -}; - -enum custom_keycodes -{ - ENCODER = SAFE_RANGE, - NEW_SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_CODE TG(_CODE) - -#define L_UP MO(_UPPER) -#define L_DWN MO(_LOWER) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c deleted file mode 100644 index 69e3b515a3a..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c +++ /dev/null @@ -1,258 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keycodes.h" - -/* Keyboard layout - ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. - | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | - `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' - ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. - | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| - | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| - | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' - | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | - | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. - |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | - `---------+---------' `---------+---------' `---------+---------+---------' -*/ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Keymap: BASE -* -* -* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. -* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | -* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' -* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. -* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| -* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| -* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' -* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | -* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. -* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | -* `---------+---------' `---------+---------' `---------+---------+---------' -* -* -*/ - [_BASE] = LAYOUT_84_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ - - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - - - [_CODE] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - - [_LOWER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - - [_UPPER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ) - - - -}; - - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -#ifdef OLED_ENABLE - // oled_rotation_t oled_init_user(oled_rotation_t rotation) { - // return OLED_ROTATION_180; - // } - - static void render_status(void) { - // 21 characters per line - // 16 cols / 8 rows - - oled_write_P(PSTR(" Kanagawa rev 1.1 "), false); - //oled_write_ln("", false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _LOWER: - oled_write_P(PSTR("[Low]\n"), false); - break; - case _UPPER: - oled_write_P(PSTR("[Up]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - // oled_write_P(PSTR(" "), false); - - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - } - - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } - - bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ENCODER: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - -#ifdef ENCODER_ENABLE - bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case _CODE: - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - break; - default: - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - break; - } - } - return true; - } -#endif diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk deleted file mode 100644 index 84b40dd3533..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -ENCODER_ENABLE = yes -OLED_ENABLE = yes - -CONSOLE_ENABLE = no -LTO_ENABLE = yes -MOUSEKEY_ENABLE = no \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h deleted file mode 100644 index f77fe122b44..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -enum layers -{ - _BASE, - _LOWER, - _UPPER, - _CODE -}; - -enum custom_keycodes -{ - ENCODER = SAFE_RANGE, - NEW_SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_CODE TG(_CODE) - -#define L_UP MO(_UPPER) -#define L_DWN MO(_LOWER) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c deleted file mode 100644 index cdd5efa4a7f..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c +++ /dev/null @@ -1,211 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keycodes.h" - -/* Keyboard layout - ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. - | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | - `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' - ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. - | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| - | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| - | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' - | ke0 | ke1 | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ,---------. - |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | ke12 | - | kf0 | kf1 | kf2 | ,-------------------. ,-------------------. | kf7 | kf8 | kf9 | ,---------|---------|---------. - |---------+---------+---------+ | kf3 | kf4 | | kf5 | kf6 | +---------+---------+---------' | kf10 | kf11 | kf12 | - `---------+---------' `---------+---------' `---------+---------+---------' -*/ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Keymap: BASE -* -* -* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. -* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | -* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' -* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. -* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| -* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| -* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' `---------' -* | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| | UP | -* | LCtrl | LGUI | LAlt | ,-------------------. ,-------------------. | RAlt | CODE | RCtrl | ,---------|---------|---------. -* |---------+---------+---------+ | Lower | Space | | Space | Upper | +---------+---------+---------' | LEFT | DOWN | RIGHT | -* `---------+---------' `---------+---------' `---------+---------+---------' -* -* -*/ - [_BASE] = LAYOUT_84_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ENCODER, /*KC_MPLY*/ \ - - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_DWN, KC_SPC, KC_SPC, L_UP, KC_RALT, TO_CODE, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ - ), - - - [_CODE] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - - [_LOWER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), - - - [_UPPER] = LAYOUT_84_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ) - - - -}; - - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -#ifdef OLED_ENABLE - static void render_status(void) { - oled_write_P(PSTR(" Kanagawa rev 1.1v "), false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _LOWER: - oled_write_P(PSTR("[Low]\n"), false); - break; - case _UPPER: - oled_write_P(PSTR("[Up]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - } - - bool oled_task_user(void) { - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ENCODER: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - -#ifdef ENCODER_ENABLE - bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - switch (get_highest_layer(layer_state)) { - case _CODE: - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - break; - default: - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - break; - } - } - return true; - } -#endif diff --git a/keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk deleted file mode 100644 index d43b4d8b5d4..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -ENCODER_ENABLE = yes -OLED_ENABLE = yes - -VIA_ENABLE = yes -BOOTMAGIC_ENABLE = lite -LTO_ENABLE = yes -MOUSEKEY_ENABLE = no \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/lib/oledfont.c b/keyboards/ciaanh/kanagawalegacy/lib/oledfont.c deleted file mode 100644 index 153007ef1a3..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/lib/oledfont.c +++ /dev/null @@ -1,277 +0,0 @@ -#include "progmem.h" - - - -const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => - - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / - - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? - - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O - - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ - - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o - - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => - 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => - 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => - 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => - 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => - 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => - 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => - 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => - 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => - 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => - 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => - - 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => - 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => - 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => - 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => - 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => - 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => - 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => - 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => - 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => - 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => - 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => - 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => - 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => - 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => - 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => - - 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => - 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => - 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => - 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => - 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => - 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => - 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => - 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => - 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => - 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => - 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => - 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => - 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => - 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => - 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => - 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => - 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => - 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => - - 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => - 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => - 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => - 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => -}; diff --git a/keyboards/ciaanh/kanagawalegacy/readme.md b/keyboards/ciaanh/kanagawalegacy/readme.md deleted file mode 100644 index 086f1353b41..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# Kanagawa - -A 75% keyboard with oled and rotary encoder for Elite-C - - Keyboard Maintainer : Ciaanh - - Hardware Supported : Kanagawa PCB - - Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa - - -Make example for this keyboard (after setting up your build environment): - - qmk compile -kb ciaanh/kanagawa -km default - -Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader diff --git a/keyboards/ciaanh/kanagawalegacy/rev1/config.h b/keyboards/ciaanh/kanagawalegacy/rev1/config.h deleted file mode 100644 index d2e6b04e41e..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rev1/config.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC1E0 -#define PRODUCT_ID 0x0010 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ciaanh -#define PRODUCT Kanagawa - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 14 - -#define MATRIX_ROW_PINS { B2, B3, B1, F7, F6, F5 } -#define MATRIX_COL_PINS { B6, F0, F1, C7, D5, B7, B5, B4, E6, D7, C6, D4, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#ifdef OLED_ENABLE -# define OLED_DISPLAY_128X64 -# define OLED_FONT_H "lib/oledfont.c" -# define OLED_FONT_END 255 -// # define OLED_DISPLAY_ADDRESS 0x78 -#endif - -/* encoder support */ -#define ENCODERS_PAD_A \ - { B0 } -#define ENCODERS_PAD_B \ - { F4 } -#define ENCODERS_PAD_A_RIGHT \ - { F4 } -#define ENCODERS_PAD_B_RIGHT \ - { B0 } -#define ENCODER_RESOLUTION 2 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -// #define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -// #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json b/keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json deleted file mode 100644 index 0551efec13d..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "Kanagawa", - "vendorId": "0xC1E0", - "productId": "0x0010", - "lighting": "none", - "matrix": { "rows": 6, "cols": 14 }, - "layouts": { - "keymap": [ - [{ "c": "#777777" }, "0,0", { "x": 0.5, "c": "#cccccc" }, "0,1", "0,2", "0,3", "0,4", { "x": 0.25 }, "0,5", "0,6", "0,7", "0,8", { "x": 0.25 }, "0,9", "0,10", "0,11", "0,12", { "x": 2.25, "c": "#777777" }, "0,13"], - [{ "y": 0.25, "c": "#cccccc" }, "1,0", "1,1", "1,2", "1,3", "1,4", "1,5", "1,6", "1,7", "1,8", "1,9", "1,10", "1,11", "1,12", { "c": "#aaaaaa", "w": 2 }, "1,13", { "x": 1.25, "c": "#777777" }, "3,13"], - [{ "c": "#aaaaaa", "w": 1.5 }, "2,0", { "c": "#cccccc" }, "2,1", "2,2", "2,3", "2,4", "2,5", "2,6", "2,7", "2,8", "2,9", "2,10", "2,11", "2,12", { "w": 1.5 }, "2,13", { "x": 1.25, "c": "#777777" }, "4,13"], - [{ "c": "#aaaaaa", "w": 1.75 }, "3,0", { "c": "#cccccc" }, "3,1", "3,2", "3,3", "3,4", "3,5", "3,6", "3,7", "3,8", "3,9", "3,10", "3,11", { "c": "#777777", "w": 2.25 }, "3,12", { "x": 1.25 }, "5,13"], - [{ "c": "#aaaaaa", "w": 2.25 }, "4,0", { "c": "#cccccc" }, "4,1", "4,2", "4,3", "4,4", "4,5", "4,6", "4,7", "4,8", "4,9", "4,10", { "c": "#aaaaaa", "w": 1.75 }, "4,11"], - [{ "y": -0.75, "x": 14.25, "c": "#777777" }, "4,12"], - [{ "y": -0.25, "c": "#aaaaaa", "w": 1.25 }, "5,0", "5,1", { "w": 1.25 }, "5,2", { "x": 6.5 }, "5,7", "5,8", "5,9"], - [{ "y": -0.75, "x": 13.25, "c": "#777777" }, "5,10", "5,11", "5,12"], - [{ "r": 15, "rx": 3.75, "ry": 5.5, "y": -0.25 }, "5,3", { "w": 2 }, "5,4"], - [{ "r": -15, "rx": 9.75, "y": -0.25, "x": -3, "w": 2 }, "5,5", "5,6"] - ] - } -} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/rev1/rev1.c b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.c deleted file mode 100644 index fd021581d38..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "kanagawa.h" - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { return encoder_update_user(index, clockwise); } -#endif - -void matrix_init_kb(void) { matrix_init_user(); }; - -void shutdown_user(void) { } \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawalegacy/rev1/rev1.h b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.h deleted file mode 100644 index ca8c09b2804..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rev1/rev1.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#include "quantum.h" - - -/* This a shortcut to help you visually see your layout. -* -* The first section contains all of the arguments representing the physical -* layout of the board and position of the K4ys. -* -* The second converts the arguments into a two-dimensional array which -* represents the switch matrix. -*/ -#define LAYOUT_84_ansi( \ - K00, K01,K02,K03,K04, K05,K06,K07,K08, K09,K010,K011,K012, K013, \ - \ - K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K110,K111,K112, K113 , K313, \ - K20 ,K21,K22,K23,K24,K25,K26,K27,K28,K29,K210,K211,K212, K213 , K413, \ - K30 ,K31,K32,K33,K34,K35,K36,K37,K38,K39,K310,K311, K312 , K513, \ - K40 ,K41,K42,K43,K44,K45,K46,K47,K48,K49,K410, K411 , K412, \ - K50 ,K51,K52 , K53,K54 , K55,K56, K57 ,K58,K59 , K510, K511, K512 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412, K413 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K510, K511, K512, K513 } \ -} diff --git a/keyboards/ciaanh/kanagawalegacy/rev1/rules.mk b/keyboards/ciaanh/kanagawalegacy/rev1/rules.mk deleted file mode 100644 index df78121d9c3..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rev1/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -ENCODER_ENABLE = no -OLED_ENABLE = no - diff --git a/keyboards/ciaanh/kanagawalegacy/rules.mk b/keyboards/ciaanh/kanagawalegacy/rules.mk deleted file mode 100644 index 731daafcd52..00000000000 --- a/keyboards/ciaanh/kanagawalegacy/rules.mk +++ /dev/null @@ -1,33 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = qmk-dfu - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -OLED_ENABLE = no - -DEFAULT_FOLDER = ciaanh/kanagawa/rev1 diff --git a/keyboards/ciaanh/pallas/config.h b/keyboards/ciaanh/pallas/config.h deleted file mode 100644 index e465a5b4f21..00000000000 --- a/keyboards/ciaanh/pallas/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "config_common.h" \ No newline at end of file diff --git a/keyboards/ciaanh/pallas/lib/oledfont.c b/keyboards/ciaanh/pallas/lib/oledfont.c deleted file mode 100644 index bc10ba86aa4..00000000000 --- a/keyboards/ciaanh/pallas/lib/oledfont.c +++ /dev/null @@ -1,282 +0,0 @@ -#include "progmem.h" - - - - - - - - -const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => - - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / - - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? - - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O - - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ - - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o - - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => - 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => - 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => - 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => - 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => - 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => - 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => - 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => - 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => - 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => - 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => - - 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => - 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => - 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => - 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => - 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => - 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => - 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => - 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => - 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => - 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => - 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => - 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => - 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => - 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => - 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => - - 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => - 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => - 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => - 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => - 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => - 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => - 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => - 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => - 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => - 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => - 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => - 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => - 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => - 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => - 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => - 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => - 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => - 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => - - 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => - 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => - 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => - 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => -}; diff --git a/keyboards/ciaanh/pallas/pallas.c b/keyboards/ciaanh/pallas/pallas.c deleted file mode 100644 index a1b7c5e68a4..00000000000 --- a/keyboards/ciaanh/pallas/pallas.c +++ /dev/null @@ -1 +0,0 @@ -#include "pallas.h" diff --git a/keyboards/ciaanh/pallas/pallas.h b/keyboards/ciaanh/pallas/pallas.h deleted file mode 100644 index e292e5ee745..00000000000 --- a/keyboards/ciaanh/pallas/pallas.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_ciaanh_pallas_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/ciaanh/pallas/readme.md b/keyboards/ciaanh/pallas/readme.md deleted file mode 100644 index 79b85c79e8a..00000000000 --- a/keyboards/ciaanh/pallas/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# Pallas - -A 75 key variant of the Alice keyboard designed for Elite-C - - Keyboard Maintainer : Ciaanh - - Hardware Supported : Pallas PCB - - Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Pallas - - -Make example for this keyboard (after setting up your build environment): - - qmk compile -kb ciaanh/pallas -km default - -Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader diff --git a/keyboards/ciaanh/pallas/rev1/config.h b/keyboards/ciaanh/pallas/rev1/config.h deleted file mode 100644 index ea3f9742bfc..00000000000 --- a/keyboards/ciaanh/pallas/rev1/config.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - -#include "config_common.h" - -/* USB Device descriptor parameter */ - -#define VENDOR_ID 0xC1E0 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ciaanh -#define PRODUCT Pallas -#define DESCRIPTION Extended Alice - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -// wiring of each half -#define MATRIX_ROW_PINS { B7, D5, C7, F1, F0 } -#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#ifdef OLED_ENABLE - #define OLED_DISPLAY_128X64 - #define OLED_FONT_H "lib/oledfont.c" - #define OLED_FONT_END 255 -#endif - -#ifdef BACKLIGHT_ENABLE - #define BACKLIGHT_PIN B5 - #define BACKLIGHT_LEVELS 4 -#endif - -#ifdef RGBLIGHT_ENABLE - /* ws2812 RGB LED */ - #define RGB_DI_PIN B0 - #define RGBLED_NUM 4 - #define RGBLIGHT_LED_MAP { 0, 1, 2, 3} - - #define RGBLIGHT_ANIMATIONS - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 -#endif - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ciaanh/pallas/rev1/info.json b/keyboards/ciaanh/pallas/rev1/info.json deleted file mode 100644 index 0cf50600121..00000000000 --- a/keyboards/ciaanh/pallas/rev1/info.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "keyboard_name": "Pallas rev 0", - "url": "", - "maintainer": "ciaanh", - "width": 25.25, - "height": 10.2, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "0.2", "x": 3.75, "y": 0.89 }, - { "label": "0.11", "x": 20.25, "y": 0.89 }, - { "label": "0.14", "x": 23.5, "y": 0.89 }, - { "label": "0.0", "x": 1.75, "y": 1 }, - { "label": "0.1", "x": 2.75, "y": 1 }, - { "label": "0.12", "x": 21.25, "y": 1 }, - { "label": "0.13", "x": 22.25, "y": 1 }, - { "label": "1.0", "x": 1.5, "y": 2, "w": 1.5 }, - { "label": "1.1", "x": 3, "y": 2 }, - { "label": "1.12", "x": 21, "y": 2 }, - { "label": "1.13", "x": 22, "y": 2 }, - { "label": "1.14", "x": 23, "y": 2 }, - { "label": "2.0", "x": 1.25, "y": 3, "w": 1.75 }, - { "label": "2.1", "x": 3, "y": 3 }, - { "label": "2.12", "x": 21, "y": 3 }, - { "label": "2.13", "x": 22, "y": 3 }, - { "label": "2.14", "x": 23, "y": 3, "w": 2.25 }, - { "label": "2.14", "x": 23.5, "y": 3, "w": 1.25, "h": 2 }, - { "label": "1.6", "x": 11, "y": 3.25 }, - { "label": "1.7", "x": 12, "y": 3.25 }, - { "label": "3.8", "x": 13, "y": 3.25 }, - { "label": "3,0", "x": 1, "y": 4, "w": 2.25 }, - { "label": "3.1", "x": 3.25, "y": 4 }, - { "label": "3.13", "x": 20.75, "y": 4 }, - { "label": "3.14", "x": 21.75, "y": 4, "w": 1.75 }, - { "label": "2.6", "x": 11, "y": 4.25 }, - { "label": "2.7", "x": 12, "y": 4.25 }, - { "label": "4.8", "x": 13, "y": 4.25 }, - { "label": "4.1", "x": 2.5, "y": 5, "w": 1.25 }, - { "label": "4.0", "x": 1, "y": 5.25, "w": 1.25 }, - { "label": "3.6", "x": 11, "y": 5.25 }, - { "label": "3.7", "x": 12, "y": 5.25 }, - { "label": "4.9", "x": 13, "y": 5.25 }, - { "label": "4.14", "x": 22.75, "y": 5.25, "w": 1.25 }, - { "label": "4.6", "x": 11, "y": 6.25 }, - { "label": "4.7", "x": 12, "y": 6.25 }, - { "label": "4.10", "x": 13, "y": 6.25 }, - { "label": "0.3", "x": 5.1, "y": 0 }, - { "label": "0.4", "x": 6.1, "y": 0 }, - { "label": "0.5", "x": 7.1, "y": 0 }, - { "label": "0.6", "x": 8.1, "y": 0 }, - { "label": "1.2", "x": 4.55, "y": 1 }, - { "label": "1.3", "x": 5.55, "y": 1 }, - { "label": "1.4", "x": 6.55, "y": 1 }, - { "label": "1.5", "x": 7.55, "y": 1 }, - { "label": "2.2", "x": 4.75, "y": 2 }, - { "label": "2.3", "x": 5.75, "y": 2 }, - { "label": "2.4", "x": 6.75, "y": 2 }, - { "label": "2.5", "x": 7.75, "y": 2 }, - { "label": "3.2", "x": 5.22, "y": 3 }, - { "label": "3.3", "x": 6.22, "y": 3 }, - { "label": "3.4", "x": 7.22, "y": 3 }, - { "label": "3.5", "x": 8.22, "y": 3 }, - { "label": "4.3", "x": 6.5, "y": 4 }, - { "label": "4.4", "x": 7.75, "y": 4, "w": 2 }, - { "label": "4.2", "x": 5, "y": 4.1, "w": 1.25 }, - { "label": "4.5", "x": 0.25, "y": 4.1, "w": 1.25 }, - { "label": "4.11", "x": -1.5, "y": 4.1, "w": 1.25 }, - { "label": "0.7", "x": -9.1, "y": 5.1 }, - { "label": "0.8", "x": -8.1, "y": 5.1 }, - { "label": "0.9", "x": -7.1, "y": 5.1 }, - { "label": "0.10", "x": -6.1, "y": 5.1 }, - { "label": "1.8", "x": -8.55, "y": 6.1 }, - { "label": "1.9", "x": -7.550000000000001, "y": 6.1 }, - { "label": "1.10", "x": -6.550000000000001, "y": 6.1 }, - { "label": "1.11", "x": -5.550000000000001, "y": 6.1 }, - { "label": "2.8", "x": -8.75, "y": 7.1 }, - { "label": "2.9", "x": -7.75, "y": 7.1 }, - { "label": "2.10", "x": -6.75, "y": 7.1 }, - { "label": "2.11", "x": -5.75, "y": 7.1 }, - { "label": "3.9", "x": -9.22, "y": 8.1 }, - { "label": "3.10", "x": -8.22, "y": 8.1 }, - { "label": "3.11", "x": -7.220000000000001, "y": 8.1 }, - { "label": "3.12", "x": -6.220000000000001, "y": 8.1 }, - { "label": "4.12", "x": -9.75, "y": 9.1, "w": 2.75 }, - { "label": "4.13", "x": -6.25, "y": 9.2, "w": 1.25 } - ] - } - } -} diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h b/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h deleted file mode 100644 index 271f48d0011..00000000000 --- a/keyboards/ciaanh/pallas/rev1/keymaps/default/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -// place overrides here diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h b/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h deleted file mode 100644 index 6951774fd53..00000000000 --- a/keyboards/ciaanh/pallas/rev1/keymaps/default/keycodes.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -enum layers -{ - _BASE, - _FN, - _VS, - _CODE, - _TOOLS, - _LEFT, - _RIGHT -}; - -enum custom_keycodes -{ - VS_FRM = SAFE_RANGE, - COMM, - UNCOMM, - NEW_SAFE_RANGE, -}; - - -#define _SAVE LCTL(KC_S) - -#define VSC_FRM LSFT(LALT(KC_F)) -#define VSC_TRM LCTL(KC_GRV) -#define VSC_COM LCTL(KC_P) - -#define VS_INT LCTL(KC_J) -#define VS_QW LSFT(KC_F9) -#define VS_PEEK LALT(KC_F12) -#define VS_GREF LCTL(KC_F12) - -#define SC_SF12 LSFT(KC_F12) - -#define TO_BASE TO(_BASE) -#define TO_FN TG(_FN) -#define TO_VS TG(_VS) -#define TO_CODE TG(_CODE) - -#define L_TOOLS MO(_TOOLS) - -#define L_LFT MO(_LEFT) -#define L_RGT MO(_RIGHT) - -#define _SCREENSHOT LSFT(LGUI(KC_S)) diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c b/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c deleted file mode 100644 index 8f013a15f6c..00000000000 --- a/keyboards/ciaanh/pallas/rev1/keymaps/default/keymap.c +++ /dev/null @@ -1,327 +0,0 @@ -#include QMK_KEYBOARD_H -#include "keycodes.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Keymap: BASE - * - * ,---------------------------------------------------- ------------------------------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | | 7 | 8 | 9 | 0 | - | = | \ | ` | - * |--------+-------+------+------+------+------+------+ ,-------+-------+-------. +------+------+------+------+------+------+--------+--------| - * | Tab | Q | W | E | R | T | | Pad_7 | Pad_8 | Pad_9 | | Y | U | I | O | P | [ | ] | - * |--------+-------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+--------+--------| - * | CapsL | A | S | D | F | G | | Pad_4 | Pad_5 | Pad_6 | | H | J | K | L | ; | ' | | - * |--------+-------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+--------+ Enter | - * | LShift | Z | X | C | V | B | | Pad_1 | Pad_2 | Pad_3 | | N | M | , | . | / | RShift | | - * |--------+-------+------+------+------+------+------+ +-------+-------+-------+ +------+------+------+------+------+------+--------+--------| - * | LCtrl | GUI | LAlt | RAlt | Del | | L_LFT| |KC_NLCK| Pad_0 |KC_PDOT| | L_RGT| | Space| | TO_FN| | _TOOLS | - * `-------------------------------------' `------' `-----------------------' `------' `------' `------' `--------' - * - */ - - [_BASE] = LAYOUT_Pallas( \ - KC_ESC , 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_BSLS, KC_GRV , \ - KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, \ - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P1, KC_P2, KC_P3, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_RALT, KC_BSPC, L_LFT, KC_NLCK, KC_P0,KC_PDOT, L_RGT, KC_SPC, TO_FN, L_TOOLS \ - ), - - - /* Keymap: FN - * - * ,---------------------------------------------------- ------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |--------+-------+------+------+------+------+------+ ,------+------+------. +------+------+------+------+------+------+--------+--------| - * | | | | | | | |KC_F10|KC_F11|KC_F12| | | | | | | | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+--------| - * | | | | | | | |KC_F7 |KC_F8 |KC_F9 | | | | | | | | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+ | - * | | | | | | | |KC_F4 |KC_F5 |KC_F6 | | | | | | | | | - * |--------+-------+------+------+------+------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+--------| - * | | | | | | | | |KC_F1 |KC_F2 |KC_F3 | | | | | | TO_VS| | | - * `-------------------------------------' `-----' `--------------------' `-----' `------' `------' `--------' - * - */ - - [_FN] = LAYOUT_Pallas( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F7, KC_F8, KC_F9, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F1, KC_F2, KC_F3, _______, _______, TO_VS, _______ \ - ), - - - - /* Keymap: VS - - Visual Studio - KC_F9 => add breakpoint - VS_QW => quick view - VS_PEEK => peek definition - VS_GREF => go to implementation - VS_INT => force show intellisense - VS_FRM => format code CTL+K,D CTL+K,E - - KC_F12 => go to definition - SC_SF12 => find references - - _SAVE => save CTL+S - - * - * ,------------------------------------------------------ -------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |--------+-------+------+------+------+------+--------+ ,------+------+-------. +------+------+------+------+-------+------+--------+--------| - * | | | | | | | | KC_F5|KC_F10| KC_F11| | | | | | | | | - * |--------+-------+------+------+------+------+ +------+------+-------+ +------+------+------+-------+------+--------+--------| - * | | | | | | | | KC_F9| VS_QW|SC_SF12| | | | | | | | | - * |--------+-------+------+------+------+------+ +------+------+-------+ +------+------+------+-------+------+--------+ | - * | | | | | | | |VS_INT| | KC_F12| | | | | | | | | - * |--------+-------+------+------+------+------+-------+ +------+------+-------+ +------+------+------+------+-------+------+--------+--------| - * | | | | | | | | |VS_FRM| _SAVE|VS_GREF| | | | | |TO_CODE| | | - * `-------------------------------------' `-------' `---------------------' `------' `------' `-------' `--------' - * - */ - [_VS] = LAYOUT_Pallas( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F5, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, KC_F9, VS_QW, SC_SF12, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, VS_INT, XXXXXXX, KC_F12, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, VS_FRM, _SAVE, VS_GREF, _______, _______, TO_CODE, _______ \ - ), - - - - - - /* Keymap: CODE - - VS Code - VSC_COM => Command palette - VSC_FRM => format code ALT+SHIFT+F - VSC_TRM => open terminal - - KC_F12 => go to definition - SC_SF12 => find references - - _SAVE => save CTL+S - - * - * ,----------------------------------------------------- --------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |--------+-------+------+------+------+------+-------+ ,-------+------+-------. +-------+------+------+------+-------+------+--------+--------| - * | | | | | | | |VSC_TRM| |VSC_COM| | | | | | | | | - * |--------+-------+------+------+------+------+ +-------+------+-------+ +------+------+------+-------+------+--------+--------| - * | | | | | | | | | |SC_SF12| | | | | | | | | - * |--------+-------+------+------+------+------+ +-------+------+-------+ +------+------+------+-------+------+--------+ | - * | | | | | | | | | | KC_F12| | | | | | | | | - * |--------+-------+------+------+------+------+-------+ +-------+------+-------+ +------+------+------+------+-------+------+--------+--------| - * | | | | | | | | |VSC_FRM| _SAVE| | | | | | |TO_BASE| | | - * `-------------------------------------' `-------' `----------------------' `------' `------' `-------' `--------' - * - */ - [_CODE] = LAYOUT_Pallas( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, VSC_TRM, XXXXXXX, VSC_COM, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, SC_SF12, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, KC_F12, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, VSC_FRM, _SAVE, XXXXXXX, _______, _______, TO_BASE, _______ \ - ), - - - - - /* Keymap: TOOLS - * - * ,---------------------------------------------------- -----------------------------------------------------------------. - * | | | | | | | | |TD_PSCR| | | |BLToggle|RGBToggl| RGB_MOD| | - * |--------+-------+------+------+------+------+------+ ,------+------+------. +-------+------+------+------+--------+--------+--------+--------| - * | | | | | | | | | | | | | | | Step |Hue Inc |Hue Dec | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+--------+--------+--------+--------| - * | | | | | | | | | | | | | | | Inc |Sat Inc |Sat Dec | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+--------+--------+--------+ | - * | | | | | | | | | | | | | | | Dec |Bright +|Bright -| | - * |--------+-------+------+------+------+------+-------+ +------+------+------+ +------+------+------+------+--------+--------+--------+--------| - * | | | |_TOOLS| | | | | | | | | | | | | Britg | | | - * `-------------------------------------' `-------' `--------------------' `------' `------' `--------' `--------' - * - */ - [_TOOLS] = LAYOUT_Pallas( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, RGB_TOG, RGB_MOD, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_STEP, RGB_HUI, RGB_HUD, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_INC, RGB_SAI, RGB_SAD, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, RGB_VAI, RGB_SPD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_BRTG, L_TOOLS \ - ), - - - - - /* Keymap: LEFT - * - * ,------------------------------------------------------ ------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | - * |--------+-------+------+-------+------+-------+------+ ,------+------+------. +------+------+------+------+------+------+--------+--------| - * | | | UP | | |KC_HOME| | | | | | | | | | | | | - * |--------+-------+------+-------+------+-------+ +------+------+------+ +------+------+------+------+------+--------+--------| - * | | LEFT | DOWN | RIGHT | | KC_END| | | | | | | | | | | | | - * |--------+-------+------+-------+------+-------+ +------+------+------+ +------+------+------+------+------+--------+ | - * | | < > | | | | | | | | | | | | | | | | | - * |--------+-------+------+-------+------+-------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+--------| - * | | | COMM| UNCOMM| F DEL| | | | | | | | | | | | | | | - * `--------------------------------------' `-----' `--------------------' `-----' `------' `------' `--------' - * - */ - - [_LEFT] = LAYOUT_Pallas( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, KC_UP , _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, KC_NUBS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, COMM, UNCOMM, KC_DEL, L_LFT, _______, _______, _______, L_RGT, _______, _______, _______ \ - ), - - - - /* Keymap: RIGHT - * - * ,---------------------------------------------------- ---------------------------------------------------------------. - * | | | | | | | | | | PREV | Play | NEXT | | |KC_PSCR| _SCREENSHOT| - * |--------+-------+------+------+------+------+------+ ,------+------+------. +------+------+------+------+------+------+--------+-----------| - * | | | | | | | | | | | |VOL DW| MUTE |VOL UP| | | | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+-----------| - * | | | | | | | | | | | | | | | | | | | - * |--------+-------+------+------+------+------+ +------+------+------+ +------+------+------+------+------+--------+ | - * | | | | | | | | | | | | | | | | | | | - * |--------+-------+------+------+------+------+-----+ +------+------+------+ +-----+------+------+------+------+------+--------+-----------| - * | | | | | | | | | | | | | | | | | | | | - * `-------------------------------------' `-----' `--------------------' `-----' `------' `------' `-----------' - * - */ - - [_RIGHT] = LAYOUT_Pallas( - _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR,_SCREENSHOT, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, L_LFT, _______, _______, _______, L_RGT, _______, _______, _______ \ - ) -}; - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case VS_FRM: - if (record->event.pressed) { - SEND_STRING(SS_LCTL("kdke")); - } else { - } - break; - - case COMM: - if (record->event.pressed) { - SEND_STRING(SS_LCTL("kc")); - } else { - } - break; - - case UNCOMM: - if (record->event.pressed) { - SEND_STRING(SS_LCTL("ku")); - } else { - } - break; - } - return true; -} - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ - -#ifdef OLED_ENABLE - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_180; -} - - -static void render_status(void) { - // 21 characters per line - // 16 cols / 8 rows - - oled_write_P(PSTR(" Pallas rev 0.3 "), false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("Default\n"), false); - break; - case _FN: - oled_write_P(PSTR("[F]\n"), false); - break; - case _VS: - oled_write_P(PSTR("Visual Studio\n"), false); - break; - case _CODE: - oled_write_P(PSTR("VS Code\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_P(PSTR(" "), false); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); - oled_write_ln("", false); -} - -static void render_pallas_logo(void) { - oled_set_cursor(0, 5); - - static const char PROGMEM pallas_logo[] = { - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - }; - - oled_write_P(pallas_logo, false); -} - - -bool oled_task_user(void) { - switch (get_highest_layer(layer_state)) { - case _TOOLS: - render_pallas_logo(); - break; - default: - render_status(); - } - - return false; -} -#endif diff --git a/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk b/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk deleted file mode 100644 index e41cb07da6d..00000000000 --- a/keyboards/ciaanh/pallas/rev1/keymaps/default/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/ciaanh/pallas/rev1/rev1.c b/keyboards/ciaanh/pallas/rev1/rev1.c deleted file mode 100644 index e1dc05329e5..00000000000 --- a/keyboards/ciaanh/pallas/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "pallas.h" - - -#ifdef SSD1306OLED -void led_set_kb(uint8_t usb_led) { - // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - led_set_user(usb_led); -} -#endif - -void matrix_init_kb(void) { - matrix_init_user(); -}; - -void shutdown_user(void) { - -} diff --git a/keyboards/ciaanh/pallas/rev1/rev1.h b/keyboards/ciaanh/pallas/rev1/rev1.h deleted file mode 100644 index 7f462616476..00000000000 --- a/keyboards/ciaanh/pallas/rev1/rev1.h +++ /dev/null @@ -1,24 +0,0 @@ -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. -* -* The first section contains all of the arguments representing the physical -* layout of the board and position of the keys. -* -* The second converts the arguments into a two-dimensional array which -* represents the switch matrix. -*/ -#define LAYOUT_Pallas( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k38, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k48, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k49, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k4a, k4b, k4c, k4d, k4e \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e } \ -} diff --git a/keyboards/ciaanh/pallas/rev1/rules.mk b/keyboards/ciaanh/pallas/rev1/rules.mk deleted file mode 100644 index 03c4a826250..00000000000 --- a/keyboards/ciaanh/pallas/rev1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -OLED_ENABLE = no - - diff --git a/keyboards/ciaanh/pallas/rules.mk b/keyboards/ciaanh/pallas/rules.mk deleted file mode 100644 index c926ee2fb93..00000000000 --- a/keyboards/ciaanh/pallas/rules.mk +++ /dev/null @@ -1,32 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = qmk-dfu - -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - -DEFAULT_FOLDER = ciaanh/pallas/rev1 From e4832359149a8c9cd385797f3cb3462d78b6433a Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 15:58:32 +0200 Subject: [PATCH 15/76] clean some code --- .../kanagawa/ansi/keymaps/default/keymap.c | 61 +++----------- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 76 ++--------------- .../kanagawa/iso/keymaps/default/keymap.c | 83 ++++--------------- 3 files changed, 35 insertions(+), 185 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 73833d4f89c..7ac53f1a65a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ @@ -56,7 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ @@ -67,17 +66,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), + [_TOP] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE @@ -120,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -212,6 +174,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 032f8524783..7ac53f1a65a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -17,12 +17,6 @@ * `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | * `---------' `---------' `---------+---------+---------' */ - -#define TO_0 TO(0) -#define MO_1 MO(1) -#define TG_2 TG(2) - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap: BASE @@ -38,23 +32,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - // BASE - [0] = LAYOUT_ansi( + [_BASE] = LAYOUT_ansi( KC_ESC, 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_MPLY, \ 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_DEL, \ 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_HOME, \ KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, MO_1, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TG_2, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), - // CODE - [1] = LAYOUT_ansi( + [_CODE] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -64,20 +56,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - // FUNCTION - [2] = LAYOUT_ansi( + [_FUNC] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_0, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), - // EMPTY - [3] = LAYOUT_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + [_TOP] = LAYOUT_ansi( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -86,18 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE @@ -140,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -232,7 +174,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index d7924911a0b..1f4bb3b1ecd 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ @@ -56,7 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_iso( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ @@ -67,24 +66,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), + [_TOP] = LAYOUT_iso( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE - // oled_rotation_t oled_init_user(oled_rotation_t rotation) { - // return OLED_ROTATION_180; - // } - static void render_status(void) { // 21 characters per line // 16 cols / 4 rows @@ -124,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - // 0, 0,128,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } - bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - + render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -215,20 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif - -// #ifdef ENCODER_ENABLE -// bool encoder_update_kb(uint8_t index, bool clockwise) { -// if (!encoder_update_user(index, clockwise)) { return false; } -// if (index == 0) { -// if (clockwise) { -// tap_code_delay(KC_VOLU, 10); -// } else { -// tap_code_delay(KC_VOLD, 10); -// } -// } -// return true; -// } -// #endif \ No newline at end of file From b328dc220812a46dc96e8f4cf7d84d252db9ce6b Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 16:09:27 +0200 Subject: [PATCH 16/76] Add licence header --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 18 ++++++++- keyboards/ciaanh/kanagawa/ansi/ansi.h | 18 ++++++++- .../kanagawa/ansi/keymaps/default/keymap.c | 18 ++++++++- .../ansi/keymaps/default/rgb_matrix_user.inc | 40 ------------------- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 18 ++++++++- keyboards/ciaanh/kanagawa/config.h | 18 ++++++++- keyboards/ciaanh/kanagawa/iso/iso.c | 18 ++++++++- keyboards/ciaanh/kanagawa/iso/iso.h | 18 ++++++++- keyboards/ciaanh/kanagawa/kanagawa.c | 18 ++++++++- keyboards/ciaanh/kanagawa/kanagawa.h | 18 ++++++++- keyboards/ciaanh/kanagawa/lib/oledfont.c | 20 ++++++++-- keyboards/ciaanh/kanagawa/mcuconf.h | 18 ++++++++- 12 files changed, 187 insertions(+), 53 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index 879f68dc186..faac5f0f995 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -1,4 +1,20 @@ -#include "kanagawa.h" +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include "kanagawa.h" #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 82 diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.h b/keyboards/ciaanh/kanagawa/ansi/ansi.h index 6f70f09beec..1de201d1c0a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.h +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.h @@ -1 +1,17 @@ -#pragma once +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #pragma once diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 7ac53f1a65a..371f09cd19e 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -1,4 +1,20 @@ -#include QMK_KEYBOARD_H +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include QMK_KEYBOARD_H /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc deleted file mode 100644 index ed2ed30106f..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rgb_matrix_user.inc +++ /dev/null @@ -1,40 +0,0 @@ -// !!! DO NOT ADD #pragma once !!! // - -// Step 1. -// Declare custom effects using the RGB_MATRIX_EFFECT macro -// (note the lack of semicolon after the macro!) -RGB_MATRIX_EFFECT(my_cool_effect) -RGB_MATRIX_EFFECT(my_cool_effect2) - -// Step 2. -// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// e.g: A simple effect, self-contained within a single method -static bool my_cool_effect(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0xff, 0xff, 0x00); - } - return rgb_matrix_check_finished_leds(led_max); -} - -// e.g: A more complex effect, relying on external methods and state, with -// dedicated init and run methods -static uint8_t some_global_state; -static void my_cool_effect2_complex_init(effect_params_t* params) { - some_global_state = 1; -} -static bool my_cool_effect2_complex_run(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0xff, some_global_state++, 0xff); - } - return rgb_matrix_check_finished_leds(led_max); -} -static bool my_cool_effect2(effect_params_t* params) { - if (params->init) my_cool_effect2_complex_init(params); - return my_cool_effect2_complex_run(params); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 7ac53f1a65a..371f09cd19e 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -1,4 +1,20 @@ -#include QMK_KEYBOARD_H +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include QMK_KEYBOARD_H /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index c85bd4c2bc6..60b87421133 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -1,4 +1,20 @@ -#pragma once +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #pragma once /* OLED SPI Defines */ #ifdef OLED_ENABLE diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 43fd253b96b..712029d8846 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -1,4 +1,20 @@ -#include "kanagawa.h" +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include "kanagawa.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ciaanh/kanagawa/iso/iso.h b/keyboards/ciaanh/kanagawa/iso/iso.h index 7b9637ef9c2..69cbd9c747c 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.h +++ b/keyboards/ciaanh/kanagawa/iso/iso.h @@ -1 +1,17 @@ -#pragma once \ No newline at end of file +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #pragma once \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c index 2b7f0847711..d5fa70946ba 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.c +++ b/keyboards/ciaanh/kanagawa/kanagawa.c @@ -1 +1,17 @@ -#include "kanagawa.h" +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include "kanagawa.h" diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h index 52b8acc89bc..cc3fa9ffc0b 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.h +++ b/keyboards/ciaanh/kanagawa/kanagawa.h @@ -1,4 +1,20 @@ -#pragma once +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #pragma once #include "quantum.h" diff --git a/keyboards/ciaanh/kanagawa/lib/oledfont.c b/keyboards/ciaanh/kanagawa/lib/oledfont.c index 153007ef1a3..6860b746853 100644 --- a/keyboards/ciaanh/kanagawa/lib/oledfont.c +++ b/keyboards/ciaanh/kanagawa/lib/oledfont.c @@ -1,6 +1,20 @@ -#include "progmem.h" - - +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include "progmem.h" const unsigned char font[] PROGMEM = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => diff --git a/keyboards/ciaanh/kanagawa/mcuconf.h b/keyboards/ciaanh/kanagawa/mcuconf.h index f6378664da8..fd272f8b1c5 100644 --- a/keyboards/ciaanh/kanagawa/mcuconf.h +++ b/keyboards/ciaanh/kanagawa/mcuconf.h @@ -1,4 +1,20 @@ -#pragma once +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #pragma once #include_next From ca957af9a2608c9177c30769aac801ce8dc57c18 Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 16:53:01 +0200 Subject: [PATCH 17/76] Add missing header --- .../kanagawa/iso/keymaps/default/keymap.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 1f4bb3b1ecd..a8265e6694b 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -1,4 +1,20 @@ -#include QMK_KEYBOARD_H +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ + + #include QMK_KEYBOARD_H /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. From cc6e84d23c80f4ba85b314f1beac9e60a4a915b9 Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 16:56:45 +0200 Subject: [PATCH 18/76] Add default folder --- keyboards/ciaanh/kanagawa/rules.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index f1c870e1b2a..d0d448472b0 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -27,3 +27,5 @@ OPT_DEFS += -DHAL_USE_I2C=TRUE ENCODER_MAP_ENABLE = yes LTO_ENABLE = no # reduce size + +DEFAULT_FOLDER = ciaanh/kanagawa/ansi From c2bf1397ef81c30c714562daabf8d696aca5e1a4 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 19 May 2023 22:43:16 +0200 Subject: [PATCH 19/76] Review comments --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 6 +- keyboards/ciaanh/kanagawa/ansi/ansi.h | 17 --- keyboards/ciaanh/kanagawa/ansi/config.h | 5 + .../ciaanh/kanagawa/{ => ansi}/info.json | 100 +------------- .../kanagawa/ansi/keymaps/default/keymap.c | 33 ++++- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 35 ++++- keyboards/ciaanh/kanagawa/ansi/rules.mk | 2 +- keyboards/ciaanh/kanagawa/config.h | 11 +- keyboards/ciaanh/kanagawa/iso/config.h | 5 + keyboards/ciaanh/kanagawa/iso/info.json | 126 ++++++++++++++++++ keyboards/ciaanh/kanagawa/iso/iso.c | 5 +- keyboards/ciaanh/kanagawa/iso/iso.h | 17 --- .../kanagawa/iso/keymaps/default/keymap.c | 33 ++++- keyboards/ciaanh/kanagawa/iso/rules.mk | 1 + keyboards/ciaanh/kanagawa/kanagawa.c | 17 --- keyboards/ciaanh/kanagawa/kanagawa.h | 51 ------- keyboards/ciaanh/kanagawa/kanagawa.json | 23 ---- keyboards/ciaanh/kanagawa/rules.mk | 6 - 18 files changed, 228 insertions(+), 265 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/ansi.h create mode 100644 keyboards/ciaanh/kanagawa/ansi/config.h rename keyboards/ciaanh/kanagawa/{ => ansi}/info.json (52%) create mode 100644 keyboards/ciaanh/kanagawa/iso/config.h create mode 100644 keyboards/ciaanh/kanagawa/iso/info.json delete mode 100644 keyboards/ciaanh/kanagawa/iso/iso.h delete mode 100644 keyboards/ciaanh/kanagawa/kanagawa.c delete mode 100644 keyboards/ciaanh/kanagawa/kanagawa.h delete mode 100644 keyboards/ciaanh/kanagawa/kanagawa.json diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index faac5f0f995..1766ba18857 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -13,11 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include "kanagawa.h" +#include "quantum.h" + +#define NA NO_LED #ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 82 led_config_t g_led_config = { { diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.h b/keyboards/ciaanh/kanagawa/ansi/ansi.h deleted file mode 100644 index 1de201d1c0a..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ - - #pragma once diff --git a/keyboards/ciaanh/kanagawa/ansi/config.h b/keyboards/ciaanh/kanagawa/ansi/config.h new file mode 100644 index 00000000000..158d54d5120 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/config.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_LED_COUNT 82 +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json similarity index 52% rename from keyboards/ciaanh/kanagawa/info.json rename to keyboards/ciaanh/kanagawa/ansi/info.json index d0da504a473..6922138a10b 100644 --- a/keyboards/ciaanh/kanagawa/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -25,7 +25,7 @@ "bootloader": "rp2040", "layouts": { - "LAYOUT_ansi": { + "LAYOUT": { "layout": [ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, @@ -108,104 +108,6 @@ { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, - { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, - { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, - { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, - { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, - { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, - { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, - { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, - { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, - { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } - ] - }, - - "LAYOUT_iso": { - "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, - { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, - - { "label": "²", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "&", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "é", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "\"", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "'", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "(", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "-", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "è", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "_", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "ç", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": "à", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": ")", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "=", "matrix": [1, 12], "x": 12, "y": 1 }, - { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, - - { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, - - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "label": "A", "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "label": "Z", "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, - { "label": "^", "matrix": [2, 11], "x": 11.5, "y": 2 }, - { "label": "$", "matrix": [2, 12], "x": 12.5, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, - - { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, - { "label": "Q", "matrix": [3, 1], "x": 1.75, "y": 3 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, - { "label": "M", "matrix": [3, 10], "x": 10.75, "y": 3 }, - { "label": "ù", "matrix": [3, 11], "x": 11.75, "y": 3 }, - { "label": "*", "matrix": [3, 12], "x": 12.75, "y": 3 }, - - { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, - - { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "<", "matrix": [4, 1], "x": 1.25, "y": 4 }, - { "label": "W", "matrix": [4, 2], "x": 2.25, "y": 4 }, - { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, - { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, - { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, - { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, - { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, - { "label": ",", "matrix": [4, 8], "x": 8.25, "y": 4 }, - { "label": ";", "matrix": [4, 9], "x": 9.25, "y": 4 }, - { "label": ":", "matrix": [4, 10], "x": 10.25, "y": 4 }, - { "label": "!", "matrix": [4, 11], "x": 11.25, "y": 4 }, - { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, - - { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 371f09cd19e..fe69fa413c9 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -13,8 +13,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include QMK_KEYBOARD_H +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +enum layers +{ + _BASE, + _CODE, + _FUNC, + _TOP +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_FUNC TG(_FUNC) +#define L_CODE MO(_CODE) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. @@ -52,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - [_BASE] = LAYOUT_ansi( + [_BASE] = LAYOUT( KC_ESC, 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_MPLY, \ 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_DEL, \ @@ -62,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT_ansi( + [_CODE] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -72,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_ansi( + [_FUNC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -82,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), - [_TOP] = LAYOUT_ansi( + [_TOP] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 371f09cd19e..741676ed746 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -12,9 +12,30 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ - - #include QMK_KEYBOARD_H + */ +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +enum layers +{ + _BASE, + _CODE, + _FUNC, + _TOP +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_FUNC TG(_FUNC) +#define L_CODE MO(_CODE) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. @@ -52,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - [_BASE] = LAYOUT_ansi( + [_BASE] = LAYOUT( KC_ESC, 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_MPLY, \ 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_DEL, \ @@ -62,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT_ansi( + [_CODE] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -72,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_ansi( + [_FUNC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -82,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), - [_TOP] = LAYOUT_ansi( + [_TOP] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ diff --git a/keyboards/ciaanh/kanagawa/ansi/rules.mk b/keyboards/ciaanh/kanagawa/ansi/rules.mk index 14ace897304..a40474b4d5c 100644 --- a/keyboards/ciaanh/kanagawa/ansi/rules.mk +++ b/keyboards/ciaanh/kanagawa/ansi/rules.mk @@ -1 +1 @@ -RGB_MATRIX_CUSTOM_USER = no +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 60b87421133..b9b5b654f63 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -13,8 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #pragma once +#pragma once /* OLED SPI Defines */ #ifdef OLED_ENABLE @@ -33,14 +32,6 @@ /* RGB Defines */ # define RGB_DI_PIN GP4 -# ifdef KEYBOARD_ciaanh_kanagawa_ansi -# define RGB_MATRIX_LED_COUNT 82 -# endif - -# ifdef KEYBOARD_ciaanh_kanagawa_iso -# define RGB_MATRIX_LED_COUNT 83 -# endif - # define RGB_MATRIX_CENTER { 90, 28 } /* Enable Framebuffer and keypress effects */ diff --git a/keyboards/ciaanh/kanagawa/iso/config.h b/keyboards/ciaanh/kanagawa/iso/config.h new file mode 100644 index 00000000000..0be2bc82a63 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/config.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef RGB_MATRIX_ENABLE +# define RGB_MATRIX_LED_COUNT 83 +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json new file mode 100644 index 00000000000..cfc06d5c8ae --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -0,0 +1,126 @@ +{ + "keyboard_name": "Kanagawa", + "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", + "manufacturer": "Ciaanh", + "maintainer": "Ciaanh", + "usb": { + "vid": "0xC1E0", + "pid": "0x0010", + "device_version": "2.1.0" + }, + "bootmagic": { + "matrix": [0, 13] + }, + "encoder": { + "rotary": [ + {"pin_a": "GP2", "pin_b": "GP3"} + ] + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + }, + "processor": "RP2040", + "bootloader": "rp2040", + + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, + { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, + + { "label": "²", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "&", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "é", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "\"", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "'", "matrix": [1, 4], "x": 4, "y": 1 }, + { "label": "(", "matrix": [1, 5], "x": 5, "y": 1 }, + { "label": "-", "matrix": [1, 6], "x": 6, "y": 1 }, + { "label": "è", "matrix": [1, 7], "x": 7, "y": 1 }, + { "label": "_", "matrix": [1, 8], "x": 8, "y": 1 }, + { "label": "ç", "matrix": [1, 9], "x": 9, "y": 1 }, + { "label": "à", "matrix": [1, 10], "x": 10, "y": 1 }, + { "label": ")", "matrix": [1, 11], "x": 11, "y": 1 }, + { "label": "=", "matrix": [1, 12], "x": 12, "y": 1 }, + { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, + + { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, + + { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, + { "label": "A", "matrix": [2, 1], "x": 1.5, "y": 2 }, + { "label": "Z", "matrix": [2, 2], "x": 2.5, "y": 2 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, + { "label": "^", "matrix": [2, 11], "x": 11.5, "y": 2 }, + { "label": "$", "matrix": [2, 12], "x": 12.5, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, + + { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, + + { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, + { "label": "Q", "matrix": [3, 1], "x": 1.75, "y": 3 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, + { "label": "M", "matrix": [3, 10], "x": 10.75, "y": 3 }, + { "label": "ù", "matrix": [3, 11], "x": 11.75, "y": 3 }, + { "label": "*", "matrix": [3, 12], "x": 12.75, "y": 3 }, + + { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, + + { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, + { "label": "<", "matrix": [4, 1], "x": 1.25, "y": 4 }, + { "label": "W", "matrix": [4, 2], "x": 2.25, "y": 4 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, + { "label": ",", "matrix": [4, 8], "x": 8.25, "y": 4 }, + { "label": ";", "matrix": [4, 9], "x": 9.25, "y": 4 }, + { "label": ":", "matrix": [4, 10], "x": 10.25, "y": 4 }, + { "label": "!", "matrix": [4, 11], "x": 11.25, "y": 4 }, + { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, + + { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, + + { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, + { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, + { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, + { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, + { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, + { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, + { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, + { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, + { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, + { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } + ] + } + } +} diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 712029d8846..bbcfaed4323 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -13,8 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include "kanagawa.h" +#include "quantum.h" + +#define NA NO_LED #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ciaanh/kanagawa/iso/iso.h b/keyboards/ciaanh/kanagawa/iso/iso.h deleted file mode 100644 index 69cbd9c747c..00000000000 --- a/keyboards/ciaanh/kanagawa/iso/iso.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ - - #pragma once \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index a8265e6694b..5bdfe62ae9a 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -13,8 +13,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - - #include QMK_KEYBOARD_H +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +enum layers +{ + _BASE, + _CODE, + _FUNC, + _TOP +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, + NEW_SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TO_FUNC TG(_FUNC) +#define L_CODE MO(_CODE) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. @@ -52,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - [_BASE] = LAYOUT_iso( + [_BASE] = LAYOUT( KC_ESC, 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_MPLY, \ 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_DEL, \ @@ -62,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT_iso( + [_CODE] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -72,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_iso( + [_FUNC] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -82,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), - [_TOP] = LAYOUT_iso( + [_TOP] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ diff --git a/keyboards/ciaanh/kanagawa/iso/rules.mk b/keyboards/ciaanh/kanagawa/iso/rules.mk index e69de29bb2d..a40474b4d5c 100644 --- a/keyboards/ciaanh/kanagawa/iso/rules.mk +++ b/keyboards/ciaanh/kanagawa/iso/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c deleted file mode 100644 index d5fa70946ba..00000000000 --- a/keyboards/ciaanh/kanagawa/kanagawa.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ - - #include "kanagawa.h" diff --git a/keyboards/ciaanh/kanagawa/kanagawa.h b/keyboards/ciaanh/kanagawa/kanagawa.h deleted file mode 100644 index cc3fa9ffc0b..00000000000 --- a/keyboards/ciaanh/kanagawa/kanagawa.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ - - #pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_ciaanh_kanagawa_ansi - #include "ansi.h" -#endif - -#ifdef KEYBOARD_ciaanh_kanagawa_iso - #include "iso.h" -#endif - -#define ___ KC_NO -#define NA NO_LED - -enum layers -{ - _BASE, - _CODE, - _FUNC, - _TOP -}; - -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, - NEW_SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_FUNC TG(_FUNC) - -#define L_CODE MO(_CODE) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/kanagawa.json b/keyboards/ciaanh/kanagawa/kanagawa.json deleted file mode 100644 index 82e887b9c3b..00000000000 --- a/keyboards/ciaanh/kanagawa/kanagawa.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Kanagawa", - "vendorId": "0xC1E0", - "productId": "0x0010", - "matrix": { "rows": 6, "cols": 14 }, - "menus": [ "qmk_rgb_matrix" ], - "keycodes": [ "qmk_lighting" ], - "layouts": { - "keymap": [ - [{"x":2.75,"c":"#777777"},"0,0",{"x":0.5,"c":"#cccccc"},"0,1","0,2","0,3","0,4",{"x":0.25},"0,5","0,6","0,7","0,8",{"x":0.25},"0,9","0,10","0,11","0,12",{"x":2.25,"c":"#777777"},"0,13\n\n\n\n\n\n\n\n\ne0"], - [{"y":0.25,"x":2.75,"c":"#cccccc"},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"c":"#aaaaaa","w":2},"1,13",{"x":1.25,"c":"#777777"},"3,13"], - [{"x":2.75,"c":"#aaaaaa","w":1.5},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12",{"w":1.5},"2,13\n\n\n1,0",{"x":1.25,"c":"#777777"},"4,13",{"x":1.75,"c":"#cccccc","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"2,13\n\n\n1,1"], - [{"x":2.75,"c":"#aaaaaa","w":1.75},"3,0",{"c":"#cccccc"},"3,1","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#777777","w":2.25},"3,12\n\n\n1,0",{"x":1.25},"5,13",{"x":0.75},"3,12\n\n\n1,1"], - [{"c":"#aaaaaa","w":1.25},"4,0\n\n\n0,1",{"c":"#cccccc"},"4,1\n\n\n0,1",{"x":0.5,"c":"#aaaaaa","w":2.25},"4,0\n\n\n0,0",{"c":"#cccccc"},"4,2","4,3","4,4","4,5","4,6","4,7","4,8","4,9","4,10","4,11",{"c":"#aaaaaa","w":1.75},"4,12"], - [{"y":-0.75,"x":17,"c":"#777777"},"5,12"], - [{"y":-0.25,"x":2.75,"c":"#aaaaaa"},"5,0","5,1","5,2",{"x":7},"5,6","5,7","5,8"], - [{"y":-0.75,"x":16,"c":"#777777"},"5,9","5,10","5,11"], - [{"ry":5.5,"y":-0.25,"x":5.75},"5,3"], - [{"r":15,"rx":6.5,"y":-0.25,"x":0.75,"w":2.25},"5,4"], - [{"r":-15,"rx":12.5,"y":-0.25,"x":-3,"w":2.75},"5,5"] - ] - } -} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index d0d448472b0..51265838985 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,7 +1,3 @@ -# RP2040-specific options -ALLOW_WARNINGS = yes -PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. - BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control @@ -24,8 +20,6 @@ OLED_DRIVER = SSD1306 OPT_DEFS += -DHAL_USE_I2C=TRUE -ENCODER_MAP_ENABLE = yes - LTO_ENABLE = no # reduce size DEFAULT_FOLDER = ciaanh/kanagawa/ansi From 5fd56f2784f441facc2e31067564182d004ed84d Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 19 May 2023 22:47:57 +0200 Subject: [PATCH 20/76] Add missing licence header --- keyboards/ciaanh/kanagawa/ansi/config.h | 15 +++++++++++++++ keyboards/ciaanh/kanagawa/iso/config.h | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/keyboards/ciaanh/kanagawa/ansi/config.h b/keyboards/ciaanh/kanagawa/ansi/config.h index 158d54d5120..4a58d3409ab 100644 --- a/keyboards/ciaanh/kanagawa/ansi/config.h +++ b/keyboards/ciaanh/kanagawa/ansi/config.h @@ -1,3 +1,18 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ #pragma once #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ciaanh/kanagawa/iso/config.h b/keyboards/ciaanh/kanagawa/iso/config.h index 0be2bc82a63..d78fba542e4 100644 --- a/keyboards/ciaanh/kanagawa/iso/config.h +++ b/keyboards/ciaanh/kanagawa/iso/config.h @@ -1,3 +1,18 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ #pragma once #ifdef RGB_MATRIX_ENABLE From c2434a91638c73b3887470205381faad921590f0 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sat, 20 May 2023 10:17:12 +0200 Subject: [PATCH 21/76] Add halconf.h --- keyboards/ciaanh/kanagawa/halconf.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 keyboards/ciaanh/kanagawa/halconf.h diff --git a/keyboards/ciaanh/kanagawa/halconf.h b/keyboards/ciaanh/kanagawa/halconf.h new file mode 100644 index 00000000000..4689667613c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/halconf.h @@ -0,0 +1,20 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next \ No newline at end of file From 8569b625762b5ea62ea312d4369fb84cf6307417 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:07:58 +0200 Subject: [PATCH 22/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 5bdfe62ae9a..da2de919137 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -28,7 +28,6 @@ enum layers enum custom_keycodes { CUSTOMKEY = SAFE_RANGE, - NEW_SAFE_RANGE, }; #define TO_BASE TO(_BASE) From 5a47c927d0eb3f26dbdd559d92bf4f93af686641 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:08:09 +0200 Subject: [PATCH 23/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index fe69fa413c9..04cfd00d39a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -28,7 +28,6 @@ enum layers enum custom_keycodes { CUSTOMKEY = SAFE_RANGE, - NEW_SAFE_RANGE, }; #define TO_BASE TO(_BASE) From 26e6736ca7264e1aaba405e1fd443e043d7990c8 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:08:30 +0200 Subject: [PATCH 24/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 741676ed746..d2400c4da4a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -28,7 +28,6 @@ enum layers enum custom_keycodes { CUSTOMKEY = SAFE_RANGE, - NEW_SAFE_RANGE, }; #define TO_BASE TO(_BASE) From 7827b50ba2133f758fa618b7fe75039ce1f88fe4 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:09:53 +0200 Subject: [PATCH 25/76] Update keyboards/ciaanh/kanagawa/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 51265838985..fa841f74294 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -20,6 +20,4 @@ OLED_DRIVER = SSD1306 OPT_DEFS += -DHAL_USE_I2C=TRUE -LTO_ENABLE = no # reduce size - DEFAULT_FOLDER = ciaanh/kanagawa/ansi From e6d3945de1fd8cd5e41bafee878cb6abf7f423a5 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:12:54 +0200 Subject: [PATCH 26/76] Update keyboards/ciaanh/kanagawa/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index fa841f74294..a3229f13518 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -18,6 +18,4 @@ WS2812_DRIVER = vendor OLED_ENABLE = yes OLED_DRIVER = SSD1306 -OPT_DEFS += -DHAL_USE_I2C=TRUE - DEFAULT_FOLDER = ciaanh/kanagawa/ansi From e659374ae0382a27c5f4789414fe866e4f591cf8 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:13:11 +0200 Subject: [PATCH 27/76] Update keyboards/ciaanh/kanagawa/mcuconf.h Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/mcuconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/mcuconf.h b/keyboards/ciaanh/kanagawa/mcuconf.h index fd272f8b1c5..6832f158099 100644 --- a/keyboards/ciaanh/kanagawa/mcuconf.h +++ b/keyboards/ciaanh/kanagawa/mcuconf.h @@ -14,7 +14,7 @@ * along with this program. If not, see . */ - #pragma once +#pragma once #include_next From cbf7fde3c883c83158893f6cc9fd69772e99ca0f Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:13:36 +0200 Subject: [PATCH 28/76] Update keyboards/ciaanh/kanagawa/iso/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index cfc06d5c8ae..7bc120f7b55 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -8,9 +8,6 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "bootmagic": { - "matrix": [0, 13] - }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} From 6b7acc9b278517351e2bd90b0a32142c1f218b8f Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:13:53 +0200 Subject: [PATCH 29/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk index 036bd6d1c3e..4253f570f0b 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file From 056edd81c801bcfb461b3db3c2e40dec9edb7dfa Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:14:04 +0200 Subject: [PATCH 30/76] Update keyboards/ciaanh/kanagawa/iso/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/rules.mk b/keyboards/ciaanh/kanagawa/iso/rules.mk index a40474b4d5c..7ff128fa692 100644 --- a/keyboards/ciaanh/kanagawa/iso/rules.mk +++ b/keyboards/ciaanh/kanagawa/iso/rules.mk @@ -1 +1 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 2f4e46dbfe37987b0130eaa63af94f98349d5a02 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:18:31 +0200 Subject: [PATCH 31/76] Update keyboards/ciaanh/kanagawa/ansi/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/rules.mk b/keyboards/ciaanh/kanagawa/ansi/rules.mk index a40474b4d5c..7ff128fa692 100644 --- a/keyboards/ciaanh/kanagawa/ansi/rules.mk +++ b/keyboards/ciaanh/kanagawa/ansi/rules.mk @@ -1 +1 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file +# This file intentionally left blank \ No newline at end of file From 7c1f7bea04161465b78b28f30f721018795a2529 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 20 May 2023 10:18:42 +0200 Subject: [PATCH 32/76] Update keyboards/ciaanh/kanagawa/ansi/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 6922138a10b..9fa838ff8f6 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -8,9 +8,6 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "bootmagic": { - "matrix": [0, 13] - }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} From f5c844281dc97e6c6612c512db63d8e924233504 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 21 May 2023 16:25:35 +0200 Subject: [PATCH 33/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index b9b5b654f63..a9947a84710 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -20,7 +20,6 @@ # define OLED_DISPLAY_128X32 # define OLED_FONT_H "lib/oledfont.c" # define OLED_FONT_END 255 -# define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ # define I2C_DRIVER I2CD0 From 6aaa6ed8ccac6c06e924ba7a0b9909a05de29bf2 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 21 May 2023 20:01:39 +0200 Subject: [PATCH 34/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index a9947a84710..8b1585d2069 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -30,6 +30,7 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ # define RGB_DI_PIN GP4 +# define WS2812_DI_PIN GP4 # define RGB_MATRIX_CENTER { 90, 28 } From c3adb77854a05777b647901c2d3088833241f31a Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 21 May 2023 20:01:59 +0200 Subject: [PATCH 35/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 8b1585d2069..d625c526265 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -17,7 +17,6 @@ /* OLED SPI Defines */ #ifdef OLED_ENABLE -# define OLED_DISPLAY_128X32 # define OLED_FONT_H "lib/oledfont.c" # define OLED_FONT_END 255 From b1bf7d7ef3c986099553095fc1e58064dcfaf855 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 21 May 2023 20:02:22 +0200 Subject: [PATCH 36/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index d625c526265..e84f8bd82c7 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -18,7 +18,6 @@ /* OLED SPI Defines */ #ifdef OLED_ENABLE # define OLED_FONT_H "lib/oledfont.c" -# define OLED_FONT_END 255 /* I2C Conf */ # define I2C_DRIVER I2CD0 From 8e7fb4eb92374c9eea202d87feda6d0caa602cac Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sun, 21 May 2023 20:06:08 +0200 Subject: [PATCH 37/76] Refacto from reviews --- keyboards/ciaanh/kanagawa/ansi/ansi.c | 60 ------ keyboards/ciaanh/kanagawa/ansi/info.json | 128 ++++++++++++- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 165 ++++++++++++++++ .../kanagawa/ansi/keymaps/default/keymap.c | 105 +++-------- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 176 ++++-------------- keyboards/ciaanh/kanagawa/config.h | 2 +- keyboards/ciaanh/kanagawa/iso/info.json | 130 ++++++++++++- keyboards/ciaanh/kanagawa/iso/iso.c | 60 ------ .../kanagawa/iso/keymaps/default/keymap.c | 173 ++++------------- keyboards/ciaanh/kanagawa/kanagawa.c | 61 ++++++ keyboards/ciaanh/kanagawa/rules.mk | 17 -- 11 files changed, 571 insertions(+), 506 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/ansi.c create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c delete mode 100644 keyboards/ciaanh/kanagawa/iso/iso.c create mode 100644 keyboards/ciaanh/kanagawa/kanagawa.c diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c deleted file mode 100644 index 1766ba18857..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ -#include "quantum.h" - -#define NA NO_LED - -#ifdef RGB_MATRIX_ENABLE - - led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, - { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, - { 65, NA, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 67 }, - { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68 } - }, - - { - // LED Index to Physical Position - {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, - {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, - {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, - {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, - {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 9, 47}, -{224, 12}, -{224, 23}, -{224, 35}, - {214, 61}, - {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, - - }, - - { - // LED Index to Flag - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, - 4, - 4, 4, - 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, - }}; -#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 9fa838ff8f6..6dc940f8a54 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -8,18 +8,39 @@ "pid": "0x0010", "device_version": "2.1.0" }, + "processor": "RP2040", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "matrix_size": { + "cols": 14, + "rows": 6 + }, + "matrix_pins": { + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} ] }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], - "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + "bootmagic": { + "enabled": true, + "matrix": [0, 13] }, - "processor": "RP2040", - "bootloader": "rp2040", + "layouts": { "LAYOUT": { @@ -119,5 +140,100 @@ { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } ] } + }, + + "rgb_matrix": { + "driver": "WS2812", + "center_point": [ 90, 28], + "layout": [ + { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, + { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, + { "flags": 4,"matrix": [0,10],"x": 161, "y": 0 }, + { "flags": 4,"matrix": [0, 9],"x": 147, "y": 0 }, + { "flags": 4,"matrix": [0, 8],"x": 126, "y": 0 }, + { "flags": 4,"matrix": [0, 7],"x": 112, "y": 0 }, + { "flags": 4,"matrix": [0, 6],"x": 98, "y": 0 }, + { "flags": 4,"matrix": [0, 5],"x": 84, "y": 0 }, + { "flags": 4,"matrix": [0, 4],"x": 63, "y": 0 }, + { "flags": 4,"matrix": [0, 3],"x": 49, "y": 0 }, + { "flags": 4,"matrix": [0, 2],"x": 35, "y": 0 }, + { "flags": 4,"matrix": [0, 1],"x": 21, "y": 0 }, + { "flags": 4,"matrix": [0, 0],"x": 0, "y": 0 }, + + { "flags": 1,"matrix": [1,13],"x": 189, "y": 12 }, + { "flags": 4,"matrix": [1,12],"x": 168, "y": 12 }, + { "flags": 4,"matrix": [1,11],"x": 154, "y": 12 }, + { "flags": 4,"matrix": [1,10],"x": 140, "y": 12 }, + { "flags": 4,"matrix": [1, 9],"x": 126, "y": 12 }, + { "flags": 4,"matrix": [1, 8],"x": 112, "y": 12 }, + { "flags": 4,"matrix": [1, 7],"x": 98, "y": 12 }, + { "flags": 4,"matrix": [1, 6],"x": 84, "y": 12 }, + { "flags": 4,"matrix": [1, 5],"x": 70, "y": 12 }, + { "flags": 4,"matrix": [1, 4],"x": 56, "y": 12 }, + { "flags": 4,"matrix": [1, 3],"x": 42, "y": 12 }, + { "flags": 4,"matrix": [1, 2],"x": 28, "y": 12 }, + { "flags": 4,"matrix": [1, 1],"x": 14, "y": 12 }, + { "flags": 4,"matrix": [1, 0],"x": 0, "y": 12 }, + + { "flags": 1,"matrix": [2,13],"x": 189, "y": 23 }, + { "flags": 4,"matrix": [2,12],"x": 179, "y": 23 }, + { "flags": 4,"matrix": [2,11],"x": 161, "y": 23 }, + { "flags": 4,"matrix": [2,10],"x": 147, "y": 23 }, + { "flags": 4,"matrix": [2, 9],"x": 133, "y": 23 }, + { "flags": 4,"matrix": [2, 8],"x": 119, "y": 23 }, + { "flags": 4,"matrix": [2, 7],"x": 105, "y": 23 }, + { "flags": 4,"matrix": [2, 6],"x": 91, "y": 23 }, + { "flags": 4,"matrix": [2, 5],"x": 77, "y": 23 }, + { "flags": 4,"matrix": [2, 4],"x": 63, "y": 23 }, + { "flags": 4,"matrix": [2, 3],"x": 49, "y": 23 }, + { "flags": 4,"matrix": [2, 2],"x": 35, "y": 23 }, + { "flags": 4,"matrix": [2, 1],"x": 21, "y": 23 }, + { "flags": 1,"matrix": [2, 0],"x": 4, "y": 23 }, + + { "flags": 1,"matrix": [3,12],"x": 187, "y": 35 }, + { "flags": 4,"matrix": [3,11],"x": 165, "y": 35 }, + { "flags": 4,"matrix": [3,10],"x": 151, "y": 35 }, + { "flags": 4,"matrix": [3, 9],"x": 137, "y": 35 }, + { "flags": 4,"matrix": [3, 8],"x": 123, "y": 35 }, + { "flags": 4,"matrix": [3, 7],"x": 109, "y": 35 }, + { "flags": 4,"matrix": [3, 6],"x": 95, "y": 35 }, + { "flags": 4,"matrix": [3, 5],"x": 81, "y": 35 }, + { "flags": 4,"matrix": [3, 4],"x": 67, "y": 35 }, + { "flags": 4,"matrix": [3, 3],"x": 53, "y": 35 }, + { "flags": 4,"matrix": [3, 2],"x": 39, "y": 35 }, + { "flags": 4,"matrix": [3, 1],"x": 25, "y": 35 }, + { "flags": 1,"matrix": [3, 0],"x": 5, "y": 35 }, + + { "flags": 1,"matrix": [4,12],"x": 177, "y": 47 }, + { "flags": 4,"matrix": [4,11],"x": 158, "y": 47 }, + { "flags": 4,"matrix": [4,10],"x": 144, "y": 47 }, + { "flags": 4,"matrix": [4, 9],"x": 130, "y": 47 }, + { "flags": 4,"matrix": [4, 8],"x": 116, "y": 47 }, + { "flags": 4,"matrix": [4, 7],"x": 102, "y": 47 }, + { "flags": 4,"matrix": [4, 6],"x": 88, "y": 47 }, + { "flags": 4,"matrix": [4, 5],"x": 74, "y": 47 }, + { "flags": 4,"matrix": [4, 4],"x": 60, "y": 47 }, + { "flags": 4,"matrix": [4, 3],"x": 46, "y": 47 }, + { "flags": 4,"matrix": [4, 2],"x": 32, "y": 47 }, + { "flags": 1,"matrix": [4, 0],"x": 9, "y": 47 }, + + { "flags": 1,"matrix": [3,13],"x": 224, "y": 12 }, + { "flags": 4,"matrix": [4,13],"x": 224, "y": 23 }, + { "flags": 4,"matrix": [5,13],"x": 224, "y": 35 }, + + { "flags": 4,"matrix": [5,11],"x": 214, "y": 61 }, + { "flags": 4,"matrix": [5,12],"x": 200, "y": 49 }, + { "flags": 4,"matrix": [5,10],"x": 200, "y": 61 }, + { "flags": 4,"matrix": [5, 9],"x": 186, "y": 61 }, + { "flags": 1,"matrix": [5, 8],"x": 168, "y": 58 }, + { "flags": 1,"matrix": [5, 7],"x": 154, "y": 58 }, + { "flags": 1,"matrix": [5, 6],"x": 140, "y": 58 }, + { "flags": 4,"matrix": [5, 5],"x": 114, "y": 64 }, + { "flags": 4,"matrix": [5, 4],"x": 82, "y": 64 }, + { "flags": 1,"matrix": [5, 3],"x": 70, "y": 58 }, + { "flags": 1,"matrix": [5, 2],"x": 32, "y": 58 }, + { "flags": 1,"matrix": [5, 1],"x": 16, "y": 58 }, + { "flags": 1,"matrix": [5, 0],"x": 0, "y": 58 } + ] } } diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c new file mode 100644 index 00000000000..773ecb92564 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -0,0 +1,165 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +enum layers +{ + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +enum custom_keycodes +{ + CUSTOMKEY = SAFE_RANGE, +}; + +#define TO_BASE TO(_BASE) +#define TG_LOW TG(_LOWER) +#define TG_UP TG(_RAISE) + +#define _SCRNSHOT LSFT(LGUI(KC_S)) + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | TG_LOW | ,---------. ,---------. | RAlt | TG_UP | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + [_BASE] = LAYOUT( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_HOME, \ + KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ + KC_LCTL, KC_LGUI, KC_LALT, TG_LOW, KC_SPC, KC_SPC, KC_RALT, TG_UP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, _______, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI \ + ) +}; + +/*****************************************************************************************************/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case CUSTOMKEY: + if (record->event.pressed) { + if (get_mods() & MOD_MASK_SHIFT) { + tap_code16(G(A(KC_K))); + } else { + tap_code(KC_MPLY); + } + } + break; + case LT(0,KC_X): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X + return false; + } + return true; + case LT(0,KC_C): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C + return false; + } + return true; + case LT(0,KC_V): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V + return false; + } + return true; + case LT(0,KC_S): + if (!record->tap.count && record->event.pressed) { + tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S + return false; + } + return true; + } + return true; +} + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, +}; +#endif + diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 04cfd00d39a..880ad3c1ad7 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -25,17 +25,6 @@ enum layers _TOP }; -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_FUNC TG(_FUNC) -#define L_CODE MO(_CODE) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) - /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. * | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | @@ -72,100 +61,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ - - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ + [_BASE] = LAYOUT( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_HOME, \ + 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT( + + [_LOWER] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ - ), - - [_TOP] = LAYOUT( + [_RAISE] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ) }; /*****************************************************************************************************/ -#ifdef OLED_ENABLE - static void render_status(void) { - // 21 characters per line - // 16 cols / 4 rows - - oled_write_P(PSTR(" Kanagawa rev 2.1 "), false); - //oled_write_ln("", false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _FUNC: - oled_write_P(PSTR("[Fn]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - // oled_write_P(PSTR(" "), false); - - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - } - - - bool oled_task_user(void) { - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case CUSTOMKEY: diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index d2400c4da4a..2d849c44e42 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -20,22 +20,11 @@ enum layers { _BASE, - _CODE, - _FUNC, - _TOP + _LOWER, + _RAISE, + _ADJUST }; -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_FUNC TG(_FUNC) -#define L_CODE MO(_CODE) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) - /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. * | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | @@ -68,149 +57,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | LOWER | ,---------. ,---------. | RAlt | RAISE | RCtrl | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ - - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ + [_BASE] = LAYOUT( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_HOME, \ + 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_TOP] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ) }; /*****************************************************************************************************/ -#ifdef OLED_ENABLE - static void render_status(void) { - // 21 characters per line - // 16 cols / 4 rows - - oled_write_P(PSTR(" Kanagawa rev 2.1 "), false); - //oled_write_ln("", false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _FUNC: - oled_write_P(PSTR("[Fn]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - // oled_write_P(PSTR(" "), false); - - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - } - - - bool oled_task_user(void) { - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif - diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index e84f8bd82c7..2e746967b84 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -36,7 +36,7 @@ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_KEYPRESSES - # define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_ALPHAS_MODS # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT # define ENABLE_RGB_MATRIX_BREATHING diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 7bc120f7b55..0bd73b55fd6 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -5,21 +5,41 @@ "maintainer": "Ciaanh", "usb": { "vid": "0xC1E0", - "pid": "0x0010", + "pid": "0x0011", "device_version": "2.1.0" }, + "processor": "RP2040", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "matrix_size": { + "cols": 14, + "rows": 6 + }, + "matrix_pins": { + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} ] }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], - "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] + "bootmagic": { + "enabled": true, + "matrix": [0, 13] }, - "processor": "RP2040", - "bootloader": "rp2040", "layouts": { "LAYOUT": { @@ -119,5 +139,101 @@ { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } ] } + }, + + "rgb_matrix": { + "driver": "WS2812", + "center_point": [ 90, 28], + "layout": [ + { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, + { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, + { "flags": 4,"matrix": [0,10],"x": 161, "y": 0 }, + { "flags": 4,"matrix": [0, 9],"x": 147, "y": 0 }, + { "flags": 4,"matrix": [0, 8],"x": 126, "y": 0 }, + { "flags": 4,"matrix": [0, 7],"x": 112, "y": 0 }, + { "flags": 4,"matrix": [0, 6],"x": 98, "y": 0 }, + { "flags": 4,"matrix": [0, 5],"x": 84, "y": 0 }, + { "flags": 4,"matrix": [0, 4],"x": 63, "y": 0 }, + { "flags": 4,"matrix": [0, 3],"x": 49, "y": 0 }, + { "flags": 4,"matrix": [0, 2],"x": 35, "y": 0 }, + { "flags": 4,"matrix": [0, 1],"x": 21, "y": 0 }, + { "flags": 4,"matrix": [0, 0],"x": 0, "y": 0 }, + + { "flags": 1,"matrix": [1,13],"x": 189, "y": 12 }, + { "flags": 4,"matrix": [1,12],"x": 168, "y": 12 }, + { "flags": 4,"matrix": [1,11],"x": 154, "y": 12 }, + { "flags": 4,"matrix": [1,10],"x": 140, "y": 12 }, + { "flags": 4,"matrix": [1, 9],"x": 126, "y": 12 }, + { "flags": 4,"matrix": [1, 8],"x": 112, "y": 12 }, + { "flags": 4,"matrix": [1, 7],"x": 98, "y": 12 }, + { "flags": 4,"matrix": [1, 6],"x": 84, "y": 12 }, + { "flags": 4,"matrix": [1, 5],"x": 70, "y": 12 }, + { "flags": 4,"matrix": [1, 4],"x": 56, "y": 12 }, + { "flags": 4,"matrix": [1, 3],"x": 42, "y": 12 }, + { "flags": 4,"matrix": [1, 2],"x": 28, "y": 12 }, + { "flags": 4,"matrix": [1, 1],"x": 14, "y": 12 }, + { "flags": 4,"matrix": [1, 0],"x": 0, "y": 12 }, + + { "flags": 1,"matrix": [2,13],"x": 189, "y": 23 }, + { "flags": 4,"matrix": [2,12],"x": 179, "y": 23 }, + { "flags": 4,"matrix": [2,11],"x": 161, "y": 23 }, + { "flags": 4,"matrix": [2,10],"x": 147, "y": 23 }, + { "flags": 4,"matrix": [2, 9],"x": 133, "y": 23 }, + { "flags": 4,"matrix": [2, 8],"x": 119, "y": 23 }, + { "flags": 4,"matrix": [2, 7],"x": 105, "y": 23 }, + { "flags": 4,"matrix": [2, 6],"x": 91, "y": 23 }, + { "flags": 4,"matrix": [2, 5],"x": 77, "y": 23 }, + { "flags": 4,"matrix": [2, 4],"x": 63, "y": 23 }, + { "flags": 4,"matrix": [2, 3],"x": 49, "y": 23 }, + { "flags": 4,"matrix": [2, 2],"x": 35, "y": 23 }, + { "flags": 4,"matrix": [2, 1],"x": 21, "y": 23 }, + { "flags": 1,"matrix": [2, 0],"x": 4, "y": 23 }, + + { "flags": 1,"matrix": [3,12],"x": 187, "y": 35 }, + { "flags": 4,"matrix": [3,11],"x": 165, "y": 35 }, + { "flags": 4,"matrix": [3,10],"x": 151, "y": 35 }, + { "flags": 4,"matrix": [3, 9],"x": 137, "y": 35 }, + { "flags": 4,"matrix": [3, 8],"x": 123, "y": 35 }, + { "flags": 4,"matrix": [3, 7],"x": 109, "y": 35 }, + { "flags": 4,"matrix": [3, 6],"x": 95, "y": 35 }, + { "flags": 4,"matrix": [3, 5],"x": 81, "y": 35 }, + { "flags": 4,"matrix": [3, 4],"x": 67, "y": 35 }, + { "flags": 4,"matrix": [3, 3],"x": 53, "y": 35 }, + { "flags": 4,"matrix": [3, 2],"x": 39, "y": 35 }, + { "flags": 4,"matrix": [3, 1],"x": 25, "y": 35 }, + { "flags": 1,"matrix": [3, 0],"x": 5, "y": 35 }, + + { "flags": 1,"matrix": [4,12],"x": 177, "y": 47 }, + { "flags": 4,"matrix": [4,11],"x": 158, "y": 47 }, + { "flags": 4,"matrix": [4,10],"x": 144, "y": 47 }, + { "flags": 4,"matrix": [4, 9],"x": 130, "y": 47 }, + { "flags": 4,"matrix": [4, 8],"x": 116, "y": 47 }, + { "flags": 4,"matrix": [4, 7],"x": 102, "y": 47 }, + { "flags": 4,"matrix": [4, 6],"x": 88, "y": 47 }, + { "flags": 4,"matrix": [4, 5],"x": 74, "y": 47 }, + { "flags": 4,"matrix": [4, 4],"x": 60, "y": 47 }, + { "flags": 4,"matrix": [4, 3],"x": 46, "y": 47 }, + { "flags": 4,"matrix": [4, 2],"x": 32, "y": 47 }, + { "flags": 4,"matrix": [4, 1],"x": 18, "y": 47 }, + { "flags": 1,"matrix": [4, 0],"x": 2, "y": 47 }, + + { "flags": 1,"matrix": [3,13],"x": 224, "y": 12 }, + { "flags": 4,"matrix": [4,13],"x": 224, "y": 23 }, + { "flags": 4,"matrix": [5,13],"x": 224, "y": 35 }, + + { "flags": 4,"matrix": [5,11],"x": 214, "y": 61 }, + { "flags": 4,"matrix": [5,12],"x": 200, "y": 49 }, + { "flags": 4,"matrix": [5,10],"x": 200, "y": 61 }, + { "flags": 4,"matrix": [5, 9],"x": 186, "y": 61 }, + { "flags": 1,"matrix": [5, 8],"x": 168, "y": 58 }, + { "flags": 1,"matrix": [5, 7],"x": 154, "y": 58 }, + { "flags": 1,"matrix": [5, 6],"x": 140, "y": 58 }, + { "flags": 4,"matrix": [5, 5],"x": 114, "y": 64 }, + { "flags": 4,"matrix": [5, 4],"x": 82, "y": 64 }, + { "flags": 1,"matrix": [5, 3],"x": 70, "y": 58 }, + { "flags": 1,"matrix": [5, 2],"x": 32, "y": 58 }, + { "flags": 1,"matrix": [5, 1],"x": 16, "y": 58 }, + { "flags": 1,"matrix": [5, 0],"x": 0, "y": 58 } + ] } } diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c deleted file mode 100644 index bbcfaed4323..00000000000 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ -#include "quantum.h" - -#define NA NO_LED - -#ifdef RGB_MATRIX_ENABLE - - led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, - { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, - { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, - { 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 69, 67 }, - { 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 68 } - }, - - { - // LED Index to Physical Position - {189, 0}, {175, 0}, {161, 0}, {147, 0}, {126, 0}, {112, 0}, { 98, 0}, { 84, 0}, { 63, 0}, { 49, 0}, { 35, 0}, { 21, 0}, { 0, 0}, - {189, 12}, {168, 12}, {154, 12}, {140, 12}, {126, 12}, {112, 12}, { 98, 12}, { 84, 12}, { 70, 12}, { 56, 12}, { 42, 12}, { 28, 12}, { 14, 12}, { 0, 12}, - {189, 23}, {179, 23}, {161, 23}, {147, 23}, {133, 23}, {119, 23}, {105, 23}, { 91, 23}, { 77, 23}, { 63, 23}, { 49, 23}, { 35, 23}, { 21, 23}, { 4, 23}, - {187, 35}, {165, 35}, {151, 35}, {137, 35}, {123, 35}, {109, 35}, { 95, 35}, { 81, 35}, { 67, 35}, { 53, 35}, { 39, 35}, { 25, 35}, { 5, 35}, - {177, 47}, {158, 47}, {144, 47}, {130, 47}, {116, 47}, {102, 47}, { 88, 47}, { 74, 47}, { 60, 47}, { 46, 47}, { 32, 47}, { 18, 47}, { 2, 47}, -{224, 12}, -{224, 23}, -{224, 35}, - {214, 61}, - {200, 49}, {200, 61}, {186, 61}, {168, 58}, {154, 58}, {140, 58}, {114, 64}, { 82, 64}, { 70, 58}, { 32, 58}, { 16, 58}, { 0, 58}, - - }, - - { - // LED Index to Flag - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, - 4, - 4, 4, - 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, - }}; -#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index da2de919137..36708f6b799 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -20,22 +20,11 @@ enum layers { _BASE, - _CODE, - _FUNC, - _TOP + _LOWER, + _RAISE, + _ADJUST }; -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, -}; - -#define TO_BASE TO(_BASE) -#define TO_FUNC TG(_FUNC) -#define L_CODE MO(_CODE) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) - /* Keyboard layout * ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. * | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | @@ -68,148 +57,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | LOWER | ,---------. ,---------. | RAlt | RAISE | RCtrl | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | -* `---------' `---------' `---------+---------+---------' +* `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, \ - 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_DEL, \ - 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_ENT, KC_HOME, \ - KC_CAPS, KC_A, LT(0,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END, \ - KC_LSFT, KC_NUBS, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, \ + 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_ENT, KC_HOME, \ + 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_NUHS, KC_END, \ + KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_CODE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_TOP] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ - ), + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ) }; /*****************************************************************************************************/ -#ifdef OLED_ENABLE - static void render_status(void) { - // 21 characters per line - // 16 cols / 4 rows - - oled_write_P(PSTR(" Kanagawa rev 2.0 "), false); - //oled_write_ln("", false); - - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("_\n"), false); - break; - case _FUNC: - oled_write_P(PSTR("[Fn]\n"), false); - break; - case _CODE: - oled_write_P(PSTR("[Code]\n"), false); - break; - default: - oled_write_P(PSTR("Undefined\n"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); - // oled_write_P(PSTR(" "), false); - - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - // oled_write_ln("", false); - } - - bool oled_task_user(void) { - - render_status(); - - return false; - } -#endif - -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c new file mode 100644 index 00000000000..0d95b2ee4a4 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/kanagawa.c @@ -0,0 +1,61 @@ +/* Copyright 2021 Sleepdealer + * + * 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 . + */ +#include QMK_KEYBOARD_H + + +#ifdef OLED_ENABLE +bool oled_task_kb(void) { + if (!oled_task_user()) { + return false; + } + + // 21 characters per line + // 16 cols / 4 rows + + oled_write_P(PSTR(" Kanagawa rev 2.1 "), false); + + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + switch (get_highest_layer(layer_state)) { + case 0: + oled_write_P(PSTR("_\n"), false); + break; + case 1: + oled_write_P(PSTR("[Lower]\n"), false); + break; + case 2: + oled_write_P(PSTR("[Raise]\n"), false); + break; + case 3: + oled_write_P(PSTR("[Adjust]\n"), false); + break; + default: + oled_write_P(PSTR("Undefined\n"), false); + } + + // Host Keyboard LED Status + led_t led_state = host_keyboard_led_state(); + oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + oled_advance_page(true); + + + return true; +} +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index a3229f13518..8db6d04ea5f 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,20 +1,3 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - -ENCODER_ENABLE = yes - -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 -WS2812_DRIVER = vendor - OLED_ENABLE = yes OLED_DRIVER = SSD1306 From d1f59a7d0323cb0360726259c75528f6787bae01 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sun, 21 May 2023 21:09:06 +0200 Subject: [PATCH 38/76] fix encoder feature delaration --- keyboards/ciaanh/kanagawa/ansi/info.json | 24 +++- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 13 +- .../kanagawa/ansi/keymaps/ciaanh/rules.mk | 1 + .../kanagawa/ansi/keymaps/default/keymap.c | 42 +------ .../kanagawa/ansi/keymaps/default/rules.mk | 1 + .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 8 +- keyboards/ciaanh/kanagawa/config.h | 94 +++++++------- keyboards/ciaanh/kanagawa/iso/info.json | 24 +++- .../kanagawa/iso/keymaps/default/keymap.c | 8 +- .../kanagawa/iso/keymaps/default/rules.mk | 1 + .../ciaanh/kanagawa/iso/keymaps/via/keymap.c | 119 ++++++++++++++++++ .../ciaanh/kanagawa/iso/keymaps/via/rules.mk | 2 + keyboards/ciaanh/kanagawa/rules.mk | 2 + 13 files changed, 237 insertions(+), 102 deletions(-) create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c create mode 100644 keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 6dc940f8a54..10e34263b02 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -29,7 +29,8 @@ "mousekey": false, "nkro": false, "rgb_matrix": true, - "rgblight": false + "rgblight": false, + "encoder": true }, "encoder": { "rotary": [ @@ -145,6 +146,27 @@ "rgb_matrix": { "driver": "WS2812", "center_point": [ 90, 28], + "animations": { + "breathing": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in_dual": true, + "cycle_spiral": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "pixel_flow": true, + "solid_reactive": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true + }, "layout": [ { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index 773ecb92564..99821a8a970 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -31,8 +31,8 @@ enum custom_keycodes }; #define TO_BASE TO(_BASE) -#define TG_LOW TG(_LOWER) -#define TG_UP TG(_RAISE) +#define TG_LOW TG(_LOWER) +#define TG_UP TG(_RAISE) #define _SCRNSHOT LSFT(LGUI(KC_S)) @@ -157,9 +157,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 880ad3c1ad7..f7cd42d5131 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -105,45 +105,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -153,3 +114,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { }; #endif +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 2d849c44e42..fd6d2cb6ca1 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -104,10 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -116,3 +112,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 2e746967b84..19497e9860f 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -30,55 +30,53 @@ # define RGB_DI_PIN GP4 # define WS2812_DI_PIN GP4 -# define RGB_MATRIX_CENTER { 90, 28 } +// /* Enable Framebuffer and keypress effects */ +// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS +// # define RGB_MATRIX_KEYPRESSES - /* Enable Framebuffer and keypress effects */ -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define RGB_MATRIX_KEYPRESSES - -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_BREATHING +// # define ENABLE_RGB_MATRIX_BAND_SAT +// # define ENABLE_RGB_MATRIX_BAND_VAL +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +// # define ENABLE_RGB_MATRIX_CYCLE_ALL +// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +// # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +// # define ENABLE_RGB_MATRIX_DUAL_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// # define ENABLE_RGB_MATRIX_RAINDROPS +// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// # define ENABLE_RGB_MATRIX_HUE_BREATHING +// # define ENABLE_RGB_MATRIX_HUE_PENDULUM +// # define ENABLE_RGB_MATRIX_HUE_WAVE +// # define ENABLE_RGB_MATRIX_PIXEL_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +// # define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +// # define ENABLE_RGB_MATRIX_SOLID_SPLASH +// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 0bd73b55fd6..5ff912f507a 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -29,7 +29,8 @@ "mousekey": false, "nkro": false, "rgb_matrix": true, - "rgblight": false + "rgblight": false, + "encoder": true }, "encoder": { "rotary": [ @@ -144,6 +145,27 @@ "rgb_matrix": { "driver": "WS2812", "center_point": [ 90, 28], + "animations": { + "breathing": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in_dual": true, + "cycle_spiral": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "pixel_flow": true, + "solid_reactive": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_nexus": true, + "splash": true + }, "layout": [ { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 36708f6b799..d9104664657 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -104,10 +104,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, @@ -116,3 +112,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c new file mode 100644 index 00000000000..94e72df1652 --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -0,0 +1,119 @@ +/* Copyright 2023 Ciaanh (@ciaanh) + * + * 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 . + */ +#include QMK_KEYBOARD_H + +#define ___ KC_NO + +enum layers +{ + _BASE, + _LOWER, + _RAISE, + _ADJUST +}; + +/* Keyboard layout +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| +* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | +* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. +* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | +* `---------' `---------' `---------+---------+---------' +*/ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* Keymap: BASE +* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. +* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | +* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' +* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. +* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| +* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | | HOME | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+ ENTER | |---------| +* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | NUHS * | | | END | +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' +* | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. +* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | +* | LCtrl | LGUI | LAlt | LOWER | ,---------. ,---------. | RAlt | RAISE | RCtrl | ,---------|---------|---------. +* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | +* `---------' `---------' `---------+---------+---------' +*/ + [_BASE] = LAYOUT( + KC_ESC, 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_MPLY, \ + + 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_DEL, \ + 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_ENT, KC_HOME, \ + 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_NUHS, KC_END, \ + KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + ), + + + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + ), + + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + ) +}; + +/*****************************************************************************************************/ + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, +}; +#endif + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk new file mode 100644 index 00000000000..4253f570f0b --- /dev/null +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 8db6d04ea5f..592ec0e7ae8 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,4 +1,6 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 +WS2812_DRIVER = vendor + DEFAULT_FOLDER = ciaanh/kanagawa/ansi From bf92c3cc668be0d630e7c4791d95dfb2d9068a95 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Sun, 21 May 2023 21:56:18 +0200 Subject: [PATCH 39/76] Fix ansi default keymap --- .../kanagawa/ansi/keymaps/default/keymap.c | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index f7cd42d5131..fd6d2cb6ca1 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -12,7 +12,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ + */ #include QMK_KEYBOARD_H #define ___ KC_NO @@ -20,9 +20,9 @@ enum layers { _BASE, - _CODE, - _FUNC, - _TOP + _LOWER, + _RAISE, + _ADJUST }; /* Keyboard layout @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | LOWER | ,---------. ,---------. | RAlt | RAISE | RCtrl | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ @@ -71,35 +71,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ ), - [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ ) }; @@ -108,9 +107,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, + [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif From 28483e86fe017c0399534a9b3bc267ab661c53e9 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:42:50 +0200 Subject: [PATCH 40/76] Update keyboards/ciaanh/kanagawa/ansi/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 10e34263b02..a0188443c5f 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -11,10 +11,6 @@ "processor": "RP2040", "bootloader": "rp2040", "diode_direction": "COL2ROW", - "matrix_size": { - "cols": 14, - "rows": 6 - }, "matrix_pins": { "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] From 1f1b905dbefec1ceee42ec6135efd9a4238768c3 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:43:12 +0200 Subject: [PATCH 41/76] Update keyboards/ciaanh/kanagawa/ansi/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/info.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index a0188443c5f..061d450d772 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -16,17 +16,15 @@ "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, - "mousekey": false, + "mousekey": true, "nkro": false, "rgb_matrix": true, - "rgblight": false, - "encoder": true + "encoder": true, + "oled": true }, "encoder": { "rotary": [ From a7886bf85c9e554cd0b066788d84053bcd8db3a1 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:43:31 +0200 Subject: [PATCH 42/76] Update keyboards/ciaanh/kanagawa/ansi/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/ansi/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 061d450d772..b0046fd3551 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -32,7 +32,6 @@ ] }, "bootmagic": { - "enabled": true, "matrix": [0, 13] }, From dea1f1358beaee8269bbfee29f1989ef8fa0535a Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:43:52 +0200 Subject: [PATCH 43/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/config.h | 47 ------------------------------ 1 file changed, 47 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 19497e9860f..f007626893f 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -33,51 +33,4 @@ // /* Enable Framebuffer and keypress effects */ // # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // # define RGB_MATRIX_KEYPRESSES - -// # define ENABLE_RGB_MATRIX_ALPHAS_MODS -// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -// # define ENABLE_RGB_MATRIX_BREATHING -// # define ENABLE_RGB_MATRIX_BAND_SAT -// # define ENABLE_RGB_MATRIX_BAND_VAL -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -// # define ENABLE_RGB_MATRIX_CYCLE_ALL -// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -// # define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -// # define ENABLE_RGB_MATRIX_DUAL_BEACON -// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON -// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -// # define ENABLE_RGB_MATRIX_RAINDROPS -// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// # define ENABLE_RGB_MATRIX_HUE_BREATHING -// # define ENABLE_RGB_MATRIX_HUE_PENDULUM -// # define ENABLE_RGB_MATRIX_HUE_WAVE -// # define ENABLE_RGB_MATRIX_PIXEL_RAIN -// # define ENABLE_RGB_MATRIX_PIXEL_FLOW -// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP -// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -// # define ENABLE_RGB_MATRIX_SPLASH -// # define ENABLE_RGB_MATRIX_MULTISPLASH -// # define ENABLE_RGB_MATRIX_SOLID_SPLASH -// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif - - - From ef88e6ed53def8c613ab556a00bdb1431b08899a Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:44:37 +0200 Subject: [PATCH 44/76] Update keyboards/ciaanh/kanagawa/iso/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 5ff912f507a..4137da7cfbf 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -11,10 +11,6 @@ "processor": "RP2040", "bootloader": "rp2040", "diode_direction": "COL2ROW", - "matrix_size": { - "cols": 14, - "rows": 6 - }, "matrix_pins": { "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] From 56c2da9475ee2629f5e48638653b80196a1cd0ef Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:44:52 +0200 Subject: [PATCH 45/76] Update keyboards/ciaanh/kanagawa/iso/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/info.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 4137da7cfbf..04980d7533e 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -16,17 +16,15 @@ "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, - "mousekey": false, + "mousekey": true, "nkro": false, "rgb_matrix": true, - "rgblight": false, - "encoder": true + "encoder": true, + "oled": true }, "encoder": { "rotary": [ From fc553a91d840ed5ad48c6568d4f45a00c96943b9 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:45:04 +0200 Subject: [PATCH 46/76] Update keyboards/ciaanh/kanagawa/iso/info.json Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/iso/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 04980d7533e..fc2f19c60b5 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -32,7 +32,6 @@ ] }, "bootmagic": { - "enabled": true, "matrix": [0, 13] }, From e4d85cad567deaa77572111b070fb89bd6f08b15 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 22 May 2023 08:45:20 +0200 Subject: [PATCH 47/76] Update keyboards/ciaanh/kanagawa/rules.mk Co-authored-by: Joel Challis --- keyboards/ciaanh/kanagawa/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 592ec0e7ae8..125a86f6991 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,4 +1,3 @@ -OLED_ENABLE = yes OLED_DRIVER = SSD1306 WS2812_DRIVER = vendor From a0a6d7639364fc0df1a49f3c22574533169b3013 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Mon, 22 May 2023 09:29:11 +0200 Subject: [PATCH 48/76] update readme --- keyboards/ciaanh/kanagawa/readme.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md index 25d925dc550..9e3c1deab71 100644 --- a/keyboards/ciaanh/kanagawa/readme.md +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -1,23 +1,26 @@ # Kanagawa -A 75% keyboard with oled and rotary encoder for Raspberry Pico - Keyboard Maintainer : Ciaanh +![Kanagawa](https://i.imgur.com/KKOZbUCh.jpeg) - Hardware Supported : Kanagawa PCB rev 2.1 - - Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa +*A 75% keyboard with oled, rotary encoder and split spacebar for Raspberry Pico* +* Keyboard Maintainer: [Nicolas Fabre](https://github.com/Ciaanh) +* Hardware Supported: *Kanagawa PCB rev 2.1, Raspberry Pico* +* Hardware Availability: *open source files for the PCB and case available [here](https://github.com/Ciaanh/keyboards/tree/main/Kanagawa)* Make example for this keyboard (after setting up your build environment): -```sh -qmk compile -kb ciaanh/kanagawa/iso -km default + make ciaanh/kanagawa/ansi:default + make ciaanh/kanagawa/iso:default -qmk compile -kb ciaanh/kanagawa/ansi -km default -``` + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). ## Bootloader -* **Bootmagic reset**: Hold down the rotary encoder push-button on power-up. -* **Physical buttons**: Press both the reset and the Bootsel button on the back while the board is connected. +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,13) in the matrix (the rotary encoder push-button) and plug in the keyboard +* **Physical reset button**: Briefly press both the reset and the Bootsel on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file From 7eee3b848aa90196f8652ca144fc6a5dcc446303 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 08:19:02 +0200 Subject: [PATCH 49/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index 99821a8a970..e46f5780080 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -155,7 +155,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, From c96036b1c223867c1da87f1249274e9dc9e8e19d Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 09:15:18 +0200 Subject: [PATCH 50/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index fd6d2cb6ca1..132ee92890f 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, From 7cb9cc4740dea0d1a6e85eb630dd5d952bc578f6 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 09:15:31 +0200 Subject: [PATCH 51/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index fd6d2cb6ca1..132ee92890f 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, From b023954b32463fd46e675fd86b285864acf0f47b Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 09:32:39 +0200 Subject: [PATCH 52/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index d9104664657..65c958af476 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, From 4fa91a7ef1616b2f0534d64b6774b34ac976a91a Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 09:34:39 +0200 Subject: [PATCH 53/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c index 94e72df1652..a2621d4b074 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /*****************************************************************************************************/ #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, From 3b14e15495d29c9262fa84d4f4ce0747e72ed989 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Mon, 29 May 2023 10:23:47 +0200 Subject: [PATCH 54/76] clean from reviews --- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 14 - .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 3 - keyboards/ciaanh/kanagawa/config.h | 2 - .../ciaanh/kanagawa/iso/keymaps/via/keymap.c | 4 - keyboards/ciaanh/kanagawa/lib/oledfont.c | 291 ------------------ 5 files changed, 314 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/lib/oledfont.c diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index e46f5780080..79bac3de016 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -25,11 +25,6 @@ enum layers _ADJUST }; -enum custom_keycodes -{ - CUSTOMKEY = SAFE_RANGE, -}; - #define TO_BASE TO(_BASE) #define TG_LOW TG(_LOWER) #define TG_UP TG(_RAISE) @@ -117,15 +112,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case CUSTOMKEY: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - tap_code16(G(A(KC_K))); - } else { - tap_code(KC_MPLY); - } - } - break; case LT(0,KC_X): if (!record->tap.count && record->event.pressed) { tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 132ee92890f..31fd2b03d6b 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -113,6 +113,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { }; #endif -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index f007626893f..1e187d5af15 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -17,8 +17,6 @@ /* OLED SPI Defines */ #ifdef OLED_ENABLE -# define OLED_FONT_H "lib/oledfont.c" - /* I2C Conf */ # define I2C_DRIVER I2CD0 # define I2C1_SDA_PIN GP0 diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c index a2621d4b074..5b75d9f0edb 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -113,7 +113,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, }; #endif - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/ciaanh/kanagawa/lib/oledfont.c b/keyboards/ciaanh/kanagawa/lib/oledfont.c deleted file mode 100644 index 6860b746853..00000000000 --- a/keyboards/ciaanh/kanagawa/lib/oledfont.c +++ /dev/null @@ -1,291 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ - - #include "progmem.h" - -const unsigned char font[] PROGMEM = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x00 000 => - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 001 => sad - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 002 => smile - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 003 => heart - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 004 => diamond - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 005 => clover - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 006 => spade - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 007 => - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 008 => - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 009 => - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 010 => - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 011 => male symbol - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 012 => female symbol - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 013 => - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 014 => - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 015 => - - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 016 => right - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 017 => left - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 018 => - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 019 => !! - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 020 => - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 021 => - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 022 => - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 023 => - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 024 => - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 025 => - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 026 => - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 027 => - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 028 => - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 029 => - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 030 => - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 031 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 032 => sp - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, // 0x21 033 => ! - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, // 0x22 034 => " - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 035 => # - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, // 0x24 036 => $ - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, // 0x25 037 => % - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, // 0x26 038 => & - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, // 0x27 039 => ' - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, // 0x28 040 => ( - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, // 0x29 041 => ) - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 042 => * - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, // 0x2B 043 => + - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, // 0x2C 044 => , - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 0x2D 045 => - - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, // 0x2E 046 => . - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, // 0x2F 047 => / - - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, // 0x30 048 => 0 - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, // 0x31 049 => 1 - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, // 0x32 050 => 2 - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, // 0x33 051 => 3 - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, // 0x34 052 => 4 - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, // 0x35 053 => 5 - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, // 0x36 054 => 6 - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, // 0x37 055 => 7 - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x38 056 => 8 - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, // 0x39 057 => 9 - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, // 0x3A 058 => : - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, // 0x3B 059 => ; - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x3C 060 => < - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 0x3D 061 => = - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, // 0x3E 062 => > - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, // 0x3F 063 => ? - - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, // 0x40 064 => @ - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, // 0x41 065 => A - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, // 0x42 066 => B - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, // 0x43 067 => C - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x44 068 => D - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, // 0x45 069 => E - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, // 0x46 070 => F - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, // 0x47 071 => G - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, // 0x48 072 => H - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, // 0x49 073 => I - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, // 0x4A 074 => J - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, // 0x4B 075 => K - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x4C 076 => L - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, // 0x4D 077 => M - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, // 0x4E 078 => N - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, // 0x4F 079 => O - - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, // 0x50 080 => P - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, // 0x51 081 => Q - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, // 0x52 082 => R - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, // 0x53 083 => S - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, // 0x54 084 => T - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, // 0x55 085 => U - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, // 0x56 086 => V - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, // 0x57 087 => W - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, // 0x58 088 => X - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, // 0x59 089 => Y - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, // 0x5A 090 => Z - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, // 0x5B 091 => [ - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, // 0x5C 092 => '\' - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, // 0x5D 093 => ] - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, // 0x5E 094 => ^ - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, // 0x5F 095 => _ - - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, // 0x60 096 => ` - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, // 0x61 097 => a - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, // 0x62 098 => b - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, // 0x63 099 => c - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, // 0x64 100 => d - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, // 0x65 101 => e - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, // 0x66 102 => f - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, // 0x67 103 => g - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x68 104 => h - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, // 0x69 105 => i - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, // 0x6A 106 => j - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, // 0x6B 107 => k - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, // 0x6C 108 => l - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, // 0x6D 109 => m - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, // 0x6E 110 => n - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, // 0x6F 111 => o - - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, // 0x70 112 => p - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, // 0x71 113 => q - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, // 0x72 114 => r - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, // 0x73 115 => s - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, // 0x74 116 => t - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, // 0x75 117 => u - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, // 0x76 118 => v - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, // 0x77 119 => w - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, // 0x78 120 => x - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, // 0x79 121 => y - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, // 0x7A 122 => z - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, // 0x7B 123 => { - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 => | - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, // 0x7D 125 => } - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, // 0x7E 126 => ~ - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, // 0x7F 127 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x80 128 => ============================= LOGOS =============================== - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x81 129 => - 0x80, 0xC0, 0xC0, 0xC0, 0xE0, 0xF0, // 0x82 130 => - 0xF0, 0xF0, 0xF8, 0xF8, 0xFF, 0xFF, // 0x83 131 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFC, // 0x84 132 => - 0xF8, 0xF8, 0xE0, 0x00, 0x00, 0x00, // 0x85 133 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x86 134 => - 0xE0, 0xF0, 0xF8, 0xF8, 0xF0, 0xE0, // 0x87 135 => - 0xE0, 0xC0, 0xC0, 0x80, 0x00, 0x00, // 0x88 136 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x89 137 => - 0x00, 0x80, 0xE0, 0xF0, 0xE0, 0xE0, // 0x8A 138 => - 0xE0, 0x00, 0x00, 0x00, 0xC0, 0xC0, // 0x8B 139 => - 0xC0, 0xC0, 0xC0, 0xC0, 0x00, 0x00, // 0x8C 140 => - 0x00, 0x00, 0xC0, 0xC0, 0xC0, 0xC0, // 0x8D 141 => - 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x8E 142 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, // 0x8F 143 => - - 0xC0, 0xF0, 0xF0, 0xF0, 0xE0, 0xE0, // 0x90 144 => - 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, // 0x91 145 => - 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0xE0, // 0x92 146 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0x00, // 0x93 147 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x94 148 => - 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, // 0x95 149 => - 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, // 0x96 150 => - 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, // 0x97 151 => - 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, // 0x98 152 => - 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, // 0x99 153 => - 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, // 0x9A 154 => - 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, // 0x9B 155 => - 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, // 0x9C 156 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9D 157 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9E 158 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x9F 159 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA0 160 => - 0x00, 0x0C, 0x0E, 0x8E, 0xCE, 0xFF, // 0xA1 161 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA2 162 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA3 163 => - 0xBF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA4 164 => - 0x7F, 0x1F, 0x0F, 0x00, 0x00, 0x00, // 0xA5 165 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xA6 166 => - 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xA7 167 => - 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x7E, // 0xA8 168 => - 0x3E, 0x3C, 0xDC, 0xE8, 0xF8, 0xFC, // 0xA9 169 => - 0xFE, 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, // 0xAA 170 => - 0xFE, 0xFC, 0xF0, 0xE0, 0xFF, 0xFF, // 0xAB 171 => - 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, // 0xAC 172 => - 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, // 0xAD 173 => - 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, // 0xAE 174 => - 0x80, 0xE0, 0xF0, 0xF8, 0xFE, 0xFF, // 0xAF 175 => - - 0xFF, 0xFF, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB0 176 => - 0xFC, 0xF0, 0xE0, 0x83, 0x0F, 0x0F, // 0xB1 177 => - 0x1F, 0x3F, 0x7F, 0x7F, 0xFF, 0xFF, // 0xB2 178 => - 0xF9, 0xF1, 0xF1, 0xE1, 0xC1, 0xC0, // 0xB3 179 => - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xB4 180 => - 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, // 0xB5 181 => - 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, // 0xB6 182 => - 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, // 0xB7 183 => - 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, // 0xB8 184 => - 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, // 0xB9 185 => - 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, // 0xBA 186 => - 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, // 0xBB 187 => - 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, // 0xBC 188 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBD 189 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBE 190 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xBF 191 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC0 192 => - 0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, // 0xC1 193 => - 0x0F, 0x0F, 0x0F, 0xFF, 0xFF, 0xFF, // 0xC2 194 => - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0xC3 195 => - 0x7F, 0x7F, 0x7F, 0x3F, 0x1F, 0x1C, // 0xC4 196 => - 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, // 0xC5 197 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xC6 198 => - 0x03, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, // 0xC7 199 => - 0x1F, 0x03, 0x01, 0x00, 0x00, 0x00, // 0xC8 200 => - 0x00, 0x00, 0x01, 0x1F, 0x1F, 0x1F, // 0xC9 201 => - 0x1F, 0x1F, 0x1E, 0x1E, 0x0E, 0x0F, // 0xCA 202 => - 0x0F, 0x1F, 0x1F, 0x01, 0x0F, 0x0F, // 0xCB 203 => - 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x1F, // 0xCC 204 => - 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x1F, // 0xCD 205 => - 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F, // 0xCE 206 => - 0x0F, 0x01, 0x1F, 0x1F, 0x1F, 0x1F, // 0xCF 207 => - - 0x1E, 0x1E, 0x1E, 0x0E, 0x0F, 0x0F, // 0xD0 208 => - 0x1F, 0x1F, 0x0F, 0x01, 0x00, 0x0E, // 0xD1 209 => - 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, // 0xD2 210 => - 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, // 0xD3 211 => - 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD4 212 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD5 213 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD6 214 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD7 215 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD8 216 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xD9 217 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDA 218 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDB 219 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDC 220 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDD 221 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDE 222 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xDF 223 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE0 224 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE1 225 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE2 226 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE3 227 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE4 228 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE5 229 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE6 230 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE7 231 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE8 232 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xE9 233 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEA 234 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEB 235 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEC 236 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xED 237 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEE 238 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xEF 239 => - - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF0 240 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF1 241 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF2 242 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF3 243 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF4 244 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF5 245 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF6 246 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF7 247 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF8 248 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xF9 249 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFA 250 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFB 251 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFC 252 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFD 253 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0xFE 254 => - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // 0xFF 255 => -}; From 6f20f3c96d3ca824d647cfdc3a0e0280df6b7f84 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Mon, 29 May 2023 13:04:49 +0200 Subject: [PATCH 55/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 1e187d5af15..cecccda5e44 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -25,7 +25,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Defines */ -# define RGB_DI_PIN GP4 # define WS2812_DI_PIN GP4 // /* Enable Framebuffer and keypress effects */ From 00b75bf94a50f006b92e92bcf1851ecc4a8a1d1f Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 07:56:49 +0200 Subject: [PATCH 56/76] Update rules.mk --- keyboards/ciaanh/kanagawa/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 125a86f6991..1ba2d9d56f9 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,5 +1,3 @@ -OLED_DRIVER = SSD1306 - WS2812_DRIVER = vendor DEFAULT_FOLDER = ciaanh/kanagawa/ansi From cac5a7057354efc1f63eb26895e6c90bbe9d8a01 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:32:43 +0200 Subject: [PATCH 57/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index 79bac3de016..17759361b1e 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -15,14 +15,11 @@ */ #include QMK_KEYBOARD_H -#define ___ KC_NO - -enum layers -{ +enum layers { _BASE, _LOWER, _RAISE, - _ADJUST + _ADJUST, }; #define TO_BASE TO(_BASE) From 96f40423e6ae341924e260222031a8a29c86bb4a Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:32:57 +0200 Subject: [PATCH 58/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 132ee92890f..7b61ecc1781 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -15,14 +15,11 @@ */ #include QMK_KEYBOARD_H -#define ___ KC_NO - -enum layers -{ +enum layers { _BASE, _LOWER, _RAISE, - _ADJUST + _ADJUST, }; /* Keyboard layout From e41a12f3085dc4340d484d5acba45aaabded96ef Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:33:12 +0200 Subject: [PATCH 59/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 31fd2b03d6b..78704570319 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -15,14 +15,11 @@ */ #include QMK_KEYBOARD_H -#define ___ KC_NO - -enum layers -{ +enum layers { _BASE, _LOWER, _RAISE, - _ADJUST + _ADJUST, }; /* Keyboard layout From e75b9ce493c252bd7c31fee2e08dfd9e63df3bf3 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:33:32 +0200 Subject: [PATCH 60/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index cecccda5e44..c9a49b6b7e8 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -15,7 +15,6 @@ */ #pragma once -/* OLED SPI Defines */ #ifdef OLED_ENABLE /* I2C Conf */ # define I2C_DRIVER I2CD0 From 2a3ec8d18eebc61dfb92ad5c0127ab239fcc5c85 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:33:58 +0200 Subject: [PATCH 61/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 65c958af476..105370aef55 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -15,14 +15,11 @@ */ #include QMK_KEYBOARD_H -#define ___ KC_NO - -enum layers -{ +enum layers { _BASE, _LOWER, _RAISE, - _ADJUST + _ADJUST, }; /* Keyboard layout From 0c829f7e4149807e6c393499141d0803352021f9 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sun, 11 Jun 2023 09:34:11 +0200 Subject: [PATCH 62/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c index 5b75d9f0edb..bdf72e7b021 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -15,14 +15,11 @@ */ #include QMK_KEYBOARD_H -#define ___ KC_NO - -enum layers -{ +enum layers { _BASE, _LOWER, _RAISE, - _ADJUST + _ADJUST, }; /* Keyboard layout From 25d6350ff02b0faa37d93268f4ae5d52a78de8f5 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Tue, 4 Jul 2023 08:47:16 +0200 Subject: [PATCH 63/76] clean keymaps --- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 48 +++++++++---------- .../kanagawa/ansi/keymaps/default/keymap.c | 48 +++++++++---------- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 48 +++++++++---------- .../kanagawa/iso/keymaps/default/keymap.c | 48 +++++++++---------- .../ciaanh/kanagawa/iso/keymaps/via/keymap.c | 48 +++++++++---------- 5 files changed, 120 insertions(+), 120 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c index 17759361b1e..1a7ab726080 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c @@ -65,43 +65,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, - 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_DEL, \ - 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_HOME, \ - KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, TG_LOW, KC_SPC, KC_SPC, KC_RALT, TG_UP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, + 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_HOME, + KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, TG_LOW, KC_SPC, KC_SPC, KC_RALT, TG_UP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, _______, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, _______, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI ) }; diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 7b61ecc1781..41aeed461be 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -59,43 +59,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, - 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_DEL, \ - 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_HOME, \ - 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, + 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_HOME, + 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 78704570319..1aede65e9c1 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -59,43 +59,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, - 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_DEL, \ - 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_HOME, \ - 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, + 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_HOME, + 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index 105370aef55..850b507d25b 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -59,43 +59,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, - 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_DEL, \ - 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_ENT, KC_HOME, \ - 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_NUHS, KC_END, \ - KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, + 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_ENT, KC_HOME, + 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_NUHS, KC_END, + KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c index bdf72e7b021..cf37f89b8e2 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -59,44 +59,44 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------' `---------' `---------+---------+---------' */ [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, \ + KC_ESC, 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_MPLY, - 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_DEL, \ - 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_ENT, KC_HOME, \ - 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_NUHS, KC_END, \ - KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT \ + 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_DEL, + 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_ENT, KC_HOME, + 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_NUHS, KC_END, + KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ), [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, + XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SPD, RGB_SPI, XXXXXXX, _______, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; From e0719c437e4937afd862a6a61f9b4011c820a1c8 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Tue, 4 Jul 2023 08:36:54 +0200 Subject: [PATCH 64/76] Update keyboards/ciaanh/kanagawa/ansi/config.h Co-authored-by: Ryan --- keyboards/ciaanh/kanagawa/ansi/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/config.h b/keyboards/ciaanh/kanagawa/ansi/config.h index 4a58d3409ab..81229ef6d4a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/config.h +++ b/keyboards/ciaanh/kanagawa/ansi/config.h @@ -15,6 +15,4 @@ */ #pragma once -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 82 -#endif \ No newline at end of file +#define RGB_MATRIX_LED_COUNT 82 \ No newline at end of file From 5bdcedb986bcd6fee094ee149ad44293f7c3b029 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Tue, 4 Jul 2023 09:02:44 +0200 Subject: [PATCH 65/76] fix comments --- keyboards/ciaanh/kanagawa/ansi/info.json | 432 +++++++++++----------- keyboards/ciaanh/kanagawa/config.h | 9 - keyboards/ciaanh/kanagawa/iso/info.json | 433 +++++++++++------------ keyboards/ciaanh/kanagawa/rules.mk | 2 - 4 files changed, 419 insertions(+), 457 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index b0046fd3551..b46bd48ec2c 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -1,254 +1,240 @@ { - "keyboard_name": "Kanagawa", - "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", "manufacturer": "Ciaanh", + "keyboard_name": "Kanagawa", "maintainer": "Ciaanh", - "usb": { - "vid": "0xC1E0", - "pid": "0x0010", - "device_version": "2.1.0" - }, - "processor": "RP2040", "bootloader": "rp2040", + "bootmagic": { + "matrix": [0, 13] + }, "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], - "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false, - "rgb_matrix": true, - "encoder": true, - "oled": true - }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} ] }, - "bootmagic": { - "matrix": [0, 13] + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgb_matrix": true }, - - - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, - { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, - - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1 }, - { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, - - { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, - - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2 }, - { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, - - { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3 }, - { "label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25 }, - - { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, - - { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25 }, - { "label": "", "matrix": [4, 1], "x": 1.25, "y": 4 }, - { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4 }, - { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, - { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, - { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, - { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, - { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, - { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4 }, - { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4 }, - { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4 }, - { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4 }, - { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, - - { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, - - { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, - { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, - { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, - { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, - { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, - { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, - { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, - { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, - { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, - { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } - ] - } + "matrix_pins": { + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"], + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"] }, - + "processor": "RP2040", "rgb_matrix": { - "driver": "WS2812", - "center_point": [ 90, 28], "animations": { - "breathing": true, - "band_val": true, "band_pinwheel_sat": true, "band_pinwheel_val": true, + "band_val": true, + "breathing": true, "cycle_all": true, "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, "cycle_out_in_dual": true, "cycle_spiral": true, + "cycle_up_down": true, + "pixel_flow": true, "rainbow_beacon": true, + "rainbow_moving_chevron": true, "rainbow_pinwheels": true, "raindrops": true, - "pixel_flow": true, "solid_reactive": true, - "solid_reactive_multiwide": true, "solid_reactive_cross": true, + "solid_reactive_multiwide": true, "solid_reactive_nexus": true, "splash": true }, + "center_point": [90, 28], + "driver": "WS2812", "layout": [ - { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, - { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, - { "flags": 4,"matrix": [0,10],"x": 161, "y": 0 }, - { "flags": 4,"matrix": [0, 9],"x": 147, "y": 0 }, - { "flags": 4,"matrix": [0, 8],"x": 126, "y": 0 }, - { "flags": 4,"matrix": [0, 7],"x": 112, "y": 0 }, - { "flags": 4,"matrix": [0, 6],"x": 98, "y": 0 }, - { "flags": 4,"matrix": [0, 5],"x": 84, "y": 0 }, - { "flags": 4,"matrix": [0, 4],"x": 63, "y": 0 }, - { "flags": 4,"matrix": [0, 3],"x": 49, "y": 0 }, - { "flags": 4,"matrix": [0, 2],"x": 35, "y": 0 }, - { "flags": 4,"matrix": [0, 1],"x": 21, "y": 0 }, - { "flags": 4,"matrix": [0, 0],"x": 0, "y": 0 }, - - { "flags": 1,"matrix": [1,13],"x": 189, "y": 12 }, - { "flags": 4,"matrix": [1,12],"x": 168, "y": 12 }, - { "flags": 4,"matrix": [1,11],"x": 154, "y": 12 }, - { "flags": 4,"matrix": [1,10],"x": 140, "y": 12 }, - { "flags": 4,"matrix": [1, 9],"x": 126, "y": 12 }, - { "flags": 4,"matrix": [1, 8],"x": 112, "y": 12 }, - { "flags": 4,"matrix": [1, 7],"x": 98, "y": 12 }, - { "flags": 4,"matrix": [1, 6],"x": 84, "y": 12 }, - { "flags": 4,"matrix": [1, 5],"x": 70, "y": 12 }, - { "flags": 4,"matrix": [1, 4],"x": 56, "y": 12 }, - { "flags": 4,"matrix": [1, 3],"x": 42, "y": 12 }, - { "flags": 4,"matrix": [1, 2],"x": 28, "y": 12 }, - { "flags": 4,"matrix": [1, 1],"x": 14, "y": 12 }, - { "flags": 4,"matrix": [1, 0],"x": 0, "y": 12 }, - - { "flags": 1,"matrix": [2,13],"x": 189, "y": 23 }, - { "flags": 4,"matrix": [2,12],"x": 179, "y": 23 }, - { "flags": 4,"matrix": [2,11],"x": 161, "y": 23 }, - { "flags": 4,"matrix": [2,10],"x": 147, "y": 23 }, - { "flags": 4,"matrix": [2, 9],"x": 133, "y": 23 }, - { "flags": 4,"matrix": [2, 8],"x": 119, "y": 23 }, - { "flags": 4,"matrix": [2, 7],"x": 105, "y": 23 }, - { "flags": 4,"matrix": [2, 6],"x": 91, "y": 23 }, - { "flags": 4,"matrix": [2, 5],"x": 77, "y": 23 }, - { "flags": 4,"matrix": [2, 4],"x": 63, "y": 23 }, - { "flags": 4,"matrix": [2, 3],"x": 49, "y": 23 }, - { "flags": 4,"matrix": [2, 2],"x": 35, "y": 23 }, - { "flags": 4,"matrix": [2, 1],"x": 21, "y": 23 }, - { "flags": 1,"matrix": [2, 0],"x": 4, "y": 23 }, - - { "flags": 1,"matrix": [3,12],"x": 187, "y": 35 }, - { "flags": 4,"matrix": [3,11],"x": 165, "y": 35 }, - { "flags": 4,"matrix": [3,10],"x": 151, "y": 35 }, - { "flags": 4,"matrix": [3, 9],"x": 137, "y": 35 }, - { "flags": 4,"matrix": [3, 8],"x": 123, "y": 35 }, - { "flags": 4,"matrix": [3, 7],"x": 109, "y": 35 }, - { "flags": 4,"matrix": [3, 6],"x": 95, "y": 35 }, - { "flags": 4,"matrix": [3, 5],"x": 81, "y": 35 }, - { "flags": 4,"matrix": [3, 4],"x": 67, "y": 35 }, - { "flags": 4,"matrix": [3, 3],"x": 53, "y": 35 }, - { "flags": 4,"matrix": [3, 2],"x": 39, "y": 35 }, - { "flags": 4,"matrix": [3, 1],"x": 25, "y": 35 }, - { "flags": 1,"matrix": [3, 0],"x": 5, "y": 35 }, - - { "flags": 1,"matrix": [4,12],"x": 177, "y": 47 }, - { "flags": 4,"matrix": [4,11],"x": 158, "y": 47 }, - { "flags": 4,"matrix": [4,10],"x": 144, "y": 47 }, - { "flags": 4,"matrix": [4, 9],"x": 130, "y": 47 }, - { "flags": 4,"matrix": [4, 8],"x": 116, "y": 47 }, - { "flags": 4,"matrix": [4, 7],"x": 102, "y": 47 }, - { "flags": 4,"matrix": [4, 6],"x": 88, "y": 47 }, - { "flags": 4,"matrix": [4, 5],"x": 74, "y": 47 }, - { "flags": 4,"matrix": [4, 4],"x": 60, "y": 47 }, - { "flags": 4,"matrix": [4, 3],"x": 46, "y": 47 }, - { "flags": 4,"matrix": [4, 2],"x": 32, "y": 47 }, - { "flags": 1,"matrix": [4, 0],"x": 9, "y": 47 }, - - { "flags": 1,"matrix": [3,13],"x": 224, "y": 12 }, - { "flags": 4,"matrix": [4,13],"x": 224, "y": 23 }, - { "flags": 4,"matrix": [5,13],"x": 224, "y": 35 }, - - { "flags": 4,"matrix": [5,11],"x": 214, "y": 61 }, - { "flags": 4,"matrix": [5,12],"x": 200, "y": 49 }, - { "flags": 4,"matrix": [5,10],"x": 200, "y": 61 }, - { "flags": 4,"matrix": [5, 9],"x": 186, "y": 61 }, - { "flags": 1,"matrix": [5, 8],"x": 168, "y": 58 }, - { "flags": 1,"matrix": [5, 7],"x": 154, "y": 58 }, - { "flags": 1,"matrix": [5, 6],"x": 140, "y": 58 }, - { "flags": 4,"matrix": [5, 5],"x": 114, "y": 64 }, - { "flags": 4,"matrix": [5, 4],"x": 82, "y": 64 }, - { "flags": 1,"matrix": [5, 3],"x": 70, "y": 58 }, - { "flags": 1,"matrix": [5, 2],"x": 32, "y": 58 }, - { "flags": 1,"matrix": [5, 1],"x": 16, "y": 58 }, - { "flags": 1,"matrix": [5, 0],"x": 0, "y": 58 } + {"matrix": [0, 12], "x": 189, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 175, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 147, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 126, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 98, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 63, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 49, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 13], "x": 189, "y": 12, "flags": 1}, + {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4}, + {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4}, + {"matrix": [1, 10], "x": 140, "y": 12, "flags": 4}, + {"matrix": [1, 9], "x": 126, "y": 12, "flags": 4}, + {"matrix": [1, 8], "x": 112, "y": 12, "flags": 4}, + {"matrix": [1, 7], "x": 98, "y": 12, "flags": 4}, + {"matrix": [1, 6], "x": 84, "y": 12, "flags": 4}, + {"matrix": [1, 5], "x": 70, "y": 12, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 12, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 12, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, + {"matrix": [2, 13], "x": 189, "y": 23, "flags": 1}, + {"matrix": [2, 12], "x": 179, "y": 23, "flags": 4}, + {"matrix": [2, 11], "x": 161, "y": 23, "flags": 4}, + {"matrix": [2, 10], "x": 147, "y": 23, "flags": 4}, + {"matrix": [2, 9], "x": 133, "y": 23, "flags": 4}, + {"matrix": [2, 8], "x": 119, "y": 23, "flags": 4}, + {"matrix": [2, 7], "x": 105, "y": 23, "flags": 4}, + {"matrix": [2, 6], "x": 91, "y": 23, "flags": 4}, + {"matrix": [2, 5], "x": 77, "y": 23, "flags": 4}, + {"matrix": [2, 4], "x": 63, "y": 23, "flags": 4}, + {"matrix": [2, 3], "x": 49, "y": 23, "flags": 4}, + {"matrix": [2, 2], "x": 35, "y": 23, "flags": 4}, + {"matrix": [2, 1], "x": 21, "y": 23, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 23, "flags": 1}, + {"matrix": [3, 12], "x": 187, "y": 35, "flags": 1}, + {"matrix": [3, 11], "x": 165, "y": 35, "flags": 4}, + {"matrix": [3, 10], "x": 151, "y": 35, "flags": 4}, + {"matrix": [3, 9], "x": 137, "y": 35, "flags": 4}, + {"matrix": [3, 8], "x": 123, "y": 35, "flags": 4}, + {"matrix": [3, 7], "x": 109, "y": 35, "flags": 4}, + {"matrix": [3, 6], "x": 95, "y": 35, "flags": 4}, + {"matrix": [3, 5], "x": 81, "y": 35, "flags": 4}, + {"matrix": [3, 4], "x": 67, "y": 35, "flags": 4}, + {"matrix": [3, 3], "x": 53, "y": 35, "flags": 4}, + {"matrix": [3, 2], "x": 39, "y": 35, "flags": 4}, + {"matrix": [3, 1], "x": 25, "y": 35, "flags": 4}, + {"matrix": [3, 0], "x": 5, "y": 35, "flags": 1}, + {"matrix": [4, 12], "x": 177, "y": 47, "flags": 1}, + {"matrix": [4, 11], "x": 158, "y": 47, "flags": 4}, + {"matrix": [4, 10], "x": 144, "y": 47, "flags": 4}, + {"matrix": [4, 9], "x": 130, "y": 47, "flags": 4}, + {"matrix": [4, 8], "x": 116, "y": 47, "flags": 4}, + {"matrix": [4, 7], "x": 102, "y": 47, "flags": 4}, + {"matrix": [4, 6], "x": 88, "y": 47, "flags": 4}, + {"matrix": [4, 5], "x": 74, "y": 47, "flags": 4}, + {"matrix": [4, 4], "x": 60, "y": 47, "flags": 4}, + {"matrix": [4, 3], "x": 46, "y": 47, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 47, "flags": 4}, + {"matrix": [4, 0], "x": 9, "y": 47, "flags": 1}, + {"matrix": [3, 13], "x": 224, "y": 12, "flags": 1}, + {"matrix": [4, 13], "x": 224, "y": 23, "flags": 4}, + {"matrix": [5, 13], "x": 224, "y": 35, "flags": 4}, + {"matrix": [5, 11], "x": 214, "y": 61, "flags": 4}, + {"matrix": [5, 12], "x": 200, "y": 49, "flags": 4}, + {"matrix": [5, 10], "x": 200, "y": 61, "flags": 4}, + {"matrix": [5, 9], "x": 186, "y": 61, "flags": 4}, + {"matrix": [5, 8], "x": 168, "y": 58, "flags": 1}, + {"matrix": [5, 7], "x": 154, "y": 58, "flags": 1}, + {"matrix": [5, 6], "x": 140, "y": 58, "flags": 1}, + {"matrix": [5, 5], "x": 114, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 82, "y": 64, "flags": 4}, + {"matrix": [5, 3], "x": 70, "y": 58, "flags": 1}, + {"matrix": [5, 2], "x": 32, "y": 58, "flags": 1}, + {"matrix": [5, 1], "x": 16, "y": 58, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 58, "flags": 1} ] + }, + "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", + "usb": { + "device_version": "2.1.0", + "pid": "0x0010", + "vid": "0xC1E0" + }, + "ws2812": { + "pin": "GP4", + "driver": "vendor" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0}, + {"label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "^", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "&", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "*", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "(", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": ")", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "_", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "+", "matrix": [1, 12], "x": 12, "y": 1}, + {"label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"label": "Del", "matrix": [3, 13], "x": 16, "y": 1}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Home", "matrix": [4, 13], "x": 16, "y": 2}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "End", "matrix": [5, 13], "x": 16, "y": 3}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"label": "", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4}, + {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4}, + {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4}, + {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5}, + {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5}, + {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5}, + {"label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5}, + {"label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25}, + {"label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75}, + {"label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5}, + {"label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5}, + {"label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5}, + {"label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25} + ] + } } -} +} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index c9a49b6b7e8..3c4b68b12fa 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -21,12 +21,3 @@ # define I2C1_SDA_PIN GP0 # define I2C1_SCL_PIN GP1 #endif - -#ifdef RGB_MATRIX_ENABLE - /* RGB Defines */ -# define WS2812_DI_PIN GP4 - -// /* Enable Framebuffer and keypress effects */ -// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index fc2f19c60b5..bcffa312da2 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -1,254 +1,241 @@ { - "keyboard_name": "Kanagawa", - "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", "manufacturer": "Ciaanh", + "keyboard_name": "Kanagawa", "maintainer": "Ciaanh", - "usb": { - "vid": "0xC1E0", - "pid": "0x0011", - "device_version": "2.1.0" - }, - "processor": "RP2040", "bootloader": "rp2040", + "bootmagic": { + "matrix": [0, 13] + }, "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"], - "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"] - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false, - "rgb_matrix": true, - "encoder": true, - "oled": true - }, "encoder": { "rotary": [ {"pin_a": "GP2", "pin_b": "GP3"} ] }, - "bootmagic": { - "matrix": [0, 13] + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgb_matrix": true }, - - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 6, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 7, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 8, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 9, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0 }, - { "label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0 }, - - { "label": "²", "matrix": [1, 0], "x": 0, "y": 1 }, - { "label": "&", "matrix": [1, 1], "x": 1, "y": 1 }, - { "label": "é", "matrix": [1, 2], "x": 2, "y": 1 }, - { "label": "\"", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "'", "matrix": [1, 4], "x": 4, "y": 1 }, - { "label": "(", "matrix": [1, 5], "x": 5, "y": 1 }, - { "label": "-", "matrix": [1, 6], "x": 6, "y": 1 }, - { "label": "è", "matrix": [1, 7], "x": 7, "y": 1 }, - { "label": "_", "matrix": [1, 8], "x": 8, "y": 1 }, - { "label": "ç", "matrix": [1, 9], "x": 9, "y": 1 }, - { "label": "à", "matrix": [1, 10], "x": 10, "y": 1 }, - { "label": ")", "matrix": [1, 11], "x": 11, "y": 1 }, - { "label": "=", "matrix": [1, 12], "x": 12, "y": 1 }, - { "label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2 }, - - { "label": "Del", "matrix": [3, 13], "x": 16, "y": 1 }, - - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5 }, - { "label": "A", "matrix": [2, 1], "x": 1.5, "y": 2 }, - { "label": "Z", "matrix": [2, 2], "x": 2.5, "y": 2 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2 }, - { "label": "^", "matrix": [2, 11], "x": 11.5, "y": 2 }, - { "label": "$", "matrix": [2, 12], "x": 12.5, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5 }, - - { "label": "Home", "matrix": [4, 13], "x": 16, "y": 2 }, - - { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75 }, - { "label": "Q", "matrix": [3, 1], "x": 1.75, "y": 3 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3 }, - { "label": "M", "matrix": [3, 10], "x": 10.75, "y": 3 }, - { "label": "ù", "matrix": [3, 11], "x": 11.75, "y": 3 }, - { "label": "*", "matrix": [3, 12], "x": 12.75, "y": 3 }, - - { "label": "End", "matrix": [5, 13], "x": 16, "y": 3 }, - - { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "<", "matrix": [4, 1], "x": 1.25, "y": 4 }, - { "label": "W", "matrix": [4, 2], "x": 2.25, "y": 4 }, - { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4 }, - { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4 }, - { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4 }, - { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4 }, - { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4 }, - { "label": ",", "matrix": [4, 8], "x": 8.25, "y": 4 }, - { "label": ";", "matrix": [4, 9], "x": 9.25, "y": 4 }, - { "label": ":", "matrix": [4, 10], "x": 10.25, "y": 4 }, - { "label": "!", "matrix": [4, 11], "x": 11.25, "y": 4 }, - { "label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75 }, - - { "label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25 }, - - { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5 }, - { "label": "Win", "matrix": [5, 1], "x": 1, "y": 5 }, - { "label": "Alt", "matrix": [5, 2], "x": 2, "y": 5 }, - { "label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5 }, - { "label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25 }, - { "label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75 }, - { "label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5 }, - { "label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5 }, - { "label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5 }, - { "label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25 } - ] - } + "matrix_pins": { + "cols": ["GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18"], + "rows": ["GP28", "GP27", "GP26", "GP22", "GP21", "GP20"] }, - + "processor": "RP2040", "rgb_matrix": { - "driver": "WS2812", - "center_point": [ 90, 28], "animations": { - "breathing": true, - "band_val": true, "band_pinwheel_sat": true, "band_pinwheel_val": true, + "band_val": true, + "breathing": true, "cycle_all": true, "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, "cycle_out_in_dual": true, "cycle_spiral": true, + "cycle_up_down": true, + "pixel_flow": true, "rainbow_beacon": true, + "rainbow_moving_chevron": true, "rainbow_pinwheels": true, "raindrops": true, - "pixel_flow": true, "solid_reactive": true, - "solid_reactive_multiwide": true, "solid_reactive_cross": true, + "solid_reactive_multiwide": true, "solid_reactive_nexus": true, "splash": true }, + "center_point": [90, 28], + "driver": "WS2812", "layout": [ - { "flags": 4,"matrix": [0,12],"x": 189, "y": 0 }, - { "flags": 4,"matrix": [0,11],"x": 175, "y": 0 }, - { "flags": 4,"matrix": [0,10],"x": 161, "y": 0 }, - { "flags": 4,"matrix": [0, 9],"x": 147, "y": 0 }, - { "flags": 4,"matrix": [0, 8],"x": 126, "y": 0 }, - { "flags": 4,"matrix": [0, 7],"x": 112, "y": 0 }, - { "flags": 4,"matrix": [0, 6],"x": 98, "y": 0 }, - { "flags": 4,"matrix": [0, 5],"x": 84, "y": 0 }, - { "flags": 4,"matrix": [0, 4],"x": 63, "y": 0 }, - { "flags": 4,"matrix": [0, 3],"x": 49, "y": 0 }, - { "flags": 4,"matrix": [0, 2],"x": 35, "y": 0 }, - { "flags": 4,"matrix": [0, 1],"x": 21, "y": 0 }, - { "flags": 4,"matrix": [0, 0],"x": 0, "y": 0 }, - - { "flags": 1,"matrix": [1,13],"x": 189, "y": 12 }, - { "flags": 4,"matrix": [1,12],"x": 168, "y": 12 }, - { "flags": 4,"matrix": [1,11],"x": 154, "y": 12 }, - { "flags": 4,"matrix": [1,10],"x": 140, "y": 12 }, - { "flags": 4,"matrix": [1, 9],"x": 126, "y": 12 }, - { "flags": 4,"matrix": [1, 8],"x": 112, "y": 12 }, - { "flags": 4,"matrix": [1, 7],"x": 98, "y": 12 }, - { "flags": 4,"matrix": [1, 6],"x": 84, "y": 12 }, - { "flags": 4,"matrix": [1, 5],"x": 70, "y": 12 }, - { "flags": 4,"matrix": [1, 4],"x": 56, "y": 12 }, - { "flags": 4,"matrix": [1, 3],"x": 42, "y": 12 }, - { "flags": 4,"matrix": [1, 2],"x": 28, "y": 12 }, - { "flags": 4,"matrix": [1, 1],"x": 14, "y": 12 }, - { "flags": 4,"matrix": [1, 0],"x": 0, "y": 12 }, - - { "flags": 1,"matrix": [2,13],"x": 189, "y": 23 }, - { "flags": 4,"matrix": [2,12],"x": 179, "y": 23 }, - { "flags": 4,"matrix": [2,11],"x": 161, "y": 23 }, - { "flags": 4,"matrix": [2,10],"x": 147, "y": 23 }, - { "flags": 4,"matrix": [2, 9],"x": 133, "y": 23 }, - { "flags": 4,"matrix": [2, 8],"x": 119, "y": 23 }, - { "flags": 4,"matrix": [2, 7],"x": 105, "y": 23 }, - { "flags": 4,"matrix": [2, 6],"x": 91, "y": 23 }, - { "flags": 4,"matrix": [2, 5],"x": 77, "y": 23 }, - { "flags": 4,"matrix": [2, 4],"x": 63, "y": 23 }, - { "flags": 4,"matrix": [2, 3],"x": 49, "y": 23 }, - { "flags": 4,"matrix": [2, 2],"x": 35, "y": 23 }, - { "flags": 4,"matrix": [2, 1],"x": 21, "y": 23 }, - { "flags": 1,"matrix": [2, 0],"x": 4, "y": 23 }, - - { "flags": 1,"matrix": [3,12],"x": 187, "y": 35 }, - { "flags": 4,"matrix": [3,11],"x": 165, "y": 35 }, - { "flags": 4,"matrix": [3,10],"x": 151, "y": 35 }, - { "flags": 4,"matrix": [3, 9],"x": 137, "y": 35 }, - { "flags": 4,"matrix": [3, 8],"x": 123, "y": 35 }, - { "flags": 4,"matrix": [3, 7],"x": 109, "y": 35 }, - { "flags": 4,"matrix": [3, 6],"x": 95, "y": 35 }, - { "flags": 4,"matrix": [3, 5],"x": 81, "y": 35 }, - { "flags": 4,"matrix": [3, 4],"x": 67, "y": 35 }, - { "flags": 4,"matrix": [3, 3],"x": 53, "y": 35 }, - { "flags": 4,"matrix": [3, 2],"x": 39, "y": 35 }, - { "flags": 4,"matrix": [3, 1],"x": 25, "y": 35 }, - { "flags": 1,"matrix": [3, 0],"x": 5, "y": 35 }, - - { "flags": 1,"matrix": [4,12],"x": 177, "y": 47 }, - { "flags": 4,"matrix": [4,11],"x": 158, "y": 47 }, - { "flags": 4,"matrix": [4,10],"x": 144, "y": 47 }, - { "flags": 4,"matrix": [4, 9],"x": 130, "y": 47 }, - { "flags": 4,"matrix": [4, 8],"x": 116, "y": 47 }, - { "flags": 4,"matrix": [4, 7],"x": 102, "y": 47 }, - { "flags": 4,"matrix": [4, 6],"x": 88, "y": 47 }, - { "flags": 4,"matrix": [4, 5],"x": 74, "y": 47 }, - { "flags": 4,"matrix": [4, 4],"x": 60, "y": 47 }, - { "flags": 4,"matrix": [4, 3],"x": 46, "y": 47 }, - { "flags": 4,"matrix": [4, 2],"x": 32, "y": 47 }, - { "flags": 4,"matrix": [4, 1],"x": 18, "y": 47 }, - { "flags": 1,"matrix": [4, 0],"x": 2, "y": 47 }, - - { "flags": 1,"matrix": [3,13],"x": 224, "y": 12 }, - { "flags": 4,"matrix": [4,13],"x": 224, "y": 23 }, - { "flags": 4,"matrix": [5,13],"x": 224, "y": 35 }, - - { "flags": 4,"matrix": [5,11],"x": 214, "y": 61 }, - { "flags": 4,"matrix": [5,12],"x": 200, "y": 49 }, - { "flags": 4,"matrix": [5,10],"x": 200, "y": 61 }, - { "flags": 4,"matrix": [5, 9],"x": 186, "y": 61 }, - { "flags": 1,"matrix": [5, 8],"x": 168, "y": 58 }, - { "flags": 1,"matrix": [5, 7],"x": 154, "y": 58 }, - { "flags": 1,"matrix": [5, 6],"x": 140, "y": 58 }, - { "flags": 4,"matrix": [5, 5],"x": 114, "y": 64 }, - { "flags": 4,"matrix": [5, 4],"x": 82, "y": 64 }, - { "flags": 1,"matrix": [5, 3],"x": 70, "y": 58 }, - { "flags": 1,"matrix": [5, 2],"x": 32, "y": 58 }, - { "flags": 1,"matrix": [5, 1],"x": 16, "y": 58 }, - { "flags": 1,"matrix": [5, 0],"x": 0, "y": 58 } + {"matrix": [0, 12], "x": 189, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 175, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 147, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 126, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 98, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 63, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 49, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 13], "x": 189, "y": 12, "flags": 1}, + {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4}, + {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4}, + {"matrix": [1, 10], "x": 140, "y": 12, "flags": 4}, + {"matrix": [1, 9], "x": 126, "y": 12, "flags": 4}, + {"matrix": [1, 8], "x": 112, "y": 12, "flags": 4}, + {"matrix": [1, 7], "x": 98, "y": 12, "flags": 4}, + {"matrix": [1, 6], "x": 84, "y": 12, "flags": 4}, + {"matrix": [1, 5], "x": 70, "y": 12, "flags": 4}, + {"matrix": [1, 4], "x": 56, "y": 12, "flags": 4}, + {"matrix": [1, 3], "x": 42, "y": 12, "flags": 4}, + {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4}, + {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, + {"matrix": [2, 13], "x": 189, "y": 23, "flags": 1}, + {"matrix": [2, 12], "x": 179, "y": 23, "flags": 4}, + {"matrix": [2, 11], "x": 161, "y": 23, "flags": 4}, + {"matrix": [2, 10], "x": 147, "y": 23, "flags": 4}, + {"matrix": [2, 9], "x": 133, "y": 23, "flags": 4}, + {"matrix": [2, 8], "x": 119, "y": 23, "flags": 4}, + {"matrix": [2, 7], "x": 105, "y": 23, "flags": 4}, + {"matrix": [2, 6], "x": 91, "y": 23, "flags": 4}, + {"matrix": [2, 5], "x": 77, "y": 23, "flags": 4}, + {"matrix": [2, 4], "x": 63, "y": 23, "flags": 4}, + {"matrix": [2, 3], "x": 49, "y": 23, "flags": 4}, + {"matrix": [2, 2], "x": 35, "y": 23, "flags": 4}, + {"matrix": [2, 1], "x": 21, "y": 23, "flags": 4}, + {"matrix": [2, 0], "x": 4, "y": 23, "flags": 1}, + {"matrix": [3, 12], "x": 187, "y": 35, "flags": 1}, + {"matrix": [3, 11], "x": 165, "y": 35, "flags": 4}, + {"matrix": [3, 10], "x": 151, "y": 35, "flags": 4}, + {"matrix": [3, 9], "x": 137, "y": 35, "flags": 4}, + {"matrix": [3, 8], "x": 123, "y": 35, "flags": 4}, + {"matrix": [3, 7], "x": 109, "y": 35, "flags": 4}, + {"matrix": [3, 6], "x": 95, "y": 35, "flags": 4}, + {"matrix": [3, 5], "x": 81, "y": 35, "flags": 4}, + {"matrix": [3, 4], "x": 67, "y": 35, "flags": 4}, + {"matrix": [3, 3], "x": 53, "y": 35, "flags": 4}, + {"matrix": [3, 2], "x": 39, "y": 35, "flags": 4}, + {"matrix": [3, 1], "x": 25, "y": 35, "flags": 4}, + {"matrix": [3, 0], "x": 5, "y": 35, "flags": 1}, + {"matrix": [4, 12], "x": 177, "y": 47, "flags": 1}, + {"matrix": [4, 11], "x": 158, "y": 47, "flags": 4}, + {"matrix": [4, 10], "x": 144, "y": 47, "flags": 4}, + {"matrix": [4, 9], "x": 130, "y": 47, "flags": 4}, + {"matrix": [4, 8], "x": 116, "y": 47, "flags": 4}, + {"matrix": [4, 7], "x": 102, "y": 47, "flags": 4}, + {"matrix": [4, 6], "x": 88, "y": 47, "flags": 4}, + {"matrix": [4, 5], "x": 74, "y": 47, "flags": 4}, + {"matrix": [4, 4], "x": 60, "y": 47, "flags": 4}, + {"matrix": [4, 3], "x": 46, "y": 47, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 47, "flags": 4}, + {"matrix": [4, 1], "x": 18, "y": 47, "flags": 4}, + {"matrix": [4, 0], "x": 2, "y": 47, "flags": 1}, + {"matrix": [3, 13], "x": 224, "y": 12, "flags": 1}, + {"matrix": [4, 13], "x": 224, "y": 23, "flags": 4}, + {"matrix": [5, 13], "x": 224, "y": 35, "flags": 4}, + {"matrix": [5, 11], "x": 214, "y": 61, "flags": 4}, + {"matrix": [5, 12], "x": 200, "y": 49, "flags": 4}, + {"matrix": [5, 10], "x": 200, "y": 61, "flags": 4}, + {"matrix": [5, 9], "x": 186, "y": 61, "flags": 4}, + {"matrix": [5, 8], "x": 168, "y": 58, "flags": 1}, + {"matrix": [5, 7], "x": 154, "y": 58, "flags": 1}, + {"matrix": [5, 6], "x": 140, "y": 58, "flags": 1}, + {"matrix": [5, 5], "x": 114, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 82, "y": 64, "flags": 4}, + {"matrix": [5, 3], "x": 70, "y": 58, "flags": 1}, + {"matrix": [5, 2], "x": 32, "y": 58, "flags": 1}, + {"matrix": [5, 1], "x": 16, "y": 58, "flags": 1}, + {"matrix": [5, 0], "x": 0, "y": 58, "flags": 1} ] + }, + "url": "https://github.com/Ciaanh/keyboards/tree/main/Kanagawa", + "usb": { + "device_version": "2.1.0", + "pid": "0x0011", + "vid": "0xC1E0" + }, + "ws2812": { + "pin": "GP4", + "driver": "vendor" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0}, + {"label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0}, + {"label": "\u00b2", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "&", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "\u00e9", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "\"", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "'", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "(", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "-", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "\u00e8", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "_", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "\u00e7", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "\u00e0", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": ")", "matrix": [1, 11], "x": 11, "y": 1}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1}, + {"label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"label": "Del", "matrix": [3, 13], "x": 16, "y": 1}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "A", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "Z", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "^", "matrix": [2, 11], "x": 11.5, "y": 2}, + {"label": "$", "matrix": [2, 12], "x": 12.5, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Home", "matrix": [4, 13], "x": 16, "y": 2}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "Q", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "\u00f9", "matrix": [3, 11], "x": 11.75, "y": 3}, + {"label": "*", "matrix": [3, 12], "x": 12.75, "y": 3}, + {"label": "End", "matrix": [5, 13], "x": 16, "y": 3}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "<", "matrix": [4, 1], "x": 1.25, "y": 4}, + {"label": "W", "matrix": [4, 2], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4}, + {"label": ",", "matrix": [4, 8], "x": 8.25, "y": 4}, + {"label": ";", "matrix": [4, 9], "x": 9.25, "y": 4}, + {"label": ":", "matrix": [4, 10], "x": 10.25, "y": 4}, + {"label": "!", "matrix": [4, 11], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5}, + {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5}, + {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5}, + {"label": "Fn1", "matrix": [5, 3], "x": 3, "y": 5}, + {"label": "LSpace", "matrix": [5, 4], "x": 4.25, "y": 5.5, "w": 2.25}, + {"label": "RSpace", "matrix": [5, 5], "x": 7, "y": 5.5, "w": 2.75}, + {"label": "Ralt", "matrix": [5, 6], "x": 10, "y": 5}, + {"label": "Fn2", "matrix": [5, 7], "x": 11, "y": 5}, + {"label": "Ctrl", "matrix": [5, 8], "x": 12, "y": 5}, + {"label": "Left", "matrix": [5, 9], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 10], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 11], "x": 15.25, "y": 5.25} + ] + } } -} +} \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 1ba2d9d56f9..9e1b97c3cf9 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,3 +1 @@ -WS2812_DRIVER = vendor - DEFAULT_FOLDER = ciaanh/kanagawa/ansi From d7d33f32cd91ae2489203b5f4a5bbed24a5c7c42 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Wed, 5 Jul 2023 09:14:47 +0200 Subject: [PATCH 66/76] Update keyboards/ciaanh/kanagawa/kanagawa.c Co-authored-by: Ryan --- keyboards/ciaanh/kanagawa/kanagawa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c index 0d95b2ee4a4..b05bc6fd437 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.c +++ b/keyboards/ciaanh/kanagawa/kanagawa.c @@ -48,7 +48,7 @@ bool oled_task_kb(void) { // Host Keyboard LED Status led_t led_state = host_keyboard_led_state(); - oled_write_ln(led_state.caps_lock ? "CAPLOCK" : " ", false); + oled_write_ln_P(led_state.caps_lock ? PSTR("CAPLOCK") : PSTR(" "), false); // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); From 3bd3082a2df9e4b064a48bce43c3c8c4c3b62c25 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Wed, 27 Sep 2023 08:32:06 +0200 Subject: [PATCH 67/76] Fix rgb_matrix driver --- keyboards/ciaanh/kanagawa/ansi/info.json | 2 +- keyboards/ciaanh/kanagawa/iso/info.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index b46bd48ec2c..099b64bc9bf 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -51,7 +51,7 @@ "splash": true }, "center_point": [90, 28], - "driver": "WS2812", + "driver": "ws2812", "layout": [ {"matrix": [0, 12], "x": 189, "y": 0, "flags": 4}, {"matrix": [0, 11], "x": 175, "y": 0, "flags": 4}, diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index bcffa312da2..6647c55df07 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -51,7 +51,7 @@ "splash": true }, "center_point": [90, 28], - "driver": "WS2812", + "driver": "ws2812", "layout": [ {"matrix": [0, 12], "x": 189, "y": 0, "flags": 4}, {"matrix": [0, 11], "x": 175, "y": 0, "flags": 4}, From ddf62c452f5cdb552bcbe125cde27fd6169acd8c Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Sat, 7 Oct 2023 11:23:04 +0200 Subject: [PATCH 68/76] Update keyboards/ciaanh/kanagawa/kanagawa.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/kanagawa.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/kanagawa.c b/keyboards/ciaanh/kanagawa/kanagawa.c index b05bc6fd437..df9013ec0ee 100644 --- a/keyboards/ciaanh/kanagawa/kanagawa.c +++ b/keyboards/ciaanh/kanagawa/kanagawa.c @@ -49,9 +49,6 @@ bool oled_task_kb(void) { // Host Keyboard LED Status led_t led_state = host_keyboard_led_state(); oled_write_ln_P(led_state.caps_lock ? PSTR("CAPLOCK") : PSTR(" "), false); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); oled_advance_page(true); From e112122451f37d8d699c47d07b4787b4eb8d5930 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 12 Oct 2023 08:40:26 +0200 Subject: [PATCH 69/76] Update keyboards/ciaanh/kanagawa/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/config.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index 3c4b68b12fa..146f94de716 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -15,9 +15,6 @@ */ #pragma once -#ifdef OLED_ENABLE -/* I2C Conf */ -# define I2C_DRIVER I2CD0 -# define I2C1_SDA_PIN GP0 -# define I2C1_SCL_PIN GP1 -#endif +#define I2C_DRIVER I2CD0 +#define I2C1_SDA_PIN GP0 +#define I2C1_SCL_PIN GP1 From 5657e06665ef0ca42b80b00e723ed8cffcc4599c Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 12 Oct 2023 08:40:47 +0200 Subject: [PATCH 70/76] Update keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c index cf37f89b8e2..af830c12bbf 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_ENT, KC_HOME, 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_NUHS, KC_END, KC_LSFT, KC_NUBS, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), From 22117cdca55fd582ff89b9b93846f110bc80a2f6 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 12 Oct 2023 08:41:13 +0200 Subject: [PATCH 71/76] Update keyboards/ciaanh/kanagawa/iso/config.h Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/iso/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/config.h b/keyboards/ciaanh/kanagawa/iso/config.h index d78fba542e4..5d6aca52d65 100644 --- a/keyboards/ciaanh/kanagawa/iso/config.h +++ b/keyboards/ciaanh/kanagawa/iso/config.h @@ -15,6 +15,4 @@ */ #pragma once -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 83 -#endif \ No newline at end of file +#define RGB_MATRIX_LED_COUNT 83 From b1ee8cf8221df5438019ce13348f9af721148db4 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 12 Oct 2023 08:41:33 +0200 Subject: [PATCH 72/76] Update keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 1aede65e9c1..aad1975e9da 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_HOME, 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_LSFT, XXXXXXX, 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, MO(_LOWER), KC_SPC, KC_SPC, KC_RALT,MO(_RAISE), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, TL_LOWR, KC_SPC, KC_SPC, KC_RALT, TL_UPPR, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_LOWER] = LAYOUT( From e152f5b511752859108acf23c5b4333a981d7d42 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Wed, 10 Jan 2024 09:34:31 +0100 Subject: [PATCH 73/76] remove config.h --- keyboards/ciaanh/kanagawa/ansi/config.h | 18 ------------------ keyboards/ciaanh/kanagawa/iso/config.h | 18 ------------------ 2 files changed, 36 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/config.h delete mode 100644 keyboards/ciaanh/kanagawa/iso/config.h diff --git a/keyboards/ciaanh/kanagawa/ansi/config.h b/keyboards/ciaanh/kanagawa/ansi/config.h deleted file mode 100644 index 81229ef6d4a..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ -#pragma once - -#define RGB_MATRIX_LED_COUNT 82 \ No newline at end of file diff --git a/keyboards/ciaanh/kanagawa/iso/config.h b/keyboards/ciaanh/kanagawa/iso/config.h deleted file mode 100644 index 5d6aca52d65..00000000000 --- a/keyboards/ciaanh/kanagawa/iso/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ -#pragma once - -#define RGB_MATRIX_LED_COUNT 83 From e089f7d963d6b7c62adae50027e149e24a1eea97 Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Wed, 10 Jan 2024 15:47:37 +0100 Subject: [PATCH 74/76] Remove user keymap --- .../kanagawa/ansi/keymaps/ciaanh/keymap.c | 151 ------------------ .../kanagawa/ansi/keymaps/ciaanh/rules.mk | 1 - 2 files changed, 152 deletions(-) delete mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c delete mode 100644 keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c deleted file mode 100644 index 1a7ab726080..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/keymap.c +++ /dev/null @@ -1,151 +0,0 @@ -/* Copyright 2023 Ciaanh (@ciaanh) - * - * 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 . - */ -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - _LOWER, - _RAISE, - _ADJUST, -}; - -#define TO_BASE TO(_BASE) -#define TG_LOW TG(_LOWER) -#define TG_UP TG(_RAISE) - -#define _SCRNSHOT LSFT(LGUI(KC_S)) - -/* Keyboard layout -* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. -* | ka0 | | ka1 | ka2 | ka3 | ka4 | | ka5 | ka6 | ka7 | ka8 | | ka9 | ka10 | ka11 | ka12 | | sw99 | -* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' -* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. -* | kb0 | kb1 | kb2 | kb3 | kb4 | kb5 | kb6 | kb7 | kb8 | kb9 | kb10 | kb11 | kb12 | kb13 | | kd13 | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| -* | kc0 | kc1 | kc2 | kc3 | kc4 | kc5 | kc6 | kc7 | kc8 | kc9 | kc10 | kc11 | kc12 | kc13 | | ke13 | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| -* | kd0 | kd1 | kd2 | kd3 | kd4 | kd5 | kd6 | kd7 | kd8 | kd9 | kd10 | kd11 | kd12 | | kf13 | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' -* | ke0 | --- | ke2 | ke3 | ke4 | ke5 | ke6 | ke7 | ke8 | ke9 | ke10 | ke11 | ke12 | ,---------. -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | kf12 | -* | kf0 | kf1 | kf2 | kf3 | ,---------. ,---------. | kf6 | kf7 | kf8 | ,---------|---------|---------. -* `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | -* `---------' `---------' `---------+---------+---------' -*/ -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Keymap: BASE -* ,---------. ,---------------------------------------. ,---------------------------------------. ,---------------------------------------. ,---------. -* | ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | ENCODER | -* `---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------+---------+---------+---------' `---------' -* ,-------------------------------------------------------------------------------------------------------------------------------------------. ,---------. -* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Backspace| | Delete | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------| |---------| -* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | HOME | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' |---------| -* | CapsL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | | END | -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' -* | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. -* |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | TG_LOW | ,---------. ,---------. | RAlt | TG_UP | RCtrl | ,---------|---------|---------. -* |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | -* `---------' `---------' `---------+---------+---------' -*/ - [_BASE] = LAYOUT( - KC_ESC, 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_MPLY, - - 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_DEL, - 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_HOME, - KC_CAPS, KC_A, LT(0,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, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, TG_LOW, KC_SPC, KC_SPC, KC_RALT, TG_UP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [_LOWER] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - - _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - [_RAISE] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), - - [_ADJUST] = LAYOUT( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, - - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, _______, RGB_SPI, RGB_SAD, RGB_HUD, RGB_SAI - ) -}; - -/*****************************************************************************************************/ - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case LT(0,KC_X): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_X)); // Intercept hold function to send Ctrl-X - return false; - } - return true; - case LT(0,KC_C): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_C)); // Intercept hold function to send Ctrl-C - return false; - } - return true; - case LT(0,KC_V): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_V)); // Intercept hold function to send Ctrl-V - return false; - } - return true; - case LT(0,KC_S): - if (!record->tap.count && record->event.pressed) { - tap_code16(C(KC_S)); // Intercept hold function to send Ctrl-S - return false; - } - return true; - } - return true; -} - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_LOWER] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_RAISE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_ADJUST] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, -}; -#endif - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk b/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk deleted file mode 100644 index a40474b4d5c..00000000000 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/ciaanh/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file From 5c0b39937809142759497621e2f19864054140a5 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 22 Aug 2024 10:22:44 +0200 Subject: [PATCH 75/76] Update info.json --- keyboards/ciaanh/kanagawa/ansi/info.json | 46 ++++++++++++++++-------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/info.json b/keyboards/ciaanh/kanagawa/ansi/info.json index 099b64bc9bf..389a5d7dff3 100644 --- a/keyboards/ciaanh/kanagawa/ansi/info.json +++ b/keyboards/ciaanh/kanagawa/ansi/info.json @@ -66,6 +66,7 @@ {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4}, {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 13], "x": 189, "y": 12, "flags": 1}, {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4}, {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4}, @@ -80,6 +81,7 @@ {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4}, {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4}, {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, + {"matrix": [2, 13], "x": 189, "y": 23, "flags": 1}, {"matrix": [2, 12], "x": 179, "y": 23, "flags": 4}, {"matrix": [2, 11], "x": 161, "y": 23, "flags": 4}, @@ -94,6 +96,7 @@ {"matrix": [2, 2], "x": 35, "y": 23, "flags": 4}, {"matrix": [2, 1], "x": 21, "y": 23, "flags": 4}, {"matrix": [2, 0], "x": 4, "y": 23, "flags": 1}, + {"matrix": [3, 12], "x": 187, "y": 35, "flags": 1}, {"matrix": [3, 11], "x": 165, "y": 35, "flags": 4}, {"matrix": [3, 10], "x": 151, "y": 35, "flags": 4}, @@ -106,14 +109,15 @@ {"matrix": [3, 3], "x": 53, "y": 35, "flags": 4}, {"matrix": [3, 2], "x": 39, "y": 35, "flags": 4}, {"matrix": [3, 1], "x": 25, "y": 35, "flags": 4}, - {"matrix": [3, 0], "x": 5, "y": 35, "flags": 1}, + {"matrix": [3, 0], "x": 5, "y": 35, "flags": 8}, + {"matrix": [4, 12], "x": 177, "y": 47, "flags": 1}, {"matrix": [4, 11], "x": 158, "y": 47, "flags": 4}, {"matrix": [4, 10], "x": 144, "y": 47, "flags": 4}, {"matrix": [4, 9], "x": 130, "y": 47, "flags": 4}, {"matrix": [4, 8], "x": 116, "y": 47, "flags": 4}, {"matrix": [4, 7], "x": 102, "y": 47, "flags": 4}, - {"matrix": [4, 6], "x": 88, "y": 47, "flags": 4}, + {"matrix": [4, 6], "x": 90, "y": 47, "flags": 4}, {"matrix": [4, 5], "x": 74, "y": 47, "flags": 4}, {"matrix": [4, 4], "x": 60, "y": 47, "flags": 4}, {"matrix": [4, 3], "x": 46, "y": 47, "flags": 4}, @@ -121,19 +125,22 @@ {"matrix": [4, 0], "x": 9, "y": 47, "flags": 1}, {"matrix": [3, 13], "x": 224, "y": 12, "flags": 1}, {"matrix": [4, 13], "x": 224, "y": 23, "flags": 4}, + {"matrix": [5, 13], "x": 224, "y": 35, "flags": 4}, - {"matrix": [5, 11], "x": 214, "y": 61, "flags": 4}, - {"matrix": [5, 12], "x": 200, "y": 49, "flags": 4}, - {"matrix": [5, 10], "x": 200, "y": 61, "flags": 4}, - {"matrix": [5, 9], "x": 186, "y": 61, "flags": 4}, - {"matrix": [5, 8], "x": 168, "y": 58, "flags": 1}, - {"matrix": [5, 7], "x": 154, "y": 58, "flags": 1}, - {"matrix": [5, 6], "x": 140, "y": 58, "flags": 1}, - {"matrix": [5, 5], "x": 114, "y": 64, "flags": 4}, - {"matrix": [5, 4], "x": 82, "y": 64, "flags": 4}, - {"matrix": [5, 3], "x": 70, "y": 58, "flags": 1}, - {"matrix": [5, 2], "x": 32, "y": 58, "flags": 1}, - {"matrix": [5, 1], "x": 16, "y": 58, "flags": 1}, + {"matrix": [5, 11], "x": 220, "y": 61, "flags": 4}, + {"matrix": [5, 12], "x": 206, "y": 49, "flags": 4}, + {"matrix": [5, 10], "x": 206, "y": 61, "flags": 4}, + {"matrix": [5, 9], "x": 192, "y": 61, "flags": 4}, + {"matrix": [5, 8], "x": 175, "y": 58, "flags": 1}, + {"matrix": [5, 7], "x": 161, "y": 58, "flags": 1}, + {"matrix": [5, 6], "x": 147, "y": 58, "flags": 1}, + + {"matrix": [5, 5], "x": 109, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 67, "y": 64, "flags": 4}, + + {"matrix": [5, 3], "x": 42, "y": 58, "flags": 1}, + {"matrix": [5, 2], "x": 28, "y": 58, "flags": 1}, + {"matrix": [5, 1], "x": 14, "y": 58, "flags": 1}, {"matrix": [5, 0], "x": 0, "y": 58, "flags": 1} ] }, @@ -164,6 +171,7 @@ {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0}, {"label": "F12", "matrix": [0, 12], "x": 13.5, "y": 0}, {"label": "Encoder", "matrix": [0, 13], "x": 16, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "!", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "@", "matrix": [1, 2], "x": 2, "y": 1}, @@ -178,7 +186,9 @@ {"label": "_", "matrix": [1, 11], "x": 11, "y": 1}, {"label": "+", "matrix": [1, 12], "x": 12, "y": 1}, {"label": "BSpace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"label": "Del", "matrix": [3, 13], "x": 16, "y": 1}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, @@ -193,7 +203,9 @@ {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2}, {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2}, {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Home", "matrix": [4, 13], "x": 16, "y": 2}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, @@ -207,7 +219,9 @@ {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3}, {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3}, {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "End", "matrix": [5, 13], "x": 16, "y": 3}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, {"label": "", "matrix": [4, 1], "x": 1.25, "y": 4}, {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4}, @@ -221,7 +235,9 @@ {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4}, {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4}, {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [5, 12], "x": 14.25, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5}, {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5}, {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5}, @@ -237,4 +253,4 @@ ] } } -} \ No newline at end of file +} From 1b0cf68dfa427d1ffecb37b308c6dd4053acef59 Mon Sep 17 00:00:00 2001 From: Nicolas Fabre Date: Thu, 22 Aug 2024 10:33:49 +0200 Subject: [PATCH 76/76] Update info.json --- keyboards/ciaanh/kanagawa/iso/info.json | 42 +++++++++++++++---------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/iso/info.json b/keyboards/ciaanh/kanagawa/iso/info.json index 6647c55df07..542dd440357 100644 --- a/keyboards/ciaanh/kanagawa/iso/info.json +++ b/keyboards/ciaanh/kanagawa/iso/info.json @@ -66,6 +66,7 @@ {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4}, {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [1, 13], "x": 189, "y": 12, "flags": 1}, {"matrix": [1, 12], "x": 168, "y": 12, "flags": 4}, {"matrix": [1, 11], "x": 154, "y": 12, "flags": 4}, @@ -80,6 +81,7 @@ {"matrix": [1, 2], "x": 28, "y": 12, "flags": 4}, {"matrix": [1, 1], "x": 14, "y": 12, "flags": 4}, {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, + {"matrix": [2, 13], "x": 189, "y": 23, "flags": 1}, {"matrix": [2, 12], "x": 179, "y": 23, "flags": 4}, {"matrix": [2, 11], "x": 161, "y": 23, "flags": 4}, @@ -94,6 +96,7 @@ {"matrix": [2, 2], "x": 35, "y": 23, "flags": 4}, {"matrix": [2, 1], "x": 21, "y": 23, "flags": 4}, {"matrix": [2, 0], "x": 4, "y": 23, "flags": 1}, + {"matrix": [3, 12], "x": 187, "y": 35, "flags": 1}, {"matrix": [3, 11], "x": 165, "y": 35, "flags": 4}, {"matrix": [3, 10], "x": 151, "y": 35, "flags": 4}, @@ -106,35 +109,40 @@ {"matrix": [3, 3], "x": 53, "y": 35, "flags": 4}, {"matrix": [3, 2], "x": 39, "y": 35, "flags": 4}, {"matrix": [3, 1], "x": 25, "y": 35, "flags": 4}, - {"matrix": [3, 0], "x": 5, "y": 35, "flags": 1}, + {"matrix": [3, 0], "x": 5, "y": 35, "flags": 8}, + {"matrix": [4, 12], "x": 177, "y": 47, "flags": 1}, {"matrix": [4, 11], "x": 158, "y": 47, "flags": 4}, {"matrix": [4, 10], "x": 144, "y": 47, "flags": 4}, {"matrix": [4, 9], "x": 130, "y": 47, "flags": 4}, {"matrix": [4, 8], "x": 116, "y": 47, "flags": 4}, {"matrix": [4, 7], "x": 102, "y": 47, "flags": 4}, - {"matrix": [4, 6], "x": 88, "y": 47, "flags": 4}, + {"matrix": [4, 6], "x": 90, "y": 47, "flags": 4}, {"matrix": [4, 5], "x": 74, "y": 47, "flags": 4}, {"matrix": [4, 4], "x": 60, "y": 47, "flags": 4}, {"matrix": [4, 3], "x": 46, "y": 47, "flags": 4}, {"matrix": [4, 2], "x": 32, "y": 47, "flags": 4}, {"matrix": [4, 1], "x": 18, "y": 47, "flags": 4}, - {"matrix": [4, 0], "x": 2, "y": 47, "flags": 1}, + {"matrix": [4, 0], "x": 9, "y": 47, "flags": 1}, + {"matrix": [3, 13], "x": 224, "y": 12, "flags": 1}, - {"matrix": [4, 13], "x": 224, "y": 23, "flags": 4}, + {"matrix": [4, 13], "x": 224, "y": 23, "flags": 4}, {"matrix": [5, 13], "x": 224, "y": 35, "flags": 4}, - {"matrix": [5, 11], "x": 214, "y": 61, "flags": 4}, - {"matrix": [5, 12], "x": 200, "y": 49, "flags": 4}, - {"matrix": [5, 10], "x": 200, "y": 61, "flags": 4}, - {"matrix": [5, 9], "x": 186, "y": 61, "flags": 4}, - {"matrix": [5, 8], "x": 168, "y": 58, "flags": 1}, - {"matrix": [5, 7], "x": 154, "y": 58, "flags": 1}, - {"matrix": [5, 6], "x": 140, "y": 58, "flags": 1}, - {"matrix": [5, 5], "x": 114, "y": 64, "flags": 4}, - {"matrix": [5, 4], "x": 82, "y": 64, "flags": 4}, - {"matrix": [5, 3], "x": 70, "y": 58, "flags": 1}, - {"matrix": [5, 2], "x": 32, "y": 58, "flags": 1}, - {"matrix": [5, 1], "x": 16, "y": 58, "flags": 1}, + + {"matrix": [5, 11], "x": 220, "y": 61, "flags": 4}, + {"matrix": [5, 12], "x": 206, "y": 49, "flags": 4}, + {"matrix": [5, 10], "x": 206, "y": 61, "flags": 4}, + {"matrix": [5, 9], "x": 192, "y": 61, "flags": 4}, + {"matrix": [5, 8], "x": 175, "y": 58, "flags": 1}, + {"matrix": [5, 7], "x": 161, "y": 58, "flags": 1}, + {"matrix": [5, 6], "x": 147, "y": 58, "flags": 1}, + + {"matrix": [5, 5], "x": 109, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 67, "y": 64, "flags": 4}, + + {"matrix": [5, 3], "x": 42, "y": 58, "flags": 1}, + {"matrix": [5, 2], "x": 28, "y": 58, "flags": 1}, + {"matrix": [5, 1], "x": 14, "y": 58, "flags": 1}, {"matrix": [5, 0], "x": 0, "y": 58, "flags": 1} ] }, @@ -238,4 +246,4 @@ ] } } -} \ No newline at end of file +}