From 0ec6d6daf73825e9801e030497c011637fd606df Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Wed, 23 Jun 2021 19:22:42 -0700
Subject: [PATCH 1/2] Update oled_bongocat to match VIA keymap (#12875)
* Update to match VIA keymap
* Update with feedback from PR
---
.../nibble/keymaps/oled_bongocat/keymap.c | 148 +++++++++++++++---
1 file changed, 126 insertions(+), 22 deletions(-)
diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
index d1ddd3bcb4..1d8559627a 100644
--- a/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_bongocat/keymap.c
@@ -21,28 +21,60 @@
enum layer_names {
- _MA,
- _FN
+ _BASE,
+ _VIA1,
+ _VIA2,
+ _VIA3
};
+#define KC_DISC_MUTE KC_F23
+#define KC_DISC_DEAF KC_F24
+
enum custom_keycodes {
- KC_CUST = SAFE_RANGE,
+ PROG = USER00,
+ DISC_MUTE,
+ DISC_DEAF,
+ SUPER_ALT_TAB,
+ _NUM_CUST_KCS,
};
+// Macro variables
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+bool muted = false;
+bool deafened = false;
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_MA] = LAYOUT_ansi(
- 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_BSPC, KC_HOME,
- KC_F13, 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_DEL,
- KC_F14, 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_PGUP,
- KC_F15, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
- KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ [_BASE] = LAYOUT_all(
+ KC_GESC, 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_HOME,
+ KC_F13, 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_DEL,
+ KC_F14, 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_PGUP,
+ KC_F15, 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_PGDN,
+ KC_F16, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [_FN] = LAYOUT_ansi(
- RESET, 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_END,
- RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+
+ [_VIA1] = LAYOUT_all(
+ RESET, 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_END,
+ RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
+ ),
+
+ [_VIA2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [_VIA3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
@@ -59,7 +91,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
#ifdef OLED_DRIVER_ENABLE
#define IDLE_FRAME_DURATION 200 // Idle animation iteration rate in ms
-oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_90; }
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
uint32_t anim_timer = 0;
uint32_t anim_sleep = 0;
@@ -126,8 +158,17 @@ static void render_anim(void) {
}
}
+void oled_task_user(void) {
+ render_anim();
+ oled_set_cursor(0, 14);
+ sprintf(wpm_str, ">%04d", get_current_wpm());
+ oled_write_ln(wpm_str, false);
+}
+#endif
+
// Animate tap
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ #ifdef OLED_DRIVER_ENABLE
// Check if non-mod
if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
if (record->event.pressed) {
@@ -140,13 +181,76 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#endif
}
}
+ #endif
+
+ switch(keycode) {
+ case PROG:
+ if (record->event.pressed) {
+ rgblight_disable_noeeprom();
+ #ifdef OLED_DRIVER_ENABLE
+ oled_off();
+ #endif
+ bootloader_jump();
+ }
+ break;
+
+ case DISC_MUTE:
+ if (record->event.pressed) {
+ tap_code(KC_DISC_MUTE);
+ if (!rgblight_is_enabled()) break;
+
+ if (muted) {
+ rgblight_enable_noeeprom();
+ } else {
+ rgblight_timer_disable();
+ uint8_t val = rgblight_get_val();
+ rgblight_sethsv_range(255, 255, val, 0, 1);
+ }
+ muted = !muted;
+ }
+ break;
+
+ case DISC_DEAF:
+ if (record->event.pressed) {
+ tap_code(KC_DISC_DEAF);
+ if (!rgblight_is_enabled()) break;
+
+ if (deafened) {
+ rgblight_enable_noeeprom();
+ } else {
+ rgblight_timer_disable();
+ uint8_t val = rgblight_get_val();
+ rgblight_sethsv_range(255, 255, val, 0, RGBLED_NUM-1);
+ }
+ deafened = !deafened;
+ }
+ break;
+
+ case SUPER_ALT_TAB:
+ if (record->event.pressed) {
+ if (!is_alt_tab_active) {
+ is_alt_tab_active = true;
+ register_code(KC_LALT);
+ }
+ alt_tab_timer = timer_read();
+ register_code(KC_TAB);
+ } else {
+ unregister_code(KC_TAB);
+ }
+ break;
+
+ default:
+ break;
+ }
+
return true;
}
-void oled_task_user(void) {
- render_anim();
- oled_set_cursor(0, 14);
- sprintf(wpm_str, ">%04d", get_current_wpm());
- oled_write_ln(wpm_str, false);
+void matrix_scan_user(void) {
+ if (is_alt_tab_active) {
+ if (timer_elapsed(alt_tab_timer) > 1000) {
+ unregister_code(KC_LALT);
+ is_alt_tab_active = false;
+ }
+ }
}
-#endif
From dee50c9cc8673c6a12d80f3deb2f79c351b2ccd3 Mon Sep 17 00:00:00 2001
From: "T.Shinohara" <takuma1201@gmail.com>
Date: Thu, 24 Jun 2021 11:23:00 +0900
Subject: [PATCH 2/2] [Keymap] fix key code. numpad to numkey (#12808)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add keyboard new macro pad "Kuro"
* change main readme.md
* remove not used code from default/keymap.c
* Remove unnecessary code
* Supports info.json
* removed back slash and not used functions.
* update at product link. add japanese messages.
* Merge All
* [Shiro]Add MacKeymap
* Change key code. Numpad→Numkey
---
keyboards/shiro/keymaps/default/keymap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/keyboards/shiro/keymaps/default/keymap.c b/keyboards/shiro/keymaps/default/keymap.c
index b80c294525..11dab6eead 100644
--- a/keyboards/shiro/keymaps/default/keymap.c
+++ b/keyboards/shiro/keymaps/default/keymap.c
@@ -28,10 +28,10 @@ enum layer_number {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUMBER] = LAYOUT(
NUMBER, CURSOL, MOUSE,
- KC_P7, KC_P8, KC_P9,
- KC_P4, KC_P5, KC_P6,
- KC_P1, KC_P2, KC_P3,
- KC_P0, KC_BSPC, KC_ENT
+ KC_7, KC_8, KC_9,
+ KC_4, KC_5, KC_6,
+ KC_1, KC_2, KC_3,
+ KC_0, KC_BSPC, KC_ENT
),
[_CURSOL] = LAYOUT(
NUMBER, CURSOL, MOUSE,