Copy of https://github.com/qmk/qmk_firmware Modified for our keyboard.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Go to file
Florian Didron 86f437c81f
Merge branch 'master' into feature/more_reactive_modes
6 years ago
.github Tweak issue templates (capitalisation mostly) (#5133) 6 years ago
drivers OLED Driver Feature 6 years ago
keyboards Set default debounce to 5 6 years ago
lib RGB Matrix Overhaul (#5372) 6 years ago
quantum Merge branch 'master' into feature/more_reactive_modes 6 years ago
tests Remove empty action_function() 6 years ago
tmk_core Remove keyboard description from Adafruit BLE device name 6 years ago
util Streamline Travis CI scripting 6 years ago
.clang-format Add .clang-format file 6 years ago
.clang_complete Vim Layout for Ergodox-EZ (mac only) (#2112) 7 years ago
.editorconfig Fix .editorconfig to not mess with line endings 7 years ago
.gitattributes Set eep files to binary mode 8 years ago
.gitignore Remove non-default keymaps 6 years ago
.gitmodules Update .gitmodules 7 years ago
.travis.yml Streamline Travis CI scripting 6 years ago
CODE_OF_CONDUCT.md Update CODE_OF_CONDUCT.md 6 years ago
Dockerfile Update build instructions and Dockerfile to download submodules 6 years ago
Doxyfile Generate API docs from source code comments (#2491) 7 years ago
LICENSE add an explicit lisence file for github to pickup 7 years ago
Makefile Shallow clone submodules. (#5279) 6 years ago
Vagrantfile Align docker and vagrant base images (#4905) 6 years ago
autocomplete.sh Make arguments redo, subproject elimination (#1784) 7 years ago
book.json adds redirects for docs 7 years ago
bootloader.mk Add Teensy ++ 2.0 bootloader support 7 years ago
build_full_test.mk Add SRC and OPT_DEFS when building tests 7 years ago
build_keyboard.mk Change split_common to use RGBLIGHT_SPLIT (#5509) 6 years ago
build_layout.mk Add a mechanism for force building a particular community layout (#5027) 6 years ago
build_test.mk Split common.mk into common.mk and common_features.mk 8 years ago
changelog.md Merge branch 'master' into feature/more_reactive_modes 6 years ago
common.mk Move Split Common VPATH addition (#4716) 6 years ago
common_features.mk Merge branch 'master' into feature/oled_driver 6 years ago
doxygen-todo Generate API docs from source code comments (#2491) 7 years ago
license_GPLv2.md Clarify the quantum license (#1042) 8 years ago
license_GPLv3.md Clarify the quantum license (#1042) 8 years ago
license_Modified_BSD.md Clarify the quantum license (#1042) 8 years ago
message.mk build size-check enhancement (#5485) 6 years ago
readme.md Update readme.md 6 years ago
secrets.tar.enc update building for .hex, secrets moving 7 years ago
shell.nix shell.nix: Packages relocated in upstream cleanup 6 years ago
show_options.mk Clean up debounce a bit (#5255) 6 years ago
testlist.mk Add basic infrastrucure for building full tests 8 years ago

readme.md

ZSA's fork of QMK Firmware

Current Version Build Status GitHub contributors GitHub forks

This purpose of this fork is maintain a clean repo that only contains the keyboard code that we need, and as little else as possible. This is to keep it lightweight, since we only need a couple of keyboards. This is the repo that the EZ Configurator will pull from.

Supported Keyboards

Maintainers

QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, Hasu. The ZSA branch is maintained by Drashna, ZSA's official QMK Liaison, and by Florian Didron, ZSA's lead developer, with input from Erez Zukerman (ZSA CEO).

Update Process

  1. Check out branch from ZSA's master branch:
    1. git remote add zsa https://github.com/ErgoDox-EZ/qmk_firmware.git
    2. git fetch --all
    3. git checkout -B branchname zsa/master
    4. git push -u zsa branchname
  2. Check for core changes:
  3. git cherry-pick the commits we want
    • git rm docs/* -r to remove the document updates when cherry picking. Repeat for any keyboard/keymap/etc that have changes that we aren't interested in
  4. Commit update
    • Include commit info in [changelog.md](http://changelog.md)
  5. Open Pull request, and include information about the commit

Strategy

To keep PRs small and easier to test, they should ideally be 1:1 with commits from QMK Firmware master. They should only group commits if/when it makes sense. Such as multiple commits for a specific feature (split RGB support, for instance)

Merging

Pull Requests should be merged/rebased, not squashed, so we can maintain a commit history that is close to QMK Firmware's, for ease of reference.