diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-11-28 12:02:18 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-28 12:02:18 -0800 |
commit | c66df1664497546f32662409778731143e45a552 (patch) | |
tree | da73a2d532a27685a31d932b3a44a707d4a3af81 /Makefile | |
parent | 15385d4113414d42bd062c60c9de5df797d3157f (diff) | |
download | qmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz qmk_firmware-c66df1664497546f32662409778731143e45a552.zip |
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 24 |
1 files changed, 20 insertions, 4 deletions
@@ -272,11 +272,24 @@ endef | |||
272 | define PARSE_RULE | 272 | define PARSE_RULE |
273 | RULE := $1 | 273 | RULE := $1 |
274 | COMMANDS := | 274 | COMMANDS := |
275 | REQUIRE_PLATFORM_KEY := | ||
275 | # If the rule starts with all, then continue the parsing from | 276 | # If the rule starts with all, then continue the parsing from |
276 | # PARSE_ALL_KEYBOARDS | 277 | # PARSE_ALL_KEYBOARDS |
277 | ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true) | 278 | ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true) |
278 | KEYBOARD_RULE=all | 279 | KEYBOARD_RULE=all |
279 | $$(eval $$(call PARSE_ALL_KEYBOARDS)) | 280 | $$(eval $$(call PARSE_ALL_KEYBOARDS)) |
281 | else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-avr),true) | ||
282 | KEYBOARD_RULE=all | ||
283 | REQUIRE_PLATFORM_KEY := avr | ||
284 | $$(eval $$(call PARSE_ALL_KEYBOARDS)) | ||
285 | else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-chibios),true) | ||
286 | KEYBOARD_RULE=all | ||
287 | REQUIRE_PLATFORM_KEY := chibios | ||
288 | $$(eval $$(call PARSE_ALL_KEYBOARDS)) | ||
289 | else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-arm_atsam),true) | ||
290 | KEYBOARD_RULE=all | ||
291 | REQUIRE_PLATFORM_KEY := arm_atsam | ||
292 | $$(eval $$(call PARSE_ALL_KEYBOARDS)) | ||
280 | else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true) | 293 | else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true) |
281 | $$(eval $$(call PARSE_TEST)) | 294 | $$(eval $$(call PARSE_TEST)) |
282 | # If the rule starts with the name of a known keyboard, then continue | 295 | # If the rule starts with the name of a known keyboard, then continue |
@@ -447,7 +460,7 @@ define PARSE_KEYMAP | |||
447 | # Format it in bold | 460 | # Format it in bold |
448 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) | 461 | KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) |
449 | # Specify the variables that we are passing forward to submake | 462 | # Specify the variables that we are passing forward to submake |
450 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) | 463 | MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) |
451 | # And the first part of the make command | 464 | # And the first part of the make command |
452 | MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) | 465 | MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) |
453 | # The message to display | 466 | # The message to display |
@@ -466,6 +479,8 @@ define BUILD | |||
466 | LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \ | 479 | LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \ |
467 | if [ $$$$? -gt 0 ]; \ | 480 | if [ $$$$? -gt 0 ]; \ |
468 | then $$(PRINT_ERROR_PLAIN); \ | 481 | then $$(PRINT_ERROR_PLAIN); \ |
482 | elif [ "$$$$LOG" = "skipped" ] ; \ | ||
483 | then $$(PRINT_SKIPPED_PLAIN); \ | ||
469 | elif [ "$$$$LOG" != "" ] ; \ | 484 | elif [ "$$$$LOG" != "" ] ; \ |
470 | then $$(PRINT_WARNING_PLAIN); \ | 485 | then $$(PRINT_WARNING_PLAIN); \ |
471 | else \ | 486 | else \ |
@@ -637,12 +652,13 @@ else | |||
637 | endif | 652 | endif |
638 | ifndef SKIP_VERSION | 653 | ifndef SKIP_VERSION |
639 | BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") | 654 | BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") |
655 | else | ||
656 | BUILD_DATE := 2020-01-01-00:00:00 | ||
657 | endif | ||
658 | |||
640 | $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) | 659 | $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) |
641 | $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) | 660 | $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) |
642 | $(shell echo '#define CHIBIOS_VERSION "$(CHIBIOS_VERSION)"' >> $(ROOT_DIR)/quantum/version.h) | 661 | $(shell echo '#define CHIBIOS_VERSION "$(CHIBIOS_VERSION)"' >> $(ROOT_DIR)/quantum/version.h) |
643 | $(shell echo '#define CHIBIOS_CONTRIB_VERSION "$(CHIBIOS_CONTRIB_VERSION)"' >> $(ROOT_DIR)/quantum/version.h) | 662 | $(shell echo '#define CHIBIOS_CONTRIB_VERSION "$(CHIBIOS_CONTRIB_VERSION)"' >> $(ROOT_DIR)/quantum/version.h) |
644 | else | ||
645 | BUILD_DATE := NA | ||
646 | endif | ||
647 | 663 | ||
648 | include $(ROOT_DIR)/testlist.mk | 664 | include $(ROOT_DIR)/testlist.mk |