gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-25 20:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2022-08-07 19:40:49 +00:00
commit 6a1a398627
6 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keyboards/keebio/iris/keymaps/csc027/config.h
View File

@ -28,10 +28,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8
#define USB_POLLING_INTERVAL_MS 1
#if defined(TAP_CODE_DELAY)
# undef TAP_CODE_DELAY
#endif
#define TAP_CODE_DELAY 10

2
keyboards/keebio/iris/keymaps/csc027/rules.mk
View File

@ -1,6 +1,6 @@
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
EXTRAKEY_ENABLE = no EXTRAKEY_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
NKRO_ENABLE = yes NKRO_ENABLE = yes

7
keyboards/planck/keymaps/csc027/config.h
View File

@ -19,10 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_ACTION_MACRO #define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION #define NO_ACTION_FUNCTION
#define USB_POLLING_INTERVAL_MS 1
#if defined(TAP_CODE_DELAY)
# undef TAP_CODE_DELAY
#endif
#define TAP_CODE_DELAY 10

6
keyboards/planck/keymaps/csc027/rules.mk
View File

@ -1,6 +1,8 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no
COMMAND_ENABLE = no COMMAND_ENABLE = no
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
EXTRAKEY_ENABLE = no EXTRAKEY_ENABLE = yes
LTO_ENABLE = no LTO_ENABLE = no
MOUSEKEY_ENABLE = yes
NKRO_ENABLE = yes
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no

6
users/csc027/custom_rgb.c
View File

@ -28,15 +28,15 @@ void keyboard_post_init_user(void) {
rgblight_sethsv_noeeprom((i + user_hue) % 256, 255, 255); rgblight_sethsv_noeeprom((i + user_hue) % 256, 255, 255);
wait_ms(5); wait_ms(5);
} }
rgblight_sethsv_noeeprom(0, 0, 0); rgblight_sethsv_noeeprom(HSV_BLACK);
} }
void on_usb_led_off(void) { void on_usb_led_off(void) {
rgblight_sethsv_noeeprom(0, 0, rgblight_get_val() - 85); rgblight_sethsv_noeeprom(HS_GRAY, rgblight_get_val() - 85);
} }
void on_usb_led_on(void) { void on_usb_led_on(void) {
rgblight_sethsv_noeeprom(0, 0, rgblight_get_val() + 85); rgblight_sethsv_noeeprom(HS_GRAY, rgblight_get_val() + 85);
} }
#endif #endif

28
users/csc027/defines.h
View File

@ -183,7 +183,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* |-----------------------------------| |-----------------------------------| * |-----------------------------------| |-----------------------------------|
* | | | App | LCAD|MRDCC|NmLck| |MVTDL|MVTDC|MVTDN|MVTDR| | | * | | | App | LCAD|MRDCC|NmLck| |MVTDL|MVTDC|MVTDN|MVTDR| | |
* |-----------------------------------| |-----------------------------------| * |-----------------------------------| |-----------------------------------|
* | | | | | | | | | | | | | | * | | |MStop|MPrev|MPlay|MNext| |MMute|MVolD|MVolD| | | |
* |-----------------------------------| |-----------------------------------| * |-----------------------------------| |-----------------------------------|
* | | | | | | | | | | | | | | * | | | | | | | | | | | | | |
* `-----------------------------------' `-----------------------------------' * `-----------------------------------' `-----------------------------------'
@ -191,12 +191,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ___________________CONVENIENCE_L1__________________ XXXXXXX, XXXXXXX, KC_INS, KC_SLCK, KC_PSCR, XXXXXXX #define ___________________CONVENIENCE_L1__________________ XXXXXXX, XXXXXXX, KC_INS, KC_SLCK, KC_PSCR, XXXXXXX
#define ___________________CONVENIENCE_L2__________________ _______, XXXXXXX, KC_APP, MC_lcad, MC_rdcc, KC_NLCK #define ___________________CONVENIENCE_L2__________________ _______, XXXXXXX, KC_APP, MC_lcad, MC_rdcc, KC_NLCK
#define ___________________CONVENIENCE_L3__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX #define ___________________CONVENIENCE_L3__________________ _______, XXXXXXX, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT
#define ___________________CONVENIENCE_L4__________________ _______, _______, _______, _______, _______, _______ #define ___________________CONVENIENCE_L4__________________ _______, _______, _______, _______, _______, _______
#define ___________________CONVENIENCE_R1__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC #define ___________________CONVENIENCE_R1__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSPC
#define ___________________CONVENIENCE_R2__________________ MC_vtdl, MC_vtdc, MC_vtdn, MC_vtdr, XXXXXXX, XXXXXXX #define ___________________CONVENIENCE_R2__________________ MC_vtdl, MC_vtdc, MC_vtdn, MC_vtdr, XXXXXXX, XXXXXXX
#define ___________________CONVENIENCE_R3__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______ #define ___________________CONVENIENCE_R3__________________ KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, _______
#define ___________________CONVENIENCE_R4__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX #define ___________________CONVENIENCE_R4__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
/* Windows Terminal Layer /* Windows Terminal Layer
@ -321,3 +321,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
CUSTOM_NAME(vtdc) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_F4)))) CUSTOM_DELIM() \ CUSTOM_NAME(vtdc) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_F4)))) CUSTOM_DELIM() \
CUSTOM_NAME(vtdn) CUSTOM_STRING(SS_LCTL(SS_LGUI("d"))) CUSTOM_DELIM() \ CUSTOM_NAME(vtdn) CUSTOM_STRING(SS_LCTL(SS_LGUI("d"))) CUSTOM_DELIM() \
CUSTOM_NAME(vtdr) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_RIGHT)))) CUSTOM_NAME(vtdr) CUSTOM_STRING(SS_LCTL(SS_LGUI(SS_TAP(X_RIGHT))))
// Additional color definitions for simplicity
#define HS_AZURE 132, 102
#define HS_BLACK 0, 0
#define HS_BLUE 170, 255
#define HS_CHARTREUSE 64, 255
#define HS_CORAL 11, 176
#define HS_CYAN 128, 255
#define HS_GOLD 36, 255
#define HS_GOLDENROD 30, 218
#define HS_GRAY 0, 0
#define HS_GREEN 85, 255
#define HS_MAGENTA 213, 255
#define HS_ORANGE 28, 255
#define HS_PINK 234, 128
#define HS_PURPLE 191, 255
#define HS_RED 0, 255
#define HS_SPRINGGREEN 106, 255
#define HS_TEAL 128, 255
#define HS_TURQUOISE 123, 90
#define HS_WHITE 0, 0
#define HS_YELLOW 43, 255