~ruther/qmk_firmware

058737f1 — Erovia 4 years ago
[CLI] Add c2json (#8817)

* Basic keymap parsing finally works

* Add 'keymap.json' creation to the qmk.keymap module

* Add tests and fix formatting

* Fix/exclude flake8 errors

* Convert keymap.c to valid keymap.json

* Fix some errors

* Add tests

* Finalize keymap.json creation, add json template

* Add docs

* Move pygments to the standard requirements

* Add support for nameless layers, fix tests

* Fix things after rebase

* Add missing 'keymap' value.

* Fix missing layer numbers from advanced keycodes

Buckwich noticed that if the advanced keycode / layer toggling key
contains a number, it goes missing.
Now we properly handle them.
Thx for noticing!

* Apply suggestions from code review

* fixup tests

Co-authored-by: Zach White <skullydazed@drpepper.org>
Co-authored-by: skullY <skullydazed@gmail.com>
Improve LAYOUT macro searching (#9530)

* Improve LAYOUT macro searching

* Apply suggestions from code review

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>

* Adjust signature

* Try to copy the makefile's handling of DEFAULT_FOLDER

* Move it further up, into `info_json()`

* Move it even further up so that keyboard_folder is correct

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

* Update lib/python/qmk/info.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

Co-authored-by: Zach White <skullydazed@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@drpepper.org>
CLI: update subcommands to use return instead of exit() (#10323)

2013f631 — Joe Strong 4 years ago
Fixes small typo in docs (#10515)

32661df8 — Gergely Peidl 4 years ago
Update personal keymap for Let's Split keyboard. (#10536)

* Add Initial layout configuration.

* Set arduino pro micro's built in RX LED as Numlock

* Enable Autoshift feautre.

* Remove DVORAK layout.

* Add Numpad, update default layer.

* Update AutoShift timeout.

* Beautify ASCII Art.

* Update keymap.

* Add Initial verison of RGB lighting.

* Add Tap dance, hungarian letters.

.Xmodmap example: https://github.com/geripgeri/dotfiles/commit/09f058753dd10e4ff8ab2aac7274b5600c466392

* Update RGB to use only noeeprom functions.

* Change default rgb led color.

* Add `pragma once`.

* Emojis added.

* Add tap dance for hungarian letters, multimedia control, slash/backslash.

* Remove audio related code.

* Add Gaming layer.

* Remove unnecessary code, update copyright.

* Add readme.md

* Implement code review suggestions.

* Implement code review suggestions #2

* Remove Auto Shift feature.

* Remove Gaming layer.
661f4aaa — Reibl János Dániel 4 years ago
[Keymap] Move my custom functions and keymaps to userspace (#10502)

* Move my custom functions and keymaps to userspace to be able to add the STM32F411 variant of my keyboard with mostly the same functionality

* Move keymaps to community layouts

* Remove keymaps from userspace readme.md

Co-authored-by: Janos Daniel Reibl <janos.daniel.reibl@protonmail.com>
27f9f319 — Jakob 4 years ago
[Keyboard] add support for ymd75 rev3 (#10483)

* add support for ymd75 rev3

* Update keyboards/ymd75/rev3/rules.mk

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

* Update keyboards/ymd75/rev3/rules.mk

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

* remove DESCRIPTION

* only apply offset for rev3

Co-authored-by: Ryan <fauxpark@gmail.com>
89446baf — Thomas Holt-Ronczy 4 years ago
[Keyboard] Add soy20 PCB (#10440)

* Add soy20 PCB

adds default and VIA Keymaps for soy20 pcb by DrewKeys

* Update keyboards/soy20/config.h

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

* Update keyboards/soy20/config.h

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

* Update keyboards/soy20/rules.mk

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

* Update keyboards/soy20/soy20.h

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

* Update keyboards/soy20/keymaps/via/keymap.c

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

* Update keyboards/soy20/keymaps/via/keymap.c

Agreed. It was left over from the original file provided by the board makers original configurator file.

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

* Update keyboards/soy20/rules.mk

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

* Update keyboards/soy20/config.h

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

* Update keyboards/soy20/config.h

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

* Update keyboards/soy20/config.h

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

* Update keyboards/soy20/keymaps/default/keymap.c

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

* Update keyboards/soy20/keymaps/default/keymap.c

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

* Update keyboards/soy20/info.json

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

* Update keyboards/soy20/readme.md

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

* Update keyboards/soy20/rules.mk

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

* Update keyboards/soy20/rules.mk

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

* Update keyboards/soy20/rules.mk

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

* Update keyboards/soy20/soy20.h

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

* Update keyboards/soy20/keymaps/default/keymap.c

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

* Update keyboards/soy20/keymaps/default/keymap.c

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

* Update keyboards/soy20/keymaps/default/keymap.c

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

* Update keyboards/soy20/keymaps/via/keymap.c

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

* Update keyboards/soy20/keymaps/via/keymap.c

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

* Update keyboards/soy20/keymaps/via/keymap.c

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

* Update keyboards/soy20/keymaps/via/keymap.c

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

* Update keyboards/soy20/info.json

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

* Update keyboards/soy20/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Updating *.c & *.h files with GPL3 license

* Delete rules.mk

* Delete keymap.c

* Corrected Header Comments

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2bcac456 — 3araht 4 years ago
Fix for MIDI sustain effect issue (#10361)

c8cff148 — QMK Bot 4 years ago
format code according to conventions [skip ci]
c4f910b1 — Drashna Jaelre 4 years ago
Merge pull request #10404 from cmdremily/opendeck-core

Allow the use of only one IS31FL3731 LED driver
edebe56f — tomic1785 4 years ago
[Keyboard] Add Yugo-M Controller (#10389)

* Created folder structure and blank files

* Update the yugo_m initial blank files

* Add yugo_m default keymap

* Update yugo_m info.json

* Fix yugo_m keymap.c

* keymap.c update

* Changed subfolder name

* File names

* Fixed lock LEDs problem

* Returned old subfolder name; LEDs fix

* Activated anti-ghosting feature in config.h

* Update readme.md

* Changed LAYOUT to LAYOUT_all

* Updated keymap.c

* corrected LAYOUT to LAYOUT_all in info.json

* Rewritten readme.md according to the template

* Removed backslashes from keymap.c

* Fixed readme.md

* Fixed readme.md again

* Tidying up readme.md

* Tidying up comments and readme.md

* Removed a line from rules.mk

* Update keyboards/yugo_m/model_m_101/model_m_101.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Removed chconf, halconf, mcuconf

* Updated LED control

* Update keyboards/yugo_m/model_m_101/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/yugo_m/model_m_101/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/yugo_m/model_m_101/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/yugo_m/model_m_101/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/yugo_m/model_m_101/model_m_101.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/yugo_m/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Updated readme.md, there was an outdated info

* Update keyboards/yugo_m/model_m_101/keymaps/default/keymap.c

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

* Update keyboards/yugo_m/model_m_101/keymaps/default/keymap.c

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

* Update keyboards/yugo_m/model_m_101/model_m_101.c

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

* Update keyboards/yugo_m/model_m_101/model_m_101.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Nidzo Tomic <tomicn8@hotmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
3a8e13a7 — Sergey Vlasov 4 years ago
[Keymap] Add onekey keymap for OLED testing (#10380)

* Add onekey keymap for OLED testing

* Add license header
1afb394d — Isaac 4 years ago
[Keymap] Add winterNebs keymaps  (#10328)

* Add kyria keymap

* Add planck keymap

* Add nyquist keymap

* Add vim movement instead of regular movement layer

* Use partial home row mods :)

* Update keyboards/keebio/nyquist/keymaps/winterNebs/config.h

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

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

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

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

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

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

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

* Update keyboards/keebio/nyquist/keymaps/winterNebs/keymap.c

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

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

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

* Update keyboards/kyria/keymaps/winterNebs/rules.mk

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

* Update keyboards/planck/keymaps/winterNebs/keymap.c

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

* Update keyboards/planck/keymaps/winterNebs/keymap.c

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

* Update keyboards/planck/keymaps/winterNebs/keymap.c

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

* Fix outdated function call

* Apply suggestions from code review

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/kyria/keymaps/winterNebs/keymap.c

somehow this wasn't added to the batch?

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* remove deprecated function

* Rename to lowercase

* Update keyboards/planck/keymaps/winterNebs/keymap.c

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

* fix oled path

* rebase and add back nyquist that was lost by rename

* Add licenses

* License in the wrong file

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
1aacbc44 — Fred Silberberg 4 years ago
[Keymap] Added 333fred 5x6_5 keymap (#10272)

* First pass at manuform layout.

* Updates from actual usage on my board. Fixed a couple of bugs, added a stormlight quote randomizer.

* Use a 32-bit timer that can actually hit 5 minutes.

* Some updates after a day of usage:

* Turn off WPM. It's too inaccurate and takes up a decent amount of space that can be devoted to quotes.
* Turn off the OLEDs after 5 minutes
* Move the keys around a bit.
* Add many more quotes.

* Adjust the quotes to make room for missing and misswritten WoT quote. Adjusted the keymap slightly. Adjust the mods display to include one_shots.

* Revert osm on lgui as it makes start menu search impossible to use.

* Use LTO_ENABLE flag.

* License all of my (333fred's) keymaps as MIT.

* Update users/333fred/rgb.c

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

Co-authored-by: Ryan <fauxpark@gmail.com>
793de76b — mechlovin 4 years ago
[Keyboard] Add hannah60rgb rev.2 PCB (#10287)

* add hannah60rgb_rev2

* add

* Update rev2.c

* fixed rgb matrix

* Update rev2.c

* update rules.mk

* update readme

* update

* Update config.h

* Update rules.mk
f176daa1 — swampmonster 4 years ago
Adding VIA support to katana60 rev2 (#10442)

Co-authored-by: swampmonster <>
459ccb68 — Sergey Vlasov 4 years ago
OLED driver fixes (#10377)

* Fix dirtying in oled_write_pixel()

Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state.  Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.

* Fix oled_write_pixel() with 90/270 degree rotation

Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.

* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE

Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT.  The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.

* Fix handling of out-of-range bits in oled_dirty

If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.

* Fix potentially wrong dirtying in oled_write_char()

oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.

* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR

Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int.  Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
1fe7743a — a_p_u_r_o 4 years ago
IS31FL3741 driver fixup (#10519)

* Fix issue with data transfer of CS1_SW7 to CS18_SW7.

* Fix issue with handling of scaling register buffer's dirty flag.

* Remove unused extern declaration.

* Compaction of struct is31_led utilizing bit fields.
a0467fda — Simon 4 years ago
add info.json for XD75 keyboard (#10523)

Currently the XD75 is missing a info.json
attributing to non standardised use of QMK
Next