Commit graph

18092 commits

Author SHA1 Message Date
James Young
922c8071e4
Merge remote-tracking branch 'upstream/master' into develop 2021-09-29 23:23:10 -07:00
Ryan
36bc3c867e
Remove redundant UNICODE_ENABLE = no in keyboard-level rules.mk (#14633) 2021-09-30 08:14:21 +10:00
Alexandre d'Alton
90797d903c
massdrop alt/ctrl: support saving into nvm (#6068)
* support saving into SmartEEPROM

Signed-off-by: Alexandre d Alton <alex@alexdalton.org>

* atsam: update smarteeprom implementation

- Use define for SmartEEPROM buffer address
- Check buffer overflow
- Do not perform operation when timeout occurs

Signed-off-by: Alexandre d'Alton <alex@alexdalton.org>

* return 0 instead of ff for invalid address or timeout

Signed-off-by: Alexandre d'Alton <alex@alexdalton.org>

* clang-format

* Add extra bounds checks

Co-authored-by: zvecr <git@zvecr.com>
2021-09-30 06:56:13 +10:00
Purdea Andrei
b02a539625
Added power tracking api (#12691)
* Add power tracking API to lufa and chibios targets

* power.c: Pass through power state to the notify function

* power: added notify_power_state_change_user too.

* making it pass the PR linter

* Add a POWER_STATE_NO_INIT state, that we start in before calling power_init();

* Rename *power* to *usb_power*

* removing stray newline

* Rename usb_power* to usb_device_state*

* Update quantum/usb_device_state.h

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

* Fix comment

* usb_device_state.h: Don't include quantum.h, only the necessary headers.

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-30 06:31:39 +10:00
QMK Bot
552c126bea Merge remote-tracking branch 'origin/master' into develop 2021-09-29 19:49:11 +00:00
James Young
8fccd82d4e
Mechlovin Hannah60RGB touch-up (#14646)
* use XXX for KC_NO in rev1.h

* add matrix diagram to rev1.h

* remove reference to KBFirmware JSON Parser from rev1.h

* use XXX for KC_NO in rev2.h

* add matrix diagram to rev2.h

* add LAYOUT_60_ansi and LAYOUT_60_iso

* enable Community Layout support

* update info.json metadata

- specify keyboard revision in keyboard_name
- use GitHub username in maintainer field

* remove reference to KBFirmware JSON Parser from main rules.mk
2021-09-29 12:48:37 -07:00
QMK Bot
be3d7063a0 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:37:46 +00:00
Drashna Jaelre
02ab7b1888
[Core] Fix "6kro enable" and clarify naming (#14563)
* Fix USB_6KRO_ENABLE compilation errors

* Add info to docs

* Rename define to be more accurate

* Remove unused rule

* Refixe docs
2021-09-29 11:37:11 -07:00
QMK Bot
81f2d0f4cb Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:16:49 +00:00
Drashna Jaelre
1e54796f0c
[Keymap] Update to Drashna Code (#14644) 2021-09-29 11:16:11 -07:00
QMK Bot
4c4c430db8 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:56:09 +00:00
npspears
929d959ef9
[Keyboard] add support for Quark_LP (#14552)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-29 09:55:58 -07:00
vattern
03df754551
[Keyboard] Update Grandiceps to Rev2 (#14618)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk>
2021-09-29 09:55:34 -07:00
QMK Bot
4b77a8719a Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:43:34 +00:00
jonavin
c89f74b929
[Keymap] Jonavin murphpad keymap update (#14637)
Co-authored-by: Jonavin <=>
2021-09-29 09:42:53 -07:00
QMK Bot
f58095fab7 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 16:30:58 +00:00
Drashna Jaelre
0338481090
[Keyboard] Updates for Tractyl Manuform config (#14641) 2021-09-29 09:30:25 -07:00
QMK Bot
f1aab47d13 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 07:39:17 +00:00
Drashna Jaelre
363eb645fc
[Keyboard] Fix end of file issue for Owlab suit80 (#14640) 2021-09-29 17:38:41 +10:00
nachie
6779d5b990
[Keyboard] Add support for PaladinPad, Arya pcb and move keyboards by KapCave into their own directory (#14194)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
2021-09-28 21:35:14 -07:00
QMK Bot
77e4b07fb5 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 02:46:05 +00:00
Grayson Carr
046e3ce5c9
[Keymap] Keychron Q1 user keymap (#14636) 2021-09-28 19:45:29 -07:00
James Young
55f699c09e
Fix for mechlovin/adelais/standard_led/arm/rev4 (#14639)
* Fix for #14622

Fix for a bad merge conflict resolution.
2021-09-28 17:18:53 -07:00
QMK Bot
00555a2f02 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 23:03:20 +00:00
James Young
02b760c6b0
convert checkerboards/quark_squared:via rules.mk to Unix line endings (#14638) 2021-09-28 16:02:48 -07:00
QMK Bot
528623eb33 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 21:50:02 +00:00
James Young
732535c1bb
Mechlovin Delphine: add LAYOUT_numpad_6x4 (#14635)
* add LAYOUT_numpad_6x4

* tidy-up info.json data

* use GitHub account name for maintainer field
* remove meta key

* add matrix diagram to delphine.h

* update Community Layout support
2021-09-28 14:49:35 -07:00
QMK Bot
4b9b9ebff4 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 20:09:18 +00:00
Ryan
873a1999bb
Move "firmware size check skipped" note to message.mk (#14632) 2021-09-29 06:08:46 +10:00
QMK Bot
bc41d37baf Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:24:40 +00:00
jonavin
705cd433c2
[Keymap] fix NKRO - switch to get_mods() and refactor encoder action code (#14278)
Co-authored-by: Jonavin <=>
2021-09-28 12:24:12 -07:00
QMK Bot
f89620d7af Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:24:10 +00:00
Greg Knapp
724ee24075
[Keyboard] Yampad VIA support (#14397)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-28 12:23:38 -07:00
QMK Bot
3f4ea5c31f Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:23:27 +00:00
owlab-git
4a2062cc01
[Keyboard] Add OwLab Suit80 (#14362)
* add suit80 files

* first add suit80 files

* modified suit80 files

* layout change

* modified again

* changed png url
2021-09-28 12:22:56 -07:00
QMK Bot
52127e7bda Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:21:40 +00:00
Alexander Kagno
bc818352a3
[Keymap] arkag userspace/keymap -- new macro and minor preonic keymap change (#14623)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-28 12:21:10 -07:00
QMK Bot
77639d8994 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:01:12 +00:00
Harshit Goel
ac1d48cbf5
[Keyboard] Pteron36 (#13475)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Harshti Goel <harshitgoel@licious.com>
2021-09-28 12:00:34 -07:00
James Young
5917334b42
Merge remote-tracking branch 'upstream/master' into develop 2021-09-28 10:21:11 -07:00
James Young
adc7cc5981
Mechlovin Adelais: add support for full-length Right Shift (#14622)
* add layout variants with 2.75u Right Shift

* move layout alias to info.json

* match info.json labels to matrix positions

Edits the label keys in info.json to match the matrix position identifiers in adelais.h.

* info.json: add line breaks between keyboard rows

* info.json: use GitHub username in maintainer field
2021-09-28 09:38:34 -07:00
QMK Bot
862b348046 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 05:27:07 +00:00
Dasky
02451fcc75
[Keyboard] Add dz60rgb_ansi v2_1 (#14614)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:26:30 -07:00
QMK Bot
ded55154ef Merge remote-tracking branch 'origin/master' into develop 2021-09-28 05:10:37 +00:00
Sergi Meseguer
574b3d8a5a
[Keyboard] z12 micropad by zigotica (#14583)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:10:10 -07:00
QMK Bot
8b74ba7e75 Merge remote-tracking branch 'origin/master' into develop 2021-09-28 05:01:22 +00:00
peepeetee
2742d0c4c1
[Keyboard] Add BM80 Keyboard (#12948)
* Initial compatibility with bm80

* move files to kprepublic directory, see #12159

* fix pin assignment

* Revert "fix pin assignment"

This reverts commit 5a53a74953a23bb5064c11d5d9e6daf007a54872.

* add testing setup (peepeetee keymap, will use for personal purposes later), fix LED assignment, add indicator LED, LED location, count, and flags are broken

* fixed flags( not sure, please check)

* fixed number of LEDs

* add comment about f11

* remove comment about f11, change capslock flag to be 1 rather than 1+8 as there is a standalone indicator LED

* readme.md

* add via keymap

* add info.json with help from noroadsleft's converter

* add suspended state implementation, I don't think it's working

* update to my testing setup

* restore erroneously included bm68rgb config

* Update keyboards/kprepublic/bm80/config.h

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

* add reset instructions

* change reset instruction grammar

* remove not working sleep function, add comment for RGB flags

* add LED mapping comments

* change readme grammar

* replace rgb light paremeters with rgb matrix paremeters, enable framebuffer effects

* re-enable peepeetee/config.h, updating my disabled effect list

* updating my disabled effect list

* update LED struct documentation

* update readme with RGB matrix effect information

* Update keyboards/kprepublic/bm80/rules.mk

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

* move files back to keyboard from keyboard/kprepublic, see 85b33d6 and qmk#12159

* Apply suggestions from code review

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* cleanup peepeetee keymap

* update peepeetee keymap; rebase on current master

* moved to /kprepublic, see #12159

* Apply suggestions from code review

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

* Apply suggestions from code review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-27 22:00:47 -07:00
QMK Bot
16c4550608 Merge remote-tracking branch 'origin/master' into develop 2021-09-27 17:50:46 +00:00
Ryan
ae993dc068
Zinc: Clean up LTO rules (#14597) 2021-09-28 03:50:06 +10:00
QMK Bot
273c426d15 Merge remote-tracking branch 'origin/master' into develop 2021-09-27 17:46:46 +00:00