forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
* upstream/master: (390 commits) [Keyboard] handwired/ortho60 Configurator update, readme update, and rules tidy (qmk#4877) Fix Encoder documentation (qmk#4861) TKC1800 refactor and Configurator visual fixes (qmk#4870) Fixed the build break of helix/rev1:OLED_sample caused by PR qmk#4462. (qmk#4874) Add cursor keys to top layer (qmk#4876) [Keyboard] Fix bootloader size for v60_type_r (qmk#4873) Flip definitions of macOS brightness alias Grammatical fixes for GPIO Control doc (qmk#4869) handwired/ortho5x13: layout macro refactor Add new brightness aliases to keycodes_basic.md [Keyboard] update VENDOR_ID, PRODUCT_ID, and DEVICE_VER for Duck boards (qmk#4612) Add Planck rev1 and rev2, clean up rev3-5 config.h Allows Terminal to use ModTap/LayerTap keys (qmk#4586) Defined IS_(HOST_)LED_ON/OFF() and improved LED documentation (qmk#4853) MacOS Brightness Alias (qmk#4836) [Keymap] added custom led effect keymap.c (qmk#4856) Simplify split_common Code significantly (qmk#4772) Add documentation and fix formating (qmk#4860) [Keymap] Adding bdk keymap for ergobox_ez (qmk#4850) 40percent.club Luddite: Configurator update (qmk#4859) ...
Showing
2,301 changed files
with
74,566 additions
and
20,473 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
name: Blank issue | ||
about: If you're 100% sure that you don't need one of the other issue templates, use this one instead. | ||
|
||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
--- | ||
name: Bug report | ||
about: Create a report to help us improve the QMK Firmware | ||
--- | ||
<!-- Provide a general summary of the bug in the Title above --> | ||
|
||
<!-- This template is entirely option and can be removed, but is here to help both you and us. --> | ||
<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. --> | ||
|
||
**Describe the bug** | ||
|
||
<!-- A clear and concise description of what the bug is. --> | ||
|
||
**System Information** | ||
- Keyboard: | ||
- Revision (if applicable): | ||
- Operating System: | ||
- avr-gcc version: | ||
<!-- Run `avr-gcc --version` to find out --> | ||
- arm gcc version: | ||
<!-- Run `arm-none-eabi-gcc --version` to find out --> | ||
- QMK Firmware version: | ||
<!-- You can run `git describe --abbrev=0 --tags` to find this out --> | ||
- Any keyboard related software installed? | ||
- [ ] Auto Hot Key | ||
- [ ] Karabiner | ||
- [ ] Other | ||
|
||
**Additional context** | ||
|
||
<!-- Add any other context about the problem here. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
--- | ||
name: Feature request | ||
about: Suggest a new feature or changes to existing features | ||
--- | ||
<!--- Provide a general summary of the changes you want in the Title above --> | ||
|
||
<!-- This template is entirely option and can be removed, but is here to help both you and us. --> | ||
<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. --> | ||
|
||
## Feature Request Type | ||
|
||
- [ ] Core Functionality | ||
- [ ] Add-on hardware support (e.g. audio, RGB, OLED screen, etc.) | ||
- [ ] Alteration (enhancement/optimization) of existing Feature(s) | ||
- [ ] New behavior | ||
|
||
## Description | ||
|
||
<!-- A few sentences describing what it is that you'd like to see. Additional information (such as links to spec sheets, licensing info, other related issues or PR's, etc) would be helpful. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- | ||
name: Other issues | ||
about: Anything else that doesn't fall into the above categories. | ||
--- | ||
<!--- Provide a general summary of the changes you want in the Title above --> | ||
|
||
<!-- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. --> | ||
|
||
<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, check the bug report option, as that may be more appropriate. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<!--- Provide a general summary of your changes in the Title above --> | ||
|
||
<!--- This template is entirely option and can be removed, but is here to help both you and us. --> | ||
<!--- This text and anything on lines wrapped like this one will not show up in the final text. This text is to help us and you. --> | ||
|
||
## Description | ||
<!--- Describe your changes in detail --> | ||
|
||
## Types of changes | ||
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> | ||
- [ ] Core | ||
- [ ] Bugfix | ||
- [ ] New Feature | ||
- [ ] Enhancement/Optimization | ||
- [ ] Keyboard (addition or update) | ||
- [ ] Keymap/Layout/Userspace (addition or update) | ||
- [ ] Documentation | ||
|
||
|
||
## Issues Fixed or Closed by this PR | ||
|
||
* | ||
|
||
## Checklist: | ||
<!--- Go over all the following points, and put an `x` in all the boxes that apply. --> | ||
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> | ||
- [ ] My code follows the code style of this project. | ||
- [ ] My change requires a change to the documentation. | ||
- [ ] I have updated the documentation accordingly. | ||
- [ ] I have read the **CONTRIBUTING** document. (https://docs.qmk.fm/#/contributing) | ||
- [ ] I have added tests to cover my changes. | ||
- [ ] I have tested the changes and verified that they work and don't break anything (as well as I can manage). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,29 @@ | ||
FROM debian:jessie | ||
MAINTAINER Erik Dasque <[email protected]> | ||
FROM debian | ||
|
||
RUN apt-get update && apt-get install --no-install-recommends -y build-essential \ | ||
gcc \ | ||
unzip \ | ||
wget \ | ||
zip \ | ||
gcc-avr \ | ||
binutils-avr \ | ||
RUN apt-get update && apt-get install --no-install-recommends -y \ | ||
avr-libc \ | ||
avrdude \ | ||
binutils-arm-none-eabi \ | ||
binutils-avr \ | ||
build-essential \ | ||
dfu-programmer \ | ||
dfu-util \ | ||
gcc \ | ||
gcc-arm-none-eabi \ | ||
binutils-arm-none-eabi \ | ||
libnewlib-arm-none-eabi \ | ||
gcc-avr \ | ||
git \ | ||
libnewlib-arm-none-eabi \ | ||
software-properties-common \ | ||
avrdude \ | ||
unzip \ | ||
wget \ | ||
zip \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
ENV keyboard=ergodox | ||
ENV subproject=ez | ||
ENV keymap=default | ||
ENV KEYBOARD=ergodox_ez | ||
ENV KEYMAP=default | ||
|
||
VOLUME /qmk_firmware | ||
WORKDIR /qmk_firmware | ||
COPY . . | ||
|
||
VOLUME /qmk | ||
WORKDIR /qmk | ||
CMD make clean ; make keyboard=${keyboard} subproject=${subproject} keymap=${keymap} | ||
CMD make $KEYBOARD:$KEYMAP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Languages | ||
|
||
* [English](/) | ||
* [Chinese](zh/) |
Oops, something went wrong.