Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pulling from tmk #6

Merged
merged 47 commits into from
Mar 16, 2015
Merged

pulling from tmk #6

merged 47 commits into from
Mar 16, 2015

Conversation

jackhumbert
Copy link
Member

No description provided.

cub-uanic and others added 30 commits November 20, 2014 23:55
@cub-uanic
Documentation: small mistake
1a9cec9 
Originally reported as cub-uanic#10, all credits to @olivierpons
@bswinnerton
Fixing typo in console mode
60acd89
@vovcacik
Added support for The Ghost Squid controller used for CM XT keyboard.
a6d33e2 
- initial commit
- created as clone of the kitten_paw subproject with pins adjusted for CM
  XT
@cub-uanic
Update other_projects.md - added TMK/Ergodox
02a9f8a
@tmk
Compensate timer during prower down
05795cb
@tmk
Fix USB plug-in while BT mode falls to be enumerated
9179246
@tmk
Fix lufa sendchar() infinite wait loop
20caf67 
- FrameNumber is not updated when adapter powered
- can be blocked in sendchar() when pluged into AC adapter
@tmk
Add LUFA device state to command info
570bcb2
@tmk
Update MEMO
de29f98
@tmk
Disable input buffer for ADC
825be9d
@tmk
Clean ADC code of battery_voltage()
25aee43
@tmk
Fix: enable digital input for PF5
2d7973f
@tmk
Add wait for charging capacitance of ADC S/H
86f82dd
@tmk
Fix power saving while USB suspended
ebe4373 
- doesn't pwoer save while Bluetooth turns on
@tmk
Change RN42 state display
160e02d
@tmk
Update doc
884c2ab
@tmk
Fxi layer stuck of keymap_hasu
a679928 
- In mouse key layer with holding semicolon, press Fn0, release
  semicolon and release Fn0 now layer 1 is stuck.
@tmk
rn42: Add rn42_getc and rn42_gets
4f121de
@tmk
rn42: Add commands for RN-42
1b95b3c
@tmk
Increase buffer of rn42_gets() and change rn42_linked()
3b3af3b
@tmk
Use pgmspace for RN-42 commands
2626a32
@tmk
rn42: Update doc
517817b
@tmk
Merge branch 'rn42'
65a2ce9
@tmk
hhkb: Fix layer stuck of keymap_hasu
3e88e8b 
- In mouse key layer with holding semicolon, press Fn0, release
  semicolon and release Fn0 now layer 1 is stuck.
