diff options
| author | Drashna Jael're <drashna@live.com> | 2022-03-25 16:31:52 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-03-25 16:31:52 -0700 |
| commit | 07a3743e878e92a9236736a65d167de26478def6 (patch) | |
| tree | 4293dd7c12bfdb193519621ac4887291d32081f5 /lib/python/qmk | |
| parent | 53ff570bf068e04740f187163774327839dfa68b (diff) | |
Fix compilation issues
Diffstat (limited to 'lib/python/qmk')
| -rw-r--r-- | lib/python/qmk/cli/new/keyboard.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/constants.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py index 1cdfe53206..3fe4684073 100644 --- a/lib/python/qmk/cli/new/keyboard.py +++ b/lib/python/qmk/cli/new/keyboard.py @@ -17,7 +17,7 @@ from qmk.json_encoders import InfoJSONEncoder from qmk.json_schema import deep_update from qmk.constants import MCU2BOOTLOADER -COMMUNITY = Path('layouts/default/') +COMMUNITY = Path('layouts/community/') TEMPLATE = Path('data/templates/keyboard/') # defaults diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py index 895fcc7d01..6956b70772 100644 --- a/lib/python/qmk/constants.py +++ b/lib/python/qmk/constants.py @@ -14,11 +14,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware' MAX_KEYBOARD_SUBFOLDERS = 5 # Supported processor types -<<<<<<< HEAD -CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443', 'GD32VF103', 'WB32F3G71' -======= CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71' ->>>>>>> qmk/master LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85' |