Merge remote-tracking branch 'upstream/master'

* upstream/master: (1967 commits)
  [Docs] Japanese translation of docs/feature_combo.md (qmk#8671)
  Remove old setup scripts (qmk#8811)
  [Keyboard] ProjectKB Alice rev2 (qmk#8718)
  MILC: Fix setting config values for store_true and store_false (qmk#8813)
  KC60 Refactor (qmk#8782)
  Fix quick7 build command (qmk#8812)
  Miscellaneous stuff: remove clang-complete and autocomplete.sh, fix some rules.mk comments (qmk#8784)
  [Keyboard] add new keyboard quick7 (qmk#8670)
  [Keymap] Added custom layout for KBDFans KBD67 rev2 (qmk#8752)
  [keyboard] Add kudox rev3 (qmk#8704)
  CLI: Fix doctor error when can't run `bin/qmk --version`. (qmk#8796)
  deleted unused keymap (qmk#8797)
  Add missing repository name to qmk setup w/ github (qmk#8792)
  Configure RGBLIGHT_SPLIT for Mint60 (qmk#8788)
  [Keyboard] Aplx6 (qmk#8727)
  update pvinis keymap (qmk#8746)
  CLI: Use `shutil.which` to detect gmake, instead of OS check.
  CLI: Invoke gmake on FreeBSD when using `qmk compile`.
  [Docs] Japanese translation of docs/feature_dip_switch.md (qmk#8673)
  Fix broken KBD8X MKII Hardware link (qmk#8787)
  ...

.editorconfig

@@ -16,6 +16,10 @@ insert_final_newline = true
 trim_trailing_whitespace = false
 indent_size = 4
 
+[{qmk,*.py}]
+charset = utf-8
+max_line_length = 200
+
 # Make these match what we have in .gitattributes
 [*.mk]
 end_of_line = lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,12 @@
 ---
 name: Bug report
-about: Create a report to help us improve the QMK Firmware
+about: Create a report to help us improve QMK Firmware.
+title: "[Bug] "
+labels: bug, help wanted
+assignees: ''
+
 ---
+
 <!-- Provide a general summary of the bug in the title above. -->
 
 <!--- This template is entirely optional and can be removed, but is here to help both you and us. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+ - name: QMK Discord
+ url: https://discord.gg/Uq7gcHh
+ about: Ask questions, discuss issues and features. Chill.
+ - name: OLKB Subreddit
+ url: https://www.reddit.com/r/olkb
+ about: All things OLKB and QMK.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,12 @@
 ---
 name: Feature request
-about: Suggest a new feature or changes to existing features 
+about: Suggest a new feature or changes to existing features.
+title: "[Feature Request] "
+labels: enhancement, help wanted
+assignees: ''
+
 ---
+
 <!--- Provide a general summary of the changes you want in the title above. -->
 
 <!--- This template is entirely optional and can be removed, but is here to help both you and us. -->

.github/ISSUE_TEMPLATE/other_issues.md

@@ -1,7 +1,12 @@
 ---
 name: Other issues
-about: Anything else that doesn't fall into the above categories. 
+about: Anything else that doesn't fall into the above categories.
+title: ''
+labels: help wanted, question
+assignees: ''
+
 ---
+
 <!--- Provide a general summary of the changes you want in the title above. -->
 
 <!--- Anything on lines wrapped in comments like these will not show up in the final text. -->

.github/ISSUE_TEMPLATE/zzz_blank.md

@@ -0,0 +1,11 @@
+---
+name: Blank issue
+about: If you're 100% sure that you don't need one of the other issue templates, use
+ this one instead.
+title: ''
+labels: help wanted, question
+assignees: ''
+
+---
+
+

.github/stale.yml

@@ -0,0 +1,58 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# General configuration
+
+# Pull request specific configuration
+pulls:
+ staleLabel: awaiting changes
+ # Number of days of inactivity before an Issue or Pull Request becomes stale
+ daysUntilStale: 45
+ # Number of days of inactivity before a stale Issue or Pull Request is closed.
+ # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+ daysUntilClose: 30
+ # Comment to post when marking as stale. Set to `false` to disable
+ markComment: >
+ Thank you for your contribution!
+
+ This pull request has been automatically marked as stale because it has not had
+ activity in the last 45 days. It will be closed in 30 days if no further activity occurs.
+ Please feel free to give a status update now, or re-open when it's ready.
+ 
+ For maintainers: Please label with `awaiting review`, `breaking_change`, `in progress`, or `on hold` to prevent 
+ the issue from being re-flagged.
+ # Comment to post when closing a stale Issue or Pull Request.
+ closeComment: >
+ Thank you for your contribution!
+
+ This pull request has been automatically closed because it has not had activity in the last 30 days.
+ Please feel free to give a status update now, ping for review, or re-open when it's ready.
+ # Limit the number of actions per hour, from 1-30. Default is 30
+ limitPerRun: 30
+ exemptLabels:
+ - awaiting review
+ - breaking_change
+ - in progress
+ - on hold
+
+# Issue specific configuration
+issues:
+ staleLabel: stale
+ limitPerRun: 10
+ daysUntilStale: 90
+ daysUntilClose: 30
+ markComment: >
+ This issue has been automatically marked as stale because it has not had activity in the
+ last 90 days. It will be closed in the next 30 days unless it is tagged properly or other activity
+ occurs.
+ 
+ For maintainers: Please label with `bug`, `in progress`, `on hold`, `discussion` or `to do` to prevent 
+ the issue from being re-flagged.
+ closeComment: >
+ This issue has been automatically closed because it has not had activity in the last 30 days.
+ If this issue is still valid, re-open the issue and let us know.
+ exemptLabels:
+ - bug
+ - in progress
+ - on hold
+ - discussion
+ - to do

.github/workflows/cli.yml

@@ -0,0 +1,28 @@
+name: CLI CI
+
+on:
+ push:
+ branches:
+ - master
+ - future
+ pull_request:
+ paths:
+ - 'lib/python/**'
+ - 'bin/qmk'
+ - 'requirements.txt'
+ - '.github/workflows/cli.yml'
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+
+ container: qmkfm/base_container
+
+ steps:
+ - uses: actions/checkout@v1
+ with:
+ submodules: recursive
+ - name: Install dependencies
+ run: pip3 install -r requirements.txt
+ - name: Run tests
+ run: bin/qmk pytest

.gitignore

@@ -24,8 +24,9 @@ quantum/version.h
 .idea/
 CMakeLists.txt
 cmake-build-debug
+.clang_complete
 doxygen/
-.DS_STORE
+.DS_Store
 /util/wsl_downloaded
 /util/win_downloaded
 /keyboards/*/Makefile
@@ -47,7 +48,6 @@ doxygen/
 *.iml
 .browse.VC.db*
 *.stackdump
-util/Win_Check_Output.txt
 # Let these ones be user specific, since we have so many different configurations
 .vscode/c_cpp_properties.json
 .vscode/launch.json
@@ -60,13 +60,16 @@ util/Win_Check_Output.txt
 
 # ignore image files
 *.png
-*.jpg
 *.gif
-
-# Do not ignore MiniDox left/right hand eeprom files
-!keyboards/minidox/*.eep
+*.jpg
 
 # things travis sees
 secrets.tar
 id_rsa_*
 /.vs
+
+# python things
+__pycache__
+
+# prerequisites for updating ChibiOS
+/util/fmpp*

.gitmodules

@@ -1,13 +1,18 @@
 [submodule "lib/chibios"]
  path = lib/chibios
  url = https://github.com/qmk/ChibiOS
+ branch = master
 [submodule "lib/chibios-contrib"]
  path = lib/chibios-contrib
  url = https://github.com/qmk/ChibiOS-Contrib
- branch = k-type-fix
+ branch = master
 [submodule "lib/ugfx"]
  path = lib/ugfx
  url = https://github.com/qmk/uGFX
+ branch = master
 [submodule "lib/googletest"]
  path = lib/googletest
  url = https://github.com/google/googletest
+[submodule "lib/lufa"]
+ path = lib/lufa
+ url = https://github.com/qmk/lufa

.travis.yml

@@ -1,6 +1,5 @@
 os: linux
 dist: trusty
-sudo: required
 group: edge
 language: c
 branches:
@@ -13,23 +12,27 @@ env:
  - MAKEFLAGS="-j3 --output-sync"
 services:
  - docker
-before_install:
- - docker build -t qmkfm/qmk_firmware .
-install:
- - npm install -g moxygen
-script:
- - git rev-parse --short HEAD
- - bash util/travis_test.sh
- - bash util/travis_build.sh
- - bash util/travis_docs.sh
 addons:
  apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ - llvm-toolchain-trusty-7
  packages:
  - pandoc
  - diffutils
  - dos2unix
  - doxygen
-after_success:
+ - clang-format-7
+ - libstdc++-7-dev
+install:
+ - npm install -g moxygen
+script:
+ - git rev-parse --short HEAD
+ - git diff --name-only HEAD $TRAVIS_BRANCH
+ - bash util/travis_test.sh
+ - bash util/travis_build.sh
+ - bash util/travis_docs.sh
+after_script:
  bash util/travis_compiled_push.sh
 notifications:
  webhooks:

.vscode/extensions.json

@@ -1,6 +1,11 @@
 // Suggested extensions
 {
  "recommendations": [
- "EditorConfig.EditorConfig"
+ "EditorConfig.EditorConfig",
+ "xaver.clang-format",
+ "ms-vscode.cpptools",
+ "bierner.github-markdown-preview",
+ "donjayamanne.git-extension-pack",
+ "CoenraadS.bracket-pair-colorizer-2"
  ]
 }

.vscode/settings.json

@@ -5,13 +5,21 @@
  // Configure glob patterns for excluding files and folders.
  "files.exclude": {
  "**/.build": true,
- "**/*.hex": true
+ "**/*.hex": true,
+ "**/*.bin": true
  },
  "files.associations": {
  "*.h": "c",
  "*.c": "c",
+ "*.inc": "c",
  "*.cpp": "cpp",
  "*.hpp": "cpp",
- "xstddef": "c"
+ "xstddef": "c",
+ "type_traits": "c",
+ "utility": "c"
+ },
+ "[markdown]": {
+ "editor.trimAutoWhitespace": false,
+ "files.trimTrailingWhitespace": false
  }
 }

CODE_OF_CONDUCT.md

@@ -8,8 +8,17 @@ Our users, contributors, and collaborators are expected to treat each other with
 
 * The use of sexualized language or imagery
 * Unwelcome advances, sexual or otherwise
+* Deliberate intimidation, stalking, or following
 * Insults or derogatory comments, or personal or political attacks
 * Publishing others’ private information without explicit permission
+* Sustained disruption of talks or other events
 * Other conduct which could reasonably be considered inappropriate in a professional setting
+* Advocating for, or encouraging, any of the above behaviour
 
-If someone is violating this Code of Conduct you may email [email protected] to bring your concern to the Members. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. 
+# Reporting
+
+If someone is violating this Code of Conduct, please email [email protected] or reach out to one of the Collaborators to bring it to our attention. All complaints will be reviewed and investigated.
+
+QMK will seek to use the least punitive means available to resolve an issue. If the circumstances require asking an offender to leave, we will do that.
+
+Reports will be taken and kept in strict confidence. You will not be required to confront an offender directly.

Dockerfile

@@ -1,26 +1,4 @@
-FROM debian:9
-
-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-avr \
- git \
- libnewlib-arm-none-eabi \
- software-properties-common \
- unzip \
- wget \
- zip \
- && rm -rf /var/lib/apt/lists/*
-
-# upgrade gcc-arm-none-eabi from the default 5.4.1 to 6.3.1 due to ARM runtime issues
-RUN wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 -O - | \
- tar xj --strip-components=1 -C /
+FROM qmkfm/base_container
 
 VOLUME /qmk_firmware
 WORKDIR /qmk_firmware