summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-02 06:09:01 +0000
committerQMK Bot <hello@qmk.fm>2021-07-02 06:09:01 +0000
commit371d3bfbdd0bd863aa161b631b472c2a44f19633 (patch)
treee2857670162f5546ecd108c82f425b6f0363acd9
parentb721e054a2fcb5de5e45a30c07dfe32f11dfb017 (diff)
parent50468835311da76aa80fdeae0a7d01c944af3ff7 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.gitignore87
-rw-r--r--[-rwxr-xr-x]keyboards/planck/keymaps/ishtob/rules.mk (renamed from keyboards/planck/keymaps/ishtob/rule.mk)0
-rw-r--r--keyboards/preonic/keymaps/that_canadian/rules.mk (renamed from keyboards/preonic/keymaps/that_canadian/Makefile)0
-rw-r--r--keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk (renamed from keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile)0
4 files changed, 47 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index adc5d9da6a..b30b87ba11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,33 @@
-.history/
-.dep
-*.o
-*.bin
-*.eep
+# Junk files
+*.bak
+*.swp
+*~
+.DS_Store
+
+# Build artifacts
+.clang_complete
+.build/
*.elf
-*.hex
-*.uf2
-*.qmk
-!util/bootloader.hex
-!quantum/tools/eeprom_reset.hex
*.log
*.lss
*.lst
*.map
+*.o
+*.stackdump
*.sym
-*.swp
-tags
-*~
+
+# QMK-specific
api_data/v1
-build/
-.build/
-*.bak
-.vagrant/
-quantum/version.h
-.idea/
-CMakeLists.txt
-cmake-build-debug
-.clang_complete
doxygen/
-.DS_Store
-/util/wsl_downloaded
-/util/win_downloaded
+quantum/version.h
+!quantum/tools/eeprom_reset.hex
+*.bin
+*.eep
+*.hex
+*.qmk
+*.uf2
+
+# Old-style QMK Makefiles
/keyboards/*/Makefile
/keyboards/*/*/Makefile
/keyboards/*/*/*/Makefile
@@ -43,39 +40,49 @@ doxygen/
/keyboards/*/*/*/*/*/keymaps/Makefile
# Eclipse/PyCharm/Other IDE Settings
+*.iml
+.browse.VC.db*
.cproject
+.idea
+.idea/
.project
.settings/
-.idea
-*.iml
-.browse.VC.db*
-*.stackdump
+.vagrant/
+
+# ?
+.dep
+.history/
+build/
+cmake-build-debug
+CMakeLists.txt
+
# Let these ones be user specific, since we have so many different configurations
*.code-workspace
+.stfolder
+.tags
.vscode/c_cpp_properties.json
+.vscode/ipch/
+.vscode/last.sql
.vscode/launch.json
.vscode/tasks.json
-.vscode/last.sql
.vscode/temp.sql
-.vscode/ipch/
-.stfolder
-.tags
+tags
-# ignore image files
-*.png
+# Ignore image files
*.gif
*.jpg
+*.png
-# things travis sees
-secrets.tar
-id_rsa_*
+# Things Travis sees
/.vs
+id_rsa_*
+secrets.tar
-# python things
+# Python things
__pycache__
.python-version
-# prerequisites for updating ChibiOS
+# Prerequisites for updating ChibiOS
/util/fmpp*
# Allow to exist but don't include it in the repo
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rules.mk
index c8ba0c919e..c8ba0c919e 100755..100644
--- a/keyboards/planck/keymaps/ishtob/rule.mk
+++ b/keyboards/planck/keymaps/ishtob/rules.mk
diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/rules.mk
index 773e5c45da..773e5c45da 100644
--- a/keyboards/preonic/keymaps/that_canadian/Makefile
+++ b/keyboards/preonic/keymaps/that_canadian/rules.mk
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
index 762905da03..762905da03 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile
+++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk