Migrate to the new onFocusEvent API

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
pull/389/head
Gergely Nagy 6 years ago
parent df9a99dd11
commit 2d8ff95239

@ -94,16 +94,21 @@ EventHandlerResult EEPROMKeymapProgrammer::onKeyswitchEvent(Key &mapped_key, byt
return EventHandlerResult::EVENT_CONSUMED; return EventHandlerResult::EVENT_CONSUMED;
} }
bool EEPROMKeymapProgrammer::focusHook(const char *command) { EventHandlerResult EEPROMKeymapProgrammer::onFocusEvent(const char *command) {
if (strcmp_P(command, PSTR("keymap.toggleProgrammer")) != 0) const char *cmd = PSTR("keymap.toggleProgrammer");
return false;
if (::Focus.handleHelp(command, cmd))
return EventHandlerResult::OK;
if (strcmp_P(command, cmd) != 0)
return EventHandlerResult::OK;
if (state_ == INACTIVE) if (state_ == INACTIVE)
activate(); activate();
else else
cancel(); cancel();
return true; return EventHandlerResult::EVENT_CONSUMED;
} }
} }

@ -37,9 +37,8 @@ class EEPROMKeymapProgrammer : public kaleidoscope::Plugin {
static void nextState(void); static void nextState(void);
static void cancel(void); static void cancel(void);
static bool focusHook(const char *command);
EventHandlerResult onKeyswitchEvent(Key &mapped_key, byte row, byte col, uint8_t key_state); EventHandlerResult onKeyswitchEvent(Key &mapped_key, byte row, byte col, uint8_t key_state);
EventHandlerResult onFocusEvent(const char *command);
private: private:
typedef enum { typedef enum {
@ -56,6 +55,3 @@ class EEPROMKeymapProgrammer : public kaleidoscope::Plugin {
} }
extern kaleidoscope::EEPROMKeymapProgrammer EEPROMKeymapProgrammer; extern kaleidoscope::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;
#define FOCUS_HOOK_KEYMAP_PROGRAMMER FOCUS_HOOK(EEPROMKeymapProgrammer.focusHook, \
"keymap.toggleProgrammer")

Loading…
Cancel
Save