From 0dc276327f5179ded5d4d6eb211213e5585e99d1 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 20 Aug 2018 23:16:01 +0200 Subject: [PATCH] Drop the V1 plugin API compatibility code Signed-off-by: Gergely Nagy --- src/Kaleidoscope-Macros.cpp | 23 ----------------------- src/Kaleidoscope-Macros.h | 11 ----------- 2 files changed, 34 deletions(-) diff --git a/src/Kaleidoscope-Macros.cpp b/src/Kaleidoscope-Macros.cpp index e9a644ef..7f51cfa1 100644 --- a/src/Kaleidoscope-Macros.cpp +++ b/src/Kaleidoscope-Macros.cpp @@ -218,27 +218,4 @@ kaleidoscope::EventHandlerResult Macros_::beforeReportingState() { return kaleidoscope::EventHandlerResult::OK; } -// Legacy V1 API -#if KALEIDOSCOPE_ENABLE_V1_PLUGIN_API -void Macros_::begin() { - Kaleidoscope.useEventHandlerHook(legacyEventHandler); - Kaleidoscope.useLoopHook(legacyLoopHook); -} - -Key Macros_::legacyEventHandler(Key mapped_key, byte row, byte col, uint8_t key_state) { - kaleidoscope::EventHandlerResult r = Macros.onKeyswitchEvent(mapped_key, row, col, key_state); - if (r == kaleidoscope::EventHandlerResult::OK) - return mapped_key; - return Key_NoKey; -} - -void Macros_::legacyLoopHook(bool is_post_clear) { - if (is_post_clear) { - Macros.afterEachCycle(); - } else { - Macros.beforeReportingState(); - } -} -#endif - Macros_ Macros; diff --git a/src/Kaleidoscope-Macros.h b/src/Kaleidoscope-Macros.h index a727b125..f1eb6c01 100644 --- a/src/Kaleidoscope-Macros.h +++ b/src/Kaleidoscope-Macros.h @@ -57,17 +57,6 @@ class Macros_ : public kaleidoscope::Plugin { static byte row, col; -#if KALEIDOSCOPE_ENABLE_V1_PLUGIN_API - kaleidoscope::EventHandlerResult onSetup() { - return kaleidoscope::EventHandlerResult::OK; - } - - protected: - void begin(); - static Key legacyEventHandler(Key mapped_key, byte row, byte col, uint8_t key_state); - static void legacyLoopHook(bool is_post_clear); -#endif - private: Key lookupAsciiCode(uint8_t ascii_code); };