sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#16917)

Browse Source 
Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
Vino Rodrigues
2022-05-12 10:09:10 +10:00
committed by GitHub
parent 37417d531d
commit 7fd05afb10
15 changed files with 139 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
View File

@@ -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