Merge pull request #7 from keyboardio/f/onFocusEvent

Migrate to the new onFocusEvent API
pull/389/head
Jesse Vincent 6 years ago committed by GitHub
commit 7bf6725628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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

@ -37,9 +37,8 @@ class EEPROMKeymapProgrammer : public kaleidoscope::Plugin {
static void nextState(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 onFocusEvent(const char *command);
private:
typedef enum {
@ -56,6 +55,3 @@ class EEPROMKeymapProgrammer : public kaleidoscope::Plugin {
}
extern kaleidoscope::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;
#define FOCUS_HOOK_KEYMAP_PROGRAMMER FOCUS_HOOK(EEPROMKeymapProgrammer.focusHook, \
"keymap.toggleProgrammer")

Loading…
Cancel
Save