Commit Graph

53 Commits

Author SHA1 Message Date
Ilya Zhuravlev
e390a34128 Merge remote-tracking branch 'qmk/master' into merge-2023-09-08 2023-09-08 20:53:27 -06:00
Ryan
023d644bb6
Move RGBLight animations to data driven (#21635)
* Move RGBLight animations to data driven, 0-9

* Move RGBLight animations to data driven, A

* Move RGBLight animations to data driven, B

* Move RGBLight animations to data driven, C

* Move RGBLight animations to data driven, D

* Move RGBLight animations to data driven, E

* Move RGBLight animations to data driven, F

* Move RGBLight animations to data driven, G

* Move RGBLight animations to data driven, H

* Move RGBLight animations to data driven, handwired

* Move RGBLight animations to data driven, I

* Move RGBLight animations to data driven, J

* Move RGBLight animations to data driven, K

* Move RGBLight animations to data driven, L

* Move RGBLight animations to data driven, M

* Move RGBLight animations to data driven, N

* Move RGBLight animations to data driven, O

* Move RGBLight animations to data driven, P

* Move RGBLight animations to data driven, Q

* Move RGBLight animations to data driven, R

* Move RGBLight animations to data driven, S

* Move RGBLight animations to data driven, T

* Move RGBLight animations to data driven, U

* Move RGBLight animations to data driven, V

* Move RGBLight animations to data driven, W

* Move RGBLight animations to data driven, X

* Move RGBLight animations to data driven, Y

* Move RGBLight animations to data driven, Z

* Fix incorrect placement

* Fix build failures and mismatches
2023-08-23 22:11:39 +01:00
Ryan
37bc949945
RGB Matrix: driver naming cleanups (#21594) 2023-08-23 01:00:03 +01:00
Ryan
4ae9bfd17a
Move RGBLIGHT_HUE/SAT/VAL_STEP to data driven (#21292)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-06-24 17:37:54 +10:00
Ryan
b1783db4ea
Move RGBLED_NUM to data driven (#21278) 2023-06-18 14:39:07 +10:00
Ilya Zhuravlev
d6e95213e3 Merge remote-tracking branch 'qmk/master' into merge-2023-06-03 2023-06-03 12:35:25 -06:00
Ryan
79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
James Young
a09453f7bf
CherryB Studio CB87v2 Layout Macro Additions (#20597)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_tkl_ansi_split_bs_rshift

* add LAYOUT_tkl_ansi

* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift

* add LAYOUT_tkl_ansi_tsangan

* add LAYOUT_tkl_iso_split_bs_rshift

* add LAYOUT_tkl_iso

* add LAYOUT_tkl_iso_tsangan_split_bs_rshift

* add LAYOUT_tkl_iso_tsangan

* enable Community Layout support

* correct listed maintainer

Maintainer has changed their GitHub username.
2023-04-27 21:23:14 -07:00
James Young
a08e4b5055
CherryB Studio CB87RGB Layout Macro Additions (#20595)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_tkl_f13_ansi_split_bs_rshift

* add LAYOUT_tkl_f13_ansi

* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift

* add LAYOUT_tkl_f13_ansi_tsangan

* add LAYOUT_tkl_f13_iso_split_bs_rshift

* add LAYOUT_tkl_f13_iso

* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift

* add LAYOUT_tkl_f13_iso_tsangan

* enable Community Layout support

* correct listed maintainer

Maintainer has changed their GitHub username.
2023-04-27 18:11:36 -07:00
James Young
16874bba95
CherryB Studio CB65 Layout Macro Additions (#20594)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_65_ansi_blocker_split_bs

* add LAYOUT_65_ansi_blocker

* add LAYOUT_65_ansi_blocker_tsangan_split_bs

* add LAYOUT_65_ansi_blocker_tsangan

* add LAYOUT_65_iso_blocker_split_bs

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_iso_blocker_tsangan_split_bs

* add LAYOUT_65_iso_blocker_tsangan

* enable Community Layout support
2023-04-27 17:10:51 -07:00
James Young
0c9c2fea54
CherryB Studio CB1800 Layout Macro Additions (#20593)
* add matrix_diagram.md

* info.json: apply friendly formatting

* add LAYOUT_1800_f13_ansi_split_numenter

* add LAYOUT_1800_f13_ansi_split_bs_numenter

* add LAYOUT_1800_f13_ansi_wkl_split_numenter

* add LAYOUT_1800_f13_ansi_wkl_split_bs_numenter

* add LAYOUT_1800_f13_iso_split_bs_numenter

* add LAYOUT_1800_f13_iso_split_numenter

* add LAYOUT_1800_f13_iso_wkl_split_numenter

* add LAYOUT_1800_f13_iso_wkl_split_bs_numenter

* correct listed maintainer

Maintainer has changed their GitHub username.
2023-04-27 15:47:20 -07:00
Ryan
172a40686b
Move single LAYOUT_alls to data driven (#20430) 2023-04-15 21:08:15 +10:00
Ryan
522048725f
Move RGB_MATRIX_DRIVER to data driven (#20350) 2023-04-08 18:08:08 +10:00
Ryan
47966dc2a6
Migrate rgblight.pin and RGB_DI_PIN to ws2812.pin (#20303) 2023-04-06 18:00:54 +10:00
Ryan
8bb4cba7b0
Move TKL layouts to data driven (#20337) 2023-04-05 15:53:45 +10:00
Ryan
ad625e7c06
Remove RGB_DI_PIN ifdefs (#20218) 2023-03-23 21:38:01 +11:00
Ilya Zhuravlev
2ec3ba62cd fix renamed keycodes 2023-03-19 12:05:44 -06:00
Ilya Zhuravlev
06a2fdcc9c Merge remote-tracking branch 'qmk/master' into merge-2023-03-12 2023-03-18 17:51:58 -06:00
Ryan
02ccc50e60
Remove more empty headers (#20155) 2023-03-17 14:02:04 +11:00
Ryan
76cc7fe109
Move matrix config to info.json, part 6 (#20019) 2023-03-11 00:32:05 +11:00
Ryan
7e0299117b
Move encoder config to data driven (#19923)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-26 09:45:12 +11:00
Ryan
314f6c1ddb
Move backlight config to data driven (#19910) 2023-02-26 08:37:57 +11:00
Ryan
26854f5940
Remove default and unused BACKLIGHT_LEVELS (#19898) 2023-02-22 01:12:42 +00:00
Ryan
2da0827d4f
Remove matrix size defines (#19581) 2023-02-17 16:08:25 +11:00
Ryan
f4ba17c4a0
Move LED indicator config to data driven (#19800) 2023-02-17 13:14:29 +11:00
Ryan
f9aeea64c1
Migrate MCU and BOOTLOADER to data-driven (#19529) 2023-02-08 18:41:46 +11:00
Ryan
ebb512db82
Debounce defines cleanup (#19742)
* Clean up `DEBOUNCE` in config.h, 0-9

* Clean up `DEBOUNCE` in config.h, A

* Clean up `DEBOUNCE` in config.h, B

* Clean up `DEBOUNCE` in config.h, C

* Clean up `DEBOUNCE` in config.h, D

* Clean up `DEBOUNCE` in config.h, E

* Clean up `DEBOUNCE` in config.h, F

* Clean up `DEBOUNCE` in config.h, G

* Clean up `DEBOUNCE` in config.h, H

* Clean up `DEBOUNCE` in config.h, handwired

* Clean up `DEBOUNCE` in config.h, I

* Clean up `DEBOUNCE` in config.h, J

* Clean up `DEBOUNCE` in config.h, K

* Clean up `DEBOUNCE` in config.h, L

* Clean up `DEBOUNCE` in config.h, M

* Clean up `DEBOUNCE` in config.h, N

* Clean up `DEBOUNCE` in config.h, O

* Clean up `DEBOUNCE` in config.h, P

* Clean up `DEBOUNCE` in config.h, Q

* Clean up `DEBOUNCE` in config.h, R

* Clean up `DEBOUNCE` in config.h, S

* Clean up `DEBOUNCE` in config.h, T

* Clean up `DEBOUNCE` in config.h, U

* Clean up `DEBOUNCE` in config.h, V

* Clean up `DEBOUNCE` in config.h, W

* Clean up `DEBOUNCE` in config.h, X

* Clean up `DEBOUNCE` in config.h, Y

* Clean up `DEBOUNCE` in config.h, Z

* Remove default debounce from info.json

* Migrate non-default debounce to info.json
2023-02-03 19:19:58 +00:00
Nick Brassel
f6dd8dea2e
Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
Ryan
56555c61e1
Migrate LAYOUTS to data driven (#19541)
* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
2023-01-10 02:48:20 +00:00
Ryan
5e4b076af3
Remove legacy keycodes, part 5 (#18710)
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
2022-10-15 22:29:43 +01:00
Drashna Jaelre
d021bedf50
Remove RGBLIGHT_ANIMTION and clean up effect defines for 0-F (#18725) 2022-10-15 09:55:12 -07:00
Drashna Jaelre
64b1ed4550
Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-10-04 15:24:22 -07:00
Drashna Jael're
4add874867
Merge remote-tracking branch 'origin/master' into develop 2022-09-24 07:14:33 -07:00
lunatic
fe9c1d8e45
[Keyboard] add CherryB CB65 (#18356) 2022-09-24 06:58:03 -07:00
Ryan
36c410592d
Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399) 2022-09-23 22:46:23 +10:00
Ilya Zhuravlev
d4fa6703b8 Merge remote-tracking branch 'qmk/master' into merge-2022-09-10 2022-09-10 04:10:44 -06:00
Nick Brassel
154d35ac14
Remove UNUSED_PINS (#17931) 2022-08-06 23:23:35 +10:00
Ryan
a939293aca
Move keyboard USB IDs and strings to data driven: C (#17789) 2022-07-26 00:04:09 +01:00
Ilya Zhuravlev
fde0c10bae Merge remote-tracking branch 'qmk/master' into merge-2022-07-11 2022-07-11 18:40:32 -06:00
Ilya Zhuravlev
b37649af36 fix newlines 2022-07-11 18:07:20 -06:00
WrinkleKrinkles
ba3099495a
Added Vial support for CherryBStudio87 RGB TKL PCB (#191)
* VIAL ported to Vega

Readme.md for changes

* Adding support for StudioKestra Galatea TKL

No RGB underglow version; tested using StudioKestra Galatea x GeonWorks TKL PCB.

Built and tested in 7U, WKL, F12 layout.

* Add VIAL support for Ninjin TKL

Build file 49502 bytes.

No features were removed; firmware was tested on ANSI, F12, WK layout.

* Added support for CherryBStudio87 RGB TKL.

Added Vial support for CherryBStudio87 RGB TKL PCB. 

Static RGB LED is still functional (saturation, hue, and brightness control), however RGB preset animations were removed to preserve EEPROM space.

List of removed features:
Several in-built RGB animations were removed (build the firmware again with several choices of RGB animations if you want to enable them)
Tap dance, space cadet, combo, key override, mousekey, extrakey, and grave escape were disabled.
Dynamic keycap layer count were set into 2. 

Total firmware size after build: 23810/28672 (83%, 4862 bytes free)

Possible issues:
In the VIAL GUI, the keyboard is still listing about 4 layers even with the maximum layer set into two.
From the .json file from May 22th, 2022 (latest update from CherryB Discord server), there were some issues on F13 stopped working and the left arrow key stopped working when using WKL layout; built and tested the firmware using the newest .json file that fixes the issue. Further testing might be required. 

Only tested on ANSI, F13 WK, 6.25u space layout.

* Updated config.h

Dynamic keymap layer count was properly inserted.

Fixed typo on fractal RGB animation disable.

* Removed layer 2 and 3

Removed layer 2 and 3, saved about 2% of the total capacity in the build (at least on my end).

* Tweaking features and revised

Keymap layer moved to the appropriate file. 

**Mousekey and extrakeys enabled**

* Moved to the correct folder

Uploaded the Vial changes to the WRONG folder... (supposed to be 'cb87rgb' instead of 'cb87'

Will delete all the additions related to cb87 later. Was tested using cb87rgb folder.

* Delete vial.json

* Delete rules.mk

* Delete keymap.c

* Delete config.h
2022-07-02 14:42:49 -06:00
Joel Challis
b7771ec25b
RESET -> QK_BOOT default keymaps (#17037) 2022-05-15 20:26:27 +01:00
DA
851cb7e406
[Keyboard] and CB87v2 and CB87RGB and fixed CB1800 and CB87 (#15824)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-13 20:37:40 -08:00
Ryan
a8d440e4e0
Tidy up NKRO_ENABLE rules (#15382) 2021-12-09 16:05:44 +11:00
Ryan
c12b997679
Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002)
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
2021-11-05 08:18:09 +11:00
Ryan
5af1799735
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379) 2021-09-12 15:27:29 +10:00
Ryan
4791cfae1a
Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
James Young
a03aa301de
Remove Full Bootmagic (#13846)
* disambiguate Bootmagic rules in keymaps

The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic.

This commit edits the files to specify that full Bootmagic is intended.

* remove BOOTMAGIC_ENABLE=full setting

* unify commented BOOTMAGIC_ENABLE rules in keyboards

Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no       # Virtual DIP switch configuration;g' {} +
```

* remove commented Bootmagic rules from keymap/user level

Command:

```
find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} +
```

* update keyboard BOOTMAGIC_ENABLE rule formatting

Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later).

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
```

* update keyboards' BOOTMAGIC_ENABLE settings

Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.

Command:

```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' +
```

* update keymap/user BOOTMAGIC_ENABLE settings

Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
```

* remove and replace inline comments in keyboards and keymap/user files

Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`.

Commands:

```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1     # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1      # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1       # Enable Bootmagic Lite;g' '{}' +
```

* rename improperly named makefiles

Some files intended to be used as makefiles had improper names causing them to not be used as intended when building.

This commit corrects the filenames of the affected files.

* update renamed file with new rule formatting

* update QMK's template files

Updates QMK's `rules.mk` templates to use the new inline comment.

* update QMK Docs

- remove documentation of full Bootmagic
- update links to Bootmagic Lite doc
- add doc for Magic Keycodes

* rules.mk patch for coarse/ixora and coarse/vinta
2021-08-06 23:59:56 -07:00
James Young
7e1d28006f
CherryB Studio CB1800: fix key sequence in info.json (#13779)
This commit fixes the position in sequence of the arrow keys.
2021-07-29 22:37:41 -07:00