drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2020-12-16 03:27:52 +00:00
commit 2e0f2025bd
81 changed files with 108 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

2
keyboards/hadron/ver2/keymaps/default/keymap.c
View file

@ -309,7 +309,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
//Functions for ver2
#ifdef KEYBOARD_hadron_ver2
#include "LUFA/Drivers/Peripheral/TWI.h"
#include <LUFA/Drivers/Peripheral/TWI.h>
void matrix_init_user(void) {
#ifdef USE_I2C
i2c_master_init();

2
keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
View file

@ -1,5 +1,5 @@
#include QMK_KEYBOARD_H
#include "LUFA/Drivers/Peripheral/TWI.h"
#include <LUFA/Drivers/Peripheral/TWI.h>
#ifdef AUDIO_ENABLE
#include "audio.h"
#endif