~ruther/qmk_firmware

ef317671 — QMK Bot 3 years ago 
Merge remote-tracking branch 'origin/master' into develop
bed7625f — negatv 3 years ago 
Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and /keyboards/kinesis/kint41 (#14665)

* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

Co-authored-by: sadkins <sadkins@iMac-Pro.local>
de4a7131 — QMK Bot 4 years ago 
Merge remote-tracking branch 'origin/master' into develop

[Docs] update Japanese translation of mod_tap.md (#13981)

* update mod_tap.md translation

* add id on config_options.md and update text based on comments
Change `MK66F18` -> `MK66FX1M0` (#14659)
85b3f5a4 — QMK Bot 4 years ago 
Merge remote-tracking branch 'origin/master' into develop
52cb1971 — Purdea Andrei 4 years ago 
Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180)
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
Next