@tmk
hhkb_rn42: Move doc
ce66988
@tmk
hhkb: Integrate RN-42 support, remove hhkb_rn42
099701d
@tmk
Merge branch 'rn42_integrate'
c610bae
@xauser
Changed hotkey for bootloader jump
f31cbc7
@xauser
Added NerD 60% support
d9b5f51
@xauser
Added NerD 80% (TKL) support
2d74020
mechmerlin pushed a commit that referenced this pull request Feb 21, 2019
@chrislewisdev @mechmerlin
Velocikey: Match RGB animation speed to typing speed (#3754)
c1c5922 
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes #1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes #5) (#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes #1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes #5) (#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <[email protected]>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 2, 2019
@chrislewisdev @zer09
Velocikey: Match RGB animation speed to typing speed (qmk#3754)
499d0f2 
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <[email protected]>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Mar 7, 2019
@chrislewisdev @slugger7
Velocikey: Match RGB animation speed to typing speed (qmk#3754)
39c135d 
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <[email protected]>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
monksoffunk referenced this pull request in monksoffunk/qmk_firmware Mar 25, 2019
@sekigon-gonnoc
Merge pull request #6 from kata0510/lily58_ble
3ffdf88 
Add Lily58_ble keyboard
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Apr 3, 2019
@chrislewisdev @slugger7
Velocikey: Match RGB animation speed to typing speed (qmk#3754)
84bc832 
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <[email protected]>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
manolodeinternet added a commit to manolodeinternet/qmk_firmware that referenced this pull request Apr 11, 2019
@manolodeinternet
[qmk#6]
c94ad8e 
* modified files:

    * gherkin/config.h,
        * backlight_breathing added,

    * gherkin/gherkin.h,
        * defining LAYOUT_ortho_3x10 with the layout upside down,
           * This is for having miniUSB port to the left,
           * As in the original position designed for the Gherkin by di0ib.

    * gherkin/keymaps/30_layout/keymap.c,
        * syntax bugs polished, now code runs !
        * but there’s an issue with *SYMB and *NMBR, they seem to have a mutilate layout:

          [SYMB]:
          ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
             ⁉️      ~      ⁉️      _       %                   \     (      )      *      /
             '      @      +      ⁉️       $                   |     {      }      :      ⁉️
             !      ?      <      >       #                   &     ⁉️      ⁉️      ,      .
          ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯

          [NMBR]:
          ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
             1      2      3      4       5                   6     7      8      9      0
             ⎵      ⌦      0      =       $                   -     4      5      6      +
             ⏎      ⁉️      ⁉️      ,       .                   /     1      2      3      *
          ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
@chrislewisdev
Velocikey: Match RGB animation speed to typing speed (qmk#3754)
a661c8b 
* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Experimental LED support (untested)

* Draft commit of typing speed RGB control

* More information in the readme

* Support all RGB animation modes (Fixes qmk#1)

* Added support for all RGB light modes to use typing speed

Except christmas lights because that is seizure-inducing at high speeds!

* Introduced a value range specific to each RGB mode

Because some modes are a little too much when running at full speed!

* Update readme.md

* Update readme.md

* Re-arrange typing_speed definitions (Fixes qmk#5) (qmk#6)

* Re-arrange variable definitions to avoid including quantum.h from rgblight.c

* Fix a compilation error when trying to run make test:all

* Tweaks to the typing speed decay rate

* Renamed to momentum; moved implementation into dedicated files

* Groundwork for toggling momentum on/off (currently always on)

* Add EEPROM toggle for momentum-matching

* Moved momentum out of RGBLIGHT_ENABLE toggles so it's more generic

* Move momentum decay task out of rgblight_task()

* Fix missing momentum.h in lufa.c

* Added documentation

* Renamed feature to velocikey

* Reverted readme to original state

* Correct the readme title

* Updated feature name in the docs

* Update EECONFIG name

* Add compile-time toggles for velocikey

* Update feature documentation

* Revert "Merge branch 'led-support' into master"

This reverts commit e123ff5, reversing
changes made to df111a5.

* Move velocikey EECONFIG definition to depend on VELOCIKEY_ENABLE

* Rename decay_task function to decelerate

* Apply suggestions from code review

Co-Authored-By: chrislewisdev <[email protected]>

* Re-order eeconfig definitions

* Apply coding conventions

* Apply #ifdef check in lufa.c

* Refactored interval time checks into one functionc

* Small rename

* Fix unused function error for layouts not using all rgb effects

* Only update EEPROM if Velocikey is enabled

* Incorporate code review feedback

* Small adjustment to top-end decay rate

* Add Velocikey documentation to table of contents

* Bring tetris:default keymap size down by disabling audio
@ridingqwerty ridingqwerty mentioned this pull request Oct 22, 2019
Closed
TeddybearCup pushed a commit to TeddybearCup/qmk_firmware that referenced this pull request Jun 10, 2020
@j-inc
Merge pull request qmk#6 from j-inc/dev_branch
999aadb 
Added RGB layout optimization, animation freeze fix, layout cleanup.
hekekee added a commit to KouvostoTelecom/qmk_firmware that referenced this pull request Nov 15, 2020
@hekekee
Bootmagic, issue qmk#6
0b83157
finlaybob pushed a commit to finlaybob/qmk_firmware that referenced this pull request Jun 8, 2021
@Gr1mR3aver @tzarc
adding implementation for drawing circles. (qmk#6)
523165f 
* adding implementation for drawing circles.

* fixing comments, adding early function declaration

* adding implementation of drawing an ellipse

* minor formatting change

* adding comments and minor optimizations

* standardizing parameter names
daltona pushed a commit to daltona/qmk_firmware that referenced this pull request Aug 28, 2021
@Drugantibus
Merge pull request qmk#6 from Drugantibus/merging-branch
bd30a37 
Upstream fetch
jiaxin96 referenced this pull request in Oh-My-Mechanical-Keyboard/qmk_firmware Aug 30, 2021
@jiaxin96
Squashed commit of the following:
6177305 
commit 52d1e434c5031b11c024a6086f15a705a7dc8c34
Author: JX <[email protected]>
Date:   Mon Aug 30 11:57:37 2021 +0800

    Squashed commit of the following:

    commit baa4230
    Author: Zach White <[email protected]>
    Date:   Sun Aug 29 16:46:36 2021 -0700

        ensure that the directory for sys.executable is in the user's path (qmk#14229)

    commit b705020
    Author: Zach White <[email protected]>
    Date:   Sun Aug 29 16:41:56 2021 -0700

        move everything from qmkfm/base_container to qmkfm/qmk_cli (qmk#14230)

    commit 13a2da9
    Author: peott-fr <[email protected]>
    Date:   Sun Aug 29 14:52:49 2021 -0700

        Nyquist (qmk#14202)

        * adding my Nyquist keymap

        * Updating Nyquist keymap with licensing.

        * Cleaning-up and improving Nyquist keymap.

        * Cleaning-up and improving Nyquist keymap.

    commit a1866a9
    Author: Sergey Vlasov <[email protected]>
    Date:   Mon Aug 30 00:24:43 2021 +0300

        Update the nix-shell environment (qmk#13316)

        * Nix: Allow calls to `bin/qmk` even when the build was started by `qmk`

        The `$PATH` modifications performed by the Nix wrapper for the `qmk`
        executable prevent `bin/qmk` from working properly (the changed `$PATH`
        contains a wrong `python3` executable which does not have the needed
        Python modules in its module path).  As a workaround, disable the
        generation of that wrapper for the `qmk` Python package (there is yet
        another wrapper generated while building the Python environment, which
        would still set the Python module path properly when running `qmk`).

        Although `bin/qmk` is officially deprecated, QMK CLI still invokes it in
        some cases (at least `qmk doctor` and `qmk pytest`), therefore keeping
        these invocations working is useful.

        * Nix: Update `util/nix/pyproject.toml` to match `requirements*.txt`

        Update the Python dependency information used by Poetry to match the
        current state of the qmk_firmware code.

        * Nix: Bump QMK CLI dependency to 1.0.0; bump other Python deps

        Update Python dependencies for nix-shell to the most recent releases:

         - dotty-dict: 1.3.0 -> no longer used
         - milc: 1.4.2 -> 1.6.2
         - pep8-naming: 0.11.1 -> 0.12.1
         - pygments: 2.9.0 -> 2.10.0
         - pyrsistent: 0.17.3 -> 0.18.0
         - pyusb: 1.1.1 -> 1.2.1
         - setuptools-scm: 6.0.1 -> no longer used
         - qmk: 0.1.0 -> 1.0.0
         - qmk-dotty-dict: not used -> 1.3.0.post1
         - yapf: 0.30.0 -> 0.31.0

        Note to self: The command to update Python dependencies changed to:

            ( cd util/nix && nix run 'nixpkgs#poetry' -- update --lock )

    commit ef7fdee
    Author: J.Flanagan <[email protected]>
    Date:   Sun Aug 29 14:18:56 2021 -0500

        [Keyboard] Add Viktus SP Mini (qmk#14069)

        Co-authored-by: Ryan <[email protected]>
        Co-authored-by: Drashna Jaelre <[email protected]>

commit 5b6ec115dfeeb5742ee8a74d7417db9f3ce06cb3
Author: JX <[email protected]>
Date:   Mon Aug 30 11:55:34 2021 +0800

    del yr kbs

commit b79ac2d8951ae95869af933b38a42a1b3572b3de
Author: JX <[email protected]>
Date:   Mon Aug 30 11:54:48 2021 +0800

    rebase

commit 3cf068dd3a4192b78dcdfed1bf54bf57284291a7
Merge: 0755243 5c3d45a2d2
Author: JX <[email protected]>
Date:   Mon Aug 30 11:51:45 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 5c3d45a2d27cb950c3052e0c007bfc6b99bb3301
Merge: a210ace14d f87cd8e
Author: JX <[email protected]>
Date:   Sun Aug 29 23:58:54 2021 +0800

    Merge pull request #1 from qmk/master

    update to qmk

commit a210ace14ddb30502d106254cacda306c869cb25
Author: JX <[email protected]>
Date:   Sun Aug 29 23:57:05 2021 +0800

    del master yr kbs

commit 2ce5192
Author: JX <[email protected]>
Date:   Sun Aug 29 22:57:58 2021 +0800

    update local file

commit 6e09953
Author: JX <[email protected]>
Date:   Sat Aug 28 01:49:54 2021 +0800

    del u80

commit c673215
Author: JX <[email protected]>
Date:   Sat Aug 28 01:28:15 2021 +0800

    Delete uchen80v1.zip

commit bc37cfc
Author: JX <[email protected]>
Date:   Sat Aug 28 01:25:01 2021 +0800

    add yr kbs

commit 0755243
Author: JX <[email protected]>
Date:   Fri Aug 27 14:00:43 2021 +0800

    Distinguish product id between versions of one kb

commit d7b6051
Author: JX <[email protected]>
Date:   Fri Aug 27 13:33:08 2021 +0800

    add info.json for kbs waiting to push into qmk master

commit 4d52f89
Author: JX <[email protected]>
Date:   Fri Aug 27 11:23:03 2021 +0800

    fix all init make readme

commit 04ed3a3
Author: JX <[email protected]>
Date:   Fri Aug 27 11:15:21 2021 +0800

    move WS69v2 to whiteMouse69

commit ef4ee0c
Author: JX <[email protected]>
Date:   Fri Aug 27 00:59:31 2021 +0800

    add zhou65 via config file

commit b1381d3
Author: JX <[email protected]>
Date:   Thu Aug 26 20:49:16 2021 +0800

    fix e75 keymap

commit 1e183b4
Merge: 3b8a86c 2ceec5c
Author: JX <[email protected]>
Date:   Thu Aug 26 01:40:09 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 3b8a86c
Author: JX <[email protected]>
Date:   Thu Aug 26 01:34:56 2021 +0800

    fix share ep bug

commit 2ceec5c
Merge: f58a2d6 bb1b822
Author: JX <[email protected]>
Date:   Wed Aug 25 18:33:57 2021 +0800

    Merge pull request #7 from qmk/master

    update to qmk master

commit f58a2d6
Author: JX <[email protected]>
Date:   Wed Aug 25 01:03:32 2021 +0800

    fix e75 pin bug and add zhou75 solder version

commit f78926d
Author: JX <[email protected]>
Date:   Sun Aug 22 19:19:54 2021 +0800

    add boyPad

commit fe2769f
Author: JX <[email protected]>
Date:   Sun Aug 22 15:45:43 2021 +0800

    del hotdox76 v2 kb

commit b99e2e0
Author: JX <[email protected]>
Date:   Sun Aug 22 03:22:15 2021 +0800

    Update hotdox76_V2.c

commit 7888677
Author: JX <[email protected]>
Date:   Sun Aug 22 03:05:10 2021 +0800

    fix split oled layer state and current input not sync

commit a54bf3a
Author: JX <[email protected]>
Date:   Thu Aug 19 17:32:12 2021 +0800

    fix avr oled

commit 4b68c3b
Author: JX <[email protected]>
Date:   Tue Aug 17 23:33:33 2021 +0800

    add hotswap version for m69

commit 8fea4d1
Author: JX <[email protected]>
Date:   Mon Aug 16 01:23:25 2021 +0800

    add Eureka75 and hotdox76_V2

commit d9ab3ed
Author: JX <[email protected]>
Date:   Sun Aug 8 23:46:56 2021 +0800

    add hotdox76 v2 kb (prelim)

commit b4e8c50
Author: JX <[email protected]>
Date:   Sat Aug 7 03:37:57 2021 +0800

    add yp87ble and fix zhou75 encoder pin error

commit 2a560b8
Author: JX <[email protected]>
Date:   Sat Aug 7 01:37:07 2021 +0800

    fix eep path

    Change the EEP path to automatically obtain the absolute path of the current directory

commit 5888f9f
Author: JX <[email protected]>
Date:   Sun Aug 1 23:17:01 2021 +0800

    fix 69 keymap

commit fba647d
Author: JX <[email protected]>
Date:   Sun Aug 1 23:10:01 2021 +0800

    fix whitemouse69 rgb position

commit 260a647
Author: JX <[email protected]>
Date:   Sun Aug 1 22:27:30 2021 +0800

    fix zhou75 encoder

commit 01be073
Author: JX <[email protected]>
Date:   Sun Aug 1 21:51:30 2021 +0800

    add zhou75, boy40ble and yp980ble

commit 183a9f8
Author: JX <[email protected]>
Date:   Tue Jul 27 15:59:41 2021 +0800

    Update config.h

commit a0572b4
Author: JX <[email protected]>
Date:   Tue Jul 27 15:38:50 2021 +0800

    add led indicate for m69

commit bd7e66b
Author: JX <[email protected]>
Date:   Tue Jul 27 15:15:32 2021 +0800

    add M69(87%)

commit 551ed94
Merge: 98a0816 bbdcb0b
Author: JX <[email protected]>
Date:   Thu Jul 22 16:10:36 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 98a0816
Author: JX <[email protected]>
Date:   Thu Jul 22 16:05:09 2021 +0800

    添加keep函数

commit bbdcb0b
Merge: e869849 07ae72e
Author: JX <[email protected]>
Date:   Sun Jul 18 22:17:29 2021 +0800

    Merge pull request #6 from qmk/master

    update to the upstream of qmk master

commit e869849
Author: JX <[email protected]>
Date:   Sun Jul 18 22:06:10 2021 +0800

    add ws69v2 keyboard

commit 0c625e7
Author: JX <[email protected]>
Date:   Thu Jul 15 14:23:22 2021 +0800

    Create chibios.mk

commit b9183ce
Author: JX <[email protected]>
Date:   Thu Jul 15 13:46:58 2021 +0800

    Update main.c

commit b6e16c4
Author: JX <[email protected]>
Date:   Thu Jul 15 13:00:20 2021 +0800

    更新白鼠69为spi驱动需要更改spi的频率，qmk的bug

commit be78933
Author: JX <[email protected]>
Date:   Fri Jul 9 16:57:49 2021 +0800

    更新白鼠69 rgb矩阵

commit a4c0819
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 28 23:54:21 2021 +0800

    v-alpha1

commit 574b709
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 27 00:42:05 2021 +0800

    添加新键盘

commit 42b0038
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 27 00:40:48 2021 +0800

    修改重启nrf

commit ee800f1
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 26 00:10:13 2021 +0800

    Update biu_nrf52.cpp

commit 79e2882
Author: JX <[email protected]>
Date:   Thu Jun 24 18:58:11 2021 +0800

    Update keymap.c

commit cf51e9c
Merge: 7595114 d77cd42
Author: jiaxin96 <[email protected]>
Date:   Tue Jun 22 14:15:07 2021 +0800

    Merge branch 'master' of https://github.com/Oh-My-Mechanical-Keyboard/qmk_firmware

commit 7595114
Author: jiaxin96 <[email protected]>
Date:   Tue Jun 22 14:11:26 2021 +0800

    add sleep

commit d77cd42
Author: JX <[email protected]>
Date:   Mon Jun 21 22:47:27 2021 +0800

    Update getRgbMtrixPosition.js

commit 6db9a90
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:48:18 2021 +0800

    Update biu_nrf52.cpp

commit dda8139
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:41:29 2021 +0800

    add ble unpair current interface

commit 8d0cf13
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 17:39:49 2021 +0800

    add final80v2 and yp980ble

commit 50e5c4b
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 15:22:16 2021 +0800

    Update biu_nrf52.cpp

commit a3f4903
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 14:33:17 2021 +0800

    Update biu_nrf52.cpp

commit c5d6b19
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 21 14:08:08 2021 +0800

    restructure the nrf framework

commit 2841425
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 23:31:08 2021 +0800

    fix pre init bug（add return）

commit 44ba86c
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:55:05 2021 +0800

    Update biu_nrf52.cpp

commit ed2f91b
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:43:14 2021 +0800

    Delete uart.c

commit ffef7ec
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:42:54 2021 +0800

    Create uart.c

commit cf3c262
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 22:11:51 2021 +0800

    fix uart

commit df7a30c
Merge: fafaa74 1012972
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:22:03 2021 +0800

    Merge branch 'qmk-master'

commit 1012972
Merge: fafaa74 939ce6a
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:21:37 2021 +0800

    Merge branch 'master' of https://github.com/qmk/qmk_firmware into qmk-master

commit fafaa74
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:17:18 2021 +0800

    ignore vscode setting

commit f44ccff
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 20:13:12 2021 +0800

    add batinfo update and fix the uart setting of chibios

commit 236b1c5
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 17:02:03 2021 +0800

    add bat information update

commit 0cfbe71
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 19 16:05:53 2021 +0800

    add nrf52 uart module support lib

commit 67fe370
Author: jiaxin96 <[email protected]>
Date:   Thu Jun 17 11:18:42 2021 +0800

    start test usb anc ble switch

commit 278d0e7
Author: jiaxin96 <[email protected]>
Date:   Thu Jun 17 00:20:01 2021 +0800

    add adc and extern the uart buffer for f401 wm28

commit 3c0dbc5
Author: JX <[email protected]>
Date:   Wed Jun 16 15:55:34 2021 +0800

    Update settings.json

commit 5699d3d
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 20:33:37 2021 +0800

    simplify the r65 code

commit 8e30997
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 20:29:33 2021 +0800

    add wm uart map

commit eacbc03
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 19:54:03 2021 +0800

    Update getRgbMtrixPosition.js

commit 2f8235c
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 19:52:28 2021 +0800

    add tdcq rgb

commit c4ce4eb
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 17:13:10 2021 +0800

    Enables the master branch to also use the EEPROM of Stm32F4

commit ed2ccb4
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 15:49:52 2021 +0800

    fix tdcq

commit cf46f1e
Author: jiaxin96 <[email protected]>
Date:   Mon Jun 14 14:17:03 2021 +0800

    fix eeprom bug

commit 21e2df3
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 13 00:23:13 2021 +0800

    Update keymap.c

commit bedd819
Author: jiaxin96 <[email protected]>
Date:   Sun Jun 13 00:16:29 2021 +0800

    fix via col and row number for wm28

commit 65e50fc
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 12 23:52:48 2021 +0800

    add bs 28 and CUSTOM_MATRIX

commit 0d7451b
Merge: 1866908 0ef145d
Author: JX <[email protected]>
Date:   Sat Jun 12 16:23:55 2021 +0800

    Merge branch 'qmk:master' into master

commit 1866908
Author: jiaxin96 <[email protected]>
Date:   Sat Jun 12 16:23:18 2021 +0800

    ADD bs28 TEST

commit db3f05e
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 12:12:05 2021 +0800

    fix via rgb

commit 063438b
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 12:05:03 2021 +0800

    add via info

commit 85e6ad9
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 11:49:02 2021 +0800

    Update readme.md

commit 0400d2f
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 11 11:48:27 2021 +0800

    add tdcq64 2s

commit 6e29f1a
Author: JX <[email protected]>
Date:   Tue Jun 8 21:56:16 2021 +0800

    Update readme.md

commit f677b10
Author: JX <[email protected]>
Date:   Mon Jun 7 19:45:12 2021 +0800

    Update readme.md

commit c70834d
Author: jiaxin96 <[email protected]>
Date:   Fri Jun 4 12:17:37 2021 +0800

    Update config.h

commit 836cf47
Author: jiaxin96 <[email protected]>
Date:   Mon May 24 21:12:06 2021 +0800

    update tdcq68 config.h

commit 3ded209
Author: jiaxin96 <[email protected]>
Date:   Sun May 23 11:48:31 2021 +0800

    add doc for r65ble

commit 21d4461
Author: jiaxin96 <[email protected]>
Date:   Sun May 23 00:47:04 2021 +0800

    add tdcq68 and add gpl2 header

commit bf24140
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 22:30:50 2021 +0800

    fix f401_rgb

commit 4f29f66
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 21:50:04 2021 +0800

    add stm32f103 and stm32f401 f411 case

commit 6f71392
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 17:20:20 2021 +0800

    add tap code delay and format the encoder behever

commit 93e889d
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 17:05:19 2021 +0800

    add sb65p-via-json

commit d205b5a
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 16:55:52 2021 +0800

    fix part of format error and add some licenses header

commit 2549671
Merge: 244d968 40f235a
Author: JX <[email protected]>
Date:   Sat May 22 11:23:12 2021 +0800

    Merge pull request #3 from qmk/master

    update to qmk master

commit 244d968
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 11:20:54 2021 +0800

    Update keymap.c

commit 374885b
Author: jiaxin96 <[email protected]>
Date:   Sat May 22 11:12:22 2021 +0800

    add r65ble-test

commit 02028fb
Merge: 5cb336a 63cdf80
Author: JX <[email protected]>
Date:   Wed Apr 28 14:16:40 2021 +0800

    Merge pull request #2 from qmk/master

    update to the qmk master branch

commit 5cb336a
Author: jiaxin96 <[email protected]>
Date:   Wed Apr 21 15:32:34 2021 +0800

    Update config.h

commit 9b733f3
Author: jiaxin96 <[email protected]>
Date:   Wed Apr 21 14:03:10 2021 +0800

    revision of the config.h

commit bfcf59c
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:54:14 2021 +0800

    Fix some typos

commit ad4b88d
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:43:22 2021 +0800

    add info.json for all keyboards of "y&r studio"

commit 06011cf
Merge: 2363cd4 8405d28
Author: JX <[email protected]>
Date:   Tue Apr 20 21:22:16 2021 +0800

    Merge pull request #1 from qmk/master

    update to the master of the qmk repo.

commit 2363cd4
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 21:20:16 2021 +0800

    add readme and correct layout naming

commit 2b475ab
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 01:15:33 2021 +0800

    add readme files

commit d6e1277
Author: jiaxin96 <[email protected]>
Date:   Tue Apr 20 00:55:51 2021 +0800

    add keyboards

    add keyboards and utils for 'y&r studio'
lalalademaxiya2 pushed a commit to lalalademaxiya2/qmk_firmware that referenced this pull request Jan 27, 2022
@KeychronMacro
Merge pull request qmk#6 from keychron-contrib/vr-q1-fix-led-matrix
8a9cd29 
[Q1] pretty up RGB matrix code on ANSI boards
lalalademaxiya2 pushed a commit to lalalademaxiya2/qmk_firmware that referenced this pull request Jan 27, 2022
@vinorodrigues
revert some of qmk#6 as the LED matrix does not work without all the …
e165f33 
…LEDs assigned
lalalademaxiya2 pushed a commit to lalalademaxiya2/qmk_firmware that referenced this pull request Jan 27, 2022
@KeychronMacro
Merge pull request qmk#8 from keychron-contrib/vr-revert-pr6
ca65b2c 
revert some of pr qmk#6
crokobit added a commit to crokobit/qmk_firmware that referenced this pull request Mar 6, 2022
@crokobit
# This is a combination of 6 commits.
d72056c 
# This is the 1st commit message:

add crokobit ergox keymap

# The commit message qmk#2 will be skipped:

# update

# The commit message qmk#3 will be skipped:

# update

# The commit message qmk#4 will be skipped:

# update

# The commit message qmk#5 will be skipped:

# update

# The commit message qmk#6 will be skipped:

# update
itarze referenced this pull request in itarze/qmk_firmware Apr 20, 2022
Merge pull request #6 from wb-Joy/gmmk_updates_and_v2
7cb43b3 
Gmmk updates and v2
EthanG45 referenced this pull request in EthanG45/qmk_firmware May 1, 2022
@vinorodrigues
revert some of #6 as the LED matrix does not work without all the LED…
f704630 
…s assigned
thxph pushed a commit to thxph/qmk_firmware that referenced this pull request Jul 25, 2022
@zhaqian12
Merge pull request qmk#6 from zhaqian12/qmk-zq
9d33290 
merge
goropikari pushed a commit to goropikari/qmk_firmware that referenced this pull request Jan 21, 2023
@aki27kbd
Merge pull request qmk#6 from btgrant-76/font-path-fix
0d4625a 
add aki27 to font path
mechmehmet added a commit to mechmehmet/qmk_firmware that referenced this pull request Mar 12, 2023
@mechmehmet
adding my keyboard 2d4d qmk#6
53fe5fe
y-usuzumi pushed a commit to y-usuzumi/qmk_firmware that referenced this pull request Sep 19, 2024
@Prens282
Air60_V2 software based on adi4086's Air96_v2 1.1.5.5. (qmk#6)
cd6ffeb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jackhumbert @cub-uanic @bswinnerton @vovcacik @tmk @xauser