From 653f65fe6efde8dca5f6c928be3ce4b38ffe86aa Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 6 Jan 2020 17:21:30 +0100 Subject: [PATCH] EEPROM-Keymap: Deprecate the deprecated 2-arg constructor Originally scheduled to be removed by May last year, lets drop it now. Signed-off-by: Gergely Nagy --- docs/UPGRADING.md | 11 ++++++----- src/kaleidoscope/plugin/EEPROM-Keymap.h | 7 ------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index f3742eff..44bee797 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -21,7 +21,6 @@ If any of this does not make sense to you, or you have trouble updating your .in + [Deprecated APIs and their replacements](#deprecated-apis-and-their-replacements) - [Removal of Layer.defaultLayer](#removal-of-layerdefaultlayer) - [More clarity in Layer method names](#more-clarity-in-layer-method-names) - - [EEPROMKeymap mode](#eepromkeymap-mode) - [Source code and namespace rearrangement](#source-code-and-namespace-rearrangement) * [Removed APIs](#removed-apis) @@ -498,10 +497,6 @@ the firmware to remain backwards compatible, however, these functions are deprec Also a new version of the onKeyswitchEvent-handler has been introduced. The old version is deprecated. -### EEPROMKeymap mode - -The [EEPROM-Keymap](doc/plugin/EEPROM-Keymap.md) plugin had its `setup()` method changed, the formerly optional `method` argument is now obsolete and unused. It can be safely removed. Supplying a second argument will continue to work until its scheduled removal by **2019-04-30**. - ## keymaps array and KEYMAPS and KEYMAPS_STACKED macros The `keymaps` array has been replaced with a `keymaps_linear` array. This new array treats each layer as a simple one dimensional array of keys, rather than a two dimensional array of arrays of rows. At the same time, the `KEYMAPS` and `KEYMAPS_STACKED` macros that were previously defined in each hardware implmentation class have been replaced with `PER_KEY_DATA` and `PER_KEY_DATA_STACKED` macros in each hardware class. This change should be invisible to users, but will require changes by any plugin that accessed the 'keymaps' variable directly. @@ -533,6 +528,12 @@ The following headers and names have changed: # Removed APIs +### Removed on 2020-01-06 + +### EEPROMKeymap mode + +The [EEPROM-Keymap](doc/plugin/EEPROM-Keymap.md) plugin had its `setup()` method changed, the formerly optional `method` argument is now obsolete and unused. It can be safely removed. + ### Removed on 2019-01-18 ### Removal of Layer.defaultLayer diff --git a/src/kaleidoscope/plugin/EEPROM-Keymap.h b/src/kaleidoscope/plugin/EEPROM-Keymap.h index ac7e4c40..838c07a6 100644 --- a/src/kaleidoscope/plugin/EEPROM-Keymap.h +++ b/src/kaleidoscope/plugin/EEPROM-Keymap.h @@ -20,10 +20,6 @@ #include "kaleidoscope/Runtime.h" #include -#define _DEPRECATED_MESSAGE_EEPROM_KEYMAP_SETUP_MODE \ - "The `mode` argument of EEPROMKeymap.setup() is deprecated and is not\n" \ - "used anymore. You can remove it safely." - namespace kaleidoscope { namespace plugin { class EEPROMKeymap : public kaleidoscope::Plugin { @@ -39,9 +35,6 @@ class EEPROMKeymap : public kaleidoscope::Plugin { EventHandlerResult onFocusEvent(const char *command); static void setup(uint8_t max); - static void setup(uint8_t max, Mode mode) DEPRECATED(EEPROM_KEYMAP_SETUP_MODE) { - setup(max); - } static void max_layers(uint8_t max);