Move declaration of keymap_config.
Should really not declare variables in .h files - since it's included in different .c files, a proper linker then complains that the same variable is declared more than once (once for each .c file that the offending .h is included in).
This commit is contained in:
parent
d9652cdf99
commit
cb663eeca6
@ -10,6 +10,7 @@
|
|||||||
#include "eeconfig.h"
|
#include "eeconfig.h"
|
||||||
#include "bootmagic.h"
|
#include "bootmagic.h"
|
||||||
|
|
||||||
|
keymap_config_t keymap_config;
|
||||||
|
|
||||||
void bootmagic(void)
|
void bootmagic(void)
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "bootloader.h"
|
#include "bootloader.h"
|
||||||
|
|
||||||
|
#ifdef BOOTMAGIC_ENABLE
|
||||||
|
extern keymap_config_t keymap_config;
|
||||||
|
#endif
|
||||||
|
|
||||||
static action_t keycode_to_action(uint8_t keycode);
|
static action_t keycode_to_action(uint8_t keycode);
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@ typedef union {
|
|||||||
bool nkro:1;
|
bool nkro:1;
|
||||||
};
|
};
|
||||||
} keymap_config_t;
|
} keymap_config_t;
|
||||||
keymap_config_t keymap_config;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user