Align some quantum sub-directories (qmk#14134)

* Misc folder tidy * Review comments * Remove redundant entry
freznel10 · Aug 24, 2021 · 2cade3a · 2cade3a
1 parent 2827a3c
commit 2cade3a
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,6 @@
 api_data/v1
 doxygen/
 quantum/version.h
-!quantum/tools/eeprom_reset.hex
 *.bin
 *.eep
 *.hex

diff --git a/quantum/template/avr/config.h → data/templates/avr/config.h b/quantum/template/avr/config.h → data/templates/avr/config.h
diff --git a/quantum/template/avr/readme.md → data/templates/avr/readme.md b/quantum/template/avr/readme.md → data/templates/avr/readme.md
diff --git a/quantum/template/avr/rules.mk → data/templates/avr/rules.mk b/quantum/template/avr/rules.mk → data/templates/avr/rules.mk
diff --git a/quantum/template/base/info.json → data/templates/base/info.json b/quantum/template/base/info.json → data/templates/base/info.json
diff --git a/quantum/template/base/keyboard.c → data/templates/base/keyboard.c b/quantum/template/base/keyboard.c → data/templates/base/keyboard.c
diff --git a/quantum/template/base/keyboard.h → data/templates/base/keyboard.h b/quantum/template/base/keyboard.h → data/templates/base/keyboard.h
diff --git a/...um/template/base/keymaps/default/keymap.c → data/templates/base/keymaps/default/keymap.c b/...um/template/base/keymaps/default/keymap.c → data/templates/base/keymaps/default/keymap.c
diff --git a/...m/template/base/keymaps/default/readme.md → .../templates/base/keymaps/default/readme.md b/...m/template/base/keymaps/default/readme.md → .../templates/base/keymaps/default/readme.md
diff --git a/quantum/template/ps2avrgb/config.h → data/templates/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h → data/templates/ps2avrgb/config.h
diff --git a/quantum/template/ps2avrgb/readme.md → data/templates/ps2avrgb/readme.md b/quantum/template/ps2avrgb/readme.md → data/templates/ps2avrgb/readme.md
diff --git a/quantum/template/ps2avrgb/rules.mk → data/templates/ps2avrgb/rules.mk b/quantum/template/ps2avrgb/rules.mk → data/templates/ps2avrgb/rules.mk
diff --git a/lib/python/qmk/cli/format/c.py b/lib/python/qmk/cli/format/c.py
@@ -12,7 +12,7 @@
 
 c_file_suffixes = ('c', 'h', 'cpp')
 core_dirs = ('drivers', 'quantum', 'tests', 'tmk_core', 'platforms')
-ignored = ('tmk_core/protocol/usb_hid', 'quantum/template', 'platforms/chibios')
+ignored = ('tmk_core/protocol/usb_hid', 'platforms/chibios/boards')
 
 
 def find_clang_format():

diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
@@ -115,9 +115,9 @@ def find_user_name():
 
 
 def copy_templates(keyboard_type, keyboard_path):
- """Copies the template files from quantum/template to the new keyboard directory.
+ """Copies the template files from data/templates to the new keyboard directory.
  """
- template_base_path = Path('quantum/template')
+ template_base_path = Path('data/templates')
  keyboard_basename = keyboard_path.name
 
  cli.log.info('Copying base template files...')

diff --git a/quantum/tools/readme.md b/quantum/tools/readme.md
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script generates a new keyboard directory under keyboards/,
-# and copies the template files from quantum/template/ into it.
+# and copies the template files from data/templates/ into it.
 
 # Print an error message with the word "ERROR" in red.
 echo_error() {
@@ -35,11 +35,11 @@ copy_templates() {
  mkdir -p "$keyboard_dir"
 
  echo -n "Copying base template files..."
- cp -r "quantum/template/base/." "${keyboard_dir}"
+ cp -r "data/templates/base/." "${keyboard_dir}"
  echo " done"
 
  echo -n "Copying $keyboard_type template files..."
- cp -r "quantum/template/${keyboard_type}/." "${keyboard_dir}"
+ cp -r "data/templates/${keyboard_type}/." "${keyboard_dir}"
  echo " done"
 
  echo -n "Renaming keyboard files..."

diff --git a/quantum/tools/eeprom_reset.hex → util/reset.eep b/quantum/tools/eeprom_reset.hex → util/reset.eep