Commit Graph

31 Commits

Author SHA1 Message Date
Ilya Zhuravlev
17e46fcec7 Merge remote-tracking branch 'qmk/master' into merge-2024-04-15 2024-04-15 19:43:02 -06:00
honorless
7b8545b635
fix: detect CONVERT_TO vs MCU in rules.mk
MCU no longer changes to match the converter, resulting in features
being disabled unnecessarily on ARM Micros.

Check for a non-blank CONVERT_TO instead.
2024-02-28 19:38:42 -05:00
Joel Challis
2f37a7854d
Migrate lighting defaults to info.json (#22920) 2024-02-01 18:10:14 +00:00
QMK Bot
bd11ddc093 Merge remote-tracking branch 'origin/master' into develop 2024-01-09 10:18:17 +00:00
Markus Knutsson
53f1e3b11f
Lotus 58 Glow - Added Auto shift to OLED, corrected OLED orientation (#22424)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2024-01-09 21:17:46 +11:00
Joel Challis
9e50faedae
Remove incorrect use of WS2812_PIO_USE_PIO1 (#22771) 2023-12-28 17:07:40 +00:00
Ilya Zhuravlev
66574eb854 Merge remote-tracking branch 'qmk/master' into merge-2023-12-16 2023-12-16 10:48:34 -06:00
Markus Knutsson
8236f59fa3
[Keyboard] Add Chameleon keyboard (#22427)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-12-05 00:30:07 -08:00
Markus Knutsson
966f80152e
Lotus 58, Vial keymap (#591)
* adding vial id

* Update Vial keymap

Replacing key-codes to match latest QMK iteration, some options are moved to .JSON

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Simplified OLED, cleaned up keymap

Simplified OLED, cleaned up keymap

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Update keyboards/tweetydabird/lotus58/keymaps/vial/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* conditional

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-11-12 03:35:39 -06:00
Joel Challis
3f1b3a5125
Migrate recently introduced sync items (#22305) 2023-10-21 12:21:23 +01:00
honorless
4b79e18d5d
refactor: unify keyboards with upstream 2023-09-09 07:51:20 -04:00
Ilya Zhuravlev
d6e95213e3 Merge remote-tracking branch 'qmk/master' into merge-2023-06-03 2023-06-03 12:35:25 -06:00
Ryan
363bfdbfda
Move RGBLIGHT_LIMIT_VAL to data driven (#20974)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 12:27:44 +10:00
Joel Challis
4ae45ca995
Tidy up encoder_map directions (#20847) 2023-05-10 22:55:49 +01:00
Ryan
ef6a712899
Even more info.json whitespace cleanups (#20703) 2023-05-04 19:09:59 +10:00
Ryan
79aa319946
info.json whitespace cleanups (#20651) 2023-05-02 08:25:15 +10:00
Drashna Jaelre
a6842d36c6
[Keyboard] Update lotus58 RGB config (#20468) 2023-04-16 13:27:21 -06:00
Ryan
798cbfe6a3
Fix info.json LTO and format encoder definitions (#20456) 2023-04-15 23:37:24 -06:00
James Young
3569f39485
Merge remote-tracking branch 'upstream/master' into develop 2023-04-15 12:28:32 -07:00
Markus Knutsson
28c11ed348
Lotus58 glow (#20386)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2023-04-15 19:34:09 +01:00
Ryan
47966dc2a6
Migrate rgblight.pin and RGB_DI_PIN to ws2812.pin (#20303) 2023-04-06 18:00:54 +10:00
Ilya Zhuravlev
06a2fdcc9c Merge remote-tracking branch 'qmk/master' into merge-2023-03-12 2023-03-18 17:51:58 -06:00
Ryan
7a8265247b
Remove "w":1 and "h":1 from info.json (#19961) 2023-02-28 15:06:11 +00:00
Ryan
d784f78bd0
Move Bootmagic config to data driven (#19860) 2023-02-17 08:49:49 +11:00
Ryan
11b6bb8179
Remove unused Bootmagic row/col defines from config.h (#19761) 2023-02-07 00:05:37 +00: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
Joel Challis
59443fa970
jsonify some info.json (#19146) 2022-11-25 02:47:02 +00:00
Markus Knutsson
ef676bce48
[Keyboard] Little Big Scroll (#264)
* lbs 4 initial

* LBS 4

Completed firmware

* LBS 6

Completed Firmware

* Cleanup LBS4

* Cleanup LBS6

* fixed keymap

* Update readme.md

* LBS 6 modified to info.json

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

* Added default QMK keymaps
2022-10-20 20:02:30 -06:00
Markus Knutsson
2b33d2c098
[Keyboard] Add Little Big Scroll 4 macropad (#18516)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-30 16:33:09 -07:00
Markus Knutsson
dab9edeabb
[Keyboard] Add Little Big Scroll 6 macropad (#18510)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-09-29 20:01:33 -07:00