From 3ac9b54ca93ab69be563b559f34795fac4170f4f Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 22 Mar 2017 08:37:07 +0100 Subject: [PATCH] Make `programmerMode` (now `mode`) public Instead of using a setter, just make the variable public. Signed-off-by: Gergely Nagy --- src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp | 9 ++------- src/Kaleidoscope/EEPROM-Keymap-Programmer.h | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp b/src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp index 446d723a..5a3b1f0a 100644 --- a/src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp +++ b/src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp @@ -21,7 +21,7 @@ namespace KaleidoscopePlugins { uint16_t EEPROMKeymapProgrammer::updatePosition; EEPROMKeymapProgrammer::state_t EEPROMKeymapProgrammer::state; - EEPROMKeymapProgrammer::mode_t EEPROMKeymapProgrammer::programmerMode; + EEPROMKeymapProgrammer::mode_t EEPROMKeymapProgrammer::mode; Key EEPROMKeymapProgrammer::newKey; EEPROMKeymapProgrammer::EEPROMKeymapProgrammer (void) { @@ -32,11 +32,6 @@ namespace KaleidoscopePlugins { event_handler_hook_use (eventHandlerHook); } - void - EEPROMKeymapProgrammer::mode (mode_t programmerMode_) { - programmerMode = programmerMode_; - } - void EEPROMKeymapProgrammer::nextState (void) { switch (state) { @@ -44,7 +39,7 @@ namespace KaleidoscopePlugins { state = WAIT_FOR_KEY; break; case WAIT_FOR_KEY: - if (programmerMode == CODE) + if (mode == CODE) state = WAIT_FOR_CODE; else state = WAIT_FOR_SOURCE_KEY; diff --git a/src/Kaleidoscope/EEPROM-Keymap-Programmer.h b/src/Kaleidoscope/EEPROM-Keymap-Programmer.h index 0ee44636..e65bc4d8 100644 --- a/src/Kaleidoscope/EEPROM-Keymap-Programmer.h +++ b/src/Kaleidoscope/EEPROM-Keymap-Programmer.h @@ -28,17 +28,16 @@ namespace KaleidoscopePlugins { CODE, COPY, } mode_t; + static mode_t mode; EEPROMKeymapProgrammer (void); virtual void begin (void) final; - static void mode (mode_t programmerMode); static void nextState (void); static void cancel (void); private: - static mode_t programmerMode; typedef enum { INACTIVE, WAIT_FOR_KEY,