aboutsummaryrefslogtreecommitdiff
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-11-28 12:02:18 -0800
committerGitHub <noreply@github.com>2020-11-28 12:02:18 -0800
commitc66df1664497546f32662409778731143e45a552 (patch)
treeda73a2d532a27685a31d932b3a44a707d4a3af81 /docs/breaking_changes.md
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
downloadqmk_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 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md30
1 files changed, 8 insertions, 22 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index abace8164..3ee14f2bf 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -6,6 +6,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
6 6
7## What has been included in past Breaking Changes? 7## What has been included in past Breaking Changes?
8 8
9* [2020 Nov 28](ChangeLog/20201128.md)
9* [2020 Aug 29](ChangeLog/20200829.md) 10* [2020 Aug 29](ChangeLog/20200829.md)
10* [2020 May 30](ChangeLog/20200530.md) 11* [2020 May 30](ChangeLog/20200530.md)
11* [2020 Feb 29](ChangeLog/20200229.md) 12* [2020 Feb 29](ChangeLog/20200229.md)
@@ -13,16 +14,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero
13 14
14## When is the next Breaking Change? 15## When is the next Breaking Change?
15 16
16The next Breaking Change is scheduled for November 28, 2020. 17The next Breaking Change is scheduled for February 27, 2021.
17 18
18### Important Dates 19### Important Dates
19 20
20* [x] 2020 Aug 29 - `develop` is created. It will be rebased weekly. 21* [x] 2020 Nov 28 - `develop` is created. Each push to `master` is subsequently merged to `develop`
21* [ ] 2020 Oct 31 - `develop` closed to new PR's. 22* [ ] 2021 Jan 30 - `develop` closed to new PR's.
22* [ ] 2020 Oct 31 - Call for testers. 23* [ ] 2021 Jan 30 - Call for testers.
23* [ ] 2020 Nov 26 - `master` is locked, no PR's merged. 24* [ ] 2021 Feb 25 - `master` is locked, no PR's merged.
24* [ ] 2020 Nov 28 - Merge `develop` to `master`. 25* [ ] 2021 Feb 27 - Merge `develop` to `master`.
25* [ ] 2020 Nov 28 - `master` is unlocked. PR's can be merged again. 26* [ ] 2021 Feb 27 - `master` is unlocked. PR's can be merged again.
26 27
27## What changes will be included? 28## What changes will be included?
28 29
@@ -39,21 +40,6 @@ Criteria for acceptance:
39 40
40This section documents various processes we use when running the Breaking Changes process. 41This section documents various processes we use when running the Breaking Changes process.
41 42
42## Rebase `develop` from `master`
43
44This is run every Friday while `develop` is open.
45
46Process:
47
48```
49cd qmk_firmware
50git checkout master
51git pull --ff-only
52git checkout develop
53git rebase master
54git push --force
55```
56
57## Creating the `develop` branch 43## Creating the `develop` branch
58 44
59This happens immediately after the previous `develop` branch is merged. 45This happens immediately after the previous `develop` branch is merged.