From ba8b236727cd391addebcedb85ee0da0a8e804fe Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Fri, 22 Apr 2022 15:36:08 +0800
Subject: [Keyboard]Remove RGB light implementation of ID67, revert the file
structure changes by #15558 (#15854)
---
.../idobao/id67/keymaps/vinorodrigues/config.h | 85 +++++++
.../idobao/id67/keymaps/vinorodrigues/keymap.c | 261 +++++++++++++++++++++
.../idobao/id67/keymaps/vinorodrigues/rules.mk | 5 +
3 files changed, 351 insertions(+)
create mode 100644 keyboards/idobao/id67/keymaps/vinorodrigues/config.h
create mode 100644 keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
create mode 100644 keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
(limited to 'keyboards/idobao/id67/keymaps/vinorodrigues')
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
new file mode 100644
index 0000000000..88fe361bde
--- /dev/null
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
@@ -0,0 +1,85 @@
+/*
+ * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * Copyright (C) 2022 Vino Rodrigues
+ *
+ * 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 3 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 .
+ */
+
+#if defined(RGB_MATRIX_ENABLE)
+ #define VIA_QMK_RGBLIGHT_ENABLE
+ #define ID67_DISABLE_UNDERGLOW // personal choice, I use a ID67 Bestype
+
+ #ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+ #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+ #endif
+ #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // // limits maximum brightness of LEDs to 200 out of 255
+
+ //// #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+
+ //// #define RGB_MATRIX_KEYPRESSES
+
+ // RGB Matrix config, nit-pick a few animations. "////" = already defined in base `config.h`, `#undef` disables it
+
+ //// #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
+ //// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
+ //// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
+ //// #define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
+ //// #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
+ //// #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
+ //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
+ //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
+ //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
+ //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
+ //// #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
+ //// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
+ //// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
+ //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
+ //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
+ //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
+ //// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
+ //// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
+ //// #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
+ //// #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
+ //// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
+ //// #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
+ //// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
+ //// #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
+ //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
+ //// #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
+
+ #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+ #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
+ #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+ #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+ //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+ //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+ #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+ #endif
+
+ #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
+ #endif
+#endif
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
new file mode 100644
index 0000000000..62fd4cfa8f
--- /dev/null
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -0,0 +1,261 @@
+/*
+ * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * Copyright (C) 2022 Vino Rodrigues
+ *
+ * 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 3 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 "version.h"
+
+enum {
+ LAYER_0 = 0,
+ LAYER_1,
+ LAYER_2,
+ LAYER_3
+};
+
+enum {
+ KC_MCON = USER00,
+ KC_LPAD,
+ KB_VRSN = SAFE_RANGE
+};
+
+enum macos_consumer_usages {
+ _AC_SHOW_ALL_WINDOWS = 0x29F, // mapped to KC_MCON
+ _AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD
+};
+
+#define LT1_C_L LT(LAYER_1, KC_CAPS)
+
+#ifndef MIN
+ #define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [LAYER_0] = LAYOUT_65_ansi_blocker(
+ 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_GRAVE, \
+ 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_BSLASH, KC_DELETE, \
+ LT1_C_L, 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_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_LCTL, KC_LALT, KC_LGUI, KC_SPC, FN_MO13, FN_MO23, KC_LEFT, KC_DOWN, KC_RIGHT),
+ [LAYER_1] = LAYOUT_65_ansi_blocker(
+ KC_GRAVE, 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_ERAS, KC_F13, \
+ _______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME, KC_END, KC_EJCT, KC_INS, \
+ KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN, KC_PENT, KC_HOME, \
+ KC_RSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_DELETE, KC_LSFT, _______, KC_END, \
+ KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______),
+ [LAYER_2] = LAYOUT_65_ansi_blocker(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_OUT, KC_F14, \
+ RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, \
+ XXXXXXX, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, XXXXXXX, KC_SLCK, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, XXXXXXX, RGB_VAI, KC_PAUS, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI),
+ [LAYER_3] = LAYOUT_65_ansi_blocker(
+ RESET, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11, MACRO12, KC_POWER, KC_F15, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, \
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MACRO00, XXXXXXX, \
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_WAKE, XXXXXXX, XXXXXXX, MACRO13, MACRO14, MACRO15),
+};
+
+#ifdef RGB_MATRIX_ENABLE
+
+/*
+ * RGB Stuff
+ */
+
+#ifdef RGBLIGHT_VAL_STEP
+ #define RGB_BRIGHTER_BY RGBLIGHT_VAL_STEP
+#else
+ #define RGB_BRIGHTER_BY 26 // about 10%
+#endif
+
+#define LED_FLAG_ALPHA_KEY 0x10 // Alpha keys (for Caps Lock)
+#define LED_FLAG_LAYER_IND 0x20 // Layer indicator
+
+const uint8_t g_led_config_new_flags[DRIVER_LED_TOTAL] = {
+ // Extended LED Index to Flag
+ // ** Remember: on ID67 this is in reverse order
+ 0x21, 0x01, 0x01, 0x01, 0x01, 0x04, 0x01, 0x01, 0x21, // Spc row
+ 0x21, 0x01, 0x01, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x21, // ZXC row
+ 0x21, 0x01, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x29, // ASD row
+ 0x21, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x21, // QWE row
+ 0x21, 0x01, 0x04, 0x04, 0x04, 0x04, 0x24, 0x24, 0x24, 0x24, 0x04, 0x04, 0x04, 0x04, 0x21 // 123 row
+};
+
+bool isRGBOff = false;
+bool isCapsBlink = false;
+static uint16_t recording_timer;
+
+void keyboard_pre_init_user(void) {
+ // override `config.h` flags with new values
+ for (int i = 0; i < DRIVER_LED_TOTAL; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
+}
+
+void keyboard_post_init_user(void) {
+ isRGBOff = false;
+}
+
+void rgb_matrix_indicators_user(void) {
+ // do nothing, override base <> function to disable it
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+ uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
+ uint8_t current_layer = get_highest_layer(layer_state);
+
+ // Caps Lock key stuff
+
+ if (host_keyboard_led_state().caps_lock) {
+ if (isRGBOff) {
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
+ } else {
+ // Caps Lock key/LED
+ if (timer_elapsed(recording_timer) > 500) {
+ isCapsBlink = !isCapsBlink;
+ recording_timer = timer_read();
+ }
+ if (isCapsBlink) {
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
+ }
+
+ // Alpha keys/LEDs
+ for (uint8_t i = led_min; i <= led_max; i++) {
+ if ((g_led_config.flags[i] & LED_FLAG_ALPHA_KEY) != 0) {
+ rgb_matrix_set_color(i, v, 0, 0); //red
+ }
+ }
+ }
+ } else if (isRGBOff) {
+ uint8_t r = 0;
+ uint8_t g = 0;
+ uint8_t b = 0;
+
+ if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
+ switch (current_layer) {
+ case LAYER_1: b = v; break; // blue
+ case LAYER_2: g = v; break; // green
+ case LAYER_3: r = v; break; // red
+ }
+ }
+
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b); // off
+ }
+
+ // Layer indicator stuff
+
+ switch (current_layer) {
+ case LAYER_1:
+ for (uint8_t i = led_min; i <= led_max; i++) {
+ if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
+ rgb_matrix_set_color(i, 0, 0, v); // blue
+ }
+ }
+ break;
+
+ case LAYER_2:
+ for (uint8_t i = led_min; i <= led_max; i++) {
+ if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
+ rgb_matrix_set_color(i, 0, v, 0); // green
+ }
+ }
+ break;
+
+ case LAYER_3:
+ for (uint8_t i = led_min; i <= led_max; i++) {
+ if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
+ rgb_matrix_set_color(i, v, 0, 0); // red
+ }
+ }
+ break;
+
+ default:
+ if (isRGBOff) {
+ // switch layer indicators off only if in OFF mode
+ for (uint8_t i = led_min; i <= led_max; i++) {
+ if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
+ rgb_matrix_set_color(i, 0, 0, 0); // red
+ }
+ }
+ }
+ break;
+ }
+}
+
+/*
+ * Sleep mode stuff (untested)
+ */
+
+void suspend_power_down_user(void) {
+ rgb_matrix_set_suspend_state(true);
+}
+
+void suspend_wakeup_init_user(void) {
+ rgb_matrix_set_suspend_state(false);
+}
+
+#endif
+
+/*
+ * Mac Fn-key stuff
+ */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+ switch (keycode) {
+ // handle RGB toggle key
+ case RGB_TOG:
+ if (record->event.pressed) {
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL:
+ isRGBOff = true;
+ rgb_matrix_set_flags(LED_FLAG_INDICATOR | LED_FLAG_LAYER_IND);
+ rgb_matrix_set_color_all(0, 0, 0);
+ break;
+ default:
+ isRGBOff = false;
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ rgb_matrix_enable_noeeprom(); // turn the lights back on
+ }
+ }
+ return false;
+
+ // print firmware version
+ case KB_VRSN:
+ if (!get_mods()) {
+ if (!record->event.pressed) {
+ SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
+ }
+ }
+ return false;
+
+ // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
+ case KC_MCON:
+ if (record->event.pressed) {
+ host_consumer_send(_AC_SHOW_ALL_WINDOWS);
+ }
+ return false;
+
+ case KC_LPAD:
+ if (record->event.pressed) {
+ host_consumer_send(_AC_SHOW_ALL_APPS);
+ }
+ return false;
+
+ default:
+ return true; /* Process all other keycodes normally */
+ }
+}
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
new file mode 100644
index 0000000000..24f7bdab9c
--- /dev/null
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
@@ -0,0 +1,5 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
+
+KEY_LOCK_ENABLE = no # Enable KC_LOCK support
+NKRO_ENABLE = no # N-Key Rollover must be OFF for mac keys to work
--
cgit v1.2.1
From d9737349769a8bd2198733a81c1c74bd7db82c3a Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Fri, 22 Apr 2022 05:50:11 -0600
Subject: Fix id67 RGB Matrix (#16916)
---
keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'keyboards/idobao/id67/keymaps/vinorodrigues')
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 62fd4cfa8f..2a42295b97 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -121,7 +121,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
if (host_keyboard_led_state().caps_lock) {
if (isRGBOff) {
- rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
+ rgb_matrix_set_color(23, v, v, v); // white
} else {
// Caps Lock key/LED
if (timer_elapsed(recording_timer) > 500) {
@@ -129,7 +129,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
recording_timer = timer_read();
}
if (isCapsBlink) {
- rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
+ rgb_matrix_set_color(23, v, v, v); // white
}
// Alpha keys/LEDs
@@ -144,7 +144,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
uint8_t g = 0;
uint8_t b = 0;
- if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
+ if ((g_led_config.flags[23] & LED_FLAG_LAYER_IND) != 0) {
switch (current_layer) {
case LAYER_1: b = v; break; // blue
case LAYER_2: g = v; break; // green
@@ -152,7 +152,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
}
}
- rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b); // off
+ rgb_matrix_set_color(23, r, g, b); // off
}
// Layer indicator stuff
--
cgit v1.2.1
From 7fd05afb100966032ebd10378f68d0446e23ed71 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Thu, 12 May 2022 10:09:10 +1000
Subject: [Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb
(#16917)
Co-authored-by: Drashna Jaelre
---
.../idobao/id67/keymaps/vinorodrigues/config.h | 57 +++++++++++-----------
.../idobao/id67/keymaps/vinorodrigues/keymap.c | 42 ++++++++--------
2 files changed, 51 insertions(+), 48 deletions(-)
(limited to 'keyboards/idobao/id67/keymaps/vinorodrigues')
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
index 88fe361bde..92b3ec0658 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
@@ -1,5 +1,5 @@
/*
- * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
* Copyright (C) 2022 Vino Rodrigues
*
* This program is free software: you can redistribute it and/or modify
@@ -16,6 +16,8 @@
* along with this program. If not, see .
*/
+#pragma once
+
#if defined(RGB_MATRIX_ENABLE)
#define VIA_QMK_RGBLIGHT_ENABLE
#define ID67_DISABLE_UNDERGLOW // personal choice, I use a ID67 Bestype
@@ -23,9 +25,7 @@
#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
#endif
- #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // // limits maximum brightness of LEDs to 200 out of 255
-
- //// #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+ #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to x out of 255
//// #define RGB_MATRIX_KEYPRESSES
@@ -46,7 +46,7 @@
//// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
//// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
//// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
- //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
+ //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shaped scrolling left to right
//// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
//// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
//// #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
@@ -54,32 +54,33 @@
//// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
//// #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
//// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
- //// #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
- //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
- //// #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
+ //// #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight amount at the same time, then shifts back
+ //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight amount in a wave to the right, then back to the left
+ //// #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight amount and then back down in a wave to the right
#undef ENABLE_RGB_MATRIX_PIXEL_RAIN
#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
- #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+ //// #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
- #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
- //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
- //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
- #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
- #endif
+ // don't need `#if`, animation modes themselves check defines
+ // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+ //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+ //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+ // #endif
- #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
- //// #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
- //// #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
- //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
- #endif
+ // don't need `#if`, animation modes themselves check defines
+ // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
+ //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
+ // #endif
#endif
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 2a42295b97..c62db2c724 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -1,5 +1,5 @@
/*
- * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
* Copyright (C) 2022 Vino Rodrigues
*
* This program is free software: you can redistribute it and/or modify
@@ -20,10 +20,10 @@
#include "version.h"
enum {
- LAYER_0 = 0,
- LAYER_1,
- LAYER_2,
- LAYER_3
+ _BASE = 0,
+ _FN1,
+ _FN2,
+ _FN3
};
enum {
@@ -37,32 +37,32 @@ enum macos_consumer_usages {
_AC_SHOW_ALL_APPS = 0x2A0 // mapped to KC_LPAD
};
-#define LT1_C_L LT(LAYER_1, KC_CAPS)
+#define LT1_C_L LT(_FN1, KC_CAPS)
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_0] = LAYOUT_65_ansi_blocker(
+ [_BASE] = LAYOUT_65_ansi_blocker(
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_GRAVE, \
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_BSLASH, KC_DELETE, \
LT1_C_L, 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_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_LCTL, KC_LALT, KC_LGUI, KC_SPC, FN_MO13, FN_MO23, KC_LEFT, KC_DOWN, KC_RIGHT),
- [LAYER_1] = LAYOUT_65_ansi_blocker(
+ [_FN1] = LAYOUT_65_ansi_blocker(
KC_GRAVE, 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_ERAS, KC_F13, \
_______, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME, KC_END, KC_EJCT, KC_INS, \
KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN, KC_PENT, KC_HOME, \
KC_RSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_DELETE, KC_LSFT, _______, KC_END, \
KC_RCTL, KC_RALT, KC_RGUI, _______, _______, _______, _______, _______, _______),
- [LAYER_2] = LAYOUT_65_ansi_blocker(
+ [_FN2] = LAYOUT_65_ansi_blocker(
KC_ESC, KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_OUT, KC_F14, \
RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, \
XXXXXXX, RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, XXXXXXX, KC_SLCK, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, XXXXXXX, RGB_VAI, KC_PAUS, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SPD, RGB_VAD, RGB_SPI),
- [LAYER_3] = LAYOUT_65_ansi_blocker(
+ [_FN3] = LAYOUT_65_ansi_blocker(
RESET, MACRO01, MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11, MACRO12, KC_POWER, KC_F15, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SLEP, XXXXXXX, \
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DEBUG, XXXXXXX, \
@@ -95,6 +95,8 @@ const uint8_t g_led_config_new_flags[DRIVER_LED_TOTAL] = {
0x21, 0x01, 0x04, 0x04, 0x04, 0x04, 0x24, 0x24, 0x24, 0x24, 0x04, 0x04, 0x04, 0x04, 0x21 // 123 row
};
+#define ID67_CAPS_LOCK_KEY_INDEX 36 // position of Caps Lock key
+
bool isRGBOff = false;
bool isCapsBlink = false;
static uint16_t recording_timer;
@@ -121,7 +123,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
if (host_keyboard_led_state().caps_lock) {
if (isRGBOff) {
- rgb_matrix_set_color(23, v, v, v); // white
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
} else {
// Caps Lock key/LED
if (timer_elapsed(recording_timer) > 500) {
@@ -129,7 +131,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
recording_timer = timer_read();
}
if (isCapsBlink) {
- rgb_matrix_set_color(23, v, v, v); // white
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v); // white
}
// Alpha keys/LEDs
@@ -144,21 +146,21 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
uint8_t g = 0;
uint8_t b = 0;
- if ((g_led_config.flags[23] & LED_FLAG_LAYER_IND) != 0) {
+ if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
switch (current_layer) {
- case LAYER_1: b = v; break; // blue
- case LAYER_2: g = v; break; // green
- case LAYER_3: r = v; break; // red
+ case _FN1: b = v; break; // blue
+ case _FN2: g = v; break; // green
+ case _FN3: r = v; break; // red
}
}
- rgb_matrix_set_color(23, r, g, b); // off
+ rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b); // off
}
// Layer indicator stuff
switch (current_layer) {
- case LAYER_1:
+ case _FN1:
for (uint8_t i = led_min; i <= led_max; i++) {
if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
rgb_matrix_set_color(i, 0, 0, v); // blue
@@ -166,7 +168,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
}
break;
- case LAYER_2:
+ case _FN2:
for (uint8_t i = led_min; i <= led_max; i++) {
if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
rgb_matrix_set_color(i, 0, v, 0); // green
@@ -174,7 +176,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
}
break;
- case LAYER_3:
+ case _FN3:
for (uint8_t i = led_min; i <= led_max; i++) {
if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
rgb_matrix_set_color(i, v, 0, 0); // red
--
cgit v1.2.1