Skip to content

Commit

Permalink
Upgrade master (#34)
Browse files Browse the repository at this point in the history 
* [Keyboard] Add Bento Box macropad (qmk#20521)

* moondrop/dash75: fix keymap (qmk#21680)

* Clarify custom keycode enum requirement for PRs (qmk#21648)

* Add VIA layout for Dactyl Manuform 5x6 (qmk#21649)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Contributing docs: add note to make sure repo is up to date (qmk#21694)

* Fix `binepad/bn009` and `durgod/dgk6x/hades_ansi` keymaps (qmk#21701)

* [Keyboard] Update usb.* of `dactyl_lightcycle` (qmk#21462)

* [Keyboard] add laneware `raindrop` keyboard (qmk#21277)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add Projectd/65/Projectd_65_ansi (qmk#21520)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>

* [Keymap] Add Via keymap for CXT Studio (qmk#21675)

* [Keyboard] fix json for nemui65 (qmk#21629)

* [Keyboard] Update USB settings for dactyl_maximus (qmk#21666)

* [Keyboard] Add mk47 keyboard (qmk#19797)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>

* correct keymap file name for tkl_f13_jis layout (qmk#21631)

* Fix `keyboard` field for some JSON keymaps (qmk#21752)

* [Keyboard] Add Shostudio Arc (qmk#21733)

* [Keymap] Update rpbaptist crkbd (qmk#21674)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Richard Baptist <richard@remote.com>

* [Keymap] Update andrebrait keymap for GMMK Pro (qmk#21668)

* [Keymap] submitting janat-t planck keymap (qmk#21619)

Co-authored-by: Janat Taerakul <jtaerakul@indeed.com>

* [keyboard] Graystudio Think6.5 V3 Support Revised (qmk#21560)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Keyboard] Add Chouchou keyboard (qmk#21699)

* Add ScottoErgo Keyboard (qmk#20944)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add Scotto34 Keyboard (qmk#20943)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add ScottoInvader Keyboard (qmk#20941)

Co-authored-by: Ryan <fauxpark@gmail.com>

* coarse/cordillera: fix backlight config (qmk#21761)

* The PoweredByPorridge layout for the Keyboardio Atreus (qmk#21737)

Co-authored-by: jack <0x6a73@protonmail.com>

* Add Galatea rev3 keyboard (qmk#21758)

* Adding support for TAN67 PCB (qmk#21003)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Keyboard] Add Jelly Evolv (qmk#21407)

Co-authored-by: jack <0x6a73@protonmail.com>

* [Keyboard] Add linworks favepada (qmk#20794)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* Initial support for ALT v2 (qmk#21754)

* Initial support for CTRL v2 (qmk#21755)

* Initial support for SHIFT v2 (qmk#21756)

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* PI60 cleanup

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* PI60 cleanup

* cleanup

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* PI60 cleanup

* latest and greatest changes after resetting master branch

* Old keymap

* latest

* DZ-60 split rshift with arrows

* typo

* missing after rebase

* Build GMMK Pro w/ encoder

* update

* latest

* Badger BM43a

* Badger flashed Preonic

* Badger Preonic

* latest greatest hits including Keychron Q2

* Ketch layout

* DEV: PyCharm updates to pi60

* Planck updates

* IJ Debug command

* PI60 cleanup

* cleanup

* Dev/upstream (#33)

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* ketch IJ debugging and other fixes

* Ketch cleanup

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* IJ Debug command

* update

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* Badger flashed Preonic

* Ketch layout

* DEV: PyCharm updates to pi60

* re-flash 1up

---------

Co-authored-by: Synth and Keys <117340582+Synth-and-Keys@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 3geek14 <nerd.of.pi@gmail.com>
Co-authored-by: Hugh Rawlinson <hughrawlinson@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: gskygithub <106651989+gskygithub@users.noreply.github.com>
Co-authored-by: gksygithub <106651989+gksygithub@users.noreply.github.com>
Co-authored-by: Brian McKenna <brian@brianmckenna.org>
Co-authored-by: spbgzh <72414103+spbgzh@users.noreply.github.com>
Co-authored-by: jonylee@hfd <108282809+jonylee1986@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Joy Lee <joylee.lc@foxmail.com>
Co-authored-by: mechlovin <57231893+mechlovin@users.noreply.github.com>
Co-authored-by: Richard Baptist <rpbaptist@users.noreply.github.com>
Co-authored-by: Richard Baptist <richard@remote.com>
Co-authored-by: Andre Brait <andrebrait@gmail.com>
Co-authored-by: Janat Taerakul <janat.taerakul@gmail.com>
Co-authored-by: Janat Taerakul <jtaerakul@indeed.com>
Co-authored-by: Yizhen Liu <62583086+edwardslau@users.noreply.github.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Joe Scotto <8194147+joe-scotto@users.noreply.github.com>
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Powered by Porridge <11315349+PoweredByPorridge@users.noreply.github.com>
Co-authored-by: studiokestra <74369928+studiokestra@users.noreply.github.com>
Co-authored-by: Pangorin <68218885+Pangorin@users.noreply.github.com>
Co-authored-by: owlab2 <64054049+lizhenmingdirk@users.noreply.github.com>
Co-authored-by: DUILCHOI <48977039+duilchoi@users.noreply.github.com>
Co-authored-by: Dan White <dan.white@cleerlyhealth.com>
  • Loading branch information
@BlueTufa @Synth-and-Keys
@fauxpark @3geek14 @hughrawlinson @dunk2k @sigprof @gskygithub @puffnfresh @spbgzh @jonylee1986 @drashna @waffle87 @zvecr @itarze @mechlovin @rpbaptist @richardbaptist @andrebrait @janat-t @edwardslau @dlip @joe-scotto @filterpaper @PoweredByPorridge @studiokestra @Pangorin @lizhenmingdirk @duilchoi @dwhite-cleerly
33 people authored Aug 22, 2023
1 parent 32fee5d commit 9d5c477
Show file tree
Hide file tree
Showing 209 changed files with 9,557 additions and 1,711 deletions.
1 change: 1 addition & 0 deletions docs/contributing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Most of our style is pretty easy to pick up on. If you are familiar with either

We have a few different types of changes in QMK, each requiring a different level of rigor. We'd like you to keep the following guidelines in mind no matter what type of change you're making.

* **Before you contribute:** Please make sure your fork is up to date with the upstream `qmk_firmware` repo. This will help minimize CI failures that may not occur for you when compiling locally.
* Separate PRs into logical units. For example, do not submit one PR covering two separate features, instead submit a separate PR for each feature.
* Check for unnecessary whitespace with `git diff --check` before committing.
* Make sure your code change actually compiles.
Expand Down
2 changes: 1 addition & 1 deletion docs/pr_checklist.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr

- `#include QMK_KEYBOARD_H` preferred to including specific board files
- prefer layer `enum`s to `#define`s
- require custom keycode `enum`s to `#define`s, first entry must have ` = SAFE_RANGE`
- custom keycode `enum`s must have first entry `= SAFE_RANGE`
- terminating backslash (`\`) in lines of LAYOUT macro parameters is superfluous and should be removed
- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap

Expand Down
2 changes: 1 addition & 1 deletion keyboards/binepad/bn009/keymaps/default/keymap.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"keyboard": "binepad/bn009r2",
"keyboard": "binepad/bn009/r2",
"version": 1,
"author": "binepad",
"notes": "This file is a keymap.json file for binepad/bn009r2",
Expand Down
2 changes: 1 addition & 1 deletion keyboards/binepad/bn009/keymaps/via/keymap.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"via": true
}
},
"keyboard": "binepad/bn009r2",
"keyboard": "binepad/bn009/r2",
"version": 1,
"author": "binepad",
"notes": "This file is a keymap.json file for binepad/bn009r2",
Expand Down
7 changes: 7 additions & 0 deletions keyboards/chouchou/config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2023 Dane Lipscombe (@dlip)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
52 changes: 52 additions & 0 deletions keyboards/chouchou/info.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"manufacturer": "dlip",
"keyboard_name": "chouchou",
"maintainer": "dlip",
"bootloader": "rp2040",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true
},
"matrix_pins": {
"direct": [
["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP26", "GP27", "GP28", "GP29"]
]
},
"processor": "RP2040",
"url": "https://github.com/dlip/chouchou",
"usb": {
"device_version": "1.0.0",
"pid": "0x0117",
"vid": "0xFABE"
},
"layouts": {
"LAYOUT_split_2x4_2": {
"layout": [
{"matrix": [0, 16], "x": 0, "y": 0.88},
{"matrix": [0, 17], "x": 1, "y": 0.38},
{"matrix": [0, 18], "x": 2, "y": 0},
{"matrix": [0, 19], "x": 3, "y": 0.38},
{"matrix": [0, 0], "x": 4, "y": 0.38},
{"matrix": [0, 1], "x": 5, "y": 0},
{"matrix": [0, 2], "x": 6, "y": 0.38},
{"matrix": [0, 3], "x": 7, "y": 0.88},
{"matrix": [0, 12], "x": 0, "y": 1.88},
{"matrix": [0, 13], "x": 1, "y": 1.38},
{"matrix": [0, 14], "x": 2, "y": 1},
{"matrix": [0, 15], "x": 3, "y": 1.38},
{"matrix": [0, 4], "x": 4, "y": 1.38},
{"matrix": [0, 5], "x": 5, "y": 1},
{"matrix": [0, 6], "x": 6, "y": 1.38},
{"matrix": [0, 7], "x": 7, "y": 1.88},
{"matrix": [0, 11], "x": 2, "y": 2.38},
{"matrix": [0, 10], "x": 3, "y": 2.5},
{"matrix": [0, 9], "x": 4, "y": 2.5},
{"matrix": [0, 8], "x": 5, "y": 2.38}
]
}
}
}
11 changes: 11 additions & 0 deletions keyboards/chouchou/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright 2023 Dane Lipscombe (@dlip)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_2x4_2(
KC_A, KC_B, KC_C, KC_D, KC_N, KC_M, KC_L, KC_K,
KC_E, KC_F, KC_G, KC_H, KC_R, KC_Q, KC_P, KC_O,
KC_I, KC_J, KC_T, KC_S
),
};
26 changes: 26 additions & 0 deletions keyboards/chouchou/readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Chouchou

![Chouchou](https://i.imgur.com/BYk2n5Ch.jpeg)

Chouchou (Japanese for butterfly) is a minimalist unibody keyboard designed to be used with the [Taipo](https://inkeys.wiki/en/keymaps/taipo) layout.

- [Github repo](https://github.com/dlip/chouchou)
- Keyboard Maintainer: [Dane Lipscombe](https://github.com/dlip)

Make example for this keyboard (after setting up your build environment):

make chouchou:default

Flashing example for this keyboard:

make chouchou:default:flash

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

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
Empty file added keyboards/chouchou/rules.mk
View file
Empty file.
2 changes: 1 addition & 1 deletion keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1,
"author": "skullydazed",
"notes": "",
"keyboard": "clueboard/2x1800/2018",
"keyboard": "clueboard/2x1800/2021",
"keymap": "default",
"layout": "LAYOUT_all",
"layers": [
Expand Down
1 change: 0 additions & 1 deletion keyboards/coarse/cordillera/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
Expand Down
146 changes: 67 additions & 79 deletions keyboards/crkbd/keymaps/rpbaptist/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,115 +20,103 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

//#define USE_MATRIX_I2C

/* Select hand configuration */
#define EE_HANDS

#ifdef OLED_ENABLE
# define OLED_TIMEOUT 600000
#endif

// #define FORCE_NKRO
#define NO_ACTION_ONESHOT
#define NO_USB_STARTUP_CHECK

#define QMK_ESC_OUTPUT F4 // usually COL
#define QMK_ESC_INPUT D4 // usually ROW
#define QMK_LED B0
#define LAYER_STATE_8BIT // 8 layer limit

#define NO_ACTION_ONESHOT
#define SPLIT_ACTIVITY_ENABLE
#define SPLIT_LAYER_STATE_ENABLE

#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150

# define RGB_MATRIX_HUE_STEP 8
# define RGB_MATRIX_SAT_STEP 12
# define RGB_MATRIX_VAL_STEP 10
# define RGB_MATRIX_SPD_STEP 10

// Undefine r2g effects
# undef ENABLE_RGB_MATRIX_ALPHAS_MODS
# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# undef ENABLE_RGB_MATRIX_BREATHING
# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_BAND_SAT
# undef ENABLE_RGB_MATRIX_BAND_VAL
# undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
# undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL

// #undef ENABLE_RGB_MATRIX_CYCLE_ALL
// # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
# undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
# undef ENABLE_RGB_MATRIX_DUAL_BEACON
# undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# undef ENABLE_RGB_MATRIX_RAINDROPS
# undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# undef ENABLE_RGB_MATRIX_HUE_BREATHING
# undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# undef ENABLE_RGB_MATRIX_SPLASH
# undef ENABLE_RGB_MATRIX_SOLID_SPLASH

# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
# define SPLIT_TRANSACTION_IDS_USER USER_CONFIG_SYNC

# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
# define IDLE_TIMEOUT 60000 * 4
# define GAMING_IDLE_TIMEOUT 10000
# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_ALL
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 135

# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define RGB_MATRIX_HUE_STEP 6
# define RGB_MATRIX_SAT_STEP 8
# define RGB_MATRIX_VAL_STEP 10
# define RGB_MATRIX_SPD_STEP 10

# undef ENABLE_RGB_MATRIX_SPLASH
# undef ENABLE_RGB_MATRIX_MULTISPLASH
# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# define ENABLE_RGB_MATRIX_BREATHING
# define ENABLE_RGB_MATRIX_CYCLE_ALL
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS

# define RGB_MATRIX_ANIMATION_SPEED_DEFAULT UINT8_MAX / 2
# define RGB_MATRIX_ANIMATION_SPEED_SLOW RGB_MATRIX_ANIMATION_SPEED_DEFAULT / 4
# define RGB_MATRIX_ANIMATION_SPEED_SLOWER RGB_MATRIX_ANIMATION_SPEED_SLOW / 3
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP

# define RGB_MATRIX_KEYPRESSES // reacts to keypresses

# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS

# define RGB_MATRIX_ANIMATION_SPEED_FAST UINT8_MAX / 2
# define RGB_MATRIX_ANIMATION_SPEED_MEDIUM UINT8_MAX / 4
# define RGB_MATRIX_ANIMATION_SPEED_SLOW UINT8_MAX / 8
# define RGB_MATRIX_ANIMATION_SPEED_SLOWER UINT8_MAX / 24

# if defined(THEME_GODSPEED)
# define THEME_HSV 132, 255, 125
# elif defined(THEME_GODSPEED_ARES)
# define THEME_HSV HSV_ORANGE
# elif defined(THEME_LASER)
# undef RGB_MATRIX_TYPING_ACTIVE
# undef RGB_MATRIX_TYPING_PASSIVE
# define THEME_HSV HSV_PURPLE
# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
# elif defined(THEME_MILKSHAKE)
# undef RGB_MATRIX_TYPING_ACTIVE
# undef RGB_MATRIX_TYPING_PASSIVE
# define THEME_HSV 30, 255, 218
# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_TYPING_HEATMAP
# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
# else
# define THEME_HSV 123, 255, 125 // default to PULSE
# endif
#endif

#define TAPPING_TERM 140
#define PERMISSIVE_HOLD
#define TAPPING_TERM_PER_KEY

#define TAP_CODE_DELAY 10
#define TAPPING_TOGGLE 2

#ifdef MOUSEKEY_ENABLE
# define MOUSEKEY_DELAY 0
# define MOUSEKEY_INTERVAL 16
# define MOUSEKEY_MAX_SPEED 6
# define MOUSEKEY_TIME_TO_MAX 36
# define MOUSEKEY_WHEEL_MAX_SPEED 4
# define MOUSEKEY_WHEEL_TIME_TO_MAX 100
#endif

#ifdef THEME_GODSPEED
# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c"
# define THEME_HSV 132, 255, 125
#endif

#ifdef THEME_PULSE
# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c"
# define THEME_HSV 123, 255, 125
#endif

#ifdef THEME_LASER
# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c"
# define THEME_HSV HSV_MAGENTA
#ifdef OLED_ENABLE
# define SPLIT_OLED_ENABLE
# define OLED_TIMEOUT 60000 * 10
# define OLED_FONT_H "glcdfont_multi.c"
#endif

#define NO_ACTION_ONESHOT

#undef PRODUCT
#define PRODUCT "Corne Keyboard"

#define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9
#define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0
Loading

0 comments on commit 9d5c477

Please sign in to comment.