Move keymap data structures out of the toplevel sketch

pull/18/head
Jesse Vincent 9 years ago
parent 3c223d4b3d
commit feebc13dca

@ -27,7 +27,6 @@ void setup();
extern HARDWARE_IMPLEMENTATION KeyboardHardware; extern HARDWARE_IMPLEMENTATION KeyboardHardware;
extern const Key keymaps[KEYMAPS][ROWS][COLS];
extern uint8_t primary_keymap; extern uint8_t primary_keymap;
extern uint8_t temporary_keymap; extern uint8_t temporary_keymap;

@ -7,7 +7,6 @@
#include "KeyboardioHID.h" #include "KeyboardioHID.h"
const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
uint8_t primary_keymap = 0; uint8_t primary_keymap = 0;
uint8_t temporary_keymap = 0; uint8_t temporary_keymap = 0;

@ -1,5 +1,7 @@
#include "key_events.h" #include "key_events.h"
const Key keymaps[KEYMAPS][ROWS][COLS] = { KEYMAP_LIST };
void handle_synthetic_key_event(uint8_t switchState, Key mappedKey) { void handle_synthetic_key_event(uint8_t switchState, Key mappedKey) {
if (mappedKey.flags & IS_MOUSE_KEY && !( mappedKey.rawKey & KEY_MOUSE_WARP) ) { if (mappedKey.flags & IS_MOUSE_KEY && !( mappedKey.rawKey & KEY_MOUSE_WARP) ) {
handle_mouse_key_event(switchState, mappedKey); handle_mouse_key_event(switchState, mappedKey);

@ -6,6 +6,8 @@
#include "MouseWrapper.h" #include "MouseWrapper.h"
#include "LEDControl.h" #include "LEDControl.h"
#include "Storage.h" #include "Storage.h"
#include "keymaps.h"
#include "generated/keymaps.h"
extern const Key keymaps[KEYMAPS][ROWS][COLS]; extern const Key keymaps[KEYMAPS][ROWS][COLS];
extern uint8_t primary_keymap; extern uint8_t primary_keymap;

Loading…
Cancel
Save