Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align some quantum sub-directories #14134

Merged
merged 3 commits into from
Aug 24, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/python/qmk/cli/format/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions lib/python/qmk/cli/new/keyboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -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...')
Expand Down
6 changes: 0 additions & 6 deletions quantum/tools/readme.md

This file was deleted.

6 changes: 3 additions & 3 deletions util/new_keyboard.sh
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down Expand Up @@ -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..."
Expand Down
File renamed without changes.