2016-08-08 00:16:06 +02:00
|
|
|
ifndef VERBOSE
|
|
|
|
.SILENT:
|
|
|
|
endif
|
|
|
|
|
2016-08-27 17:13:01 +02:00
|
|
|
# Never run this makefile in parallel, as it could screw things up
|
|
|
|
# It won't affect the submakes, so you still get the speedup from specifying -jx
|
|
|
|
.NOTPARALLEL:
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Allow the silent with lower caps to work the same way as upper caps
|
2016-08-09 08:52:01 +02:00
|
|
|
ifdef silent
|
|
|
|
SILENT = $(silent)
|
|
|
|
endif
|
|
|
|
|
|
|
|
ifdef SILENT
|
2016-08-20 13:53:29 +02:00
|
|
|
SUB_IS_SILENT := $(SILENT)
|
2016-08-09 08:52:01 +02:00
|
|
|
endif
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# We need to make sure that silent is always turned off at the top level
|
2017-02-02 15:15:08 +01:00
|
|
|
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
|
2016-08-20 13:53:29 +02:00
|
|
|
override SILENT := false
|
2016-08-09 08:52:01 +02:00
|
|
|
|
2017-11-15 04:56:29 +01:00
|
|
|
ifndef SUB_IS_SILENT
|
2019-08-15 23:03:26 +02:00
|
|
|
ifndef SKIP_GIT
|
|
|
|
QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
|
|
|
|
endif
|
|
|
|
|
2017-08-11 00:54:14 +02:00
|
|
|
ifneq ($(QMK_VERSION),)
|
2017-10-14 23:32:19 +02:00
|
|
|
$(info QMK Firmware $(QMK_VERSION))
|
2017-08-11 00:54:14 +02:00
|
|
|
endif
|
2017-11-15 04:14:59 +01:00
|
|
|
endif
|
2017-08-11 00:54:14 +02:00
|
|
|
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
# Determine which qmk cli to use
|
|
|
|
ifeq (,$(shell which qmk))
|
|
|
|
QMK_BIN = bin/qmk
|
|
|
|
else
|
|
|
|
QMK_BIN = qmk
|
|
|
|
endif
|
|
|
|
|
2020-05-15 00:17:17 +02:00
|
|
|
# avoid 'Entering|Leaving directory' messages
|
|
|
|
MAKEFLAGS += --no-print-directory
|
|
|
|
|
2017-02-02 15:15:08 +01:00
|
|
|
ON_ERROR := error_occurred=1
|
2016-08-16 07:42:08 +02:00
|
|
|
|
2017-04-09 19:04:12 +02:00
|
|
|
BREAK_ON_ERRORS = no
|
|
|
|
|
2016-08-01 08:23:37 +02:00
|
|
|
STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
|
|
|
|
ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
|
2016-08-07 17:30:58 +02:00
|
|
|
ROOT_DIR := $(dir $(ROOT_MAKEFILE))
|
2016-08-03 08:28:47 +02:00
|
|
|
ifeq ($(ROOT_DIR),)
|
|
|
|
ROOT_DIR := .
|
|
|
|
endif
|
2016-08-01 08:23:37 +02:00
|
|
|
ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE))
|
|
|
|
ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
|
|
|
|
ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
|
|
|
|
ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
|
|
|
|
STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
|
2016-10-30 16:03:01 +01:00
|
|
|
BUILD_DIR := $(ROOT_DIR)/.build
|
|
|
|
TEST_DIR := $(BUILD_DIR)/test
|
2017-02-02 15:15:08 +01:00
|
|
|
ERROR_FILE := $(BUILD_DIR)/error_occurred
|
2016-08-01 08:23:37 +02:00
|
|
|
|
2016-08-07 16:04:39 +02:00
|
|
|
MAKEFILE_INCLUDED=yes
|
2016-08-07 15:45:33 +02:00
|
|
|
|
2016-11-01 17:52:58 +01:00
|
|
|
# Helper function to process the newt element of a space separated path
|
2016-08-20 13:53:29 +02:00
|
|
|
# It works a bit like the traditional functional head tail
|
2017-02-02 15:15:08 +01:00
|
|
|
# so the CURRENT_PATH_ELEMENT will become the new head
|
2016-08-20 13:53:29 +02:00
|
|
|
# and the PATH_ELEMENTS are the rest that are still unprocessed
|
2016-08-01 08:23:37 +02:00
|
|
|
define NEXT_PATH_ELEMENT
|
|
|
|
$$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS)))
|
|
|
|
$$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS)))
|
|
|
|
endef
|
|
|
|
|
2016-11-01 17:52:58 +01:00
|
|
|
# We change the / to spaces so that we more easily can work with the elements
|
2016-08-20 13:53:29 +02:00
|
|
|
# separately
|
|
|
|
PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR))
|
|
|
|
# Initialize the path elements list for further processing
|
2016-08-01 08:23:37 +02:00
|
|
|
$(eval $(call NEXT_PATH_ELEMENT))
|
|
|
|
|
2017-10-14 23:32:19 +02:00
|
|
|
|
2020-12-29 20:42:09 +01:00
|
|
|
# Phony targets to enable a few simple make commands outside the main processing below.
|
2019-02-02 15:26:35 +01:00
|
|
|
.PHONY: list-keyboards
|
2017-10-14 23:32:19 +02:00
|
|
|
list-keyboards:
|
2020-12-18 21:17:53 +01:00
|
|
|
util/list_keyboards.sh | sort -u | tr '\n' ' '
|
2017-11-15 04:14:59 +01:00
|
|
|
|
2019-02-02 15:26:35 +01:00
|
|
|
.PHONY: generate-keyboards-file
|
2017-11-15 04:14:59 +01:00
|
|
|
generate-keyboards-file:
|
2020-12-18 21:17:53 +01:00
|
|
|
util/list_keyboards.sh | sort -u
|
2017-11-15 04:14:59 +01:00
|
|
|
|
2019-02-02 15:26:35 +01:00
|
|
|
.PHONY: clean
|
2018-03-06 20:42:38 +01:00
|
|
|
clean:
|
2019-02-05 00:06:08 +01:00
|
|
|
echo -n 'Deleting .build/ ... '
|
2018-03-06 20:42:38 +01:00
|
|
|
rm -rf $(BUILD_DIR)
|
2019-02-05 00:06:08 +01:00
|
|
|
echo 'done.'
|
|
|
|
|
|
|
|
.PHONY: distclean
|
|
|
|
distclean: clean
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
|
|
|
|
rm -f *.bin *.hex *.uf2
|
2019-02-05 00:06:08 +01:00
|
|
|
echo 'done.'
|
2018-03-06 20:42:38 +01:00
|
|
|
|
2017-02-02 15:15:08 +01:00
|
|
|
#Compatibility with the old make variables, anything you specify directly on the command line
|
2016-08-20 13:53:29 +02:00
|
|
|
# always overrides the detected folders
|
2016-08-07 17:54:12 +02:00
|
|
|
ifdef keyboard
|
|
|
|
KEYBOARD := $(keyboard)
|
|
|
|
endif
|
|
|
|
ifdef keymap
|
|
|
|
KEYMAP := $(keymap)
|
|
|
|
endif
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Uncomment these for debugging
|
2017-10-14 23:32:19 +02:00
|
|
|
# $(info Keyboard: $(KEYBOARD))
|
|
|
|
# $(info Keymap: $(KEYMAP))
|
2016-08-03 08:28:47 +02:00
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
|
2017-02-02 15:15:08 +01:00
|
|
|
# Set the default goal depending on where we are running make from
|
2016-08-20 13:53:29 +02:00
|
|
|
# this handles the case where you run make without any arguments
|
2017-10-14 23:32:19 +02:00
|
|
|
.DEFAULT_GOAL := all:all
|
2016-08-07 18:16:44 +02:00
|
|
|
ifneq ($(KEYMAP),)
|
2017-10-14 23:32:19 +02:00
|
|
|
.DEFAULT_GOAL := $(KEYBOARD):$(KEYMAP)
|
2016-08-07 18:16:44 +02:00
|
|
|
else ifneq ($(KEYBOARD),)
|
2016-08-20 13:53:29 +02:00
|
|
|
# Inside a keyboard folder, build all keymaps for all subprojects
|
|
|
|
# Note that this is different from the old behaviour, which would
|
|
|
|
# build only the default keymap of the default keyboard
|
2017-10-14 23:32:19 +02:00
|
|
|
.DEFAULT_GOAL := $(KEYBOARD):all
|
2016-08-07 18:16:44 +02:00
|
|
|
endif
|
|
|
|
|
2016-08-01 08:23:37 +02:00
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Compare the start of the RULE variable with the first argument($1)
|
2017-10-14 23:32:19 +02:00
|
|
|
# If the rules equals $1 or starts with $1:, RULE_FOUND is set to true
|
2016-08-03 07:44:11 +02:00
|
|
|
# and $1 is removed from the RULE variable
|
2016-08-20 13:53:29 +02:00
|
|
|
# Otherwise the RULE_FOUND variable is set to false, and RULE left as it was
|
2016-08-03 07:44:11 +02:00
|
|
|
# The function is a bit tricky, since there's no built in $(startswith) function
|
2016-08-07 14:56:41 +02:00
|
|
|
define COMPARE_AND_REMOVE_FROM_RULE_HELPER
|
2016-08-03 07:44:11 +02:00
|
|
|
ifeq ($1,$$(RULE))
|
|
|
|
RULE:=
|
|
|
|
RULE_FOUND := true
|
|
|
|
else
|
2017-10-14 23:32:19 +02:00
|
|
|
STARTCOLON_REMOVED=$$(subst START$1:,,START$$(RULE))
|
|
|
|
ifneq ($$(STARTCOLON_REMOVED),START$$(RULE))
|
2016-08-03 07:44:11 +02:00
|
|
|
RULE_FOUND := true
|
2017-10-14 23:32:19 +02:00
|
|
|
RULE := $$(STARTCOLON_REMOVED)
|
2016-08-03 07:44:11 +02:00
|
|
|
else
|
|
|
|
RULE_FOUND := false
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endef
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# This makes it easier to call COMPARE_AND_REMOVE_FROM_RULE, since it makes it behave like
|
|
|
|
# a function that returns the value
|
2016-08-07 14:56:41 +02:00
|
|
|
COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND)
|
|
|
|
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Recursively try to find a match for the start of the rule to be checked
|
2016-08-04 08:17:02 +02:00
|
|
|
# $1 The list to be checked
|
|
|
|
# If a match is found, then RULE_FOUND is set to true
|
|
|
|
# and MATCHED_ITEM to the item that was matched
|
2016-08-21 12:10:34 +02:00
|
|
|
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER3
|
2016-08-07 13:33:49 +02:00
|
|
|
ifneq ($1,)
|
2016-08-07 14:56:41 +02:00
|
|
|
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true)
|
2016-08-07 13:33:49 +02:00
|
|
|
MATCHED_ITEM := $$(firstword $1)
|
2016-11-01 17:52:58 +01:00
|
|
|
else
|
2016-08-21 12:10:34 +02:00
|
|
|
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$$(wordlist 2,9999,$1)))
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endef
|
|
|
|
|
|
|
|
# A recursive helper function for finding the longest match
|
2017-02-02 15:15:08 +01:00
|
|
|
# $1 The list to be checked
|
2016-11-01 17:52:58 +01:00
|
|
|
# It works by always removing the currently matched item from the list
|
2016-08-21 12:10:34 +02:00
|
|
|
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER2
|
2016-11-01 17:52:58 +01:00
|
|
|
# Stop the recursion when the list is empty
|
2016-08-21 12:10:34 +02:00
|
|
|
ifneq ($1,)
|
|
|
|
RULE_BEFORE := $$(RULE)
|
|
|
|
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$1))
|
|
|
|
# If a match is found in the current list, otherwise just return what we had before
|
|
|
|
ifeq ($$(RULE_FOUND),true)
|
2017-02-02 15:15:08 +01:00
|
|
|
# Save the best match so far and call itself recursively
|
2016-08-21 12:10:34 +02:00
|
|
|
BEST_MATCH := $$(MATCHED_ITEM)
|
|
|
|
BEST_MATCH_RULE := $$(RULE)
|
|
|
|
RULE_FOUND := false
|
|
|
|
RULE := $$(RULE_BEFORE)
|
|
|
|
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$$(filter-out $$(MATCHED_ITEM),$1)))
|
2016-08-07 13:33:49 +02:00
|
|
|
endif
|
2016-08-21 12:10:34 +02:00
|
|
|
endif
|
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
|
|
# Recursively try to find the longest match for the start of the rule to be checked
|
|
|
|
# $1 The list to be checked
|
|
|
|
# If a match is found, then RULE_FOUND is set to true
|
|
|
|
# and MATCHED_ITEM to the item that was matched
|
|
|
|
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER
|
|
|
|
BEST_MATCH :=
|
|
|
|
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$1))
|
|
|
|
ifneq ($$(BEST_MATCH),)
|
|
|
|
RULE_FOUND := true
|
|
|
|
RULE := $$(BEST_MATCH_RULE)
|
|
|
|
MATCHED_ITEM := $$(BEST_MATCH)
|
|
|
|
else
|
|
|
|
RULE_FOUND := false
|
|
|
|
MATCHED_ITEM :=
|
2016-08-04 08:17:02 +02:00
|
|
|
endif
|
|
|
|
endef
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST
|
2016-08-07 14:56:41 +02:00
|
|
|
TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
|
|
|
|
|
2016-08-04 08:56:03 +02:00
|
|
|
define ALL_IN_LIST_LOOP
|
|
|
|
OLD_RULE$1 := $$(RULE)
|
|
|
|
$$(eval $$(call $1,$$(ITEM$1)))
|
|
|
|
RULE := $$(OLD_RULE$1)
|
|
|
|
endef
|
|
|
|
|
|
|
|
define PARSE_ALL_IN_LIST
|
|
|
|
$$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1)))
|
|
|
|
endef
|
2016-08-04 08:17:02 +02:00
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# The entry point for rule parsing
|
2017-10-14 23:32:19 +02:00
|
|
|
# parses a rule in the format <keyboard>:<keymap>:<target>
|
2016-08-20 13:53:29 +02:00
|
|
|
# but this particular function only deals with the first <keyboard> part
|
2016-08-07 15:02:14 +02:00
|
|
|
define PARSE_RULE
|
|
|
|
RULE := $1
|
|
|
|
COMMANDS :=
|
2020-11-28 21:02:18 +01:00
|
|
|
REQUIRE_PLATFORM_KEY :=
|
2017-10-14 23:32:19 +02:00
|
|
|
# If the rule starts with all, then continue the parsing from
|
2016-08-20 13:53:29 +02:00
|
|
|
# PARSE_ALL_KEYBOARDS
|
2017-10-14 23:32:19 +02:00
|
|
|
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
|
2019-11-20 23:32:16 +01:00
|
|
|
KEYBOARD_RULE=all
|
2016-08-07 15:02:14 +02:00
|
|
|
$$(eval $$(call PARSE_ALL_KEYBOARDS))
|
2020-11-28 21:02:18 +01:00
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-avr),true)
|
|
|
|
KEYBOARD_RULE=all
|
|
|
|
REQUIRE_PLATFORM_KEY := avr
|
|
|
|
$$(eval $$(call PARSE_ALL_KEYBOARDS))
|
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-chibios),true)
|
|
|
|
KEYBOARD_RULE=all
|
|
|
|
REQUIRE_PLATFORM_KEY := chibios
|
|
|
|
$$(eval $$(call PARSE_ALL_KEYBOARDS))
|
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-arm_atsam),true)
|
|
|
|
KEYBOARD_RULE=all
|
|
|
|
REQUIRE_PLATFORM_KEY := arm_atsam
|
|
|
|
$$(eval $$(call PARSE_ALL_KEYBOARDS))
|
2016-08-21 15:29:54 +02:00
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true)
|
|
|
|
$$(eval $$(call PARSE_TEST))
|
2016-08-20 13:53:29 +02:00
|
|
|
# If the rule starts with the name of a known keyboard, then continue
|
|
|
|
# the parsing from PARSE_KEYBOARD
|
2020-12-18 21:17:53 +01:00
|
|
|
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true)
|
2019-11-20 23:32:16 +01:00
|
|
|
KEYBOARD_RULE=$$(MATCHED_ITEM)
|
2016-08-07 15:02:14 +02:00
|
|
|
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
|
2016-08-20 13:53:29 +02:00
|
|
|
# Otherwise use the KEYBOARD variable, which is determined either by
|
|
|
|
# the current directory you run make from, or passed in as an argument
|
2016-08-07 17:30:58 +02:00
|
|
|
else ifneq ($$(KEYBOARD),)
|
|
|
|
$$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD)))
|
2016-08-07 17:15:45 +02:00
|
|
|
else
|
|
|
|
$$(info make: *** No rule to make target '$1'. Stop.)
|
2017-10-14 23:32:19 +02:00
|
|
|
$$(info |)
|
2021-07-28 13:02:29 +02:00
|
|
|
$$(info | QMK's make format is:)
|
|
|
|
$$(info | make keyboard_folder:keymap_folder[:target])
|
|
|
|
$$(info |)
|
|
|
|
$$(info | Where `keyboard_folder` is the path to the keyboard relative to)
|
|
|
|
$$(info | `qmk_firmware/keyboards/`, and `keymap_folder` is the name of the)
|
|
|
|
$$(info | keymap folder under that board's `keymaps/` directory.)
|
|
|
|
$$(info |)
|
|
|
|
$$(info | Examples:)
|
|
|
|
$$(info | keyboards/dz60, keyboards/dz60/keymaps/default)
|
|
|
|
$$(info | -> make dz60:default)
|
|
|
|
$$(info | -> qmk compile -kb dz60 -km default)
|
|
|
|
$$(info | keyboards/planck/rev6, keyboards/planck/keymaps/default)
|
|
|
|
$$(info | -> make planck/rev6:default:flash)
|
|
|
|
$$(info | -> qmk flash -kb planck/rev6 -km default)
|
2017-10-14 23:32:19 +02:00
|
|
|
$$(info |)
|
2016-08-07 15:02:14 +02:00
|
|
|
endif
|
2016-08-04 08:56:03 +02:00
|
|
|
endef
|
|
|
|
|
2016-08-07 15:02:14 +02:00
|
|
|
# $1 = Keyboard
|
2017-10-14 23:32:19 +02:00
|
|
|
# Parses a rule in the format <keymap>:<target>
|
2016-08-20 13:53:29 +02:00
|
|
|
# the keyboard is already known when entering this function
|
2016-08-07 15:02:14 +02:00
|
|
|
define PARSE_KEYBOARD
|
2017-10-14 23:32:19 +02:00
|
|
|
# If we want to compile the default subproject, then we need to
|
|
|
|
# include the correct makefile to determine the actual name of it
|
2016-08-07 15:02:14 +02:00
|
|
|
CURRENT_KB := $1
|
2017-10-14 23:32:19 +02:00
|
|
|
|
|
|
|
# KEYBOARD_FOLDERS := $$(subst /, , $(CURRENT_KB))
|
|
|
|
|
|
|
|
DEFAULT_FOLDER := $$(CURRENT_KB)
|
|
|
|
|
|
|
|
# We assume that every rules.mk will contain the full default value
|
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
|
|
|
|
ifneq ($$(DEFAULT_FOLDER),$$(CURRENT_KB))
|
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(DEFAULT_FOLDER)/rules.mk)
|
|
|
|
endif
|
|
|
|
CURRENT_KB := $$(DEFAULT_FOLDER)
|
|
|
|
|
|
|
|
# 5/4/3/2/1
|
|
|
|
KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
|
|
|
|
KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))
|
|
|
|
KEYBOARD_FOLDER_PATH_3 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_2)))
|
|
|
|
KEYBOARD_FOLDER_PATH_4 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_3)))
|
|
|
|
KEYBOARD_FOLDER_PATH_5 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_4)))
|
|
|
|
|
|
|
|
KEYMAPS :=
|
|
|
|
# get a list of all keymaps
|
|
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
|
|
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
|
|
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
|
|
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
|
|
|
|
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
|
2017-10-15 22:54:06 +02:00
|
|
|
# this might be needed, but in a different form
|
2017-10-15 22:44:31 +02:00
|
|
|
#KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
|
2017-10-14 23:32:19 +02:00
|
|
|
$$(KEYBOARD_FOLDER_3) $$(KEYBOARD_FOLDER_4) $$(KEYBOARD_FOLDER_5), $$(KEYMAPS)))
|
|
|
|
|
|
|
|
KEYBOARD_LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/rules.mk)","")
|
2017-10-14 23:32:19 +02:00
|
|
|
LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/rules.mk)
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
|
|
|
|
endif
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/rules.mk)","")
|
2017-10-14 23:32:19 +02:00
|
|
|
LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/rules.mk)
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
|
|
|
|
endif
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/rules.mk)","")
|
2017-10-14 23:32:19 +02:00
|
|
|
LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/rules.mk)
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
|
|
|
|
endif
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/rules.mk)","")
|
2017-10-14 23:32:19 +02:00
|
|
|
LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/rules.mk)
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
|
|
|
|
endif
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/rules.mk)","")
|
2017-10-14 23:32:19 +02:00
|
|
|
LAYOUTS :=
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/rules.mk)
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
|
|
|
|
endif
|
|
|
|
|
|
|
|
LAYOUT_KEYMAPS :=
|
|
|
|
$$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
|
Correct parsing of rules.mk for keyboard revisions
Previously, when looking for rules.mk files, we'd parse the individual
folders (A/B/C/D/E) into 5 variables, (A/B/C/D/E, A/B/C/D, A/B/C, A/B,
and A). Then, we'd get the final directory names and store _those_ in 5
new variables (A, B, C, D, and E). Then, when looking for the rules.mk,
we'd look in root_dir/keyboards/(A|B|C|D|E)/rules.mk, instead of looking
in root_dir/keyboards(A|A/B|A/B/C|A/B/C/D|A/B/C/D/E)/rules.mk. This
commit changes that logic from the former to the latter.
2018-07-11 08:39:38 +02:00
|
|
|
|
2017-10-14 23:32:19 +02:00
|
|
|
KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
|
|
|
|
|
|
|
|
# if the rule after removing the start of it is empty (we haven't specified a kemap or target)
|
|
|
|
# compile all the keymaps
|
|
|
|
ifeq ($$(RULE),)
|
|
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
|
|
|
# The same if all was specified
|
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
|
|
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
2019-09-21 09:00:58 +02:00
|
|
|
# List all keymaps for the given keyboard
|
|
|
|
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,list-keymaps),true)
|
|
|
|
$$(eval $$(call LIST_ALL_KEYMAPS))
|
2017-10-14 23:32:19 +02:00
|
|
|
# Try to match the specified keyamp with the list of known keymaps
|
|
|
|
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
|
|
|
|
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
|
|
|
|
# Otherwise try to match the keymap from the current folder, or arguments to the make command
|
|
|
|
else ifneq ($$(KEYMAP),)
|
|
|
|
$$(eval $$(call PARSE_KEYMAP,$$(KEYMAP)))
|
2019-11-20 23:32:16 +01:00
|
|
|
# Otherwise if we are running make all:<user> just skip
|
|
|
|
else ifeq ($$(KEYBOARD_RULE),all)
|
|
|
|
# $$(info Skipping: No user keymap for $$(CURRENT_KB))
|
2017-10-14 23:32:19 +02:00
|
|
|
# Otherwise, make all keymaps, again this is consistent with how it works without
|
|
|
|
# any arguments
|
2016-11-01 17:52:58 +01:00
|
|
|
else
|
2017-10-14 23:32:19 +02:00
|
|
|
$$(eval $$(call PARSE_ALL_KEYMAPS))
|
2016-08-07 15:02:14 +02:00
|
|
|
endif
|
2016-08-03 07:44:11 +02:00
|
|
|
endef
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# if we are going to compile all keyboards, match the rest of the rule
|
|
|
|
# for each of them
|
2016-08-07 15:02:14 +02:00
|
|
|
define PARSE_ALL_KEYBOARDS
|
2020-12-18 21:17:53 +01:00
|
|
|
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
|
2016-08-07 13:33:49 +02:00
|
|
|
endef
|
|
|
|
|
2019-09-21 09:00:58 +02:00
|
|
|
# Prints a list of all known keymaps for the given keyboard
|
|
|
|
define LIST_ALL_KEYMAPS
|
|
|
|
COMMAND_true_LIST_KEYMAPS := \
|
|
|
|
printf "$$(KEYMAPS)\n";
|
|
|
|
COMMAND_false_LIST_KEYMAPS := \
|
|
|
|
printf "$$(MSG_AVAILABLE_KEYMAPS)\n"; \
|
|
|
|
printf "$$(KEYMAPS)\n";
|
|
|
|
COMMANDS += LIST_KEYMAPS
|
|
|
|
endef
|
|
|
|
|
2016-08-04 08:17:02 +02:00
|
|
|
# $1 Keymap
|
2016-08-20 13:53:29 +02:00
|
|
|
# This is the meat of compiling a keyboard, when entering this, everything is known
|
|
|
|
# keyboard, subproject, and keymap
|
|
|
|
# Note that we are not directly calling the command here, but instead building a list,
|
|
|
|
# which will later be processed
|
2016-08-04 07:49:44 +02:00
|
|
|
define PARSE_KEYMAP
|
2016-08-04 08:17:02 +02:00
|
|
|
CURRENT_KM = $1
|
2016-08-14 11:25:23 +02:00
|
|
|
# The rest of the rule is the target
|
2017-10-14 23:32:19 +02:00
|
|
|
# Remove the leading ":" from the target, as it acts as a separator
|
|
|
|
MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
|
2016-08-20 13:53:29 +02:00
|
|
|
# We need to generate an unique indentifer to append to the COMMANDS list
|
2017-10-14 23:32:19 +02:00
|
|
|
CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
|
|
|
|
COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
|
2016-08-20 13:53:29 +02:00
|
|
|
# If we are compiling a keyboard without a subproject, we want to display just the name
|
|
|
|
# of the keyboard, otherwise keyboard/subproject
|
2017-10-14 23:32:19 +02:00
|
|
|
KB_SP := $$(CURRENT_KB)
|
2016-08-20 13:53:29 +02:00
|
|
|
# Format it in bold
|
2016-08-08 00:16:06 +02:00
|
|
|
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
|
2016-08-20 13:53:29 +02:00
|
|
|
# Specify the variables that we are passing forward to submake
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
|
2016-08-20 13:53:29 +02:00
|
|
|
# And the first part of the make command
|
2016-08-14 11:25:23 +02:00
|
|
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
|
2016-08-20 13:53:29 +02:00
|
|
|
# The message to display
|
|
|
|
MAKE_MSG := $$(MSG_MAKE_KB)
|
|
|
|
# We run the command differently, depending on if we want more output or not
|
|
|
|
# The true version for silent output and the false version otherwise
|
2016-08-21 16:14:38 +02:00
|
|
|
$$(eval $$(call BUILD))
|
|
|
|
endef
|
|
|
|
|
|
|
|
define BUILD
|
|
|
|
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
|
|
|
COMMANDS += $$(COMMAND)
|
2016-08-09 08:52:01 +02:00
|
|
|
COMMAND_true_$$(COMMAND) := \
|
|
|
|
printf "$$(MAKE_MSG)" | \
|
|
|
|
$$(MAKE_MSG_FORMAT); \
|
2016-08-11 08:34:23 +02:00
|
|
|
LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
|
2016-08-08 09:26:23 +02:00
|
|
|
if [ $$$$? -gt 0 ]; \
|
|
|
|
then $$(PRINT_ERROR_PLAIN); \
|
2020-11-28 21:02:18 +01:00
|
|
|
elif [ "$$$$LOG" = "skipped" ] ; \
|
|
|
|
then $$(PRINT_SKIPPED_PLAIN); \
|
2016-08-08 09:26:23 +02:00
|
|
|
elif [ "$$$$LOG" != "" ] ; \
|
|
|
|
then $$(PRINT_WARNING_PLAIN); \
|
|
|
|
else \
|
|
|
|
$$(PRINT_OK); \
|
|
|
|
fi;
|
2016-08-09 08:52:01 +02:00
|
|
|
COMMAND_false_$$(COMMAND) := \
|
2016-08-16 07:57:10 +02:00
|
|
|
printf "$$(MAKE_MSG)\n\n"; \
|
2016-08-25 10:25:27 +02:00
|
|
|
$$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; \
|
|
|
|
if [ $$$$? -gt 0 ]; \
|
2017-02-02 15:15:08 +01:00
|
|
|
then error_occurred=1; \
|
2016-08-25 10:25:27 +02:00
|
|
|
fi;
|
2016-08-04 07:49:44 +02:00
|
|
|
endef
|
2016-08-03 08:28:47 +02:00
|
|
|
|
2017-02-02 15:15:08 +01:00
|
|
|
# Just parse all the keymaps for a specific keyboard
|
2016-08-07 15:02:14 +02:00
|
|
|
define PARSE_ALL_KEYMAPS
|
|
|
|
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS)))
|
2016-08-03 07:44:11 +02:00
|
|
|
endef
|
|
|
|
|
2016-08-21 16:14:38 +02:00
|
|
|
define BUILD_TEST
|
|
|
|
TEST_NAME := $1
|
|
|
|
MAKE_TARGET := $2
|
|
|
|
COMMAND := $1
|
|
|
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
|
2017-07-14 10:11:35 +02:00
|
|
|
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
|
2017-08-11 00:54:14 +02:00
|
|
|
MAKE_MSG := $$(MSG_MAKE_TEST)
|
2016-08-21 16:14:38 +02:00
|
|
|
$$(eval $$(call BUILD))
|
2016-08-27 17:01:59 +02:00
|
|
|
ifneq ($$(MAKE_TARGET),clean)
|
|
|
|
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
|
|
|
|
TESTS += $$(TEST_NAME)
|
|
|
|
TEST_MSG := $$(MSG_TEST)
|
|
|
|
$$(TEST_NAME)_COMMAND := \
|
|
|
|
printf "$$(TEST_MSG)\n"; \
|
|
|
|
$$(TEST_EXECUTABLE); \
|
|
|
|
if [ $$$$? -gt 0 ]; \
|
2017-02-02 15:15:08 +01:00
|
|
|
then error_occurred=1; \
|
2016-08-27 17:01:59 +02:00
|
|
|
fi; \
|
|
|
|
printf "\n";
|
|
|
|
endif
|
2016-08-21 16:14:38 +02:00
|
|
|
endef
|
|
|
|
|
2016-08-21 15:29:54 +02:00
|
|
|
define PARSE_TEST
|
2016-08-27 12:29:54 +02:00
|
|
|
TESTS :=
|
2017-10-14 23:32:19 +02:00
|
|
|
TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
|
|
|
|
TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
|
2016-08-27 17:01:59 +02:00
|
|
|
ifeq ($$(TEST_NAME),all)
|
|
|
|
MATCHED_TESTS := $$(TEST_LIST)
|
|
|
|
else
|
|
|
|
MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),))
|
|
|
|
endif
|
2016-08-21 16:14:38 +02:00
|
|
|
$$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
|
2016-08-21 15:29:54 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Set the silent mode depending on if we are trying to compile multiple keyboards or not
|
2017-02-02 15:15:08 +01:00
|
|
|
# By default it's on in that case, but it can be overridden by specifying silent=false
|
2016-08-20 13:53:29 +02:00
|
|
|
# from the command line
|
2016-08-09 08:52:01 +02:00
|
|
|
define SET_SILENT_MODE
|
|
|
|
ifdef SUB_IS_SILENT
|
|
|
|
SILENT_MODE := $(SUB_IS_SILENT)
|
|
|
|
else ifeq ($$(words $$(COMMANDS)),1)
|
|
|
|
SILENT_MODE := false
|
|
|
|
else
|
|
|
|
SILENT_MODE := true
|
|
|
|
endif
|
|
|
|
endef
|
|
|
|
|
2016-08-08 00:16:06 +02:00
|
|
|
include $(ROOT_DIR)/message.mk
|
|
|
|
|
2017-04-09 19:04:12 +02:00
|
|
|
ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
|
|
|
|
HANDLE_ERROR = exit 1
|
|
|
|
else
|
|
|
|
HANDLE_ERROR = echo $$error_occurred > $(ERROR_FILE)
|
|
|
|
endif
|
|
|
|
|
2016-10-30 16:03:01 +01:00
|
|
|
# The empty line is important here, as it will force a new shell to be created for each command
|
|
|
|
# Otherwise the command line will become too long with a lot of keyboards and keymaps
|
|
|
|
define RUN_COMMAND
|
2017-02-02 15:15:08 +01:00
|
|
|
+error_occurred=0;\
|
2016-10-30 16:03:01 +01:00
|
|
|
$(COMMAND_$(SILENT_MODE)_$(COMMAND))\
|
2017-04-09 19:04:12 +02:00
|
|
|
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
|
2016-10-30 16:03:01 +01:00
|
|
|
|
|
|
|
|
|
|
|
endef
|
|
|
|
define RUN_TEST
|
2017-02-02 15:15:08 +01:00
|
|
|
+error_occurred=0;\
|
2016-12-29 13:56:01 +01:00
|
|
|
$($(TEST)_COMMAND)\
|
2017-04-09 19:04:12 +02:00
|
|
|
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
|
2017-07-10 12:04:27 +02:00
|
|
|
|
|
|
|
|
2016-10-30 16:03:01 +01:00
|
|
|
endef
|
2016-08-03 07:44:11 +02:00
|
|
|
|
2020-12-29 20:42:09 +01:00
|
|
|
# Catch everything and parse the command line ourselves.
|
2016-08-03 07:44:11 +02:00
|
|
|
.PHONY: %
|
2016-11-01 17:52:58 +01:00
|
|
|
%:
|
2016-08-20 13:53:29 +02:00
|
|
|
# Check if we have the CMP tool installed
|
2016-11-08 21:45:20 +01:00
|
|
|
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 23:38:50 +02:00
|
|
|
# Ensure that $(QMK_BIN) works.
|
|
|
|
if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi
|
2016-08-20 13:53:29 +02:00
|
|
|
# Check if the submodules are dirty, and display a warning if they are
|
2016-12-29 14:20:43 +01:00
|
|
|
ifndef SKIP_GIT
|
2019-11-05 20:50:18 +01:00
|
|
|
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi
|
|
|
|
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 50 --init lib/chibios-contrib; fi
|
|
|
|
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --depth 50 --init lib/ugfx; fi
|
|
|
|
if [ ! -e lib/lufa ]; then git submodule sync lib/lufa && git submodule update --depth 50 --init lib/lufa; fi
|
2020-05-30 22:14:59 +02:00
|
|
|
if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi
|
|
|
|
if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi
|
2016-08-08 10:19:29 +02:00
|
|
|
git submodule status --recursive 2>/dev/null | \
|
|
|
|
while IFS= read -r x; do \
|
|
|
|
case "$$x" in \
|
|
|
|
\ *) ;; \
|
|
|
|
*) printf "$(MSG_SUBMODULE_DIRTY)";break;; \
|
|
|
|
esac \
|
|
|
|
done
|
2016-12-29 14:20:43 +01:00
|
|
|
endif
|
2016-10-30 16:03:01 +01:00
|
|
|
rm -f $(ERROR_FILE) > /dev/null 2>&1
|
2016-08-03 07:44:11 +02:00
|
|
|
$(eval $(call PARSE_RULE,$@))
|
2016-08-09 08:52:01 +02:00
|
|
|
$(eval $(call SET_SILENT_MODE))
|
2016-08-20 13:53:29 +02:00
|
|
|
# Run all the commands in the same shell, notice the + at the first line
|
|
|
|
# it has to be there to allow parallel execution of the submake
|
|
|
|
# This always tries to compile everything, even if error occurs in the middle
|
|
|
|
# But we return the error code at the end, to trigger travis failures
|
2019-01-26 19:03:58 +01:00
|
|
|
# The sort at this point is to remove duplicates
|
|
|
|
$(foreach COMMAND,$(sort $(COMMANDS)),$(RUN_COMMAND))
|
2016-10-30 16:03:01 +01:00
|
|
|
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
|
2019-01-26 19:03:58 +01:00
|
|
|
$(foreach TEST,$(sort $(TESTS)),$(RUN_TEST))
|
2016-11-01 17:52:58 +01:00
|
|
|
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
|
2016-08-03 07:44:11 +02:00
|
|
|
|
2017-09-07 06:09:01 +02:00
|
|
|
lib/%:
|
|
|
|
git submodule sync $?
|
|
|
|
git submodule update --init $?
|
|
|
|
|
2019-02-02 15:26:35 +01:00
|
|
|
.PHONY: git-submodule
|
2017-08-27 05:58:19 +02:00
|
|
|
git-submodule:
|
|
|
|
git submodule sync --recursive
|
2018-09-11 01:21:54 +02:00
|
|
|
git submodule update --init --recursive --progress
|
2017-08-27 05:58:19 +02:00
|
|
|
|
2016-08-20 13:53:29 +02:00
|
|
|
# Generate the version.h file
|
2021-06-26 18:29:02 +02:00
|
|
|
ifdef SKIP_GIT
|
|
|
|
VERSION_H_FLAGS := --skip-git
|
2016-11-01 17:52:58 +01:00
|
|
|
endif
|
2021-06-26 18:29:02 +02:00
|
|
|
ifdef SKIP_VERSION
|
|
|
|
VERSION_H_FLAGS := --skip-all
|
|
|
|
SKIP_GIT := yes
|
2020-11-28 21:02:18 +01:00
|
|
|
endif
|
|
|
|
|
2021-06-26 18:29:02 +02:00
|
|
|
$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o quantum/version.h)
|
2020-12-20 03:51:11 +01:00
|
|
|
$(shell python3 util/build_id.py >> $(ROOT_DIR)/quantum/version.h)
|
2016-08-21 15:29:54 +02:00
|
|
|
|
2016-11-08 21:45:20 +01:00
|
|
|
include $(ROOT_DIR)/testlist.mk
|