~ruther/qmk_firmware

34d5833a — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
0be3cd3e — npspears 4 years ago
Quark_LP- change MCU and RGB (#14650)

1667f137 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
292b7b38 — James Young 4 years ago
Remove firmware size impact notes from <keyboard>/rules.mk (#14652)

e5d48f6d — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
Remove redundant `MIDI_ENABLE = no` in keyboard-level rules.mk (#14649)

ed062d81 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
a8e13f04 — James Young 4 years ago
Mechlovin Hex4B: extend layout support (#14651)

* use XXX for KC_NO in hex4b.h

* add matrix diagram to hex4b.h

* rename LAYOUT to LAYOUT_all

* remove reference to KBFirmware JSON Parser

* info.json: add line breaks between rows

* rename LAYOUT_all to LAYOUT_split_bs

- LAYOUT alias for backward compatibility
- LAYOUT_all alias to signify support for every matrix position

* add LAYOUT_2u_bs

* add LAYOUT_tsangan_split_bs

* add LAYOUT_tsangan_2u_bs

* info.json: remove meta key
922c8071 — James Young 4 years ago
Merge remote-tracking branch 'upstream/master' into develop
Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)

90797d90 — Alexandre d'Alton 4 years ago
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>
b02a5396 — Purdea Andrei 4 years ago
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>
552c126b — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
8fccd82d — James Young 4 years ago
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
be3d7063 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
02ab7b18 — Drashna Jaelre 4 years ago
[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
81f2d0f4 — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
1e54796f — Drashna Jaelre 4 years ago
[Keymap] Update to Drashna Code (#14644)

4c4c430d — QMK Bot 4 years ago
Merge remote-tracking branch 'origin/master' into develop
929d959e — npspears 4 years ago
[Keyboard] add support for Quark_LP (#14552)

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