From a79a2c736572ac082d4947ef1555e9fd22bf94f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 9 Jan 2017 20:25:35 +0100 Subject: [PATCH] Rename default_layout.c to current_keymap.c and add current_keymap.h --- right/src/action.c | 1 + right/src/action.h | 2 -- right/src/{default_layout.c => current_keymap.c} | 0 right/src/current_keymap.h | 12 ++++++++++++ right/src/deserialize.c | 2 ++ 5 files changed, 15 insertions(+), 2 deletions(-) rename right/src/{default_layout.c => current_keymap.c} (100%) create mode 100644 right/src/current_keymap.h diff --git a/right/src/action.c b/right/src/action.c index 5cd04b1..c414b47 100644 --- a/right/src/action.c +++ b/right/src/action.c @@ -3,6 +3,7 @@ #include "led_display.h" #include "layer.h" #include "usb_interface_mouse.h" +#include "current_keymap.h" static uint8_t keyMasks[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; diff --git a/right/src/action.h b/right/src/action.h index d54fe41..6d333a4 100644 --- a/right/src/action.h +++ b/right/src/action.h @@ -90,8 +90,6 @@ typedef struct { }; } __attribute__ ((packed)) key_action_t; -extern key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; - void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_report_t *mouseReport); #endif diff --git a/right/src/default_layout.c b/right/src/current_keymap.c similarity index 100% rename from right/src/default_layout.c rename to right/src/current_keymap.c diff --git a/right/src/current_keymap.h b/right/src/current_keymap.h new file mode 100644 index 0000000..2f12834 --- /dev/null +++ b/right/src/current_keymap.h @@ -0,0 +1,12 @@ +#ifndef __CURRENT_KEYMAP_H_ +#define __CURRENT_KEYMAP_H_ + +// Includes: + + #include + +// Variables: + + extern key_action_t CurrentKeymap[LAYER_COUNT][SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; + +#endif diff --git a/right/src/deserialize.c b/right/src/deserialize.c index cc2f258..2794970 100644 --- a/right/src/deserialize.c +++ b/right/src/deserialize.c @@ -1,5 +1,7 @@ #include "deserialize.h" #include "action.h" +#include "current_keymap.h" + #define longCompactLengthPrefix 0xff #define HAS_SCANCODE (1 << 0)