Browse Source

Align some quantum sub-directories (#14134)

* Misc folder tidy

* Review comments

* Remove redundant entry
pull/12797/head
Joel Challis 2 months ago
committed by GitHub
parent
commit
2cade3a483
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 6 additions and 13 deletions
  1. +0
    -1
      .gitignore
  2. +0
    -0
      data/templates/avr/config.h
  3. +0
    -0
      data/templates/avr/readme.md
  4. +0
    -0
      data/templates/avr/rules.mk
  5. +0
    -0
      data/templates/base/info.json
  6. +0
    -0
      data/templates/base/keyboard.c
  7. +0
    -0
      data/templates/base/keyboard.h
  8. +0
    -0
      data/templates/base/keymaps/default/keymap.c
  9. +0
    -0
      data/templates/base/keymaps/default/readme.md
  10. +0
    -0
      data/templates/ps2avrgb/config.h
  11. +0
    -0
      data/templates/ps2avrgb/readme.md
  12. +0
    -0
      data/templates/ps2avrgb/rules.mk
  13. +1
    -1
      lib/python/qmk/cli/format/c.py
  14. +2
    -2
      lib/python/qmk/cli/new/keyboard.py
  15. +0
    -6
      quantum/tools/readme.md
  16. +3
    -3
      util/new_keyboard.sh
  17. +0
    -0
      util/reset.eep

+ 0
- 1
.gitignore View File

@ -20,7 +20,6 @@
api_data/v1
doxygen/
quantum/version.h
!quantum/tools/eeprom_reset.hex
*.bin
*.eep
*.hex


quantum/template/avr/config.h → data/templates/avr/config.h View File


quantum/template/avr/readme.md → data/templates/avr/readme.md View File


quantum/template/avr/rules.mk → data/templates/avr/rules.mk View File


quantum/template/base/info.json → data/templates/base/info.json View File


quantum/template/base/keyboard.c → data/templates/base/keyboard.c View File


quantum/template/base/keyboard.h → data/templates/base/keyboard.h View File


quantum/template/base/keymaps/default/keymap.c → data/templates/base/keymaps/default/keymap.c View File


quantum/template/base/keymaps/default/readme.md → data/templates/base/keymaps/default/readme.md View File


quantum/template/ps2avrgb/config.h → data/templates/ps2avrgb/config.h View File


quantum/template/ps2avrgb/readme.md → data/templates/ps2avrgb/readme.md View File


quantum/template/ps2avrgb/rules.mk → data/templates/ps2avrgb/rules.mk View File


+ 1
- 1
lib/python/qmk/cli/format/c.py View File

@ -12,7 +12,7 @@ from qmk.c_parse import c_source_files
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():


+ 2
- 2
lib/python/qmk/cli/new/keyboard.py View File

@ -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...')


+ 0
- 6
quantum/tools/readme.md View File

@ -1,6 +0,0 @@
`eeprom_reset.hex` is to reset the eeprom on the Atmega32u4, like this:
dfu-programmer atmega32u4 erase
dfu-programmer atmega32u4 flash --eeprom eeprom_reset.hex
You'll need to reflash afterwards, because DFU requires the flash to be erased before messing with the eeprom.

+ 3
- 3
util/new_keyboard.sh View File

@ -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..."


quantum/tools/eeprom_reset.hex → util/reset.eep View File


Loading…
Cancel
Save