aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-12-24 13:36:44 +1100
committerGitHub <noreply@github.com>2020-12-24 02:36:44 +0000
commit6a292e11d3faddbdbed8175a97aaed00a3469afa (patch)
treefab7c779727fae970a331068e947db9bf028bf07
parent3e3f93c971aec877efbee71da76b48f3f006e97c (diff)
downloadqmk_firmware-6a292e11d3faddbdbed8175a97aaed00a3469afa.tar.gz
qmk_firmware-6a292e11d3faddbdbed8175a97aaed00a3469afa.zip
`qmk fileformat`: only print complaints, and fix some of them (#11278)
-rw-r--r--keyboards/kc60/keymaps/noroadsleft/readme_git.md4
-rw-r--r--keyboards/lily58/keymaps/chuan/keymap.c4
-rw-r--r--keyboards/lily58/keymaps/default/keymap.c6
-rw-r--r--keyboards/lily58/keymaps/lily58l/keymap.c4
-rw-r--r--lib/python/qmk/cli/fileformat.py2
5 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/kc60/keymaps/noroadsleft/readme_git.md b/keyboards/kc60/keymaps/noroadsleft/readme_git.md
index 432f1abc7..a8564703f 100644
--- a/keyboards/kc60/keymaps/noroadsleft/readme_git.md
+++ b/keyboards/kc60/keymaps/noroadsleft/readme_git.md
@@ -46,11 +46,11 @@
46 branch-name = "!git rev-parse --abbrev-ref HEAD" 46 branch-name = "!git rev-parse --abbrev-ref HEAD"
47 bn = "!git branch-name" # short-form of the above 47 bn = "!git branch-name" # short-form of the above
48 # List branches by the date of their last commit, newest to oldest 48 # List branches by the date of their last commit, newest to oldest
49 bbd = "for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(objectname) %(objecttype) %(refname:short) (%(authordate))'" 49 bbd = "for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='\e[33m%(objectname)\e[0m %(objecttype) \e[32m%(refname:short)\e[0m (%(authordate))'"
50 50
51 # Compare commit counts between current branch and QMK master 51 # Compare commit counts between current branch and QMK master
52 # e.g. `git cc dev_branch upstream/master` returns how many commits are on `dev_branch` and not on `upstream/master`, and vice versa. 52 # e.g. `git cc dev_branch upstream/master` returns how many commits are on `dev_branch` and not on `upstream/master`, and vice versa.
53 cc = "!f() { git fetch upstream; echo \"$(git branch-name) vs. $2\"; git rev-list --left-right --count $1...$2; }; f" 53 cc = "!f() { git fetch upstream; echo \"\e[0;32m$(git branch-name)\e[0m vs. \e[0;31m$2\e[0m\"; git rev-list --left-right --count $1...$2; }; f"
54 54
55 # Push to origin repo 55 # Push to origin repo
56 po = "push origin $(git branch-name)" 56 po = "push origin $(git branch-name)"
diff --git a/keyboards/lily58/keymaps/chuan/keymap.c b/keyboards/lily58/keymaps/chuan/keymap.c
index da49e67a0..e3a2b9db6 100644
--- a/keyboards/lily58/keymaps/chuan/keymap.c
+++ b/keyboards/lily58/keymaps/chuan/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
48 * ,-----------------------------------------. ,-----------------------------------------. 48 * ,-----------------------------------------. ,-----------------------------------------.
49 * | | | | | | | | | | | | | | 49 * | | | | | | | | | | | | | |
50 * |------+------+------+------+------+------| |------+------+------+------+------+------| 50 * |------+------+------+------+------+------| |------+------+------+------+------+------|
51 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | 51 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
52 * |------+------+------+------+------+------| |------+------+------+------+------+------| 52 * |------+------+------+------+------+------| |------+------+------+------+------+------|
53 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - | 53 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - |
54 * |------+------+------+------+------+------| cmd spc| | |------+------+------+------+------+------| 54 * |------+------+------+------+------+------| cmd spc| | |------+------+------+------+------+------|
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 * |------+------+------+------+------+------| |------+------+------+------+------+------| 71 * |------+------+------+------+------+------| |------+------+------+------+------+------|
72 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | 72 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
73 * |------+------+------+------+------+------| |------+------+------+------+------+------| 73 * |------+------+------+------+------+------| |------+------+------+------+------+------|
74 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | 74 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | |
75 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 75 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
76 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | 76 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ |
77 * `-----------------------------------------/ / \ \-----------------------------------------' 77 * `-----------------------------------------/ / \ \-----------------------------------------'
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c
index 52d401c5c..b7cf34b2e 100644
--- a/keyboards/lily58/keymaps/default/keymap.c
+++ b/keyboards/lily58/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
45 * ,-----------------------------------------. ,-----------------------------------------. 45 * ,-----------------------------------------. ,-----------------------------------------.
46 * | | | | | | | | | | | | | | 46 * | | | | | | | | | | | | | |
47 * |------+------+------+------+------+------| |------+------+------+------+------+------| 47 * |------+------+------+------+------+------| |------+------+------+------+------+------|
48 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | 48 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
49 * |------+------+------+------+------+------| |------+------+------+------+------+------| 49 * |------+------+------+------+------+------| |------+------+------+------+------+------|
50 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - | 50 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - |
51 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 51 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
68 * |------+------+------+------+------+------| |------+------+------+------+------+------| 68 * |------+------+------+------+------+------| |------+------+------+------+------+------|
69 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | 69 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
70 * |------+------+------+------+------+------| |------+------+------+------+------+------| 70 * |------+------+------+------+------+------| |------+------+------+------+------+------|
71 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | 71 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | |
72 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 72 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
73 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | 73 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ |
74 * `-----------------------------------------/ / \ \-----------------------------------------' 74 * `-----------------------------------------/ / \ \-----------------------------------------'
@@ -160,4 +160,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
160 // set_timelog(); 160 // set_timelog();
161 } 161 }
162 return true; 162 return true;
163} \ No newline at end of file 163}
diff --git a/keyboards/lily58/keymaps/lily58l/keymap.c b/keyboards/lily58/keymaps/lily58l/keymap.c
index 6683d2242..7c32dae48 100644
--- a/keyboards/lily58/keymaps/lily58l/keymap.c
+++ b/keyboards/lily58/keymaps/lily58l/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
59 * ,-----------------------------------------. ,-----------------------------------------. 59 * ,-----------------------------------------. ,-----------------------------------------.
60 * | | | | | | | | | | | | | | 60 * | | | | | | | | | | | | | |
61 * |------+------+------+------+------+------| |------+------+------+------+------+------| 61 * |------+------+------+------+------+------| |------+------+------+------+------+------|
62 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | 62 * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
63 * |------+------+------+------+------+------| |------+------+------+------+------+------| 63 * |------+------+------+------+------+------| |------+------+------+------+------+------|
64 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - | 64 * | ` | ! | @ | # | $ | % |-------. ,-------| ^ | & | * | ( | ) | - |
65 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 65 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 * |------+------+------+------+------+------| |------+------+------+------+------+------| 82 * |------+------+------+------+------+------| |------+------+------+------+------+------|
83 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | 83 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
84 * |------+------+------+------+------+------| |------+------+------+------+------+------| 84 * |------+------+------+------+------+------| |------+------+------+------+------+------|
85 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | | 85 * | F1 | F2 | F3 | F4 | F5 | F6 |-------. ,-------| | Left | Down | Up |Right | |
86 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| 86 * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------|
87 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ | 87 * | F7 | F8 | F9 | F10 | F11 | F12 |-------| |-------| + | - | = | [ | ] | \ |
88 * `-----------------------------------------/ / \ \-----------------------------------------' 88 * `-----------------------------------------/ / \ \-----------------------------------------'
diff --git a/lib/python/qmk/cli/fileformat.py b/lib/python/qmk/cli/fileformat.py
index db8e13f10..112d8d59d 100644
--- a/lib/python/qmk/cli/fileformat.py
+++ b/lib/python/qmk/cli/fileformat.py
@@ -9,5 +9,5 @@ import subprocess
9def fileformat(cli): 9def fileformat(cli):
10 """Run several general formatting commands. 10 """Run several general formatting commands.
11 """ 11 """
12 dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix']) 12 dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix'], stdout=subprocess.DEVNULL)
13 return dos2unix.returncode 13 return dos2unix.returncode